commit | caa3f20aa7b64240f4265ede5e6deddf0f2d0cf7 | [log] [tgz] |
---|---|---|
author | Adam Barth <abarth@google.com> | Thu Jan 31 20:36:13 2019 -0800 |
committer | Adam Barth <abarth@google.com> | Thu Jan 31 20:36:13 2019 -0800 |
tree | 879aca0d00aefa440f34129e4c6a7dcd55d23036 | |
parent | 66e1924c2a18c92594644cfa392bf02cb568984d [diff] |
[reorg] Prepare for merge into fuchsia.git
diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index d19ca21..0000000 --- a/MAINTAINERS +++ /dev/null
@@ -1,2 +0,0 @@ -abarth@google.com -raggi@google.com
diff --git a/.cargo/config b/garnet/.cargo/config similarity index 100% rename from .cargo/config rename to garnet/.cargo/config
diff --git a/.clang-format b/garnet/.clang-format similarity index 100% rename from .clang-format rename to garnet/.clang-format
diff --git a/.dir-locals.el b/garnet/.dir-locals.el similarity index 100% rename from .dir-locals.el rename to garnet/.dir-locals.el
diff --git a/.gitattributes b/garnet/.gitattributes similarity index 100% rename from .gitattributes rename to garnet/.gitattributes
diff --git a/.gitignore b/garnet/.gitignore similarity index 100% rename from .gitignore rename to garnet/.gitignore
diff --git a/AUTHORS b/garnet/AUTHORS similarity index 100% rename from AUTHORS rename to garnet/AUTHORS
diff --git a/BUILD.gn b/garnet/BUILD.gn similarity index 100% rename from BUILD.gn rename to garnet/BUILD.gn
diff --git a/CONTRIBUTING.md b/garnet/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to garnet/CONTRIBUTING.md
diff --git a/LICENSE b/garnet/LICENSE similarity index 100% rename from LICENSE rename to garnet/LICENSE
diff --git a/lib/MAINTAINERS b/garnet/MAINTAINERS similarity index 100% copy from lib/MAINTAINERS copy to garnet/MAINTAINERS
diff --git a/PATENTS b/garnet/PATENTS similarity index 100% rename from PATENTS rename to garnet/PATENTS
diff --git a/README.md b/garnet/README.md similarity index 100% rename from README.md rename to garnet/README.md
diff --git a/bin/MAINTAINERS b/garnet/bin/MAINTAINERS similarity index 100% rename from bin/MAINTAINERS rename to garnet/bin/MAINTAINERS
diff --git a/bin/a11y/BUILD.gn b/garnet/bin/a11y/BUILD.gn similarity index 100% rename from bin/a11y/BUILD.gn rename to garnet/bin/a11y/BUILD.gn
diff --git a/bin/a11y/MAINTAINERS b/garnet/bin/a11y/MAINTAINERS similarity index 100% rename from bin/a11y/MAINTAINERS rename to garnet/bin/a11y/MAINTAINERS
diff --git a/bin/a11y/README.md b/garnet/bin/a11y/README.md similarity index 100% rename from bin/a11y/README.md rename to garnet/bin/a11y/README.md
diff --git a/bin/a11y/a11y_manager/BUILD.gn b/garnet/bin/a11y/a11y_manager/BUILD.gn similarity index 100% rename from bin/a11y/a11y_manager/BUILD.gn rename to garnet/bin/a11y/a11y_manager/BUILD.gn
diff --git a/bin/a11y/a11y_manager/app.cc b/garnet/bin/a11y/a11y_manager/app.cc similarity index 100% rename from bin/a11y/a11y_manager/app.cc rename to garnet/bin/a11y/a11y_manager/app.cc
diff --git a/bin/a11y/a11y_manager/app.h b/garnet/bin/a11y/a11y_manager/app.h similarity index 100% rename from bin/a11y/a11y_manager/app.h rename to garnet/bin/a11y/a11y_manager/app.h
diff --git a/bin/a11y/a11y_manager/main.cc b/garnet/bin/a11y/a11y_manager/main.cc similarity index 100% rename from bin/a11y/a11y_manager/main.cc rename to garnet/bin/a11y/a11y_manager/main.cc
diff --git a/bin/a11y/a11y_manager/manager_impl.cc b/garnet/bin/a11y/a11y_manager/manager_impl.cc similarity index 100% rename from bin/a11y/a11y_manager/manager_impl.cc rename to garnet/bin/a11y/a11y_manager/manager_impl.cc
diff --git a/bin/a11y/a11y_manager/manager_impl.h b/garnet/bin/a11y/a11y_manager/manager_impl.h similarity index 100% rename from bin/a11y/a11y_manager/manager_impl.h rename to garnet/bin/a11y/a11y_manager/manager_impl.h
diff --git a/bin/a11y/a11y_manager/semantic_tree.cc b/garnet/bin/a11y/a11y_manager/semantic_tree.cc similarity index 100% rename from bin/a11y/a11y_manager/semantic_tree.cc rename to garnet/bin/a11y/a11y_manager/semantic_tree.cc
diff --git a/bin/a11y/a11y_manager/semantic_tree.h b/garnet/bin/a11y/a11y_manager/semantic_tree.h similarity index 100% rename from bin/a11y/a11y_manager/semantic_tree.h rename to garnet/bin/a11y/a11y_manager/semantic_tree.h
diff --git a/bin/a11y/a11y_manager/toggler_impl.cc b/garnet/bin/a11y/a11y_manager/toggler_impl.cc similarity index 100% rename from bin/a11y/a11y_manager/toggler_impl.cc rename to garnet/bin/a11y/a11y_manager/toggler_impl.cc
diff --git a/bin/a11y/a11y_manager/toggler_impl.h b/garnet/bin/a11y/a11y_manager/toggler_impl.h similarity index 100% rename from bin/a11y/a11y_manager/toggler_impl.h rename to garnet/bin/a11y/a11y_manager/toggler_impl.h
diff --git a/bin/a11y/a11y_toggler/BUILD.gn b/garnet/bin/a11y/a11y_toggler/BUILD.gn similarity index 100% rename from bin/a11y/a11y_toggler/BUILD.gn rename to garnet/bin/a11y/a11y_toggler/BUILD.gn
diff --git a/bin/a11y/a11y_toggler/README.md b/garnet/bin/a11y/a11y_toggler/README.md similarity index 100% rename from bin/a11y/a11y_toggler/README.md rename to garnet/bin/a11y/a11y_toggler/README.md
diff --git a/bin/a11y/a11y_toggler/main.cc b/garnet/bin/a11y/a11y_toggler/main.cc similarity index 100% rename from bin/a11y/a11y_toggler/main.cc rename to garnet/bin/a11y/a11y_toggler/main.cc
diff --git a/bin/a11y/meta/a11y_manager.cmx b/garnet/bin/a11y/meta/a11y_manager.cmx similarity index 100% rename from bin/a11y/meta/a11y_manager.cmx rename to garnet/bin/a11y/meta/a11y_manager.cmx
diff --git a/bin/a11y/meta/a11y_manager_apptests.cmx b/garnet/bin/a11y/meta/a11y_manager_apptests.cmx similarity index 100% rename from bin/a11y/meta/a11y_manager_apptests.cmx rename to garnet/bin/a11y/meta/a11y_manager_apptests.cmx
diff --git a/bin/a11y/meta/a11y_toggler.cmx b/garnet/bin/a11y/meta/a11y_toggler.cmx similarity index 100% rename from bin/a11y/meta/a11y_toggler.cmx rename to garnet/bin/a11y/meta/a11y_toggler.cmx
diff --git a/bin/a11y/meta/talkback.cmx b/garnet/bin/a11y/meta/talkback.cmx similarity index 100% rename from bin/a11y/meta/talkback.cmx rename to garnet/bin/a11y/meta/talkback.cmx
diff --git a/bin/a11y/talkback/BUILD.gn b/garnet/bin/a11y/talkback/BUILD.gn similarity index 100% rename from bin/a11y/talkback/BUILD.gn rename to garnet/bin/a11y/talkback/BUILD.gn
diff --git a/bin/a11y/talkback/README.md b/garnet/bin/a11y/talkback/README.md similarity index 100% rename from bin/a11y/talkback/README.md rename to garnet/bin/a11y/talkback/README.md
diff --git a/bin/a11y/talkback/app.cc b/garnet/bin/a11y/talkback/app.cc similarity index 100% rename from bin/a11y/talkback/app.cc rename to garnet/bin/a11y/talkback/app.cc
diff --git a/bin/a11y/talkback/app.h b/garnet/bin/a11y/talkback/app.h similarity index 100% rename from bin/a11y/talkback/app.h rename to garnet/bin/a11y/talkback/app.h
diff --git a/bin/a11y/talkback/gesture_detector.cc b/garnet/bin/a11y/talkback/gesture_detector.cc similarity index 100% rename from bin/a11y/talkback/gesture_detector.cc rename to garnet/bin/a11y/talkback/gesture_detector.cc
diff --git a/bin/a11y/talkback/gesture_detector.h b/garnet/bin/a11y/talkback/gesture_detector.h similarity index 100% rename from bin/a11y/talkback/gesture_detector.h rename to garnet/bin/a11y/talkback/gesture_detector.h
diff --git a/bin/a11y/talkback/gesture_listener.h b/garnet/bin/a11y/talkback/gesture_listener.h similarity index 100% rename from bin/a11y/talkback/gesture_listener.h rename to garnet/bin/a11y/talkback/gesture_listener.h
diff --git a/bin/a11y/talkback/main.cc b/garnet/bin/a11y/talkback/main.cc similarity index 100% rename from bin/a11y/talkback/main.cc rename to garnet/bin/a11y/talkback/main.cc
diff --git a/bin/a11y/talkback/talkback_gesture_state_machine.png b/garnet/bin/a11y/talkback/talkback_gesture_state_machine.png similarity index 100% rename from bin/a11y/talkback/talkback_gesture_state_machine.png rename to garnet/bin/a11y/talkback/talkback_gesture_state_machine.png Binary files differ
diff --git a/bin/a11y/talkback/talkback_impl.cc b/garnet/bin/a11y/talkback/talkback_impl.cc similarity index 100% rename from bin/a11y/talkback/talkback_impl.cc rename to garnet/bin/a11y/talkback/talkback_impl.cc
diff --git a/bin/a11y/talkback/talkback_impl.h b/garnet/bin/a11y/talkback/talkback_impl.h similarity index 100% rename from bin/a11y/talkback/talkback_impl.h rename to garnet/bin/a11y/talkback/talkback_impl.h
diff --git a/bin/a11y/tests/BUILD.gn b/garnet/bin/a11y/tests/BUILD.gn similarity index 100% rename from bin/a11y/tests/BUILD.gn rename to garnet/bin/a11y/tests/BUILD.gn
diff --git a/bin/a11y/tests/README.md b/garnet/bin/a11y/tests/README.md similarity index 100% rename from bin/a11y/tests/README.md rename to garnet/bin/a11y/tests/README.md
diff --git a/bin/a11y/tests/mocks/BUILD.gn b/garnet/bin/a11y/tests/mocks/BUILD.gn similarity index 100% rename from bin/a11y/tests/mocks/BUILD.gn rename to garnet/bin/a11y/tests/mocks/BUILD.gn
diff --git a/bin/a11y/tests/mocks/mock_semantics_provider.cc b/garnet/bin/a11y/tests/mocks/mock_semantics_provider.cc similarity index 100% rename from bin/a11y/tests/mocks/mock_semantics_provider.cc rename to garnet/bin/a11y/tests/mocks/mock_semantics_provider.cc
diff --git a/bin/a11y/tests/mocks/mock_semantics_provider.h b/garnet/bin/a11y/tests/mocks/mock_semantics_provider.h similarity index 100% rename from bin/a11y/tests/mocks/mock_semantics_provider.h rename to garnet/bin/a11y/tests/mocks/mock_semantics_provider.h
diff --git a/bin/a11y/tests/semantic_tree_test.cc b/garnet/bin/a11y/tests/semantic_tree_test.cc similarity index 100% rename from bin/a11y/tests/semantic_tree_test.cc rename to garnet/bin/a11y/tests/semantic_tree_test.cc
diff --git a/bin/appmgr/BUILD.gn b/garnet/bin/appmgr/BUILD.gn similarity index 100% rename from bin/appmgr/BUILD.gn rename to garnet/bin/appmgr/BUILD.gn
diff --git a/bin/appmgr/README.md b/garnet/bin/appmgr/README.md similarity index 100% rename from bin/appmgr/README.md rename to garnet/bin/appmgr/README.md
diff --git a/bin/appmgr/appmgr.cc b/garnet/bin/appmgr/appmgr.cc similarity index 100% rename from bin/appmgr/appmgr.cc rename to garnet/bin/appmgr/appmgr.cc
diff --git a/bin/appmgr/appmgr.h b/garnet/bin/appmgr/appmgr.h similarity index 100% rename from bin/appmgr/appmgr.h rename to garnet/bin/appmgr/appmgr.h
diff --git a/bin/appmgr/appmgr_unittest.cc b/garnet/bin/appmgr/appmgr_unittest.cc similarity index 100% rename from bin/appmgr/appmgr_unittest.cc rename to garnet/bin/appmgr/appmgr_unittest.cc
diff --git a/bin/appmgr/component_container.h b/garnet/bin/appmgr/component_container.h similarity index 100% rename from bin/appmgr/component_container.h rename to garnet/bin/appmgr/component_container.h
diff --git a/bin/appmgr/component_controller_impl.cc b/garnet/bin/appmgr/component_controller_impl.cc similarity index 100% rename from bin/appmgr/component_controller_impl.cc rename to garnet/bin/appmgr/component_controller_impl.cc
diff --git a/bin/appmgr/component_controller_impl.h b/garnet/bin/appmgr/component_controller_impl.h similarity index 100% rename from bin/appmgr/component_controller_impl.h rename to garnet/bin/appmgr/component_controller_impl.h
diff --git a/bin/appmgr/component_controller_unittest.cc b/garnet/bin/appmgr/component_controller_unittest.cc similarity index 100% rename from bin/appmgr/component_controller_unittest.cc rename to garnet/bin/appmgr/component_controller_unittest.cc
diff --git a/bin/appmgr/debug_info_retriever.cc b/garnet/bin/appmgr/debug_info_retriever.cc similarity index 100% rename from bin/appmgr/debug_info_retriever.cc rename to garnet/bin/appmgr/debug_info_retriever.cc
diff --git a/bin/appmgr/debug_info_retriever.h b/garnet/bin/appmgr/debug_info_retriever.h similarity index 100% rename from bin/appmgr/debug_info_retriever.h rename to garnet/bin/appmgr/debug_info_retriever.h
diff --git a/bin/appmgr/dynamic_library_loader.cc b/garnet/bin/appmgr/dynamic_library_loader.cc similarity index 100% rename from bin/appmgr/dynamic_library_loader.cc rename to garnet/bin/appmgr/dynamic_library_loader.cc
diff --git a/bin/appmgr/dynamic_library_loader.h b/garnet/bin/appmgr/dynamic_library_loader.h similarity index 100% rename from bin/appmgr/dynamic_library_loader.h rename to garnet/bin/appmgr/dynamic_library_loader.h
diff --git a/bin/appmgr/environment_controller_impl.cc b/garnet/bin/appmgr/environment_controller_impl.cc similarity index 100% rename from bin/appmgr/environment_controller_impl.cc rename to garnet/bin/appmgr/environment_controller_impl.cc
diff --git a/bin/appmgr/environment_controller_impl.h b/garnet/bin/appmgr/environment_controller_impl.h similarity index 100% rename from bin/appmgr/environment_controller_impl.h rename to garnet/bin/appmgr/environment_controller_impl.h
diff --git a/bin/appmgr/hub/component_hub.cc b/garnet/bin/appmgr/hub/component_hub.cc similarity index 100% rename from bin/appmgr/hub/component_hub.cc rename to garnet/bin/appmgr/hub/component_hub.cc
diff --git a/bin/appmgr/hub/component_hub.h b/garnet/bin/appmgr/hub/component_hub.h similarity index 100% rename from bin/appmgr/hub/component_hub.h rename to garnet/bin/appmgr/hub/component_hub.h
diff --git a/bin/appmgr/hub/hub.cc b/garnet/bin/appmgr/hub/hub.cc similarity index 100% rename from bin/appmgr/hub/hub.cc rename to garnet/bin/appmgr/hub/hub.cc
diff --git a/bin/appmgr/hub/hub.h b/garnet/bin/appmgr/hub/hub.h similarity index 100% rename from bin/appmgr/hub/hub.h rename to garnet/bin/appmgr/hub/hub.h
diff --git a/bin/appmgr/hub/hub_holder_unittest.cc b/garnet/bin/appmgr/hub/hub_holder_unittest.cc similarity index 100% rename from bin/appmgr/hub/hub_holder_unittest.cc rename to garnet/bin/appmgr/hub/hub_holder_unittest.cc
diff --git a/bin/appmgr/hub/hub_info.cc b/garnet/bin/appmgr/hub/hub_info.cc similarity index 100% rename from bin/appmgr/hub/hub_info.cc rename to garnet/bin/appmgr/hub/hub_info.cc
diff --git a/bin/appmgr/hub/hub_info.h b/garnet/bin/appmgr/hub/hub_info.h similarity index 100% rename from bin/appmgr/hub/hub_info.h rename to garnet/bin/appmgr/hub/hub_info.h
diff --git a/bin/appmgr/hub/realm_hub.cc b/garnet/bin/appmgr/hub/realm_hub.cc similarity index 100% rename from bin/appmgr/hub/realm_hub.cc rename to garnet/bin/appmgr/hub/realm_hub.cc
diff --git a/bin/appmgr/hub/realm_hub.h b/garnet/bin/appmgr/hub/realm_hub.h similarity index 100% rename from bin/appmgr/hub/realm_hub.h rename to garnet/bin/appmgr/hub/realm_hub.h
diff --git a/bin/appmgr/integration_tests/BUILD.gn b/garnet/bin/appmgr/integration_tests/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/BUILD.gn rename to garnet/bin/appmgr/integration_tests/BUILD.gn
diff --git a/bin/appmgr/integration_tests/components/BUILD.gn b/garnet/bin/appmgr/integration_tests/components/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/components/BUILD.gn rename to garnet/bin/appmgr/integration_tests/components/BUILD.gn
diff --git a/bin/appmgr/integration_tests/components/components_binary_argv_test b/garnet/bin/appmgr/integration_tests/components/components_binary_argv_test similarity index 100% rename from bin/appmgr/integration_tests/components/components_binary_argv_test rename to garnet/bin/appmgr/integration_tests/components/components_binary_argv_test
diff --git a/bin/appmgr/integration_tests/components/components_binary_argv_test.cmx b/garnet/bin/appmgr/integration_tests/components/components_binary_argv_test.cmx similarity index 100% rename from bin/appmgr/integration_tests/components/components_binary_argv_test.cmx rename to garnet/bin/appmgr/integration_tests/components/components_binary_argv_test.cmx
diff --git a/bin/appmgr/integration_tests/components/meta/program1.cmx b/garnet/bin/appmgr/integration_tests/components/meta/program1.cmx similarity index 100% rename from bin/appmgr/integration_tests/components/meta/program1.cmx rename to garnet/bin/appmgr/integration_tests/components/meta/program1.cmx
diff --git a/bin/appmgr/integration_tests/components/meta/program2.cmx b/garnet/bin/appmgr/integration_tests/components/meta/program2.cmx similarity index 100% rename from bin/appmgr/integration_tests/components/meta/program2.cmx rename to garnet/bin/appmgr/integration_tests/components/meta/program2.cmx
diff --git a/bin/appmgr/integration_tests/components/program.cc b/garnet/bin/appmgr/integration_tests/components/program.cc similarity index 100% rename from bin/appmgr/integration_tests/components/program.cc rename to garnet/bin/appmgr/integration_tests/components/program.cc
diff --git a/bin/appmgr/integration_tests/fidl/BUILD.gn b/garnet/bin/appmgr/integration_tests/fidl/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/fidl/BUILD.gn rename to garnet/bin/appmgr/integration_tests/fidl/BUILD.gn
diff --git a/bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/BUILD.gn b/garnet/bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/BUILD.gn rename to garnet/bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/BUILD.gn
diff --git a/bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/test_service.fidl b/garnet/bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/test_service.fidl similarity index 100% rename from bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/test_service.fidl rename to garnet/bin/appmgr/integration_tests/fidl/fuchsia.testing.appmgr/test_service.fidl
diff --git a/bin/appmgr/integration_tests/fidl/runner.fidl b/garnet/bin/appmgr/integration_tests/fidl/runner.fidl similarity index 100% rename from bin/appmgr/integration_tests/fidl/runner.fidl rename to garnet/bin/appmgr/integration_tests/fidl/runner.fidl
diff --git a/bin/appmgr/integration_tests/hub_integration_test.cc b/garnet/bin/appmgr/integration_tests/hub_integration_test.cc similarity index 100% rename from bin/appmgr/integration_tests/hub_integration_test.cc rename to garnet/bin/appmgr/integration_tests/hub_integration_test.cc
diff --git a/bin/appmgr/integration_tests/inspect/BUILD.gn b/garnet/bin/appmgr/integration_tests/inspect/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/inspect/BUILD.gn rename to garnet/bin/appmgr/integration_tests/inspect/BUILD.gn
diff --git a/bin/appmgr/integration_tests/inspect/meta/inspect_integration_tests.cmx b/garnet/bin/appmgr/integration_tests/inspect/meta/inspect_integration_tests.cmx similarity index 100% rename from bin/appmgr/integration_tests/inspect/meta/inspect_integration_tests.cmx rename to garnet/bin/appmgr/integration_tests/inspect/meta/inspect_integration_tests.cmx
diff --git a/bin/appmgr/integration_tests/inspect/meta/inspect_test_app.cmx b/garnet/bin/appmgr/integration_tests/inspect/meta/inspect_test_app.cmx similarity index 100% rename from bin/appmgr/integration_tests/inspect/meta/inspect_test_app.cmx rename to garnet/bin/appmgr/integration_tests/inspect/meta/inspect_test_app.cmx
diff --git a/bin/appmgr/integration_tests/inspect/program.cc b/garnet/bin/appmgr/integration_tests/inspect/program.cc similarity index 100% rename from bin/appmgr/integration_tests/inspect/program.cc rename to garnet/bin/appmgr/integration_tests/inspect/program.cc
diff --git a/bin/appmgr/integration_tests/inspect/test.cc b/garnet/bin/appmgr/integration_tests/inspect/test.cc similarity index 100% rename from bin/appmgr/integration_tests/inspect/test.cc rename to garnet/bin/appmgr/integration_tests/inspect/test.cc
diff --git a/bin/appmgr/integration_tests/meta/appmgr_hub_integration_tests.cmx b/garnet/bin/appmgr/integration_tests/meta/appmgr_hub_integration_tests.cmx similarity index 100% rename from bin/appmgr/integration_tests/meta/appmgr_hub_integration_tests.cmx rename to garnet/bin/appmgr/integration_tests/meta/appmgr_hub_integration_tests.cmx
diff --git a/bin/appmgr/integration_tests/meta/appmgr_realm_integration_tests.cmx b/garnet/bin/appmgr/integration_tests/meta/appmgr_realm_integration_tests.cmx similarity index 100% rename from bin/appmgr/integration_tests/meta/appmgr_realm_integration_tests.cmx rename to garnet/bin/appmgr/integration_tests/meta/appmgr_realm_integration_tests.cmx
diff --git a/bin/appmgr/integration_tests/mock_runner/BUILD.gn b/garnet/bin/appmgr/integration_tests/mock_runner/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/mock_runner/BUILD.gn rename to garnet/bin/appmgr/integration_tests/mock_runner/BUILD.gn
diff --git a/bin/appmgr/integration_tests/mock_runner/fake_component/meta/fake_component.cmx b/garnet/bin/appmgr/integration_tests/mock_runner/fake_component/meta/fake_component.cmx similarity index 100% rename from bin/appmgr/integration_tests/mock_runner/fake_component/meta/fake_component.cmx rename to garnet/bin/appmgr/integration_tests/mock_runner/fake_component/meta/fake_component.cmx
diff --git a/bin/appmgr/integration_tests/mock_runner/main.cc b/garnet/bin/appmgr/integration_tests/mock_runner/main.cc similarity index 100% rename from bin/appmgr/integration_tests/mock_runner/main.cc rename to garnet/bin/appmgr/integration_tests/mock_runner/main.cc
diff --git a/bin/appmgr/integration_tests/mock_runner/meta/mock_runner.cmx b/garnet/bin/appmgr/integration_tests/mock_runner/meta/mock_runner.cmx similarity index 100% rename from bin/appmgr/integration_tests/mock_runner/meta/mock_runner.cmx rename to garnet/bin/appmgr/integration_tests/mock_runner/meta/mock_runner.cmx
diff --git a/bin/appmgr/integration_tests/mock_runner/mock_runner.cc b/garnet/bin/appmgr/integration_tests/mock_runner/mock_runner.cc similarity index 100% rename from bin/appmgr/integration_tests/mock_runner/mock_runner.cc rename to garnet/bin/appmgr/integration_tests/mock_runner/mock_runner.cc
diff --git a/bin/appmgr/integration_tests/mock_runner/mock_runner.h b/garnet/bin/appmgr/integration_tests/mock_runner/mock_runner.h similarity index 100% rename from bin/appmgr/integration_tests/mock_runner/mock_runner.h rename to garnet/bin/appmgr/integration_tests/mock_runner/mock_runner.h
diff --git a/bin/appmgr/integration_tests/mock_runner_registry.cc b/garnet/bin/appmgr/integration_tests/mock_runner_registry.cc similarity index 100% rename from bin/appmgr/integration_tests/mock_runner_registry.cc rename to garnet/bin/appmgr/integration_tests/mock_runner_registry.cc
diff --git a/bin/appmgr/integration_tests/mock_runner_registry.h b/garnet/bin/appmgr/integration_tests/mock_runner_registry.h similarity index 100% rename from bin/appmgr/integration_tests/mock_runner_registry.h rename to garnet/bin/appmgr/integration_tests/mock_runner_registry.h
diff --git a/bin/appmgr/integration_tests/realm_integration_test.cc b/garnet/bin/appmgr/integration_tests/realm_integration_test.cc similarity index 100% rename from bin/appmgr/integration_tests/realm_integration_test.cc rename to garnet/bin/appmgr/integration_tests/realm_integration_test.cc
diff --git a/bin/appmgr/integration_tests/realm_runner_integration_test.cc b/garnet/bin/appmgr/integration_tests/realm_runner_integration_test.cc similarity index 100% rename from bin/appmgr/integration_tests/realm_runner_integration_test.cc rename to garnet/bin/appmgr/integration_tests/realm_runner_integration_test.cc
diff --git a/bin/appmgr/integration_tests/sandbox/BUILD.gn b/garnet/bin/appmgr/integration_tests/sandbox/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/sandbox/BUILD.gn rename to garnet/bin/appmgr/integration_tests/sandbox/BUILD.gn
diff --git a/bin/appmgr/integration_tests/sandbox/features/build-info/BUILD.gn b/garnet/bin/appmgr/integration_tests/sandbox/features/build-info/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/build-info/BUILD.gn rename to garnet/bin/appmgr/integration_tests/sandbox/features/build-info/BUILD.gn
diff --git a/bin/appmgr/integration_tests/sandbox/features/build-info/build_info.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/build-info/build_info.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/build-info/build_info.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/build-info/build_info.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/build-info/meta/build_info_tests.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/build-info/meta/build_info_tests.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/build-info/meta/build_info_tests.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/build-info/meta/build_info_tests.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/persistent-storage/BUILD.gn b/garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/persistent-storage/BUILD.gn rename to garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/BUILD.gn
diff --git a/bin/appmgr/integration_tests/sandbox/features/persistent-storage/has_persistent_storage.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/has_persistent_storage.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/persistent-storage/has_persistent_storage.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/has_persistent_storage.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/has_persistent_storage.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/has_persistent_storage.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/has_persistent_storage.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/has_persistent_storage.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/no_persistent_storage.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/no_persistent_storage.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/no_persistent_storage.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/meta/no_persistent_storage.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/persistent-storage/no_persistent_storage.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/no_persistent_storage.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/persistent-storage/no_persistent_storage.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/persistent-storage/no_persistent_storage.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell-commands/BUILD.gn b/garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell-commands/BUILD.gn rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/BUILD.gn
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell-commands/has_shell_commands.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/has_shell_commands.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell-commands/has_shell_commands.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/has_shell_commands.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/has_shell_commands.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/has_shell_commands.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/has_shell_commands.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/has_shell_commands.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/no_shell_commands.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/no_shell_commands.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/no_shell_commands.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/meta/no_shell_commands.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell-commands/no_shell_commands.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/no_shell_commands.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell-commands/no_shell_commands.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell-commands/no_shell_commands.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell/BUILD.gn b/garnet/bin/appmgr/integration_tests/sandbox/features/shell/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell/BUILD.gn rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell/BUILD.gn
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell/has_shell.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/shell/has_shell.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell/has_shell.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell/has_shell.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell/meta/has_shell.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/shell/meta/has_shell.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell/meta/has_shell.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell/meta/has_shell.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell/meta/no_shell.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/shell/meta/no_shell.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell/meta/no_shell.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell/meta/no_shell.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/shell/no_shell.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/shell/no_shell.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/shell/no_shell.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/shell/no_shell.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/system-temp/BUILD.gn b/garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/system-temp/BUILD.gn rename to garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/BUILD.gn
diff --git a/bin/appmgr/integration_tests/sandbox/features/system-temp/has_system_temp.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/has_system_temp.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/system-temp/has_system_temp.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/has_system_temp.cc
diff --git a/bin/appmgr/integration_tests/sandbox/features/system-temp/meta/has_system_temp.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/meta/has_system_temp.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/system-temp/meta/has_system_temp.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/meta/has_system_temp.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/system-temp/meta/no_system_temp.cmx b/garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/meta/no_system_temp.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/system-temp/meta/no_system_temp.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/meta/no_system_temp.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/features/system-temp/no_system_temp.cc b/garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/no_system_temp.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/features/system-temp/no_system_temp.cc rename to garnet/bin/appmgr/integration_tests/sandbox/features/system-temp/no_system_temp.cc
diff --git a/bin/appmgr/integration_tests/sandbox/namespace_test.cc b/garnet/bin/appmgr/integration_tests/sandbox/namespace_test.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/namespace_test.cc rename to garnet/bin/appmgr/integration_tests/sandbox/namespace_test.cc
diff --git a/bin/appmgr/integration_tests/sandbox/namespace_test.h b/garnet/bin/appmgr/integration_tests/sandbox/namespace_test.h similarity index 100% rename from bin/appmgr/integration_tests/sandbox/namespace_test.h rename to garnet/bin/appmgr/integration_tests/sandbox/namespace_test.h
diff --git a/bin/appmgr/integration_tests/sandbox/sandbox_test_package.gni b/garnet/bin/appmgr/integration_tests/sandbox/sandbox_test_package.gni similarity index 100% rename from bin/appmgr/integration_tests/sandbox/sandbox_test_package.gni rename to garnet/bin/appmgr/integration_tests/sandbox/sandbox_test_package.gni
diff --git a/bin/appmgr/integration_tests/sandbox/services/BUILD.gn b/garnet/bin/appmgr/integration_tests/sandbox/services/BUILD.gn similarity index 100% rename from bin/appmgr/integration_tests/sandbox/services/BUILD.gn rename to garnet/bin/appmgr/integration_tests/sandbox/services/BUILD.gn
diff --git a/bin/appmgr/integration_tests/sandbox/services/meta/multiple_components.cmx b/garnet/bin/appmgr/integration_tests/sandbox/services/meta/multiple_components.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/services/meta/multiple_components.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/services/meta/multiple_components.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/services/meta/no_services.cmx b/garnet/bin/appmgr/integration_tests/sandbox/services/meta/no_services.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/services/meta/no_services.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/services/meta/no_services.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/services/meta/some_services.cmx b/garnet/bin/appmgr/integration_tests/sandbox/services/meta/some_services.cmx similarity index 100% rename from bin/appmgr/integration_tests/sandbox/services/meta/some_services.cmx rename to garnet/bin/appmgr/integration_tests/sandbox/services/meta/some_services.cmx
diff --git a/bin/appmgr/integration_tests/sandbox/services/multiple_components.cc b/garnet/bin/appmgr/integration_tests/sandbox/services/multiple_components.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/services/multiple_components.cc rename to garnet/bin/appmgr/integration_tests/sandbox/services/multiple_components.cc
diff --git a/bin/appmgr/integration_tests/sandbox/services/no_services.cc b/garnet/bin/appmgr/integration_tests/sandbox/services/no_services.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/services/no_services.cc rename to garnet/bin/appmgr/integration_tests/sandbox/services/no_services.cc
diff --git a/bin/appmgr/integration_tests/sandbox/services/some_services.cc b/garnet/bin/appmgr/integration_tests/sandbox/services/some_services.cc similarity index 100% rename from bin/appmgr/integration_tests/sandbox/services/some_services.cc rename to garnet/bin/appmgr/integration_tests/sandbox/services/some_services.cc
diff --git a/bin/appmgr/job_provider_impl.cc b/garnet/bin/appmgr/job_provider_impl.cc similarity index 100% rename from bin/appmgr/job_provider_impl.cc rename to garnet/bin/appmgr/job_provider_impl.cc
diff --git a/bin/appmgr/job_provider_impl.h b/garnet/bin/appmgr/job_provider_impl.h similarity index 100% rename from bin/appmgr/job_provider_impl.h rename to garnet/bin/appmgr/job_provider_impl.h
diff --git a/bin/appmgr/legacy_flat_exported_dir b/garnet/bin/appmgr/legacy_flat_exported_dir similarity index 100% rename from bin/appmgr/legacy_flat_exported_dir rename to garnet/bin/appmgr/legacy_flat_exported_dir
diff --git a/bin/appmgr/main.cc b/garnet/bin/appmgr/main.cc similarity index 100% rename from bin/appmgr/main.cc rename to garnet/bin/appmgr/main.cc
diff --git a/bin/appmgr/namespace.cc b/garnet/bin/appmgr/namespace.cc similarity index 100% rename from bin/appmgr/namespace.cc rename to garnet/bin/appmgr/namespace.cc
diff --git a/bin/appmgr/namespace.h b/garnet/bin/appmgr/namespace.h similarity index 100% rename from bin/appmgr/namespace.h rename to garnet/bin/appmgr/namespace.h
diff --git a/bin/appmgr/namespace_builder.cc b/garnet/bin/appmgr/namespace_builder.cc similarity index 100% rename from bin/appmgr/namespace_builder.cc rename to garnet/bin/appmgr/namespace_builder.cc
diff --git a/bin/appmgr/namespace_builder.h b/garnet/bin/appmgr/namespace_builder.h similarity index 100% rename from bin/appmgr/namespace_builder.h rename to garnet/bin/appmgr/namespace_builder.h
diff --git a/bin/appmgr/namespace_builder_unittest.cc b/garnet/bin/appmgr/namespace_builder_unittest.cc similarity index 100% rename from bin/appmgr/namespace_builder_unittest.cc rename to garnet/bin/appmgr/namespace_builder_unittest.cc
diff --git a/bin/appmgr/namespace_unittest.cc b/garnet/bin/appmgr/namespace_unittest.cc similarity index 100% rename from bin/appmgr/namespace_unittest.cc rename to garnet/bin/appmgr/namespace_unittest.cc
diff --git a/bin/appmgr/realm.cc b/garnet/bin/appmgr/realm.cc similarity index 100% rename from bin/appmgr/realm.cc rename to garnet/bin/appmgr/realm.cc
diff --git a/bin/appmgr/realm.h b/garnet/bin/appmgr/realm.h similarity index 100% rename from bin/appmgr/realm.h rename to garnet/bin/appmgr/realm.h
diff --git a/bin/appmgr/runner_holder.cc b/garnet/bin/appmgr/runner_holder.cc similarity index 100% rename from bin/appmgr/runner_holder.cc rename to garnet/bin/appmgr/runner_holder.cc
diff --git a/bin/appmgr/runner_holder.h b/garnet/bin/appmgr/runner_holder.h similarity index 100% rename from bin/appmgr/runner_holder.h rename to garnet/bin/appmgr/runner_holder.h
diff --git a/bin/appmgr/scheme_map.cc b/garnet/bin/appmgr/scheme_map.cc similarity index 100% rename from bin/appmgr/scheme_map.cc rename to garnet/bin/appmgr/scheme_map.cc
diff --git a/bin/appmgr/scheme_map.config b/garnet/bin/appmgr/scheme_map.config similarity index 100% rename from bin/appmgr/scheme_map.config rename to garnet/bin/appmgr/scheme_map.config
diff --git a/bin/appmgr/scheme_map.h b/garnet/bin/appmgr/scheme_map.h similarity index 100% rename from bin/appmgr/scheme_map.h rename to garnet/bin/appmgr/scheme_map.h
diff --git a/bin/appmgr/scheme_map_unittest.cc b/garnet/bin/appmgr/scheme_map_unittest.cc similarity index 100% rename from bin/appmgr/scheme_map_unittest.cc rename to garnet/bin/appmgr/scheme_map_unittest.cc
diff --git a/bin/appmgr/service_provider_dir_impl.cc b/garnet/bin/appmgr/service_provider_dir_impl.cc similarity index 100% rename from bin/appmgr/service_provider_dir_impl.cc rename to garnet/bin/appmgr/service_provider_dir_impl.cc
diff --git a/bin/appmgr/service_provider_dir_impl.h b/garnet/bin/appmgr/service_provider_dir_impl.h similarity index 100% rename from bin/appmgr/service_provider_dir_impl.h rename to garnet/bin/appmgr/service_provider_dir_impl.h
diff --git a/bin/appmgr/service_provider_dir_unittest.cc b/garnet/bin/appmgr/service_provider_dir_unittest.cc similarity index 100% rename from bin/appmgr/service_provider_dir_unittest.cc rename to garnet/bin/appmgr/service_provider_dir_unittest.cc
diff --git a/bin/appmgr/system_objects_directory.cc b/garnet/bin/appmgr/system_objects_directory.cc similarity index 100% rename from bin/appmgr/system_objects_directory.cc rename to garnet/bin/appmgr/system_objects_directory.cc
diff --git a/bin/appmgr/system_objects_directory.h b/garnet/bin/appmgr/system_objects_directory.h similarity index 100% rename from bin/appmgr/system_objects_directory.h rename to garnet/bin/appmgr/system_objects_directory.h
diff --git a/bin/appmgr/util.cc b/garnet/bin/appmgr/util.cc similarity index 100% rename from bin/appmgr/util.cc rename to garnet/bin/appmgr/util.cc
diff --git a/bin/appmgr/util.h b/garnet/bin/appmgr/util.h similarity index 100% rename from bin/appmgr/util.h rename to garnet/bin/appmgr/util.h
diff --git a/bin/appmgr/util_unittest.cc b/garnet/bin/appmgr/util_unittest.cc similarity index 100% rename from bin/appmgr/util_unittest.cc rename to garnet/bin/appmgr/util_unittest.cc
diff --git a/bin/auth/BUILD.gn b/garnet/bin/auth/BUILD.gn similarity index 100% rename from bin/auth/BUILD.gn rename to garnet/bin/auth/BUILD.gn
diff --git a/bin/auth/MAINTAINERS b/garnet/bin/auth/MAINTAINERS similarity index 100% rename from bin/auth/MAINTAINERS rename to garnet/bin/auth/MAINTAINERS
diff --git a/bin/auth/README.md b/garnet/bin/auth/README.md similarity index 100% rename from bin/auth/README.md rename to garnet/bin/auth/README.md
diff --git a/bin/auth/account_handler/BUILD.gn b/garnet/bin/auth/account_handler/BUILD.gn similarity index 100% rename from bin/auth/account_handler/BUILD.gn rename to garnet/bin/auth/account_handler/BUILD.gn
diff --git a/bin/auth/account_handler/README.md b/garnet/bin/auth/account_handler/README.md similarity index 100% rename from bin/auth/account_handler/README.md rename to garnet/bin/auth/account_handler/README.md
diff --git a/bin/auth/account_handler/src/account.rs b/garnet/bin/auth/account_handler/src/account.rs similarity index 100% rename from bin/auth/account_handler/src/account.rs rename to garnet/bin/auth/account_handler/src/account.rs
diff --git a/bin/auth/account_handler/src/account_handler.rs b/garnet/bin/auth/account_handler/src/account_handler.rs similarity index 100% rename from bin/auth/account_handler/src/account_handler.rs rename to garnet/bin/auth/account_handler/src/account_handler.rs
diff --git a/bin/auth/account_handler/src/auth_provider_supplier.rs b/garnet/bin/auth/account_handler/src/auth_provider_supplier.rs similarity index 100% rename from bin/auth/account_handler/src/auth_provider_supplier.rs rename to garnet/bin/auth/account_handler/src/auth_provider_supplier.rs
diff --git a/bin/auth/account_handler/src/main.rs b/garnet/bin/auth/account_handler/src/main.rs similarity index 100% rename from bin/auth/account_handler/src/main.rs rename to garnet/bin/auth/account_handler/src/main.rs
diff --git a/bin/auth/account_handler/src/persona.rs b/garnet/bin/auth/account_handler/src/persona.rs similarity index 100% rename from bin/auth/account_handler/src/persona.rs rename to garnet/bin/auth/account_handler/src/persona.rs
diff --git a/bin/auth/account_handler/src/test_util.rs b/garnet/bin/auth/account_handler/src/test_util.rs similarity index 100% rename from bin/auth/account_handler/src/test_util.rs rename to garnet/bin/auth/account_handler/src/test_util.rs
diff --git a/bin/auth/account_manager/BUILD.gn b/garnet/bin/auth/account_manager/BUILD.gn similarity index 100% rename from bin/auth/account_manager/BUILD.gn rename to garnet/bin/auth/account_manager/BUILD.gn
diff --git a/bin/auth/account_manager/README.md b/garnet/bin/auth/account_manager/README.md similarity index 100% rename from bin/auth/account_manager/README.md rename to garnet/bin/auth/account_manager/README.md
diff --git a/bin/auth/account_manager/src/account_handler_connection.rs b/garnet/bin/auth/account_manager/src/account_handler_connection.rs similarity index 100% rename from bin/auth/account_manager/src/account_handler_connection.rs rename to garnet/bin/auth/account_manager/src/account_handler_connection.rs
diff --git a/bin/auth/account_manager/src/account_handler_context.rs b/garnet/bin/auth/account_manager/src/account_handler_context.rs similarity index 100% rename from bin/auth/account_manager/src/account_handler_context.rs rename to garnet/bin/auth/account_manager/src/account_handler_context.rs
diff --git a/bin/auth/account_manager/src/account_manager.rs b/garnet/bin/auth/account_manager/src/account_manager.rs similarity index 100% rename from bin/auth/account_manager/src/account_manager.rs rename to garnet/bin/auth/account_manager/src/account_manager.rs
diff --git a/bin/auth/account_manager/src/main.rs b/garnet/bin/auth/account_manager/src/main.rs similarity index 100% rename from bin/auth/account_manager/src/main.rs rename to garnet/bin/auth/account_manager/src/main.rs
diff --git a/bin/auth/meta/account_handler.cmx b/garnet/bin/auth/meta/account_handler.cmx similarity index 100% rename from bin/auth/meta/account_handler.cmx rename to garnet/bin/auth/meta/account_handler.cmx
diff --git a/bin/auth/meta/account_manager.cmx b/garnet/bin/auth/meta/account_manager.cmx similarity index 100% rename from bin/auth/meta/account_manager.cmx rename to garnet/bin/auth/meta/account_manager.cmx
diff --git a/bin/auth/meta/token_manager_factory.cmx b/garnet/bin/auth/meta/token_manager_factory.cmx similarity index 100% rename from bin/auth/meta/token_manager_factory.cmx rename to garnet/bin/auth/meta/token_manager_factory.cmx
diff --git a/bin/auth/testing/BUILD.gn b/garnet/bin/auth/testing/BUILD.gn similarity index 100% rename from bin/auth/testing/BUILD.gn rename to garnet/bin/auth/testing/BUILD.gn
diff --git a/bin/auth/testing/dev_auth_provider/BUILD.gn b/garnet/bin/auth/testing/dev_auth_provider/BUILD.gn similarity index 100% rename from bin/auth/testing/dev_auth_provider/BUILD.gn rename to garnet/bin/auth/testing/dev_auth_provider/BUILD.gn
diff --git a/bin/auth/testing/dev_auth_provider/src/dev_auth_provider.rs b/garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider.rs similarity index 100% rename from bin/auth/testing/dev_auth_provider/src/dev_auth_provider.rs rename to garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider.rs
diff --git a/bin/auth/testing/dev_auth_provider/src/dev_auth_provider_factory.rs b/garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider_factory.rs similarity index 100% rename from bin/auth/testing/dev_auth_provider/src/dev_auth_provider_factory.rs rename to garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider_factory.rs
diff --git a/bin/auth/testing/dev_auth_provider/src/main.rs b/garnet/bin/auth/testing/dev_auth_provider/src/main.rs similarity index 100% rename from bin/auth/testing/dev_auth_provider/src/main.rs rename to garnet/bin/auth/testing/dev_auth_provider/src/main.rs
diff --git a/bin/auth/testing/dev_auth_provider_iotid/BUILD.gn b/garnet/bin/auth/testing/dev_auth_provider_iotid/BUILD.gn similarity index 100% rename from bin/auth/testing/dev_auth_provider_iotid/BUILD.gn rename to garnet/bin/auth/testing/dev_auth_provider_iotid/BUILD.gn
diff --git a/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs b/garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs similarity index 100% rename from bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs rename to garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs
diff --git a/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs b/garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs similarity index 100% rename from bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs rename to garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs
diff --git a/bin/auth/testing/dev_auth_provider_iotid/src/main.rs b/garnet/bin/auth/testing/dev_auth_provider_iotid/src/main.rs similarity index 100% rename from bin/auth/testing/dev_auth_provider_iotid/src/main.rs rename to garnet/bin/auth/testing/dev_auth_provider_iotid/src/main.rs
diff --git a/bin/auth/testing/meta/dev_auth_provider.cmx b/garnet/bin/auth/testing/meta/dev_auth_provider.cmx similarity index 100% rename from bin/auth/testing/meta/dev_auth_provider.cmx rename to garnet/bin/auth/testing/meta/dev_auth_provider.cmx
diff --git a/bin/auth/testing/meta/dev_auth_provider_iotid.cmx b/garnet/bin/auth/testing/meta/dev_auth_provider_iotid.cmx similarity index 100% rename from bin/auth/testing/meta/dev_auth_provider_iotid.cmx rename to garnet/bin/auth/testing/meta/dev_auth_provider_iotid.cmx
diff --git a/bin/auth/tests/account_manager_integration/BUILD.gn b/garnet/bin/auth/tests/account_manager_integration/BUILD.gn similarity index 100% rename from bin/auth/tests/account_manager_integration/BUILD.gn rename to garnet/bin/auth/tests/account_manager_integration/BUILD.gn
diff --git a/bin/auth/tests/account_manager_integration/meta/account_manager_integration_lib_test.cmx b/garnet/bin/auth/tests/account_manager_integration/meta/account_manager_integration_lib_test.cmx similarity index 100% rename from bin/auth/tests/account_manager_integration/meta/account_manager_integration_lib_test.cmx rename to garnet/bin/auth/tests/account_manager_integration/meta/account_manager_integration_lib_test.cmx
diff --git a/bin/auth/tests/account_manager_integration/tests/account.rs b/garnet/bin/auth/tests/account_manager_integration/tests/account.rs similarity index 100% rename from bin/auth/tests/account_manager_integration/tests/account.rs rename to garnet/bin/auth/tests/account_manager_integration/tests/account.rs
diff --git a/bin/auth/tests/account_manager_integration/tests/lib.rs b/garnet/bin/auth/tests/account_manager_integration/tests/lib.rs similarity index 100% rename from bin/auth/tests/account_manager_integration/tests/lib.rs rename to garnet/bin/auth/tests/account_manager_integration/tests/lib.rs
diff --git a/bin/auth/tests/token_manager_integration/BUILD.gn b/garnet/bin/auth/tests/token_manager_integration/BUILD.gn similarity index 100% rename from bin/auth/tests/token_manager_integration/BUILD.gn rename to garnet/bin/auth/tests/token_manager_integration/BUILD.gn
diff --git a/bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc b/garnet/bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc similarity index 100% rename from bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc rename to garnet/bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc
diff --git a/bin/auth/token_manager_factory/BUILD.gn b/garnet/bin/auth/token_manager_factory/BUILD.gn similarity index 100% rename from bin/auth/token_manager_factory/BUILD.gn rename to garnet/bin/auth/token_manager_factory/BUILD.gn
diff --git a/bin/auth/token_manager_factory/README.md b/garnet/bin/auth/token_manager_factory/README.md similarity index 100% rename from bin/auth/token_manager_factory/README.md rename to garnet/bin/auth/token_manager_factory/README.md
diff --git a/bin/auth/token_manager_factory/src/auth_provider_supplier.rs b/garnet/bin/auth/token_manager_factory/src/auth_provider_supplier.rs similarity index 100% rename from bin/auth/token_manager_factory/src/auth_provider_supplier.rs rename to garnet/bin/auth/token_manager_factory/src/auth_provider_supplier.rs
diff --git a/bin/auth/token_manager_factory/src/main.rs b/garnet/bin/auth/token_manager_factory/src/main.rs similarity index 100% rename from bin/auth/token_manager_factory/src/main.rs rename to garnet/bin/auth/token_manager_factory/src/main.rs
diff --git a/bin/auth/token_manager_factory/src/token_manager_factory.rs b/garnet/bin/auth/token_manager_factory/src/token_manager_factory.rs similarity index 100% rename from bin/auth/token_manager_factory/src/token_manager_factory.rs rename to garnet/bin/auth/token_manager_factory/src/token_manager_factory.rs
diff --git a/bin/banjo/BUILD.gn b/garnet/bin/banjo/BUILD.gn similarity index 100% rename from bin/banjo/BUILD.gn rename to garnet/bin/banjo/BUILD.gn
diff --git a/bin/banjo/src/ast.rs b/garnet/bin/banjo/src/ast.rs similarity index 100% rename from bin/banjo/src/ast.rs rename to garnet/bin/banjo/src/ast.rs
diff --git a/bin/banjo/src/backends/ast.rs b/garnet/bin/banjo/src/backends/ast.rs similarity index 100% rename from bin/banjo/src/backends/ast.rs rename to garnet/bin/banjo/src/backends/ast.rs
diff --git a/bin/banjo/src/backends/c.rs b/garnet/bin/banjo/src/backends/c.rs similarity index 100% rename from bin/banjo/src/backends/c.rs rename to garnet/bin/banjo/src/backends/c.rs
diff --git a/bin/banjo/src/backends/cpp.rs b/garnet/bin/banjo/src/backends/cpp.rs similarity index 100% rename from bin/banjo/src/backends/cpp.rs rename to garnet/bin/banjo/src/backends/cpp.rs
diff --git a/bin/banjo/src/backends/mod.rs b/garnet/bin/banjo/src/backends/mod.rs similarity index 100% rename from bin/banjo/src/backends/mod.rs rename to garnet/bin/banjo/src/backends/mod.rs
diff --git a/bin/banjo/src/backends/templates/c/body.h b/garnet/bin/banjo/src/backends/templates/c/body.h similarity index 100% rename from bin/banjo/src/backends/templates/c/body.h rename to garnet/bin/banjo/src/backends/templates/c/body.h
diff --git a/bin/banjo/src/backends/templates/c/header.h b/garnet/bin/banjo/src/backends/templates/c/header.h similarity index 100% rename from bin/banjo/src/backends/templates/c/header.h rename to garnet/bin/banjo/src/backends/templates/c/header.h
diff --git a/bin/banjo/src/backends/templates/c/interface.h b/garnet/bin/banjo/src/backends/templates/c/interface.h similarity index 100% rename from bin/banjo/src/backends/templates/c/interface.h rename to garnet/bin/banjo/src/backends/templates/c/interface.h
diff --git a/bin/banjo/src/backends/templates/c/protocol.h b/garnet/bin/banjo/src/backends/templates/c/protocol.h similarity index 100% rename from bin/banjo/src/backends/templates/c/protocol.h rename to garnet/bin/banjo/src/backends/templates/c/protocol.h
diff --git a/bin/banjo/src/backends/templates/c/protocol_ops.h b/garnet/bin/banjo/src/backends/templates/c/protocol_ops.h similarity index 100% rename from bin/banjo/src/backends/templates/c/protocol_ops.h rename to garnet/bin/banjo/src/backends/templates/c/protocol_ops.h
diff --git a/bin/banjo/src/backends/templates/c/struct.h b/garnet/bin/banjo/src/backends/templates/c/struct.h similarity index 100% rename from bin/banjo/src/backends/templates/c/struct.h rename to garnet/bin/banjo/src/backends/templates/c/struct.h
diff --git a/bin/banjo/src/backends/templates/cpp/base_protocol.h b/garnet/bin/banjo/src/backends/templates/cpp/base_protocol.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/base_protocol.h rename to garnet/bin/banjo/src/backends/templates/cpp/base_protocol.h
diff --git a/bin/banjo/src/backends/templates/cpp/example.h b/garnet/bin/banjo/src/backends/templates/cpp/example.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/example.h rename to garnet/bin/banjo/src/backends/templates/cpp/example.h
diff --git a/bin/banjo/src/backends/templates/cpp/footer.h b/garnet/bin/banjo/src/backends/templates/cpp/footer.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/footer.h rename to garnet/bin/banjo/src/backends/templates/cpp/footer.h
diff --git a/bin/banjo/src/backends/templates/cpp/header.h b/garnet/bin/banjo/src/backends/templates/cpp/header.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/header.h rename to garnet/bin/banjo/src/backends/templates/cpp/header.h
diff --git a/bin/banjo/src/backends/templates/cpp/interface.h b/garnet/bin/banjo/src/backends/templates/cpp/interface.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/interface.h rename to garnet/bin/banjo/src/backends/templates/cpp/interface.h
diff --git a/bin/banjo/src/backends/templates/cpp/internal.h b/garnet/bin/banjo/src/backends/templates/cpp/internal.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/internal.h rename to garnet/bin/banjo/src/backends/templates/cpp/internal.h
diff --git a/bin/banjo/src/backends/templates/cpp/internal_decl.h b/garnet/bin/banjo/src/backends/templates/cpp/internal_decl.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/internal_decl.h rename to garnet/bin/banjo/src/backends/templates/cpp/internal_decl.h
diff --git a/bin/banjo/src/backends/templates/cpp/internal_protocol.h b/garnet/bin/banjo/src/backends/templates/cpp/internal_protocol.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/internal_protocol.h rename to garnet/bin/banjo/src/backends/templates/cpp/internal_protocol.h
diff --git a/bin/banjo/src/backends/templates/cpp/internal_static_assert.h b/garnet/bin/banjo/src/backends/templates/cpp/internal_static_assert.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/internal_static_assert.h rename to garnet/bin/banjo/src/backends/templates/cpp/internal_static_assert.h
diff --git a/bin/banjo/src/backends/templates/cpp/protocol.h b/garnet/bin/banjo/src/backends/templates/cpp/protocol.h similarity index 100% rename from bin/banjo/src/backends/templates/cpp/protocol.h rename to garnet/bin/banjo/src/backends/templates/cpp/protocol.h
diff --git a/bin/banjo/src/main.rs b/garnet/bin/banjo/src/main.rs similarity index 100% rename from bin/banjo/src/main.rs rename to garnet/bin/banjo/src/main.rs
diff --git a/bin/banjo/src/parser.rs b/garnet/bin/banjo/src/parser.rs similarity index 100% rename from bin/banjo/src/parser.rs rename to garnet/bin/banjo/src/parser.rs
diff --git a/bin/bindc/BUILD.gn b/garnet/bin/bindc/BUILD.gn similarity index 100% rename from bin/bindc/BUILD.gn rename to garnet/bin/bindc/BUILD.gn
diff --git a/bin/bindc/MAINTAINERS b/garnet/bin/bindc/MAINTAINERS similarity index 100% rename from bin/bindc/MAINTAINERS rename to garnet/bin/bindc/MAINTAINERS
diff --git a/bin/bindc/src/c_generation.rs b/garnet/bin/bindc/src/c_generation.rs similarity index 100% rename from bin/bindc/src/c_generation.rs rename to garnet/bin/bindc/src/c_generation.rs
diff --git a/bin/bindc/src/instruction.rs b/garnet/bin/bindc/src/instruction.rs similarity index 100% rename from bin/bindc/src/instruction.rs rename to garnet/bin/bindc/src/instruction.rs
diff --git a/bin/bindc/src/main.rs b/garnet/bin/bindc/src/main.rs similarity index 100% rename from bin/bindc/src/main.rs rename to garnet/bin/bindc/src/main.rs
diff --git a/bin/bluetooth/MAINTAINERS b/garnet/bin/bluetooth/MAINTAINERS similarity index 100% rename from bin/bluetooth/MAINTAINERS rename to garnet/bin/bluetooth/MAINTAINERS
diff --git a/bin/bluetooth/README.md b/garnet/bin/bluetooth/README.md similarity index 100% rename from bin/bluetooth/README.md rename to garnet/bin/bluetooth/README.md
diff --git a/bin/bluetooth/bt-gap/BUILD.gn b/garnet/bin/bluetooth/bt-gap/BUILD.gn similarity index 100% rename from bin/bluetooth/bt-gap/BUILD.gn rename to garnet/bin/bluetooth/bt-gap/BUILD.gn
diff --git a/bin/bluetooth/bt-gap/README.md b/garnet/bin/bluetooth/bt-gap/README.md similarity index 100% rename from bin/bluetooth/bt-gap/README.md rename to garnet/bin/bluetooth/bt-gap/README.md
diff --git a/bin/bluetooth/bt-gap/meta/bt-gap-unittests.cmx b/garnet/bin/bluetooth/bt-gap/meta/bt-gap-unittests.cmx similarity index 100% rename from bin/bluetooth/bt-gap/meta/bt-gap-unittests.cmx rename to garnet/bin/bluetooth/bt-gap/meta/bt-gap-unittests.cmx
diff --git a/bin/bluetooth/bt-gap/meta/bt-gap.cmx b/garnet/bin/bluetooth/bt-gap/meta/bt-gap.cmx similarity index 100% rename from bin/bluetooth/bt-gap/meta/bt-gap.cmx rename to garnet/bin/bluetooth/bt-gap/meta/bt-gap.cmx
diff --git a/bin/bluetooth/bt-gap/src/adapters.rs b/garnet/bin/bluetooth/bt-gap/src/adapters.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/adapters.rs rename to garnet/bin/bluetooth/bt-gap/src/adapters.rs
diff --git a/bin/bluetooth/bt-gap/src/host_device.rs b/garnet/bin/bluetooth/bt-gap/src/host_device.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/host_device.rs rename to garnet/bin/bluetooth/bt-gap/src/host_device.rs
diff --git a/bin/bluetooth/bt-gap/src/host_dispatcher.rs b/garnet/bin/bluetooth/bt-gap/src/host_dispatcher.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/host_dispatcher.rs rename to garnet/bin/bluetooth/bt-gap/src/host_dispatcher.rs
diff --git a/bin/bluetooth/bt-gap/src/main.rs b/garnet/bin/bluetooth/bt-gap/src/main.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/main.rs rename to garnet/bin/bluetooth/bt-gap/src/main.rs
diff --git a/bin/bluetooth/bt-gap/src/services/control.rs b/garnet/bin/bluetooth/bt-gap/src/services/control.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/services/control.rs rename to garnet/bin/bluetooth/bt-gap/src/services/control.rs
diff --git a/bin/bluetooth/bt-gap/src/services/mod.rs b/garnet/bin/bluetooth/bt-gap/src/services/mod.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/services/mod.rs rename to garnet/bin/bluetooth/bt-gap/src/services/mod.rs
diff --git a/bin/bluetooth/bt-gap/src/services/pairing_delegate.rs b/garnet/bin/bluetooth/bt-gap/src/services/pairing_delegate.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/services/pairing_delegate.rs rename to garnet/bin/bluetooth/bt-gap/src/services/pairing_delegate.rs
diff --git a/bin/bluetooth/bt-gap/src/store/keys.rs b/garnet/bin/bluetooth/bt-gap/src/store/keys.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/store/keys.rs rename to garnet/bin/bluetooth/bt-gap/src/store/keys.rs
diff --git a/bin/bluetooth/bt-gap/src/store/mod.rs b/garnet/bin/bluetooth/bt-gap/src/store/mod.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/store/mod.rs rename to garnet/bin/bluetooth/bt-gap/src/store/mod.rs
diff --git a/bin/bluetooth/bt-gap/src/store/serde.rs b/garnet/bin/bluetooth/bt-gap/src/store/serde.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/store/serde.rs rename to garnet/bin/bluetooth/bt-gap/src/store/serde.rs
diff --git a/bin/bluetooth/bt-gap/src/store/stash.rs b/garnet/bin/bluetooth/bt-gap/src/store/stash.rs similarity index 100% rename from bin/bluetooth/bt-gap/src/store/stash.rs rename to garnet/bin/bluetooth/bt-gap/src/store/stash.rs
diff --git a/bin/bluetooth/bt-mgr/BUILD.gn b/garnet/bin/bluetooth/bt-mgr/BUILD.gn similarity index 100% rename from bin/bluetooth/bt-mgr/BUILD.gn rename to garnet/bin/bluetooth/bt-mgr/BUILD.gn
diff --git a/bin/bluetooth/bt-mgr/config/default.json b/garnet/bin/bluetooth/bt-mgr/config/default.json similarity index 100% rename from bin/bluetooth/bt-mgr/config/default.json rename to garnet/bin/bluetooth/bt-mgr/config/default.json
diff --git a/bin/bluetooth/bt-mgr/meta/bt-mgr.cmx b/garnet/bin/bluetooth/bt-mgr/meta/bt-mgr.cmx similarity index 100% rename from bin/bluetooth/bt-mgr/meta/bt-mgr.cmx rename to garnet/bin/bluetooth/bt-mgr/meta/bt-mgr.cmx
diff --git a/bin/bluetooth/bt-mgr/src/config.rs b/garnet/bin/bluetooth/bt-mgr/src/config.rs similarity index 100% rename from bin/bluetooth/bt-mgr/src/config.rs rename to garnet/bin/bluetooth/bt-mgr/src/config.rs
diff --git a/bin/bluetooth/bt-mgr/src/main.rs b/garnet/bin/bluetooth/bt-mgr/src/main.rs similarity index 100% rename from bin/bluetooth/bt-mgr/src/main.rs rename to garnet/bin/bluetooth/bt-mgr/src/main.rs
diff --git a/bin/bluetooth/bt-snoop/BUILD.gn b/garnet/bin/bluetooth/bt-snoop/BUILD.gn similarity index 100% rename from bin/bluetooth/bt-snoop/BUILD.gn rename to garnet/bin/bluetooth/bt-snoop/BUILD.gn
diff --git a/bin/bluetooth/bt-snoop/meta/bt-snoop.cmx b/garnet/bin/bluetooth/bt-snoop/meta/bt-snoop.cmx similarity index 100% rename from bin/bluetooth/bt-snoop/meta/bt-snoop.cmx rename to garnet/bin/bluetooth/bt-snoop/meta/bt-snoop.cmx
diff --git a/bin/bluetooth/bt-snoop/src/bounded_queue.rs b/garnet/bin/bluetooth/bt-snoop/src/bounded_queue.rs similarity index 100% rename from bin/bluetooth/bt-snoop/src/bounded_queue.rs rename to garnet/bin/bluetooth/bt-snoop/src/bounded_queue.rs
diff --git a/bin/bluetooth/bt-snoop/src/main.rs b/garnet/bin/bluetooth/bt-snoop/src/main.rs similarity index 100% rename from bin/bluetooth/bt-snoop/src/main.rs rename to garnet/bin/bluetooth/bt-snoop/src/main.rs
diff --git a/bin/bluetooth/bt-snoop/src/packet_logs.rs b/garnet/bin/bluetooth/bt-snoop/src/packet_logs.rs similarity index 100% rename from bin/bluetooth/bt-snoop/src/packet_logs.rs rename to garnet/bin/bluetooth/bt-snoop/src/packet_logs.rs
diff --git a/bin/bluetooth/bt-snoop/src/snooper.rs b/garnet/bin/bluetooth/bt-snoop/src/snooper.rs similarity index 100% rename from bin/bluetooth/bt-snoop/src/snooper.rs rename to garnet/bin/bluetooth/bt-snoop/src/snooper.rs
diff --git a/bin/bluetooth/bt-snoop/src/subscription_manager.rs b/garnet/bin/bluetooth/bt-snoop/src/subscription_manager.rs similarity index 100% rename from bin/bluetooth/bt-snoop/src/subscription_manager.rs rename to garnet/bin/bluetooth/bt-snoop/src/subscription_manager.rs
diff --git a/bin/bluetooth/bt-snoop/src/tests.rs b/garnet/bin/bluetooth/bt-snoop/src/tests.rs similarity index 100% rename from bin/bluetooth/bt-snoop/src/tests.rs rename to garnet/bin/bluetooth/bt-snoop/src/tests.rs
diff --git a/bin/bluetooth/profiles/bt-a2dp-sink/BUILD.gn b/garnet/bin/bluetooth/profiles/bt-a2dp-sink/BUILD.gn similarity index 100% rename from bin/bluetooth/profiles/bt-a2dp-sink/BUILD.gn rename to garnet/bin/bluetooth/profiles/bt-a2dp-sink/BUILD.gn
diff --git a/bin/bluetooth/profiles/bt-a2dp-sink/meta/bt-a2dp-sink.cmx b/garnet/bin/bluetooth/profiles/bt-a2dp-sink/meta/bt-a2dp-sink.cmx similarity index 100% rename from bin/bluetooth/profiles/bt-a2dp-sink/meta/bt-a2dp-sink.cmx rename to garnet/bin/bluetooth/profiles/bt-a2dp-sink/meta/bt-a2dp-sink.cmx
diff --git a/bin/bluetooth/profiles/bt-a2dp-sink/src/main.rs b/garnet/bin/bluetooth/profiles/bt-a2dp-sink/src/main.rs similarity index 100% rename from bin/bluetooth/profiles/bt-a2dp-sink/src/main.rs rename to garnet/bin/bluetooth/profiles/bt-a2dp-sink/src/main.rs
diff --git a/bin/bluetooth/profiles/bt-a2dp-sink/src/player.rs b/garnet/bin/bluetooth/profiles/bt-a2dp-sink/src/player.rs similarity index 100% rename from bin/bluetooth/profiles/bt-a2dp-sink/src/player.rs rename to garnet/bin/bluetooth/profiles/bt-a2dp-sink/src/player.rs
diff --git a/bin/bluetooth/tests/BUILD.gn b/garnet/bin/bluetooth/tests/BUILD.gn similarity index 100% rename from bin/bluetooth/tests/BUILD.gn rename to garnet/bin/bluetooth/tests/BUILD.gn
diff --git a/bin/bluetooth/tests/integration/BUILD.gn b/garnet/bin/bluetooth/tests/integration/BUILD.gn similarity index 100% rename from bin/bluetooth/tests/integration/BUILD.gn rename to garnet/bin/bluetooth/tests/integration/BUILD.gn
diff --git a/bin/bluetooth/tests/integration/tests/common/mod.rs b/garnet/bin/bluetooth/tests/integration/tests/common/mod.rs similarity index 100% rename from bin/bluetooth/tests/integration/tests/common/mod.rs rename to garnet/bin/bluetooth/tests/integration/tests/common/mod.rs
diff --git a/bin/bluetooth/tests/integration/tests/host_integration.rs b/garnet/bin/bluetooth/tests/integration/tests/host_integration.rs similarity index 100% rename from bin/bluetooth/tests/integration/tests/host_integration.rs rename to garnet/bin/bluetooth/tests/integration/tests/host_integration.rs
diff --git a/bin/bluetooth/tests/integration/tests/host_lifecycle.rs b/garnet/bin/bluetooth/tests/integration/tests/host_lifecycle.rs similarity index 100% rename from bin/bluetooth/tests/integration/tests/host_lifecycle.rs rename to garnet/bin/bluetooth/tests/integration/tests/host_lifecycle.rs
diff --git a/bin/bluetooth/tests/meta/bt-host-integration-tests.cmx b/garnet/bin/bluetooth/tests/meta/bt-host-integration-tests.cmx similarity index 100% rename from bin/bluetooth/tests/meta/bt-host-integration-tests.cmx rename to garnet/bin/bluetooth/tests/meta/bt-host-integration-tests.cmx
diff --git a/bin/bluetooth/tests/meta/bt-host-lifecycle-tests.cmx b/garnet/bin/bluetooth/tests/meta/bt-host-lifecycle-tests.cmx similarity index 100% rename from bin/bluetooth/tests/meta/bt-host-lifecycle-tests.cmx rename to garnet/bin/bluetooth/tests/meta/bt-host-lifecycle-tests.cmx
diff --git a/bin/bluetooth/tests/meta/bt-host-unittests.cmx b/garnet/bin/bluetooth/tests/meta/bt-host-unittests.cmx similarity index 100% rename from bin/bluetooth/tests/meta/bt-host-unittests.cmx rename to garnet/bin/bluetooth/tests/meta/bt-host-unittests.cmx
diff --git a/bin/bluetooth/tools/BUILD.gn b/garnet/bin/bluetooth/tools/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/BUILD.gn rename to garnet/bin/bluetooth/tools/BUILD.gn
diff --git a/bin/bluetooth/tools/README.md b/garnet/bin/bluetooth/tools/README.md similarity index 100% rename from bin/bluetooth/tools/README.md rename to garnet/bin/bluetooth/tools/README.md
diff --git a/bin/bluetooth/tools/bt-cli/BUILD.gn b/garnet/bin/bluetooth/tools/bt-cli/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-cli/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-cli/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-cli/src/commands.rs b/garnet/bin/bluetooth/tools/bt-cli/src/commands.rs similarity index 100% rename from bin/bluetooth/tools/bt-cli/src/commands.rs rename to garnet/bin/bluetooth/tools/bt-cli/src/commands.rs
diff --git a/bin/bluetooth/tools/bt-cli/src/main.rs b/garnet/bin/bluetooth/tools/bt-cli/src/main.rs similarity index 100% rename from bin/bluetooth/tools/bt-cli/src/main.rs rename to garnet/bin/bluetooth/tools/bt-cli/src/main.rs
diff --git a/bin/bluetooth/tools/bt-cli/src/types.rs b/garnet/bin/bluetooth/tools/bt-cli/src/types.rs similarity index 100% rename from bin/bluetooth/tools/bt-cli/src/types.rs rename to garnet/bin/bluetooth/tools/bt-cli/src/types.rs
diff --git a/bin/bluetooth/tools/bt-fake-hci/BUILD.gn b/garnet/bin/bluetooth/tools/bt-fake-hci/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-fake-hci/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-fake-hci/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-fake-hci/src/main.rs b/garnet/bin/bluetooth/tools/bt-fake-hci/src/main.rs similarity index 100% rename from bin/bluetooth/tools/bt-fake-hci/src/main.rs rename to garnet/bin/bluetooth/tools/bt-fake-hci/src/main.rs
diff --git a/bin/bluetooth/tools/bt-hci-tool/BUILD.gn b/garnet/bin/bluetooth/tools/bt-hci-tool/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-hci-tool/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-hci-tool/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-hci-tool/commands.cc b/garnet/bin/bluetooth/tools/bt-hci-tool/commands.cc similarity index 100% rename from bin/bluetooth/tools/bt-hci-tool/commands.cc rename to garnet/bin/bluetooth/tools/bt-hci-tool/commands.cc
diff --git a/bin/bluetooth/tools/bt-hci-tool/commands.h b/garnet/bin/bluetooth/tools/bt-hci-tool/commands.h similarity index 100% rename from bin/bluetooth/tools/bt-hci-tool/commands.h rename to garnet/bin/bluetooth/tools/bt-hci-tool/commands.h
diff --git a/bin/bluetooth/tools/bt-hci-tool/main.cc b/garnet/bin/bluetooth/tools/bt-hci-tool/main.cc similarity index 100% rename from bin/bluetooth/tools/bt-hci-tool/main.cc rename to garnet/bin/bluetooth/tools/bt-hci-tool/main.cc
diff --git a/bin/bluetooth/tools/bt-intel-tool/BUILD.gn b/garnet/bin/bluetooth/tools/bt-intel-tool/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-intel-tool/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-intel-tool/bt_intel.h b/garnet/bin/bluetooth/tools/bt-intel-tool/bt_intel.h similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/bt_intel.h rename to garnet/bin/bluetooth/tools/bt-intel-tool/bt_intel.h
diff --git a/bin/bluetooth/tools/bt-intel-tool/command_channel.cc b/garnet/bin/bluetooth/tools/bt-intel-tool/command_channel.cc similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/command_channel.cc rename to garnet/bin/bluetooth/tools/bt-intel-tool/command_channel.cc
diff --git a/bin/bluetooth/tools/bt-intel-tool/command_channel.h b/garnet/bin/bluetooth/tools/bt-intel-tool/command_channel.h similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/command_channel.h rename to garnet/bin/bluetooth/tools/bt-intel-tool/command_channel.h
diff --git a/bin/bluetooth/tools/bt-intel-tool/commands.cc b/garnet/bin/bluetooth/tools/bt-intel-tool/commands.cc similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/commands.cc rename to garnet/bin/bluetooth/tools/bt-intel-tool/commands.cc
diff --git a/bin/bluetooth/tools/bt-intel-tool/commands.h b/garnet/bin/bluetooth/tools/bt-intel-tool/commands.h similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/commands.h rename to garnet/bin/bluetooth/tools/bt-intel-tool/commands.h
diff --git a/bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.cc b/garnet/bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.cc similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.cc rename to garnet/bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.cc
diff --git a/bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.h b/garnet/bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.h similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.h rename to garnet/bin/bluetooth/tools/bt-intel-tool/intel_firmware_loader.h
diff --git a/bin/bluetooth/tools/bt-intel-tool/main.cc b/garnet/bin/bluetooth/tools/bt-intel-tool/main.cc similarity index 100% rename from bin/bluetooth/tools/bt-intel-tool/main.cc rename to garnet/bin/bluetooth/tools/bt-intel-tool/main.cc
diff --git a/bin/bluetooth/tools/bt-le-central/BUILD.gn b/garnet/bin/bluetooth/tools/bt-le-central/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-le-central/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-le-central/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-le-central/src/central.rs b/garnet/bin/bluetooth/tools/bt-le-central/src/central.rs similarity index 100% rename from bin/bluetooth/tools/bt-le-central/src/central.rs rename to garnet/bin/bluetooth/tools/bt-le-central/src/central.rs
diff --git a/bin/bluetooth/tools/bt-le-central/src/gatt.rs b/garnet/bin/bluetooth/tools/bt-le-central/src/gatt.rs similarity index 100% rename from bin/bluetooth/tools/bt-le-central/src/gatt.rs rename to garnet/bin/bluetooth/tools/bt-le-central/src/gatt.rs
diff --git a/bin/bluetooth/tools/bt-le-central/src/gatt/commands.rs b/garnet/bin/bluetooth/tools/bt-le-central/src/gatt/commands.rs similarity index 100% rename from bin/bluetooth/tools/bt-le-central/src/gatt/commands.rs rename to garnet/bin/bluetooth/tools/bt-le-central/src/gatt/commands.rs
diff --git a/bin/bluetooth/tools/bt-le-central/src/gatt/repl.rs b/garnet/bin/bluetooth/tools/bt-le-central/src/gatt/repl.rs similarity index 100% rename from bin/bluetooth/tools/bt-le-central/src/gatt/repl.rs rename to garnet/bin/bluetooth/tools/bt-le-central/src/gatt/repl.rs
diff --git a/bin/bluetooth/tools/bt-le-central/src/gatt/types.rs b/garnet/bin/bluetooth/tools/bt-le-central/src/gatt/types.rs similarity index 100% rename from bin/bluetooth/tools/bt-le-central/src/gatt/types.rs rename to garnet/bin/bluetooth/tools/bt-le-central/src/gatt/types.rs
diff --git a/bin/bluetooth/tools/bt-le-central/src/main.rs b/garnet/bin/bluetooth/tools/bt-le-central/src/main.rs similarity index 100% rename from bin/bluetooth/tools/bt-le-central/src/main.rs rename to garnet/bin/bluetooth/tools/bt-le-central/src/main.rs
diff --git a/bin/bluetooth/tools/bt-le-peripheral/BUILD.gn b/garnet/bin/bluetooth/tools/bt-le-peripheral/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-le-peripheral/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-le-peripheral/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-le-peripheral/src/main.rs b/garnet/bin/bluetooth/tools/bt-le-peripheral/src/main.rs similarity index 100% rename from bin/bluetooth/tools/bt-le-peripheral/src/main.rs rename to garnet/bin/bluetooth/tools/bt-le-peripheral/src/main.rs
diff --git a/bin/bluetooth/tools/bt-pairing-tool/BUILD.gn b/garnet/bin/bluetooth/tools/bt-pairing-tool/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-pairing-tool/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-pairing-tool/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-pairing-tool/src/main.rs b/garnet/bin/bluetooth/tools/bt-pairing-tool/src/main.rs similarity index 100% rename from bin/bluetooth/tools/bt-pairing-tool/src/main.rs rename to garnet/bin/bluetooth/tools/bt-pairing-tool/src/main.rs
diff --git a/bin/bluetooth/tools/bt-pairing-tool/src/pairing.rs b/garnet/bin/bluetooth/tools/bt-pairing-tool/src/pairing.rs similarity index 100% rename from bin/bluetooth/tools/bt-pairing-tool/src/pairing.rs rename to garnet/bin/bluetooth/tools/bt-pairing-tool/src/pairing.rs
diff --git a/bin/bluetooth/tools/bt-snoop-cli/BUILD.gn b/garnet/bin/bluetooth/tools/bt-snoop-cli/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/bt-snoop-cli/BUILD.gn rename to garnet/bin/bluetooth/tools/bt-snoop-cli/BUILD.gn
diff --git a/bin/bluetooth/tools/bt-snoop-cli/meta/bt-snoop-cli.cmx b/garnet/bin/bluetooth/tools/bt-snoop-cli/meta/bt-snoop-cli.cmx similarity index 100% rename from bin/bluetooth/tools/bt-snoop-cli/meta/bt-snoop-cli.cmx rename to garnet/bin/bluetooth/tools/bt-snoop-cli/meta/bt-snoop-cli.cmx
diff --git a/bin/bluetooth/tools/bt-snoop-cli/src/main.rs b/garnet/bin/bluetooth/tools/bt-snoop-cli/src/main.rs similarity index 100% rename from bin/bluetooth/tools/bt-snoop-cli/src/main.rs rename to garnet/bin/bluetooth/tools/bt-snoop-cli/src/main.rs
diff --git a/bin/bluetooth/tools/lib/BUILD.gn b/garnet/bin/bluetooth/tools/lib/BUILD.gn similarity index 100% rename from bin/bluetooth/tools/lib/BUILD.gn rename to garnet/bin/bluetooth/tools/lib/BUILD.gn
diff --git a/bin/bluetooth/tools/lib/command_dispatcher.cc b/garnet/bin/bluetooth/tools/lib/command_dispatcher.cc similarity index 100% rename from bin/bluetooth/tools/lib/command_dispatcher.cc rename to garnet/bin/bluetooth/tools/lib/command_dispatcher.cc
diff --git a/bin/bluetooth/tools/lib/command_dispatcher.h b/garnet/bin/bluetooth/tools/lib/command_dispatcher.h similarity index 100% rename from bin/bluetooth/tools/lib/command_dispatcher.h rename to garnet/bin/bluetooth/tools/lib/command_dispatcher.h
diff --git a/bin/catapult_converter/BUILD.gn b/garnet/bin/catapult_converter/BUILD.gn similarity index 100% rename from bin/catapult_converter/BUILD.gn rename to garnet/bin/catapult_converter/BUILD.gn
diff --git a/bin/catapult_converter/README.md b/garnet/bin/catapult_converter/README.md similarity index 100% rename from bin/catapult_converter/README.md rename to garnet/bin/catapult_converter/README.md
diff --git a/bin/catapult_converter/converter.cc b/garnet/bin/catapult_converter/converter.cc similarity index 100% rename from bin/catapult_converter/converter.cc rename to garnet/bin/catapult_converter/converter.cc
diff --git a/bin/catapult_converter/converter.h b/garnet/bin/catapult_converter/converter.h similarity index 100% rename from bin/catapult_converter/converter.h rename to garnet/bin/catapult_converter/converter.h
diff --git a/bin/catapult_converter/converter_unittest.cc b/garnet/bin/catapult_converter/converter_unittest.cc similarity index 100% rename from bin/catapult_converter/converter_unittest.cc rename to garnet/bin/catapult_converter/converter_unittest.cc
diff --git a/bin/catapult_converter/main.cc b/garnet/bin/catapult_converter/main.cc similarity index 100% rename from bin/catapult_converter/main.cc rename to garnet/bin/catapult_converter/main.cc
diff --git a/bin/catapult_converter/meta/catapult_converter.cmx b/garnet/bin/catapult_converter/meta/catapult_converter.cmx similarity index 100% rename from bin/catapult_converter/meta/catapult_converter.cmx rename to garnet/bin/catapult_converter/meta/catapult_converter.cmx
diff --git a/bin/chrealm/BUILD.gn b/garnet/bin/chrealm/BUILD.gn similarity index 100% rename from bin/chrealm/BUILD.gn rename to garnet/bin/chrealm/BUILD.gn
diff --git a/bin/chrealm/integration_tests/BUILD.gn b/garnet/bin/chrealm/integration_tests/BUILD.gn similarity index 100% rename from bin/chrealm/integration_tests/BUILD.gn rename to garnet/bin/chrealm/integration_tests/BUILD.gn
diff --git a/bin/chrealm/integration_tests/chrealm_integration_test.cc b/garnet/bin/chrealm/integration_tests/chrealm_integration_test.cc similarity index 100% rename from bin/chrealm/integration_tests/chrealm_integration_test.cc rename to garnet/bin/chrealm/integration_tests/chrealm_integration_test.cc
diff --git a/bin/chrealm/integration_tests/chrealm_test_get_message.cmx b/garnet/bin/chrealm/integration_tests/chrealm_test_get_message.cmx similarity index 100% rename from bin/chrealm/integration_tests/chrealm_test_get_message.cmx rename to garnet/bin/chrealm/integration_tests/chrealm_test_get_message.cmx
diff --git a/bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/BUILD.gn b/garnet/bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/BUILD.gn similarity index 100% rename from bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/BUILD.gn rename to garnet/bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/BUILD.gn
diff --git a/bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/test_service.fidl b/garnet/bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/test_service.fidl similarity index 100% rename from bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/test_service.fidl rename to garnet/bin/chrealm/integration_tests/fidl/fuchsia.testing.chrealm/test_service.fidl
diff --git a/bin/chrealm/integration_tests/get_message_client.cc b/garnet/bin/chrealm/integration_tests/get_message_client.cc similarity index 100% rename from bin/chrealm/integration_tests/get_message_client.cc rename to garnet/bin/chrealm/integration_tests/get_message_client.cc
diff --git a/bin/chrealm/integration_tests/meta/chrealm_integration_test.cmx b/garnet/bin/chrealm/integration_tests/meta/chrealm_integration_test.cmx similarity index 100% rename from bin/chrealm/integration_tests/meta/chrealm_integration_test.cmx rename to garnet/bin/chrealm/integration_tests/meta/chrealm_integration_test.cmx
diff --git a/bin/chrealm/main.cc b/garnet/bin/chrealm/main.cc similarity index 100% rename from bin/chrealm/main.cc rename to garnet/bin/chrealm/main.cc
diff --git a/bin/cmc/BUILD.gn b/garnet/bin/cmc/BUILD.gn similarity index 100% rename from bin/cmc/BUILD.gn rename to garnet/bin/cmc/BUILD.gn
diff --git a/bin/cmc/README.md b/garnet/bin/cmc/README.md similarity index 100% rename from bin/cmc/README.md rename to garnet/bin/cmc/README.md
diff --git a/bin/cmc/meta/cmc_integration_test.cmx b/garnet/bin/cmc/meta/cmc_integration_test.cmx similarity index 100% rename from bin/cmc/meta/cmc_integration_test.cmx rename to garnet/bin/cmc/meta/cmc_integration_test.cmx
diff --git a/bin/cmc/meta/example.cml b/garnet/bin/cmc/meta/example.cml similarity index 100% rename from bin/cmc/meta/example.cml rename to garnet/bin/cmc/meta/example.cml
diff --git a/bin/cmc/src/cml.rs b/garnet/bin/cmc/src/cml.rs similarity index 100% rename from bin/cmc/src/cml.rs rename to garnet/bin/cmc/src/cml.rs
diff --git a/bin/cmc/src/compile.rs b/garnet/bin/cmc/src/compile.rs similarity index 100% rename from bin/cmc/src/compile.rs rename to garnet/bin/cmc/src/compile.rs
diff --git a/bin/cmc/src/format.rs b/garnet/bin/cmc/src/format.rs similarity index 100% rename from bin/cmc/src/format.rs rename to garnet/bin/cmc/src/format.rs
diff --git a/bin/cmc/src/main.rs b/garnet/bin/cmc/src/main.rs similarity index 100% rename from bin/cmc/src/main.rs rename to garnet/bin/cmc/src/main.rs
diff --git a/bin/cmc/src/merge.rs b/garnet/bin/cmc/src/merge.rs similarity index 100% rename from bin/cmc/src/merge.rs rename to garnet/bin/cmc/src/merge.rs
diff --git a/bin/cmc/src/opts.rs b/garnet/bin/cmc/src/opts.rs similarity index 100% rename from bin/cmc/src/opts.rs rename to garnet/bin/cmc/src/opts.rs
diff --git a/bin/cmc/src/validate.rs b/garnet/bin/cmc/src/validate.rs similarity index 100% rename from bin/cmc/src/validate.rs rename to garnet/bin/cmc/src/validate.rs
diff --git a/bin/cmc/tests/example.rs b/garnet/bin/cmc/tests/example.rs similarity index 100% rename from bin/cmc/tests/example.rs rename to garnet/bin/cmc/tests/example.rs
diff --git a/bin/cmc/tests/golden_debug.cm b/garnet/bin/cmc/tests/golden_debug.cm similarity index 100% rename from bin/cmc/tests/golden_debug.cm rename to garnet/bin/cmc/tests/golden_debug.cm
diff --git a/bin/cmc/tests/golden_release.cm b/garnet/bin/cmc/tests/golden_release.cm similarity index 100% rename from bin/cmc/tests/golden_release.cm rename to garnet/bin/cmc/tests/golden_release.cm
diff --git a/bin/cmc/tests/integration_test.rs b/garnet/bin/cmc/tests/integration_test.rs similarity index 100% rename from bin/cmc/tests/integration_test.rs rename to garnet/bin/cmc/tests/integration_test.rs
diff --git a/bin/cobalt/BUILD.gn b/garnet/bin/cobalt/BUILD.gn similarity index 100% rename from bin/cobalt/BUILD.gn rename to garnet/bin/cobalt/BUILD.gn
diff --git a/bin/cobalt/README.md b/garnet/bin/cobalt/README.md similarity index 100% rename from bin/cobalt/README.md rename to garnet/bin/cobalt/README.md
diff --git a/bin/cobalt/app/BUILD.gn b/garnet/bin/cobalt/app/BUILD.gn similarity index 100% rename from bin/cobalt/app/BUILD.gn rename to garnet/bin/cobalt/app/BUILD.gn
diff --git a/bin/cobalt/app/cobalt_app.cc b/garnet/bin/cobalt/app/cobalt_app.cc similarity index 100% rename from bin/cobalt/app/cobalt_app.cc rename to garnet/bin/cobalt/app/cobalt_app.cc
diff --git a/bin/cobalt/app/cobalt_app.h b/garnet/bin/cobalt/app/cobalt_app.h similarity index 100% rename from bin/cobalt/app/cobalt_app.h rename to garnet/bin/cobalt/app/cobalt_app.h
diff --git a/bin/cobalt/app/cobalt_controller_impl.cc b/garnet/bin/cobalt/app/cobalt_controller_impl.cc similarity index 100% rename from bin/cobalt/app/cobalt_controller_impl.cc rename to garnet/bin/cobalt/app/cobalt_controller_impl.cc
diff --git a/bin/cobalt/app/cobalt_controller_impl.h b/garnet/bin/cobalt/app/cobalt_controller_impl.h similarity index 100% rename from bin/cobalt/app/cobalt_controller_impl.h rename to garnet/bin/cobalt/app/cobalt_controller_impl.h
diff --git a/bin/cobalt/app/cobalt_main.cc b/garnet/bin/cobalt/app/cobalt_main.cc similarity index 100% rename from bin/cobalt/app/cobalt_main.cc rename to garnet/bin/cobalt/app/cobalt_main.cc
diff --git a/bin/cobalt/app/legacy_logger_impl.cc b/garnet/bin/cobalt/app/legacy_logger_impl.cc similarity index 100% rename from bin/cobalt/app/legacy_logger_impl.cc rename to garnet/bin/cobalt/app/legacy_logger_impl.cc
diff --git a/bin/cobalt/app/legacy_logger_impl.h b/garnet/bin/cobalt/app/legacy_logger_impl.h similarity index 100% rename from bin/cobalt/app/legacy_logger_impl.h rename to garnet/bin/cobalt/app/legacy_logger_impl.h
diff --git a/bin/cobalt/app/logger_factory_impl.cc b/garnet/bin/cobalt/app/logger_factory_impl.cc similarity index 100% rename from bin/cobalt/app/logger_factory_impl.cc rename to garnet/bin/cobalt/app/logger_factory_impl.cc
diff --git a/bin/cobalt/app/logger_factory_impl.h b/garnet/bin/cobalt/app/logger_factory_impl.h similarity index 100% rename from bin/cobalt/app/logger_factory_impl.h rename to garnet/bin/cobalt/app/logger_factory_impl.h
diff --git a/bin/cobalt/app/logger_impl.cc b/garnet/bin/cobalt/app/logger_impl.cc similarity index 100% rename from bin/cobalt/app/logger_impl.cc rename to garnet/bin/cobalt/app/logger_impl.cc
diff --git a/bin/cobalt/app/logger_impl.h b/garnet/bin/cobalt/app/logger_impl.h similarity index 100% rename from bin/cobalt/app/logger_impl.h rename to garnet/bin/cobalt/app/logger_impl.h
diff --git a/bin/cobalt/app/meta/cobalt.cmx b/garnet/bin/cobalt/app/meta/cobalt.cmx similarity index 100% rename from bin/cobalt/app/meta/cobalt.cmx rename to garnet/bin/cobalt/app/meta/cobalt.cmx
diff --git a/bin/cobalt/app/product_hack.h b/garnet/bin/cobalt/app/product_hack.h similarity index 100% rename from bin/cobalt/app/product_hack.h rename to garnet/bin/cobalt/app/product_hack.h
diff --git a/bin/cobalt/app/system_data_updater_impl.cc b/garnet/bin/cobalt/app/system_data_updater_impl.cc similarity index 100% rename from bin/cobalt/app/system_data_updater_impl.cc rename to garnet/bin/cobalt/app/system_data_updater_impl.cc
diff --git a/bin/cobalt/app/system_data_updater_impl.h b/garnet/bin/cobalt/app/system_data_updater_impl.h similarity index 100% rename from bin/cobalt/app/system_data_updater_impl.h rename to garnet/bin/cobalt/app/system_data_updater_impl.h
diff --git a/bin/cobalt/app/system_data_updater_impl_test.cc b/garnet/bin/cobalt/app/system_data_updater_impl_test.cc similarity index 100% rename from bin/cobalt/app/system_data_updater_impl_test.cc rename to garnet/bin/cobalt/app/system_data_updater_impl_test.cc
diff --git a/bin/cobalt/app/timer_manager.cc b/garnet/bin/cobalt/app/timer_manager.cc similarity index 100% rename from bin/cobalt/app/timer_manager.cc rename to garnet/bin/cobalt/app/timer_manager.cc
diff --git a/bin/cobalt/app/timer_manager.h b/garnet/bin/cobalt/app/timer_manager.h similarity index 100% rename from bin/cobalt/app/timer_manager.h rename to garnet/bin/cobalt/app/timer_manager.h
diff --git a/bin/cobalt/app/timer_manager_test.cc b/garnet/bin/cobalt/app/timer_manager_test.cc similarity index 100% rename from bin/cobalt/app/timer_manager_test.cc rename to garnet/bin/cobalt/app/timer_manager_test.cc
diff --git a/bin/cobalt/app/utils.cc b/garnet/bin/cobalt/app/utils.cc similarity index 100% rename from bin/cobalt/app/utils.cc rename to garnet/bin/cobalt/app/utils.cc
diff --git a/bin/cobalt/app/utils.h b/garnet/bin/cobalt/app/utils.h similarity index 100% rename from bin/cobalt/app/utils.h rename to garnet/bin/cobalt/app/utils.h
diff --git a/bin/cobalt/download_report_client.py b/garnet/bin/cobalt/download_report_client.py similarity index 100% rename from bin/cobalt/download_report_client.py rename to garnet/bin/cobalt/download_report_client.py
diff --git a/bin/cobalt/system-metrics/BUILD.gn b/garnet/bin/cobalt/system-metrics/BUILD.gn similarity index 100% rename from bin/cobalt/system-metrics/BUILD.gn rename to garnet/bin/cobalt/system-metrics/BUILD.gn
diff --git a/bin/cobalt/system-metrics/meta/cobalt_system_metrics.cmx b/garnet/bin/cobalt/system-metrics/meta/cobalt_system_metrics.cmx similarity index 100% rename from bin/cobalt/system-metrics/meta/cobalt_system_metrics.cmx rename to garnet/bin/cobalt/system-metrics/meta/cobalt_system_metrics.cmx
diff --git a/bin/cobalt/system-metrics/system_metrics_main.cc b/garnet/bin/cobalt/system-metrics/system_metrics_main.cc similarity index 100% rename from bin/cobalt/system-metrics/system_metrics_main.cc rename to garnet/bin/cobalt/system-metrics/system_metrics_main.cc
diff --git a/bin/cobalt/testapp/BUILD.gn b/garnet/bin/cobalt/testapp/BUILD.gn similarity index 100% rename from bin/cobalt/testapp/BUILD.gn rename to garnet/bin/cobalt/testapp/BUILD.gn
diff --git a/bin/cobalt/testapp/cobalt_testapp.cc b/garnet/bin/cobalt/testapp/cobalt_testapp.cc similarity index 100% rename from bin/cobalt/testapp/cobalt_testapp.cc rename to garnet/bin/cobalt/testapp/cobalt_testapp.cc
diff --git a/bin/cobalt/testapp/cobalt_testapp.h b/garnet/bin/cobalt/testapp/cobalt_testapp.h similarity index 100% rename from bin/cobalt/testapp/cobalt_testapp.h rename to garnet/bin/cobalt/testapp/cobalt_testapp.h
diff --git a/bin/cobalt/testapp/cobalt_testapp_logger.cc b/garnet/bin/cobalt/testapp/cobalt_testapp_logger.cc similarity index 100% rename from bin/cobalt/testapp/cobalt_testapp_logger.cc rename to garnet/bin/cobalt/testapp/cobalt_testapp_logger.cc
diff --git a/bin/cobalt/testapp/cobalt_testapp_logger.h b/garnet/bin/cobalt/testapp/cobalt_testapp_logger.h similarity index 100% rename from bin/cobalt/testapp/cobalt_testapp_logger.h rename to garnet/bin/cobalt/testapp/cobalt_testapp_logger.h
diff --git a/bin/cobalt/testapp/cobalt_testapp_main.cc b/garnet/bin/cobalt/testapp/cobalt_testapp_main.cc similarity index 100% rename from bin/cobalt/testapp/cobalt_testapp_main.cc rename to garnet/bin/cobalt/testapp/cobalt_testapp_main.cc
diff --git a/bin/cobalt/testapp/cobalt_testapp_no_environment.sh b/garnet/bin/cobalt/testapp/cobalt_testapp_no_environment.sh similarity index 100% rename from bin/cobalt/testapp/cobalt_testapp_no_environment.sh rename to garnet/bin/cobalt/testapp/cobalt_testapp_no_environment.sh
diff --git a/bin/cobalt/testapp/cobalt_testapp_no_network.sh b/garnet/bin/cobalt/testapp/cobalt_testapp_no_network.sh similarity index 100% rename from bin/cobalt/testapp/cobalt_testapp_no_network.sh rename to garnet/bin/cobalt/testapp/cobalt_testapp_no_network.sh
diff --git a/bin/cobalt/testapp/test_constants.h b/garnet/bin/cobalt/testapp/test_constants.h similarity index 100% rename from bin/cobalt/testapp/test_constants.h rename to garnet/bin/cobalt/testapp/test_constants.h
diff --git a/bin/cobalt/testapp/tests.cc b/garnet/bin/cobalt/testapp/tests.cc similarity index 100% rename from bin/cobalt/testapp/tests.cc rename to garnet/bin/cobalt/testapp/tests.cc
diff --git a/bin/cobalt/testapp/tests.h b/garnet/bin/cobalt/testapp/tests.h similarity index 100% rename from bin/cobalt/testapp/tests.h rename to garnet/bin/cobalt/testapp/tests.h
diff --git a/bin/cobalt/utils/BUILD.gn b/garnet/bin/cobalt/utils/BUILD.gn similarity index 100% rename from bin/cobalt/utils/BUILD.gn rename to garnet/bin/cobalt/utils/BUILD.gn
diff --git a/bin/cobalt/utils/fuchsia_http_client.cc b/garnet/bin/cobalt/utils/fuchsia_http_client.cc similarity index 100% rename from bin/cobalt/utils/fuchsia_http_client.cc rename to garnet/bin/cobalt/utils/fuchsia_http_client.cc
diff --git a/bin/cobalt/utils/fuchsia_http_client.h b/garnet/bin/cobalt/utils/fuchsia_http_client.h similarity index 100% rename from bin/cobalt/utils/fuchsia_http_client.h rename to garnet/bin/cobalt/utils/fuchsia_http_client.h
diff --git a/bin/cobalt/utils/fuchsia_http_client_test.cc b/garnet/bin/cobalt/utils/fuchsia_http_client_test.cc similarity index 100% rename from bin/cobalt/utils/fuchsia_http_client_test.cc rename to garnet/bin/cobalt/utils/fuchsia_http_client_test.cc
diff --git a/bin/cowsay/BUILD.gn b/garnet/bin/cowsay/BUILD.gn similarity index 100% rename from bin/cowsay/BUILD.gn rename to garnet/bin/cowsay/BUILD.gn
diff --git a/bin/cowsay/cowsay.c b/garnet/bin/cowsay/cowsay.c similarity index 100% rename from bin/cowsay/cowsay.c rename to garnet/bin/cowsay/cowsay.c
diff --git a/bin/cpuperf/BUILD.gn b/garnet/bin/cpuperf/BUILD.gn similarity index 100% rename from bin/cpuperf/BUILD.gn rename to garnet/bin/cpuperf/BUILD.gn
diff --git a/bin/cpuperf/MAINTAINERS b/garnet/bin/cpuperf/MAINTAINERS similarity index 100% rename from bin/cpuperf/MAINTAINERS rename to garnet/bin/cpuperf/MAINTAINERS
diff --git a/bin/cpuperf/README.md b/garnet/bin/cpuperf/README.md similarity index 100% rename from bin/cpuperf/README.md rename to garnet/bin/cpuperf/README.md
diff --git a/bin/cpuperf/copy_cpuperf.sh b/garnet/bin/cpuperf/copy_cpuperf.sh similarity index 100% rename from bin/cpuperf/copy_cpuperf.sh rename to garnet/bin/cpuperf/copy_cpuperf.sh
diff --git a/bin/cpuperf/cpspec/basic-cpu-memory.cpspec b/garnet/bin/cpuperf/cpspec/basic-cpu-memory.cpspec similarity index 100% rename from bin/cpuperf/cpspec/basic-cpu-memory.cpspec rename to garnet/bin/cpuperf/cpspec/basic-cpu-memory.cpspec
diff --git a/bin/cpuperf/cpspec/l1.cpspec b/garnet/bin/cpuperf/cpspec/l1.cpspec similarity index 100% rename from bin/cpuperf/cpspec/l1.cpspec rename to garnet/bin/cpuperf/cpspec/l1.cpspec
diff --git a/bin/cpuperf/cpspec/l2.cpspec b/garnet/bin/cpuperf/cpspec/l2.cpspec similarity index 100% rename from bin/cpuperf/cpspec/l2.cpspec rename to garnet/bin/cpuperf/cpspec/l2.cpspec
diff --git a/bin/cpuperf/cpspec/l3.cpspec b/garnet/bin/cpuperf/cpspec/l3.cpspec similarity index 100% rename from bin/cpuperf/cpspec/l3.cpspec rename to garnet/bin/cpuperf/cpspec/l3.cpspec
diff --git a/bin/cpuperf/main.cc b/garnet/bin/cpuperf/main.cc similarity index 100% rename from bin/cpuperf/main.cc rename to garnet/bin/cpuperf/main.cc
diff --git a/bin/cpuperf/meta/README.md b/garnet/bin/cpuperf/meta/README.md similarity index 100% rename from bin/cpuperf/meta/README.md rename to garnet/bin/cpuperf/meta/README.md
diff --git a/bin/cpuperf/meta/cpuperf.cmx b/garnet/bin/cpuperf/meta/cpuperf.cmx similarity index 100% rename from bin/cpuperf/meta/cpuperf.cmx rename to garnet/bin/cpuperf/meta/cpuperf.cmx
diff --git a/bin/cpuperf/print/BUILD.gn b/garnet/bin/cpuperf/print/BUILD.gn similarity index 100% rename from bin/cpuperf/print/BUILD.gn rename to garnet/bin/cpuperf/print/BUILD.gn
diff --git a/bin/cpuperf/print/README.md b/garnet/bin/cpuperf/print/README.md similarity index 100% rename from bin/cpuperf/print/README.md rename to garnet/bin/cpuperf/print/README.md
diff --git a/bin/cpuperf/print/main.cc b/garnet/bin/cpuperf/print/main.cc similarity index 100% rename from bin/cpuperf/print/main.cc rename to garnet/bin/cpuperf/print/main.cc
diff --git a/bin/cpuperf/print/printer_config.cc b/garnet/bin/cpuperf/print/printer_config.cc similarity index 100% rename from bin/cpuperf/print/printer_config.cc rename to garnet/bin/cpuperf/print/printer_config.cc
diff --git a/bin/cpuperf/print/printer_config.h b/garnet/bin/cpuperf/print/printer_config.h similarity index 100% rename from bin/cpuperf/print/printer_config.h rename to garnet/bin/cpuperf/print/printer_config.h
diff --git a/bin/cpuperf/print/raw_printer.cc b/garnet/bin/cpuperf/print/raw_printer.cc similarity index 100% rename from bin/cpuperf/print/raw_printer.cc rename to garnet/bin/cpuperf/print/raw_printer.cc
diff --git a/bin/cpuperf/print/raw_printer.h b/garnet/bin/cpuperf/print/raw_printer.h similarity index 100% rename from bin/cpuperf/print/raw_printer.h rename to garnet/bin/cpuperf/print/raw_printer.h
diff --git a/bin/cpuperf/print/tests/BUILD.gn b/garnet/bin/cpuperf/print/tests/BUILD.gn similarity index 100% rename from bin/cpuperf/print/tests/BUILD.gn rename to garnet/bin/cpuperf/print/tests/BUILD.gn
diff --git a/bin/cpuperf/print/tests/raw-expected-output.txt b/garnet/bin/cpuperf/print/tests/raw-expected-output.txt similarity index 100% rename from bin/cpuperf/print/tests/raw-expected-output.txt rename to garnet/bin/cpuperf/print/tests/raw-expected-output.txt
diff --git a/bin/cpuperf/print/tests/raw-test.0.0.cpuperf b/garnet/bin/cpuperf/print/tests/raw-test.0.0.cpuperf similarity index 100% rename from bin/cpuperf/print/tests/raw-test.0.0.cpuperf rename to garnet/bin/cpuperf/print/tests/raw-test.0.0.cpuperf Binary files differ
diff --git a/bin/cpuperf/print/tests/raw-test.0.1.cpuperf b/garnet/bin/cpuperf/print/tests/raw-test.0.1.cpuperf similarity index 100% rename from bin/cpuperf/print/tests/raw-test.0.1.cpuperf rename to garnet/bin/cpuperf/print/tests/raw-test.0.1.cpuperf Binary files differ
diff --git a/bin/cpuperf/print/tests/raw-test.0.2.cpuperf b/garnet/bin/cpuperf/print/tests/raw-test.0.2.cpuperf similarity index 100% rename from bin/cpuperf/print/tests/raw-test.0.2.cpuperf rename to garnet/bin/cpuperf/print/tests/raw-test.0.2.cpuperf Binary files differ
diff --git a/bin/cpuperf/print/tests/raw-test.0.3.cpuperf b/garnet/bin/cpuperf/print/tests/raw-test.0.3.cpuperf similarity index 100% rename from bin/cpuperf/print/tests/raw-test.0.3.cpuperf rename to garnet/bin/cpuperf/print/tests/raw-test.0.3.cpuperf Binary files differ
diff --git a/bin/cpuperf/print/tests/raw-test.cpsession b/garnet/bin/cpuperf/print/tests/raw-test.cpsession similarity index 100% rename from bin/cpuperf/print/tests/raw-test.cpsession rename to garnet/bin/cpuperf/print/tests/raw-test.cpsession
diff --git a/bin/cpuperf/print/tests/raw_printer_test.go b/garnet/bin/cpuperf/print/tests/raw_printer_test.go similarity index 100% rename from bin/cpuperf/print/tests/raw_printer_test.go rename to garnet/bin/cpuperf/print/tests/raw_printer_test.go
diff --git a/bin/cpuperf/print/tests/util.go b/garnet/bin/cpuperf/print/tests/util.go similarity index 100% rename from bin/cpuperf/print/tests/util.go rename to garnet/bin/cpuperf/print/tests/util.go
diff --git a/bin/cpuperf/print_tallies.cc b/garnet/bin/cpuperf/print_tallies.cc similarity index 100% rename from bin/cpuperf/print_tallies.cc rename to garnet/bin/cpuperf/print_tallies.cc
diff --git a/bin/cpuperf/print_tallies.h b/garnet/bin/cpuperf/print_tallies.h similarity index 100% rename from bin/cpuperf/print_tallies.h rename to garnet/bin/cpuperf/print_tallies.h
diff --git a/bin/cpuperf/session_result_spec.cc b/garnet/bin/cpuperf/session_result_spec.cc similarity index 100% rename from bin/cpuperf/session_result_spec.cc rename to garnet/bin/cpuperf/session_result_spec.cc
diff --git a/bin/cpuperf/session_result_spec.h b/garnet/bin/cpuperf/session_result_spec.h similarity index 100% rename from bin/cpuperf/session_result_spec.h rename to garnet/bin/cpuperf/session_result_spec.h
diff --git a/bin/cpuperf/session_result_spec_unittest.cc b/garnet/bin/cpuperf/session_result_spec_unittest.cc similarity index 100% rename from bin/cpuperf/session_result_spec_unittest.cc rename to garnet/bin/cpuperf/session_result_spec_unittest.cc
diff --git a/bin/cpuperf/session_spec.cc b/garnet/bin/cpuperf/session_spec.cc similarity index 100% rename from bin/cpuperf/session_spec.cc rename to garnet/bin/cpuperf/session_spec.cc
diff --git a/bin/cpuperf/session_spec.h b/garnet/bin/cpuperf/session_spec.h similarity index 100% rename from bin/cpuperf/session_spec.h rename to garnet/bin/cpuperf/session_spec.h
diff --git a/bin/cpuperf/session_spec_unittest.cc b/garnet/bin/cpuperf/session_spec_unittest.cc similarity index 100% rename from bin/cpuperf/session_spec_unittest.cc rename to garnet/bin/cpuperf/session_spec_unittest.cc
diff --git a/bin/cpuperf/tests/BUILD.gn b/garnet/bin/cpuperf/tests/BUILD.gn similarity index 100% rename from bin/cpuperf/tests/BUILD.gn rename to garnet/bin/cpuperf/tests/BUILD.gn
diff --git a/bin/cpuperf/tests/fixed_counters.cc b/garnet/bin/cpuperf/tests/fixed_counters.cc similarity index 100% rename from bin/cpuperf/tests/fixed_counters.cc rename to garnet/bin/cpuperf/tests/fixed_counters.cc
diff --git a/bin/cpuperf/tests/fixed_counters.cpspec b/garnet/bin/cpuperf/tests/fixed_counters.cpspec similarity index 100% rename from bin/cpuperf/tests/fixed_counters.cpspec rename to garnet/bin/cpuperf/tests/fixed_counters.cpspec
diff --git a/bin/cpuperf/tests/gen_printer_test_data.cpspec b/garnet/bin/cpuperf/tests/gen_printer_test_data.cpspec similarity index 100% rename from bin/cpuperf/tests/gen_printer_test_data.cpspec rename to garnet/bin/cpuperf/tests/gen_printer_test_data.cpspec
diff --git a/bin/cpuperf/tests/integration_tests.cc b/garnet/bin/cpuperf/tests/integration_tests.cc similarity index 100% rename from bin/cpuperf/tests/integration_tests.cc rename to garnet/bin/cpuperf/tests/integration_tests.cc
diff --git a/bin/cpuperf/tests/last_branch.cc b/garnet/bin/cpuperf/tests/last_branch.cc similarity index 100% rename from bin/cpuperf/tests/last_branch.cc rename to garnet/bin/cpuperf/tests/last_branch.cc
diff --git a/bin/cpuperf/tests/last_branch.cpspec b/garnet/bin/cpuperf/tests/last_branch.cpspec similarity index 100% rename from bin/cpuperf/tests/last_branch.cpspec rename to garnet/bin/cpuperf/tests/last_branch.cpspec
diff --git a/bin/cpuperf/tests/meta/README.md b/garnet/bin/cpuperf/tests/meta/README.md similarity index 100% rename from bin/cpuperf/tests/meta/README.md rename to garnet/bin/cpuperf/tests/meta/README.md
diff --git a/bin/cpuperf/tests/meta/cpuperf_integration_tests.cmx b/garnet/bin/cpuperf/tests/meta/cpuperf_integration_tests.cmx similarity index 100% rename from bin/cpuperf/tests/meta/cpuperf_integration_tests.cmx rename to garnet/bin/cpuperf/tests/meta/cpuperf_integration_tests.cmx
diff --git a/bin/cpuperf/tests/os_flag.cc b/garnet/bin/cpuperf/tests/os_flag.cc similarity index 100% rename from bin/cpuperf/tests/os_flag.cc rename to garnet/bin/cpuperf/tests/os_flag.cc
diff --git a/bin/cpuperf/tests/os_flag.cpspec b/garnet/bin/cpuperf/tests/os_flag.cpspec similarity index 100% rename from bin/cpuperf/tests/os_flag.cpspec rename to garnet/bin/cpuperf/tests/os_flag.cpspec
diff --git a/bin/cpuperf/tests/programmable_counters.cc b/garnet/bin/cpuperf/tests/programmable_counters.cc similarity index 100% rename from bin/cpuperf/tests/programmable_counters.cc rename to garnet/bin/cpuperf/tests/programmable_counters.cc
diff --git a/bin/cpuperf/tests/programmable_counters.cpspec b/garnet/bin/cpuperf/tests/programmable_counters.cpspec similarity index 100% rename from bin/cpuperf/tests/programmable_counters.cpspec rename to garnet/bin/cpuperf/tests/programmable_counters.cpspec
diff --git a/bin/cpuperf/tests/run_test.cc b/garnet/bin/cpuperf/tests/run_test.cc similarity index 100% rename from bin/cpuperf/tests/run_test.cc rename to garnet/bin/cpuperf/tests/run_test.cc
diff --git a/bin/cpuperf/tests/run_test.h b/garnet/bin/cpuperf/tests/run_test.h similarity index 100% rename from bin/cpuperf/tests/run_test.h rename to garnet/bin/cpuperf/tests/run_test.h
diff --git a/bin/cpuperf/tests/tally.cc b/garnet/bin/cpuperf/tests/tally.cc similarity index 100% rename from bin/cpuperf/tests/tally.cc rename to garnet/bin/cpuperf/tests/tally.cc
diff --git a/bin/cpuperf/tests/tally.cpspec b/garnet/bin/cpuperf/tests/tally.cpspec similarity index 100% rename from bin/cpuperf/tests/tally.cpspec rename to garnet/bin/cpuperf/tests/tally.cpspec
diff --git a/bin/cpuperf/tests/user_flag.cc b/garnet/bin/cpuperf/tests/user_flag.cc similarity index 100% rename from bin/cpuperf/tests/user_flag.cc rename to garnet/bin/cpuperf/tests/user_flag.cc
diff --git a/bin/cpuperf/tests/user_flag.cpspec b/garnet/bin/cpuperf/tests/user_flag.cpspec similarity index 100% rename from bin/cpuperf/tests/user_flag.cpspec rename to garnet/bin/cpuperf/tests/user_flag.cpspec
diff --git a/bin/cpuperf/tests/value_records.cc b/garnet/bin/cpuperf/tests/value_records.cc similarity index 100% rename from bin/cpuperf/tests/value_records.cc rename to garnet/bin/cpuperf/tests/value_records.cc
diff --git a/bin/cpuperf/tests/value_records.cpspec b/garnet/bin/cpuperf/tests/value_records.cpspec similarity index 100% rename from bin/cpuperf/tests/value_records.cpspec rename to garnet/bin/cpuperf/tests/value_records.cpspec
diff --git a/bin/cpuperf/tests/verify_test.cc b/garnet/bin/cpuperf/tests/verify_test.cc similarity index 100% rename from bin/cpuperf/tests/verify_test.cc rename to garnet/bin/cpuperf/tests/verify_test.cc
diff --git a/bin/cpuperf/tests/verify_test.h b/garnet/bin/cpuperf/tests/verify_test.h similarity index 100% rename from bin/cpuperf/tests/verify_test.h rename to garnet/bin/cpuperf/tests/verify_test.h
diff --git a/bin/cpuperf_provider/BUILD.gn b/garnet/bin/cpuperf_provider/BUILD.gn similarity index 100% rename from bin/cpuperf_provider/BUILD.gn rename to garnet/bin/cpuperf_provider/BUILD.gn
diff --git a/bin/cpuperf_provider/MAINTAINERS b/garnet/bin/cpuperf_provider/MAINTAINERS similarity index 100% rename from bin/cpuperf_provider/MAINTAINERS rename to garnet/bin/cpuperf_provider/MAINTAINERS
diff --git a/bin/cpuperf_provider/README.md b/garnet/bin/cpuperf_provider/README.md similarity index 100% rename from bin/cpuperf_provider/README.md rename to garnet/bin/cpuperf_provider/README.md
diff --git a/bin/cpuperf_provider/app.cc b/garnet/bin/cpuperf_provider/app.cc similarity index 100% rename from bin/cpuperf_provider/app.cc rename to garnet/bin/cpuperf_provider/app.cc
diff --git a/bin/cpuperf_provider/app.h b/garnet/bin/cpuperf_provider/app.h similarity index 100% rename from bin/cpuperf_provider/app.h rename to garnet/bin/cpuperf_provider/app.h
diff --git a/bin/cpuperf_provider/categories.cc b/garnet/bin/cpuperf_provider/categories.cc similarity index 100% rename from bin/cpuperf_provider/categories.cc rename to garnet/bin/cpuperf_provider/categories.cc
diff --git a/bin/cpuperf_provider/categories.h b/garnet/bin/cpuperf_provider/categories.h similarity index 100% rename from bin/cpuperf_provider/categories.h rename to garnet/bin/cpuperf_provider/categories.h
diff --git a/bin/cpuperf_provider/importer.cc b/garnet/bin/cpuperf_provider/importer.cc similarity index 100% rename from bin/cpuperf_provider/importer.cc rename to garnet/bin/cpuperf_provider/importer.cc
diff --git a/bin/cpuperf_provider/importer.h b/garnet/bin/cpuperf_provider/importer.h similarity index 100% rename from bin/cpuperf_provider/importer.h rename to garnet/bin/cpuperf_provider/importer.h
diff --git a/bin/cpuperf_provider/intel-pm-categories.inc b/garnet/bin/cpuperf_provider/intel-pm-categories.inc similarity index 100% rename from bin/cpuperf_provider/intel-pm-categories.inc rename to garnet/bin/cpuperf_provider/intel-pm-categories.inc
diff --git a/bin/cpuperf_provider/intel-timebase-categories.inc b/garnet/bin/cpuperf_provider/intel-timebase-categories.inc similarity index 100% rename from bin/cpuperf_provider/intel-timebase-categories.inc rename to garnet/bin/cpuperf_provider/intel-timebase-categories.inc
diff --git a/bin/cpuperf_provider/main.cc b/garnet/bin/cpuperf_provider/main.cc similarity index 100% rename from bin/cpuperf_provider/main.cc rename to garnet/bin/cpuperf_provider/main.cc
diff --git a/bin/cpuperf_provider/meta/README.md b/garnet/bin/cpuperf_provider/meta/README.md similarity index 100% rename from bin/cpuperf_provider/meta/README.md rename to garnet/bin/cpuperf_provider/meta/README.md
diff --git a/bin/cpuperf_provider/meta/cpuperf_provider.cmx b/garnet/bin/cpuperf_provider/meta/cpuperf_provider.cmx similarity index 100% rename from bin/cpuperf_provider/meta/cpuperf_provider.cmx rename to garnet/bin/cpuperf_provider/meta/cpuperf_provider.cmx
diff --git a/bin/cpuperf_provider/report-generators/tally/BUILD.gn b/garnet/bin/cpuperf_provider/report-generators/tally/BUILD.gn similarity index 100% rename from bin/cpuperf_provider/report-generators/tally/BUILD.gn rename to garnet/bin/cpuperf_provider/report-generators/tally/BUILD.gn
diff --git a/bin/cpuperf_provider/report-generators/tally/main.go b/garnet/bin/cpuperf_provider/report-generators/tally/main.go similarity index 100% rename from bin/cpuperf_provider/report-generators/tally/main.go rename to garnet/bin/cpuperf_provider/report-generators/tally/main.go
diff --git a/bin/cpuperf_provider/skylake-misc-categories.inc b/garnet/bin/cpuperf_provider/skylake-misc-categories.inc similarity index 100% rename from bin/cpuperf_provider/skylake-misc-categories.inc rename to garnet/bin/cpuperf_provider/skylake-misc-categories.inc
diff --git a/bin/cpuperf_provider/skylake-pm-categories.inc b/garnet/bin/cpuperf_provider/skylake-pm-categories.inc similarity index 100% rename from bin/cpuperf_provider/skylake-pm-categories.inc rename to garnet/bin/cpuperf_provider/skylake-pm-categories.inc
diff --git a/bin/crashpad/BUILD.gn b/garnet/bin/crashpad/BUILD.gn similarity index 100% rename from bin/crashpad/BUILD.gn rename to garnet/bin/crashpad/BUILD.gn
diff --git a/bin/crashpad/MAINTAINERS b/garnet/bin/crashpad/MAINTAINERS similarity index 100% rename from bin/crashpad/MAINTAINERS rename to garnet/bin/crashpad/MAINTAINERS
diff --git a/bin/crashpad/README.md b/garnet/bin/crashpad/README.md similarity index 100% rename from bin/crashpad/README.md rename to garnet/bin/crashpad/README.md
diff --git a/bin/crashpad/config.cc b/garnet/bin/crashpad/config.cc similarity index 100% rename from bin/crashpad/config.cc rename to garnet/bin/crashpad/config.cc
diff --git a/bin/crashpad/config.h b/garnet/bin/crashpad/config.h similarity index 100% rename from bin/crashpad/config.h rename to garnet/bin/crashpad/config.h
diff --git a/bin/crashpad/configs/default.json b/garnet/bin/crashpad/configs/default.json similarity index 100% rename from bin/crashpad/configs/default.json rename to garnet/bin/crashpad/configs/default.json
diff --git a/bin/crashpad/configs/upload_to_prod_server.json b/garnet/bin/crashpad/configs/upload_to_prod_server.json similarity index 100% rename from bin/crashpad/configs/upload_to_prod_server.json rename to garnet/bin/crashpad/configs/upload_to_prod_server.json
diff --git a/bin/crashpad/crashpad_analyzer_impl.cc b/garnet/bin/crashpad/crashpad_analyzer_impl.cc similarity index 100% rename from bin/crashpad/crashpad_analyzer_impl.cc rename to garnet/bin/crashpad/crashpad_analyzer_impl.cc
diff --git a/bin/crashpad/crashpad_analyzer_impl.h b/garnet/bin/crashpad/crashpad_analyzer_impl.h similarity index 100% rename from bin/crashpad/crashpad_analyzer_impl.h rename to garnet/bin/crashpad/crashpad_analyzer_impl.h
diff --git a/bin/crashpad/main.cc b/garnet/bin/crashpad/main.cc similarity index 100% rename from bin/crashpad/main.cc rename to garnet/bin/crashpad/main.cc
diff --git a/bin/crashpad/meta/crashpad_analyzer.cmx b/garnet/bin/crashpad/meta/crashpad_analyzer.cmx similarity index 100% rename from bin/crashpad/meta/crashpad_analyzer.cmx rename to garnet/bin/crashpad/meta/crashpad_analyzer.cmx
diff --git a/bin/crashpad/report_annotations.cc b/garnet/bin/crashpad/report_annotations.cc similarity index 100% rename from bin/crashpad/report_annotations.cc rename to garnet/bin/crashpad/report_annotations.cc
diff --git a/bin/crashpad/report_annotations.h b/garnet/bin/crashpad/report_annotations.h similarity index 100% rename from bin/crashpad/report_annotations.h rename to garnet/bin/crashpad/report_annotations.h
diff --git a/bin/crashpad/report_attachments.cc b/garnet/bin/crashpad/report_attachments.cc similarity index 100% rename from bin/crashpad/report_attachments.cc rename to garnet/bin/crashpad/report_attachments.cc
diff --git a/bin/crashpad/report_attachments.h b/garnet/bin/crashpad/report_attachments.h similarity index 100% rename from bin/crashpad/report_attachments.h rename to garnet/bin/crashpad/report_attachments.h
diff --git a/bin/crashpad/scoped_unlink.h b/garnet/bin/crashpad/scoped_unlink.h similarity index 100% rename from bin/crashpad/scoped_unlink.h rename to garnet/bin/crashpad/scoped_unlink.h
diff --git a/bin/crashpad/test/BUILD.gn b/garnet/bin/crashpad/test/BUILD.gn similarity index 100% rename from bin/crashpad/test/BUILD.gn rename to garnet/bin/crashpad/test/BUILD.gn
diff --git a/bin/crashpad/test/config_unittest.cc b/garnet/bin/crashpad/test/config_unittest.cc similarity index 100% rename from bin/crashpad/test/config_unittest.cc rename to garnet/bin/crashpad/test/config_unittest.cc
diff --git a/bin/crashpad/test/configs/bad_schema_missing_required_field.json b/garnet/bin/crashpad/test/configs/bad_schema_missing_required_field.json similarity index 100% rename from bin/crashpad/test/configs/bad_schema_missing_required_field.json rename to garnet/bin/crashpad/test/configs/bad_schema_missing_required_field.json
diff --git a/bin/crashpad/test/configs/bad_schema_missing_server.json b/garnet/bin/crashpad/test/configs/bad_schema_missing_server.json similarity index 100% rename from bin/crashpad/test/configs/bad_schema_missing_server.json rename to garnet/bin/crashpad/test/configs/bad_schema_missing_server.json
diff --git a/bin/crashpad/test/configs/bad_schema_spurious_field.json b/garnet/bin/crashpad/test/configs/bad_schema_spurious_field.json similarity index 100% rename from bin/crashpad/test/configs/bad_schema_spurious_field.json rename to garnet/bin/crashpad/test/configs/bad_schema_spurious_field.json
diff --git a/bin/crashpad/test/configs/valid_no_upload.json b/garnet/bin/crashpad/test/configs/valid_no_upload.json similarity index 100% rename from bin/crashpad/test/configs/valid_no_upload.json rename to garnet/bin/crashpad/test/configs/valid_no_upload.json
diff --git a/bin/crashpad/test/configs/valid_no_upload_spurious_server.json b/garnet/bin/crashpad/test/configs/valid_no_upload_spurious_server.json similarity index 100% rename from bin/crashpad/test/configs/valid_no_upload_spurious_server.json rename to garnet/bin/crashpad/test/configs/valid_no_upload_spurious_server.json
diff --git a/bin/crashpad/test/configs/valid_upload.json b/garnet/bin/crashpad/test/configs/valid_upload.json similarity index 100% rename from bin/crashpad/test/configs/valid_upload.json rename to garnet/bin/crashpad/test/configs/valid_upload.json
diff --git a/bin/crashpad/test/crashpad_analyzer_impl_unittest.cc b/garnet/bin/crashpad/test/crashpad_analyzer_impl_unittest.cc similarity index 100% rename from bin/crashpad/test/crashpad_analyzer_impl_unittest.cc rename to garnet/bin/crashpad/test/crashpad_analyzer_impl_unittest.cc
diff --git a/bin/crashpad/test/meta/config_unittest.cmx b/garnet/bin/crashpad/test/meta/config_unittest.cmx similarity index 100% rename from bin/crashpad/test/meta/config_unittest.cmx rename to garnet/bin/crashpad/test/meta/config_unittest.cmx
diff --git a/bin/crashpad/test/meta/crashpad_analyzer_impl_unittest.cmx b/garnet/bin/crashpad/test/meta/crashpad_analyzer_impl_unittest.cmx similarity index 100% rename from bin/crashpad/test/meta/crashpad_analyzer_impl_unittest.cmx rename to garnet/bin/crashpad/test/meta/crashpad_analyzer_impl_unittest.cmx
diff --git a/bin/cs/BUILD.gn b/garnet/bin/cs/BUILD.gn similarity index 100% rename from bin/cs/BUILD.gn rename to garnet/bin/cs/BUILD.gn
diff --git a/bin/cs/meta/cs.cmx b/garnet/bin/cs/meta/cs.cmx similarity index 100% rename from bin/cs/meta/cs.cmx rename to garnet/bin/cs/meta/cs.cmx
diff --git a/bin/cs/src/inspect.rs b/garnet/bin/cs/src/inspect.rs similarity index 100% rename from bin/cs/src/inspect.rs rename to garnet/bin/cs/src/inspect.rs
diff --git a/bin/cs/src/main.rs b/garnet/bin/cs/src/main.rs similarity index 100% rename from bin/cs/src/main.rs rename to garnet/bin/cs/src/main.rs
diff --git a/bin/debug_agent/BUILD.gn b/garnet/bin/debug_agent/BUILD.gn similarity index 100% rename from bin/debug_agent/BUILD.gn rename to garnet/bin/debug_agent/BUILD.gn
diff --git a/bin/debug_agent/arch.cc b/garnet/bin/debug_agent/arch.cc similarity index 100% rename from bin/debug_agent/arch.cc rename to garnet/bin/debug_agent/arch.cc
diff --git a/bin/debug_agent/arch.h b/garnet/bin/debug_agent/arch.h similarity index 100% rename from bin/debug_agent/arch.h rename to garnet/bin/debug_agent/arch.h
diff --git a/bin/debug_agent/arch_arm64.cc b/garnet/bin/debug_agent/arch_arm64.cc similarity index 100% rename from bin/debug_agent/arch_arm64.cc rename to garnet/bin/debug_agent/arch_arm64.cc
diff --git a/bin/debug_agent/arch_arm64.h b/garnet/bin/debug_agent/arch_arm64.h similarity index 100% rename from bin/debug_agent/arch_arm64.h rename to garnet/bin/debug_agent/arch_arm64.h
diff --git a/bin/debug_agent/arch_arm64_helpers.cc b/garnet/bin/debug_agent/arch_arm64_helpers.cc similarity index 100% rename from bin/debug_agent/arch_arm64_helpers.cc rename to garnet/bin/debug_agent/arch_arm64_helpers.cc
diff --git a/bin/debug_agent/arch_arm64_helpers.h b/garnet/bin/debug_agent/arch_arm64_helpers.h similarity index 100% rename from bin/debug_agent/arch_arm64_helpers.h rename to garnet/bin/debug_agent/arch_arm64_helpers.h
diff --git a/bin/debug_agent/arch_arm64_helpers_unittest.cc b/garnet/bin/debug_agent/arch_arm64_helpers_unittest.cc similarity index 100% rename from bin/debug_agent/arch_arm64_helpers_unittest.cc rename to garnet/bin/debug_agent/arch_arm64_helpers_unittest.cc
diff --git a/bin/debug_agent/arch_x64.cc b/garnet/bin/debug_agent/arch_x64.cc similarity index 100% rename from bin/debug_agent/arch_x64.cc rename to garnet/bin/debug_agent/arch_x64.cc
diff --git a/bin/debug_agent/arch_x64.h b/garnet/bin/debug_agent/arch_x64.h similarity index 100% rename from bin/debug_agent/arch_x64.h rename to garnet/bin/debug_agent/arch_x64.h
diff --git a/bin/debug_agent/arch_x64_helpers.cc b/garnet/bin/debug_agent/arch_x64_helpers.cc similarity index 100% rename from bin/debug_agent/arch_x64_helpers.cc rename to garnet/bin/debug_agent/arch_x64_helpers.cc
diff --git a/bin/debug_agent/arch_x64_helpers.h b/garnet/bin/debug_agent/arch_x64_helpers.h similarity index 100% rename from bin/debug_agent/arch_x64_helpers.h rename to garnet/bin/debug_agent/arch_x64_helpers.h
diff --git a/bin/debug_agent/arch_x64_helpers_unittest.cc b/garnet/bin/debug_agent/arch_x64_helpers_unittest.cc similarity index 100% rename from bin/debug_agent/arch_x64_helpers_unittest.cc rename to garnet/bin/debug_agent/arch_x64_helpers_unittest.cc
diff --git a/bin/debug_agent/breakpoint.cc b/garnet/bin/debug_agent/breakpoint.cc similarity index 100% rename from bin/debug_agent/breakpoint.cc rename to garnet/bin/debug_agent/breakpoint.cc
diff --git a/bin/debug_agent/breakpoint.h b/garnet/bin/debug_agent/breakpoint.h similarity index 100% rename from bin/debug_agent/breakpoint.h rename to garnet/bin/debug_agent/breakpoint.h
diff --git a/bin/debug_agent/breakpoint_unittest.cc b/garnet/bin/debug_agent/breakpoint_unittest.cc similarity index 100% rename from bin/debug_agent/breakpoint_unittest.cc rename to garnet/bin/debug_agent/breakpoint_unittest.cc
diff --git a/bin/debug_agent/debug_agent.cc b/garnet/bin/debug_agent/debug_agent.cc similarity index 100% rename from bin/debug_agent/debug_agent.cc rename to garnet/bin/debug_agent/debug_agent.cc
diff --git a/bin/debug_agent/debug_agent.h b/garnet/bin/debug_agent/debug_agent.h similarity index 100% rename from bin/debug_agent/debug_agent.h rename to garnet/bin/debug_agent/debug_agent.h
diff --git a/bin/debug_agent/debugged_job.cc b/garnet/bin/debug_agent/debugged_job.cc similarity index 100% rename from bin/debug_agent/debugged_job.cc rename to garnet/bin/debug_agent/debugged_job.cc
diff --git a/bin/debug_agent/debugged_job.h b/garnet/bin/debug_agent/debugged_job.h similarity index 100% rename from bin/debug_agent/debugged_job.h rename to garnet/bin/debug_agent/debugged_job.h
diff --git a/bin/debug_agent/debugged_job_unittest.cc b/garnet/bin/debug_agent/debugged_job_unittest.cc similarity index 100% rename from bin/debug_agent/debugged_job_unittest.cc rename to garnet/bin/debug_agent/debugged_job_unittest.cc
diff --git a/bin/debug_agent/debugged_process.cc b/garnet/bin/debug_agent/debugged_process.cc similarity index 100% rename from bin/debug_agent/debugged_process.cc rename to garnet/bin/debug_agent/debugged_process.cc
diff --git a/bin/debug_agent/debugged_process.h b/garnet/bin/debug_agent/debugged_process.h similarity index 100% rename from bin/debug_agent/debugged_process.h rename to garnet/bin/debug_agent/debugged_process.h
diff --git a/bin/debug_agent/debugged_thread.cc b/garnet/bin/debug_agent/debugged_thread.cc similarity index 100% rename from bin/debug_agent/debugged_thread.cc rename to garnet/bin/debug_agent/debugged_thread.cc
diff --git a/bin/debug_agent/debugged_thread.h b/garnet/bin/debug_agent/debugged_thread.h similarity index 100% rename from bin/debug_agent/debugged_thread.h rename to garnet/bin/debug_agent/debugged_thread.h
diff --git a/bin/debug_agent/debugged_thread_unittest.cc b/garnet/bin/debug_agent/debugged_thread_unittest.cc similarity index 100% rename from bin/debug_agent/debugged_thread_unittest.cc rename to garnet/bin/debug_agent/debugged_thread_unittest.cc
diff --git a/bin/debug_agent/integration_tests/BUILD.gn b/garnet/bin/debug_agent/integration_tests/BUILD.gn similarity index 100% rename from bin/debug_agent/integration_tests/BUILD.gn rename to garnet/bin/debug_agent/integration_tests/BUILD.gn
diff --git a/bin/debug_agent/integration_tests/breakpoint_test.cc b/garnet/bin/debug_agent/integration_tests/breakpoint_test.cc similarity index 100% rename from bin/debug_agent/integration_tests/breakpoint_test.cc rename to garnet/bin/debug_agent/integration_tests/breakpoint_test.cc
diff --git a/bin/debug_agent/integration_tests/message_loop_wrapper.cc b/garnet/bin/debug_agent/integration_tests/message_loop_wrapper.cc similarity index 100% rename from bin/debug_agent/integration_tests/message_loop_wrapper.cc rename to garnet/bin/debug_agent/integration_tests/message_loop_wrapper.cc
diff --git a/bin/debug_agent/integration_tests/message_loop_wrapper.h b/garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h similarity index 100% rename from bin/debug_agent/integration_tests/message_loop_wrapper.h rename to garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h
diff --git a/bin/debug_agent/integration_tests/mock_stream_backend.cc b/garnet/bin/debug_agent/integration_tests/mock_stream_backend.cc similarity index 100% rename from bin/debug_agent/integration_tests/mock_stream_backend.cc rename to garnet/bin/debug_agent/integration_tests/mock_stream_backend.cc
diff --git a/bin/debug_agent/integration_tests/mock_stream_backend.h b/garnet/bin/debug_agent/integration_tests/mock_stream_backend.h similarity index 100% rename from bin/debug_agent/integration_tests/mock_stream_backend.h rename to garnet/bin/debug_agent/integration_tests/mock_stream_backend.h
diff --git a/bin/debug_agent/integration_tests/so_wrapper.cc b/garnet/bin/debug_agent/integration_tests/so_wrapper.cc similarity index 100% rename from bin/debug_agent/integration_tests/so_wrapper.cc rename to garnet/bin/debug_agent/integration_tests/so_wrapper.cc
diff --git a/bin/debug_agent/integration_tests/so_wrapper.h b/garnet/bin/debug_agent/integration_tests/so_wrapper.h similarity index 100% rename from bin/debug_agent/integration_tests/so_wrapper.h rename to garnet/bin/debug_agent/integration_tests/so_wrapper.h
diff --git a/bin/debug_agent/integration_tests/write_registers_test.cc b/garnet/bin/debug_agent/integration_tests/write_registers_test.cc similarity index 100% rename from bin/debug_agent/integration_tests/write_registers_test.cc rename to garnet/bin/debug_agent/integration_tests/write_registers_test.cc
diff --git a/bin/debug_agent/launcher.cc b/garnet/bin/debug_agent/launcher.cc similarity index 100% rename from bin/debug_agent/launcher.cc rename to garnet/bin/debug_agent/launcher.cc
diff --git a/bin/debug_agent/launcher.h b/garnet/bin/debug_agent/launcher.h similarity index 100% rename from bin/debug_agent/launcher.h rename to garnet/bin/debug_agent/launcher.h
diff --git a/bin/debug_agent/main.cc b/garnet/bin/debug_agent/main.cc similarity index 100% rename from bin/debug_agent/main.cc rename to garnet/bin/debug_agent/main.cc
diff --git a/bin/debug_agent/meta/debug_agent.cmx b/garnet/bin/debug_agent/meta/debug_agent.cmx similarity index 100% rename from bin/debug_agent/meta/debug_agent.cmx rename to garnet/bin/debug_agent/meta/debug_agent.cmx
diff --git a/bin/debug_agent/meta/debug_agent_integration_tests.cmx b/garnet/bin/debug_agent/meta/debug_agent_integration_tests.cmx similarity index 100% rename from bin/debug_agent/meta/debug_agent_integration_tests.cmx rename to garnet/bin/debug_agent/meta/debug_agent_integration_tests.cmx
diff --git a/bin/debug_agent/meta/debug_agent_unit_tests.cmx b/garnet/bin/debug_agent/meta/debug_agent_unit_tests.cmx similarity index 100% rename from bin/debug_agent/meta/debug_agent_unit_tests.cmx rename to garnet/bin/debug_agent/meta/debug_agent_unit_tests.cmx
diff --git a/bin/debug_agent/mock_arch_provider.cc b/garnet/bin/debug_agent/mock_arch_provider.cc similarity index 100% rename from bin/debug_agent/mock_arch_provider.cc rename to garnet/bin/debug_agent/mock_arch_provider.cc
diff --git a/bin/debug_agent/mock_arch_provider.h b/garnet/bin/debug_agent/mock_arch_provider.h similarity index 100% rename from bin/debug_agent/mock_arch_provider.h rename to garnet/bin/debug_agent/mock_arch_provider.h
diff --git a/bin/debug_agent/mock_process.cc b/garnet/bin/debug_agent/mock_process.cc similarity index 100% rename from bin/debug_agent/mock_process.cc rename to garnet/bin/debug_agent/mock_process.cc
diff --git a/bin/debug_agent/mock_process.h b/garnet/bin/debug_agent/mock_process.h similarity index 100% rename from bin/debug_agent/mock_process.h rename to garnet/bin/debug_agent/mock_process.h
diff --git a/bin/debug_agent/object_util.cc b/garnet/bin/debug_agent/object_util.cc similarity index 100% rename from bin/debug_agent/object_util.cc rename to garnet/bin/debug_agent/object_util.cc
diff --git a/bin/debug_agent/object_util.h b/garnet/bin/debug_agent/object_util.h similarity index 100% rename from bin/debug_agent/object_util.h rename to garnet/bin/debug_agent/object_util.h
diff --git a/bin/debug_agent/process_breakpoint.cc b/garnet/bin/debug_agent/process_breakpoint.cc similarity index 100% rename from bin/debug_agent/process_breakpoint.cc rename to garnet/bin/debug_agent/process_breakpoint.cc
diff --git a/bin/debug_agent/process_breakpoint.h b/garnet/bin/debug_agent/process_breakpoint.h similarity index 100% rename from bin/debug_agent/process_breakpoint.h rename to garnet/bin/debug_agent/process_breakpoint.h
diff --git a/bin/debug_agent/process_breakpoint_unittest.cc b/garnet/bin/debug_agent/process_breakpoint_unittest.cc similarity index 100% rename from bin/debug_agent/process_breakpoint_unittest.cc rename to garnet/bin/debug_agent/process_breakpoint_unittest.cc
diff --git a/bin/debug_agent/process_info.cc b/garnet/bin/debug_agent/process_info.cc similarity index 100% rename from bin/debug_agent/process_info.cc rename to garnet/bin/debug_agent/process_info.cc
diff --git a/bin/debug_agent/process_info.h b/garnet/bin/debug_agent/process_info.h similarity index 100% rename from bin/debug_agent/process_info.h rename to garnet/bin/debug_agent/process_info.h
diff --git a/bin/debug_agent/process_info_unittests.cc b/garnet/bin/debug_agent/process_info_unittests.cc similarity index 100% rename from bin/debug_agent/process_info_unittests.cc rename to garnet/bin/debug_agent/process_info_unittests.cc
diff --git a/bin/debug_agent/process_memory_accessor.h b/garnet/bin/debug_agent/process_memory_accessor.h similarity index 100% rename from bin/debug_agent/process_memory_accessor.h rename to garnet/bin/debug_agent/process_memory_accessor.h
diff --git a/bin/debug_agent/process_watchpoint.cc b/garnet/bin/debug_agent/process_watchpoint.cc similarity index 100% rename from bin/debug_agent/process_watchpoint.cc rename to garnet/bin/debug_agent/process_watchpoint.cc
diff --git a/bin/debug_agent/process_watchpoint.h b/garnet/bin/debug_agent/process_watchpoint.h similarity index 100% rename from bin/debug_agent/process_watchpoint.h rename to garnet/bin/debug_agent/process_watchpoint.h
diff --git a/bin/debug_agent/process_watchpoint_unittest.cc b/garnet/bin/debug_agent/process_watchpoint_unittest.cc similarity index 100% rename from bin/debug_agent/process_watchpoint_unittest.cc rename to garnet/bin/debug_agent/process_watchpoint_unittest.cc
diff --git a/bin/debug_agent/remote_api.h b/garnet/bin/debug_agent/remote_api.h similarity index 100% rename from bin/debug_agent/remote_api.h rename to garnet/bin/debug_agent/remote_api.h
diff --git a/bin/debug_agent/remote_api_adapter.cc b/garnet/bin/debug_agent/remote_api_adapter.cc similarity index 100% rename from bin/debug_agent/remote_api_adapter.cc rename to garnet/bin/debug_agent/remote_api_adapter.cc
diff --git a/bin/debug_agent/remote_api_adapter.h b/garnet/bin/debug_agent/remote_api_adapter.h similarity index 100% rename from bin/debug_agent/remote_api_adapter.h rename to garnet/bin/debug_agent/remote_api_adapter.h
diff --git a/bin/debug_agent/system_info.cc b/garnet/bin/debug_agent/system_info.cc similarity index 100% rename from bin/debug_agent/system_info.cc rename to garnet/bin/debug_agent/system_info.cc
diff --git a/bin/debug_agent/system_info.h b/garnet/bin/debug_agent/system_info.h similarity index 100% rename from bin/debug_agent/system_info.h rename to garnet/bin/debug_agent/system_info.h
diff --git a/bin/debug_agent/system_info_unittests.cc b/garnet/bin/debug_agent/system_info_unittests.cc similarity index 100% rename from bin/debug_agent/system_info_unittests.cc rename to garnet/bin/debug_agent/system_info_unittests.cc
diff --git a/bin/debug_agent/test_data/BUILD.gn b/garnet/bin/debug_agent/test_data/BUILD.gn similarity index 100% rename from bin/debug_agent/test_data/BUILD.gn rename to garnet/bin/debug_agent/test_data/BUILD.gn
diff --git a/bin/debug_agent/test_data/README.md b/garnet/bin/debug_agent/test_data/README.md similarity index 100% rename from bin/debug_agent/test_data/README.md rename to garnet/bin/debug_agent/test_data/README.md
diff --git a/bin/debug_agent/test_data/breakpoint_test_exe.cc b/garnet/bin/debug_agent/test_data/breakpoint_test_exe.cc similarity index 100% rename from bin/debug_agent/test_data/breakpoint_test_exe.cc rename to garnet/bin/debug_agent/test_data/breakpoint_test_exe.cc
diff --git a/bin/debug_agent/test_data/breakpoint_test_so.cc b/garnet/bin/debug_agent/test_data/breakpoint_test_so.cc similarity index 100% rename from bin/debug_agent/test_data/breakpoint_test_so.cc rename to garnet/bin/debug_agent/test_data/breakpoint_test_so.cc
diff --git a/bin/debug_agent/test_data/process_loop.cc b/garnet/bin/debug_agent/test_data/process_loop.cc similarity index 100% rename from bin/debug_agent/test_data/process_loop.cc rename to garnet/bin/debug_agent/test_data/process_loop.cc
diff --git a/bin/debug_agent/test_data/process_spawner.cc b/garnet/bin/debug_agent/test_data/process_spawner.cc similarity index 100% rename from bin/debug_agent/test_data/process_spawner.cc rename to garnet/bin/debug_agent/test_data/process_spawner.cc
diff --git a/bin/debug_agent/test_data/test_so_symbols.h b/garnet/bin/debug_agent/test_data/test_so_symbols.h similarity index 100% rename from bin/debug_agent/test_data/test_so_symbols.h rename to garnet/bin/debug_agent/test_data/test_so_symbols.h
diff --git a/bin/debug_agent/test_data/x64_write_register_test_exe.cc b/garnet/bin/debug_agent/test_data/x64_write_register_test_exe.cc similarity index 100% rename from bin/debug_agent/test_data/x64_write_register_test_exe.cc rename to garnet/bin/debug_agent/test_data/x64_write_register_test_exe.cc
diff --git a/bin/debug_agent/test_data/x64_write_register_test_so.cc b/garnet/bin/debug_agent/test_data/x64_write_register_test_so.cc similarity index 100% rename from bin/debug_agent/test_data/x64_write_register_test_so.cc rename to garnet/bin/debug_agent/test_data/x64_write_register_test_so.cc
diff --git a/bin/debug_agent/unwind.cc b/garnet/bin/debug_agent/unwind.cc similarity index 100% rename from bin/debug_agent/unwind.cc rename to garnet/bin/debug_agent/unwind.cc
diff --git a/bin/debug_agent/unwind.h b/garnet/bin/debug_agent/unwind.h similarity index 100% rename from bin/debug_agent/unwind.h rename to garnet/bin/debug_agent/unwind.h
diff --git a/bin/debug_agent/watchpoint.cc b/garnet/bin/debug_agent/watchpoint.cc similarity index 100% rename from bin/debug_agent/watchpoint.cc rename to garnet/bin/debug_agent/watchpoint.cc
diff --git a/bin/debug_agent/watchpoint.h b/garnet/bin/debug_agent/watchpoint.h similarity index 100% rename from bin/debug_agent/watchpoint.h rename to garnet/bin/debug_agent/watchpoint.h
diff --git a/bin/debug_agent/zxdb_test_app.cc b/garnet/bin/debug_agent/zxdb_test_app.cc similarity index 100% rename from bin/debug_agent/zxdb_test_app.cc rename to garnet/bin/debug_agent/zxdb_test_app.cc
diff --git a/bin/debugserver/BUILD.gn b/garnet/bin/debugserver/BUILD.gn similarity index 100% rename from bin/debugserver/BUILD.gn rename to garnet/bin/debugserver/BUILD.gn
diff --git a/bin/debugserver/MAINTAINERS b/garnet/bin/debugserver/MAINTAINERS similarity index 100% rename from bin/debugserver/MAINTAINERS rename to garnet/bin/debugserver/MAINTAINERS
diff --git a/bin/debugserver/README.md b/garnet/bin/debugserver/README.md similarity index 100% rename from bin/debugserver/README.md rename to garnet/bin/debugserver/README.md
diff --git a/bin/debugserver/cmd_handler.cc b/garnet/bin/debugserver/cmd_handler.cc similarity index 100% rename from bin/debugserver/cmd_handler.cc rename to garnet/bin/debugserver/cmd_handler.cc
diff --git a/bin/debugserver/cmd_handler.h b/garnet/bin/debugserver/cmd_handler.h similarity index 100% rename from bin/debugserver/cmd_handler.h rename to garnet/bin/debugserver/cmd_handler.h
diff --git a/bin/debugserver/io_loop.cc b/garnet/bin/debugserver/io_loop.cc similarity index 100% rename from bin/debugserver/io_loop.cc rename to garnet/bin/debugserver/io_loop.cc
diff --git a/bin/debugserver/io_loop.h b/garnet/bin/debugserver/io_loop.h similarity index 100% rename from bin/debugserver/io_loop.h rename to garnet/bin/debugserver/io_loop.h
diff --git a/bin/debugserver/main.cc b/garnet/bin/debugserver/main.cc similarity index 100% rename from bin/debugserver/main.cc rename to garnet/bin/debugserver/main.cc
diff --git a/bin/debugserver/run_all_unittests.cc b/garnet/bin/debugserver/run_all_unittests.cc similarity index 100% rename from bin/debugserver/run_all_unittests.cc rename to garnet/bin/debugserver/run_all_unittests.cc
diff --git a/bin/debugserver/server.cc b/garnet/bin/debugserver/server.cc similarity index 100% rename from bin/debugserver/server.cc rename to garnet/bin/debugserver/server.cc
diff --git a/bin/debugserver/server.h b/garnet/bin/debugserver/server.h similarity index 100% rename from bin/debugserver/server.h rename to garnet/bin/debugserver/server.h
diff --git a/bin/debugserver/stop_reply_packet.cc b/garnet/bin/debugserver/stop_reply_packet.cc similarity index 100% rename from bin/debugserver/stop_reply_packet.cc rename to garnet/bin/debugserver/stop_reply_packet.cc
diff --git a/bin/debugserver/stop_reply_packet.h b/garnet/bin/debugserver/stop_reply_packet.h similarity index 100% rename from bin/debugserver/stop_reply_packet.h rename to garnet/bin/debugserver/stop_reply_packet.h
diff --git a/bin/debugserver/stop_reply_packet_unittest.cc b/garnet/bin/debugserver/stop_reply_packet_unittest.cc similarity index 100% rename from bin/debugserver/stop_reply_packet_unittest.cc rename to garnet/bin/debugserver/stop_reply_packet_unittest.cc
diff --git a/bin/debugserver/test_apps/BUILD.gn b/garnet/bin/debugserver/test_apps/BUILD.gn similarity index 100% rename from bin/debugserver/test_apps/BUILD.gn rename to garnet/bin/debugserver/test_apps/BUILD.gn
diff --git a/bin/debugserver/test_apps/crash-test.c b/garnet/bin/debugserver/test_apps/crash-test.c similarity index 100% rename from bin/debugserver/test_apps/crash-test.c rename to garnet/bin/debugserver/test_apps/crash-test.c
diff --git a/bin/debugserver/test_apps/exit-test.c b/garnet/bin/debugserver/test_apps/exit-test.c similarity index 100% rename from bin/debugserver/test_apps/exit-test.c rename to garnet/bin/debugserver/test_apps/exit-test.c
diff --git a/bin/debugserver/test_apps/loop-test.c b/garnet/bin/debugserver/test_apps/loop-test.c similarity index 100% rename from bin/debugserver/test_apps/loop-test.c rename to garnet/bin/debugserver/test_apps/loop-test.c
diff --git a/bin/debugserver/test_apps/syscall-test.c b/garnet/bin/debugserver/test_apps/syscall-test.c similarity index 100% rename from bin/debugserver/test_apps/syscall-test.c rename to garnet/bin/debugserver/test_apps/syscall-test.c
diff --git a/bin/debugserver/test_apps/thread-test.c b/garnet/bin/debugserver/test_apps/thread-test.c similarity index 100% rename from bin/debugserver/test_apps/thread-test.c rename to garnet/bin/debugserver/test_apps/thread-test.c
diff --git a/bin/debugserver/thread_action_list.cc b/garnet/bin/debugserver/thread_action_list.cc similarity index 100% rename from bin/debugserver/thread_action_list.cc rename to garnet/bin/debugserver/thread_action_list.cc
diff --git a/bin/debugserver/thread_action_list.h b/garnet/bin/debugserver/thread_action_list.h similarity index 100% rename from bin/debugserver/thread_action_list.h rename to garnet/bin/debugserver/thread_action_list.h
diff --git a/bin/debugserver/thread_action_list_unittest.cc b/garnet/bin/debugserver/thread_action_list_unittest.cc similarity index 100% rename from bin/debugserver/thread_action_list_unittest.cc rename to garnet/bin/debugserver/thread_action_list_unittest.cc
diff --git a/bin/debugserver/util.cc b/garnet/bin/debugserver/util.cc similarity index 100% rename from bin/debugserver/util.cc rename to garnet/bin/debugserver/util.cc
diff --git a/bin/debugserver/util.h b/garnet/bin/debugserver/util.h similarity index 100% rename from bin/debugserver/util.h rename to garnet/bin/debugserver/util.h
diff --git a/bin/debugserver/util_unittest.cc b/garnet/bin/debugserver/util_unittest.cc similarity index 100% rename from bin/debugserver/util_unittest.cc rename to garnet/bin/debugserver/util_unittest.cc
diff --git a/bin/dev_finder/BUILD.gn b/garnet/bin/dev_finder/BUILD.gn similarity index 100% rename from bin/dev_finder/BUILD.gn rename to garnet/bin/dev_finder/BUILD.gn
diff --git a/bin/dev_finder/common.go b/garnet/bin/dev_finder/common.go similarity index 100% rename from bin/dev_finder/common.go rename to garnet/bin/dev_finder/common.go
diff --git a/bin/dev_finder/list.go b/garnet/bin/dev_finder/list.go similarity index 100% rename from bin/dev_finder/list.go rename to garnet/bin/dev_finder/list.go
diff --git a/bin/dev_finder/main.go b/garnet/bin/dev_finder/main.go similarity index 100% rename from bin/dev_finder/main.go rename to garnet/bin/dev_finder/main.go
diff --git a/bin/dev_finder/resolve.go b/garnet/bin/dev_finder/resolve.go similarity index 100% rename from bin/dev_finder/resolve.go rename to garnet/bin/dev_finder/resolve.go
diff --git a/bin/developer/tiles/BUILD.gn b/garnet/bin/developer/tiles/BUILD.gn similarity index 100% rename from bin/developer/tiles/BUILD.gn rename to garnet/bin/developer/tiles/BUILD.gn
diff --git a/bin/developer/tiles/main.cc b/garnet/bin/developer/tiles/main.cc similarity index 100% rename from bin/developer/tiles/main.cc rename to garnet/bin/developer/tiles/main.cc
diff --git a/bin/developer/tiles/meta/tiles.cmx b/garnet/bin/developer/tiles/meta/tiles.cmx similarity index 100% rename from bin/developer/tiles/meta/tiles.cmx rename to garnet/bin/developer/tiles/meta/tiles.cmx
diff --git a/bin/developer/tiles/tiles.cc b/garnet/bin/developer/tiles/tiles.cc similarity index 100% rename from bin/developer/tiles/tiles.cc rename to garnet/bin/developer/tiles/tiles.cc
diff --git a/bin/developer/tiles/tiles.h b/garnet/bin/developer/tiles/tiles.h similarity index 100% rename from bin/developer/tiles/tiles.h rename to garnet/bin/developer/tiles/tiles.h
diff --git a/bin/developer/tiles/tiles_unittest.cc b/garnet/bin/developer/tiles/tiles_unittest.cc similarity index 100% rename from bin/developer/tiles/tiles_unittest.cc rename to garnet/bin/developer/tiles/tiles_unittest.cc
diff --git a/bin/developer/tiles_ctl/BUILD.gn b/garnet/bin/developer/tiles_ctl/BUILD.gn similarity index 100% rename from bin/developer/tiles_ctl/BUILD.gn rename to garnet/bin/developer/tiles_ctl/BUILD.gn
diff --git a/bin/developer/tiles_ctl/README.md b/garnet/bin/developer/tiles_ctl/README.md similarity index 100% rename from bin/developer/tiles_ctl/README.md rename to garnet/bin/developer/tiles_ctl/README.md
diff --git a/bin/developer/tiles_ctl/main.cc b/garnet/bin/developer/tiles_ctl/main.cc similarity index 100% rename from bin/developer/tiles_ctl/main.cc rename to garnet/bin/developer/tiles_ctl/main.cc
diff --git a/bin/developer/tiles_ctl/meta/tiles_ctl.cmx b/garnet/bin/developer/tiles_ctl/meta/tiles_ctl.cmx similarity index 100% rename from bin/developer/tiles_ctl/meta/tiles_ctl.cmx rename to garnet/bin/developer/tiles_ctl/meta/tiles_ctl.cmx
diff --git a/bin/device_settings/BUILD.gn b/garnet/bin/device_settings/BUILD.gn similarity index 100% rename from bin/device_settings/BUILD.gn rename to garnet/bin/device_settings/BUILD.gn
diff --git a/bin/device_settings/meta/device_settings_manager.cmx b/garnet/bin/device_settings/meta/device_settings_manager.cmx similarity index 100% rename from bin/device_settings/meta/device_settings_manager.cmx rename to garnet/bin/device_settings/meta/device_settings_manager.cmx
diff --git a/bin/device_settings/src/main.rs b/garnet/bin/device_settings/src/main.rs similarity index 100% rename from bin/device_settings/src/main.rs rename to garnet/bin/device_settings/src/main.rs
diff --git a/bin/dhcpd/BUILD.gn b/garnet/bin/dhcpd/BUILD.gn similarity index 100% rename from bin/dhcpd/BUILD.gn rename to garnet/bin/dhcpd/BUILD.gn
diff --git a/bin/dhcpd/data/test_server_config.json b/garnet/bin/dhcpd/data/test_server_config.json similarity index 100% rename from bin/dhcpd/data/test_server_config.json rename to garnet/bin/dhcpd/data/test_server_config.json
diff --git a/bin/dhcpd/meta/dhcpd.cmx b/garnet/bin/dhcpd/meta/dhcpd.cmx similarity index 100% rename from bin/dhcpd/meta/dhcpd.cmx rename to garnet/bin/dhcpd/meta/dhcpd.cmx
diff --git a/bin/dhcpd/src/main.rs b/garnet/bin/dhcpd/src/main.rs similarity index 100% rename from bin/dhcpd/src/main.rs rename to garnet/bin/dhcpd/src/main.rs
diff --git a/bin/dhcpd_test_client/BUILD.gn b/garnet/bin/dhcpd_test_client/BUILD.gn similarity index 100% rename from bin/dhcpd_test_client/BUILD.gn rename to garnet/bin/dhcpd_test_client/BUILD.gn
diff --git a/bin/dhcpd_test_client/meta/dhcpd_test_client.cmx b/garnet/bin/dhcpd_test_client/meta/dhcpd_test_client.cmx similarity index 100% rename from bin/dhcpd_test_client/meta/dhcpd_test_client.cmx rename to garnet/bin/dhcpd_test_client/meta/dhcpd_test_client.cmx
diff --git a/bin/dhcpd_test_client/src/main.rs b/garnet/bin/dhcpd_test_client/src/main.rs similarity index 100% rename from bin/dhcpd_test_client/src/main.rs rename to garnet/bin/dhcpd_test_client/src/main.rs
diff --git a/bin/display_capture_test/BUILD.gn b/garnet/bin/display_capture_test/BUILD.gn similarity index 100% rename from bin/display_capture_test/BUILD.gn rename to garnet/bin/display_capture_test/BUILD.gn
diff --git a/bin/display_capture_test/alpha_tests.cc b/garnet/bin/display_capture_test/alpha_tests.cc similarity index 100% rename from bin/display_capture_test/alpha_tests.cc rename to garnet/bin/display_capture_test/alpha_tests.cc
diff --git a/bin/display_capture_test/basic_tests.cc b/garnet/bin/display_capture_test/basic_tests.cc similarity index 100% rename from bin/display_capture_test/basic_tests.cc rename to garnet/bin/display_capture_test/basic_tests.cc
diff --git a/bin/display_capture_test/context.cc b/garnet/bin/display_capture_test/context.cc similarity index 100% rename from bin/display_capture_test/context.cc rename to garnet/bin/display_capture_test/context.cc
diff --git a/bin/display_capture_test/context.h b/garnet/bin/display_capture_test/context.h similarity index 100% rename from bin/display_capture_test/context.h rename to garnet/bin/display_capture_test/context.h
diff --git a/bin/display_capture_test/image.cc b/garnet/bin/display_capture_test/image.cc similarity index 100% rename from bin/display_capture_test/image.cc rename to garnet/bin/display_capture_test/image.cc
diff --git a/bin/display_capture_test/image.h b/garnet/bin/display_capture_test/image.h similarity index 100% rename from bin/display_capture_test/image.h rename to garnet/bin/display_capture_test/image.h
diff --git a/bin/display_capture_test/layer.cc b/garnet/bin/display_capture_test/layer.cc similarity index 100% rename from bin/display_capture_test/layer.cc rename to garnet/bin/display_capture_test/layer.cc
diff --git a/bin/display_capture_test/layer.h b/garnet/bin/display_capture_test/layer.h similarity index 100% rename from bin/display_capture_test/layer.h rename to garnet/bin/display_capture_test/layer.h
diff --git a/bin/display_capture_test/main.cc b/garnet/bin/display_capture_test/main.cc similarity index 100% rename from bin/display_capture_test/main.cc rename to garnet/bin/display_capture_test/main.cc
diff --git a/bin/display_capture_test/meta/display_capture_test.cmx b/garnet/bin/display_capture_test/meta/display_capture_test.cmx similarity index 100% rename from bin/display_capture_test/meta/display_capture_test.cmx rename to garnet/bin/display_capture_test/meta/display_capture_test.cmx
diff --git a/bin/display_capture_test/position_tests.cc b/garnet/bin/display_capture_test/position_tests.cc similarity index 100% rename from bin/display_capture_test/position_tests.cc rename to garnet/bin/display_capture_test/position_tests.cc
diff --git a/bin/display_capture_test/runner.cc b/garnet/bin/display_capture_test/runner.cc similarity index 100% rename from bin/display_capture_test/runner.cc rename to garnet/bin/display_capture_test/runner.cc
diff --git a/bin/display_capture_test/runner.h b/garnet/bin/display_capture_test/runner.h similarity index 100% rename from bin/display_capture_test/runner.h rename to garnet/bin/display_capture_test/runner.h
diff --git a/bin/display_capture_test/test.h b/garnet/bin/display_capture_test/test.h similarity index 100% rename from bin/display_capture_test/test.h rename to garnet/bin/display_capture_test/test.h
diff --git a/bin/display_capture_test/utils.h b/garnet/bin/display_capture_test/utils.h similarity index 100% rename from bin/display_capture_test/utils.h rename to garnet/bin/display_capture_test/utils.h
diff --git a/bin/display_manager/BUILD.gn b/garnet/bin/display_manager/BUILD.gn similarity index 100% rename from bin/display_manager/BUILD.gn rename to garnet/bin/display_manager/BUILD.gn
diff --git a/bin/display_manager/display.cc b/garnet/bin/display_manager/display.cc similarity index 100% rename from bin/display_manager/display.cc rename to garnet/bin/display_manager/display.cc
diff --git a/bin/display_manager/display.h b/garnet/bin/display_manager/display.h similarity index 100% rename from bin/display_manager/display.h rename to garnet/bin/display_manager/display.h
diff --git a/bin/display_manager/display_manager_impl.cc b/garnet/bin/display_manager/display_manager_impl.cc similarity index 100% rename from bin/display_manager/display_manager_impl.cc rename to garnet/bin/display_manager/display_manager_impl.cc
diff --git a/bin/display_manager/display_manager_impl.h b/garnet/bin/display_manager/display_manager_impl.h similarity index 100% rename from bin/display_manager/display_manager_impl.h rename to garnet/bin/display_manager/display_manager_impl.h
diff --git a/bin/display_manager/main.cc b/garnet/bin/display_manager/main.cc similarity index 100% rename from bin/display_manager/main.cc rename to garnet/bin/display_manager/main.cc
diff --git a/bin/display_manager/meta/display_manager.cmx b/garnet/bin/display_manager/meta/display_manager.cmx similarity index 100% rename from bin/display_manager/meta/display_manager.cmx rename to garnet/bin/display_manager/meta/display_manager.cmx
diff --git a/bin/far/BUILD.gn b/garnet/bin/far/BUILD.gn similarity index 100% rename from bin/far/BUILD.gn rename to garnet/bin/far/BUILD.gn
diff --git a/bin/far/main.cc b/garnet/bin/far/main.cc similarity index 100% rename from bin/far/main.cc rename to garnet/bin/far/main.cc
diff --git a/bin/fidl_compatibility_test/BUILD.gn b/garnet/bin/fidl_compatibility_test/BUILD.gn similarity index 100% rename from bin/fidl_compatibility_test/BUILD.gn rename to garnet/bin/fidl_compatibility_test/BUILD.gn
diff --git a/bin/fidl_compatibility_test/compatibility_test.cc b/garnet/bin/fidl_compatibility_test/compatibility_test.cc similarity index 100% rename from bin/fidl_compatibility_test/compatibility_test.cc rename to garnet/bin/fidl_compatibility_test/compatibility_test.cc
diff --git a/bin/fidl_compatibility_test/compatibility_test_server_cpp.cc b/garnet/bin/fidl_compatibility_test/compatibility_test_server_cpp.cc similarity index 100% rename from bin/fidl_compatibility_test/compatibility_test_server_cpp.cc rename to garnet/bin/fidl_compatibility_test/compatibility_test_server_cpp.cc
diff --git a/bin/fidl_compatibility_test/compatibility_test_server_rust.rs b/garnet/bin/fidl_compatibility_test/compatibility_test_server_rust.rs similarity index 100% rename from bin/fidl_compatibility_test/compatibility_test_server_rust.rs rename to garnet/bin/fidl_compatibility_test/compatibility_test_server_rust.rs
diff --git a/bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_cpp.cmx b/garnet/bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_cpp.cmx similarity index 100% rename from bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_cpp.cmx rename to garnet/bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_cpp.cmx
diff --git a/bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_rust.cmx b/garnet/bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_rust.cmx similarity index 100% rename from bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_rust.cmx rename to garnet/bin/fidl_compatibility_test/meta/fidl_compatibility_test_server_rust.cmx
diff --git a/bin/fidl_compatibility_test/run_fidl_compatibility_test_garnet.sh b/garnet/bin/fidl_compatibility_test/run_fidl_compatibility_test_garnet.sh similarity index 100% rename from bin/fidl_compatibility_test/run_fidl_compatibility_test_garnet.sh rename to garnet/bin/fidl_compatibility_test/run_fidl_compatibility_test_garnet.sh
diff --git a/bin/fonts/BUILD.gn b/garnet/bin/fonts/BUILD.gn similarity index 100% rename from bin/fonts/BUILD.gn rename to garnet/bin/fonts/BUILD.gn
diff --git a/bin/fonts/README.md b/garnet/bin/fonts/README.md similarity index 100% rename from bin/fonts/README.md rename to garnet/bin/fonts/README.md
diff --git a/bin/fonts/manifest.json b/garnet/bin/fonts/manifest.json similarity index 100% rename from bin/fonts/manifest.json rename to garnet/bin/fonts/manifest.json
diff --git a/bin/fonts/manifest_minimal.json b/garnet/bin/fonts/manifest_minimal.json similarity index 100% rename from bin/fonts/manifest_minimal.json rename to garnet/bin/fonts/manifest_minimal.json
diff --git a/bin/fonts/meta/fonts.cmx b/garnet/bin/fonts/meta/fonts.cmx similarity index 100% rename from bin/fonts/meta/fonts.cmx rename to garnet/bin/fonts/meta/fonts.cmx
diff --git a/bin/fonts/src/collection.rs b/garnet/bin/fonts/src/collection.rs similarity index 100% rename from bin/fonts/src/collection.rs rename to garnet/bin/fonts/src/collection.rs
diff --git a/bin/fonts/src/font_info.rs b/garnet/bin/fonts/src/font_info.rs similarity index 100% rename from bin/fonts/src/font_info.rs rename to garnet/bin/fonts/src/font_info.rs
diff --git a/bin/fonts/src/font_service.rs b/garnet/bin/fonts/src/font_service.rs similarity index 100% rename from bin/fonts/src/font_service.rs rename to garnet/bin/fonts/src/font_service.rs
diff --git a/bin/fonts/src/freetype_ffi.rs b/garnet/bin/fonts/src/freetype_ffi.rs similarity index 100% rename from bin/fonts/src/freetype_ffi.rs rename to garnet/bin/fonts/src/freetype_ffi.rs
diff --git a/bin/fonts/src/main.rs b/garnet/bin/fonts/src/main.rs similarity index 100% rename from bin/fonts/src/main.rs rename to garnet/bin/fonts/src/main.rs
diff --git a/bin/fonts/src/manifest.rs b/garnet/bin/fonts/src/manifest.rs similarity index 100% rename from bin/fonts/src/manifest.rs rename to garnet/bin/fonts/src/manifest.rs
diff --git a/bin/fonts/tests/font_provider_test.rs b/garnet/bin/fonts/tests/font_provider_test.rs similarity index 100% rename from bin/fonts/tests/font_provider_test.rs rename to garnet/bin/fonts/tests/font_provider_test.rs
diff --git a/bin/fonts/tests/test_manifest.json b/garnet/bin/fonts/tests/test_manifest.json similarity index 100% rename from bin/fonts/tests/test_manifest.json rename to garnet/bin/fonts/tests/test_manifest.json
diff --git a/bin/fonts/third_party/.gitignore b/garnet/bin/fonts/third_party/.gitignore similarity index 100% rename from bin/fonts/third_party/.gitignore rename to garnet/bin/fonts/third_party/.gitignore
diff --git a/bin/fortune/BUILD.gn b/garnet/bin/fortune/BUILD.gn similarity index 100% rename from bin/fortune/BUILD.gn rename to garnet/bin/fortune/BUILD.gn
diff --git a/bin/fortune/README.md b/garnet/bin/fortune/README.md similarity index 100% rename from bin/fortune/README.md rename to garnet/bin/fortune/README.md
diff --git a/bin/fortune/fortune.c b/garnet/bin/fortune/fortune.c similarity index 100% rename from bin/fortune/fortune.c rename to garnet/bin/fortune/fortune.c
diff --git a/bin/glob/BUILD.gn b/garnet/bin/glob/BUILD.gn similarity index 100% rename from bin/glob/BUILD.gn rename to garnet/bin/glob/BUILD.gn
diff --git a/bin/glob/glob.cc b/garnet/bin/glob/glob.cc similarity index 100% rename from bin/glob/glob.cc rename to garnet/bin/glob/glob.cc
diff --git a/bin/glob/meta/glob.cmx b/garnet/bin/glob/meta/glob.cmx similarity index 100% rename from bin/glob/meta/glob.cmx rename to garnet/bin/glob/meta/glob.cmx
diff --git a/bin/guest/MAINTAINERS b/garnet/bin/guest/MAINTAINERS similarity index 100% rename from bin/guest/MAINTAINERS rename to garnet/bin/guest/MAINTAINERS
diff --git a/bin/guest/README.md b/garnet/bin/guest/README.md similarity index 100% rename from bin/guest/README.md rename to garnet/bin/guest/README.md
diff --git a/bin/guest/cli/BUILD.gn b/garnet/bin/guest/cli/BUILD.gn similarity index 100% rename from bin/guest/cli/BUILD.gn rename to garnet/bin/guest/cli/BUILD.gn
diff --git a/bin/guest/cli/balloon.cc b/garnet/bin/guest/cli/balloon.cc similarity index 100% rename from bin/guest/cli/balloon.cc rename to garnet/bin/guest/cli/balloon.cc
diff --git a/bin/guest/cli/balloon.h b/garnet/bin/guest/cli/balloon.h similarity index 100% rename from bin/guest/cli/balloon.h rename to garnet/bin/guest/cli/balloon.h
diff --git a/bin/guest/cli/launch.cc b/garnet/bin/guest/cli/launch.cc similarity index 100% rename from bin/guest/cli/launch.cc rename to garnet/bin/guest/cli/launch.cc
diff --git a/bin/guest/cli/launch.h b/garnet/bin/guest/cli/launch.h similarity index 100% rename from bin/guest/cli/launch.h rename to garnet/bin/guest/cli/launch.h
diff --git a/bin/guest/cli/list.cc b/garnet/bin/guest/cli/list.cc similarity index 100% rename from bin/guest/cli/list.cc rename to garnet/bin/guest/cli/list.cc
diff --git a/bin/guest/cli/list.h b/garnet/bin/guest/cli/list.h similarity index 100% rename from bin/guest/cli/list.h rename to garnet/bin/guest/cli/list.h
diff --git a/bin/guest/cli/main.cc b/garnet/bin/guest/cli/main.cc similarity index 100% rename from bin/guest/cli/main.cc rename to garnet/bin/guest/cli/main.cc
diff --git a/bin/guest/cli/serial.cc b/garnet/bin/guest/cli/serial.cc similarity index 100% rename from bin/guest/cli/serial.cc rename to garnet/bin/guest/cli/serial.cc
diff --git a/bin/guest/cli/serial.h b/garnet/bin/guest/cli/serial.h similarity index 100% rename from bin/guest/cli/serial.h rename to garnet/bin/guest/cli/serial.h
diff --git a/bin/guest/cli/socat.cc b/garnet/bin/guest/cli/socat.cc similarity index 100% rename from bin/guest/cli/socat.cc rename to garnet/bin/guest/cli/socat.cc
diff --git a/bin/guest/cli/socat.h b/garnet/bin/guest/cli/socat.h similarity index 100% rename from bin/guest/cli/socat.h rename to garnet/bin/guest/cli/socat.h
diff --git a/bin/guest/integration/BUILD.gn b/garnet/bin/guest/integration/BUILD.gn similarity index 100% rename from bin/guest/integration/BUILD.gn rename to garnet/bin/guest/integration/BUILD.gn
diff --git a/bin/guest/integration/enclosed_guest.cc b/garnet/bin/guest/integration/enclosed_guest.cc similarity index 100% rename from bin/guest/integration/enclosed_guest.cc rename to garnet/bin/guest/integration/enclosed_guest.cc
diff --git a/bin/guest/integration/enclosed_guest.h b/garnet/bin/guest/integration/enclosed_guest.h similarity index 100% rename from bin/guest/integration/enclosed_guest.h rename to garnet/bin/guest/integration/enclosed_guest.h
diff --git a/bin/guest/integration/guest_test.h b/garnet/bin/guest/integration/guest_test.h similarity index 100% rename from bin/guest/integration/guest_test.h rename to garnet/bin/guest/integration/guest_test.h
diff --git a/bin/guest/integration/main.cc b/garnet/bin/guest/integration/main.cc similarity index 100% rename from bin/guest/integration/main.cc rename to garnet/bin/guest/integration/main.cc
diff --git a/bin/guest/integration/meta/guest_integration_tests.cmx b/garnet/bin/guest/integration/meta/guest_integration_tests.cmx similarity index 100% rename from bin/guest/integration/meta/guest_integration_tests.cmx rename to garnet/bin/guest/integration/meta/guest_integration_tests.cmx
diff --git a/bin/guest/integration/mock_netstack.cc b/garnet/bin/guest/integration/mock_netstack.cc similarity index 100% rename from bin/guest/integration/mock_netstack.cc rename to garnet/bin/guest/integration/mock_netstack.cc
diff --git a/bin/guest/integration/mock_netstack.h b/garnet/bin/guest/integration/mock_netstack.h similarity index 100% rename from bin/guest/integration/mock_netstack.h rename to garnet/bin/guest/integration/mock_netstack.h
diff --git a/bin/guest/integration/test_serial.cc b/garnet/bin/guest/integration/test_serial.cc similarity index 100% rename from bin/guest/integration/test_serial.cc rename to garnet/bin/guest/integration/test_serial.cc
diff --git a/bin/guest/integration/test_serial.h b/garnet/bin/guest/integration/test_serial.h similarity index 100% rename from bin/guest/integration/test_serial.h rename to garnet/bin/guest/integration/test_serial.h
diff --git a/bin/guest/integration/virtio_block_test_util/BUILD.gn b/garnet/bin/guest/integration/virtio_block_test_util/BUILD.gn similarity index 100% rename from bin/guest/integration/virtio_block_test_util/BUILD.gn rename to garnet/bin/guest/integration/virtio_block_test_util/BUILD.gn
diff --git a/bin/guest/integration/virtio_block_test_util/meta/virtio_block_test_util.cmx b/garnet/bin/guest/integration/virtio_block_test_util/meta/virtio_block_test_util.cmx similarity index 100% rename from bin/guest/integration/virtio_block_test_util/meta/virtio_block_test_util.cmx rename to garnet/bin/guest/integration/virtio_block_test_util/meta/virtio_block_test_util.cmx
diff --git a/bin/guest/integration/virtio_block_test_util/src/main.rs b/garnet/bin/guest/integration/virtio_block_test_util/src/main.rs similarity index 100% rename from bin/guest/integration/virtio_block_test_util/src/main.rs rename to garnet/bin/guest/integration/virtio_block_test_util/src/main.rs
diff --git a/bin/guest/integration/virtio_block_tests.cc b/garnet/bin/guest/integration/virtio_block_tests.cc similarity index 100% rename from bin/guest/integration/virtio_block_tests.cc rename to garnet/bin/guest/integration/virtio_block_tests.cc
diff --git a/bin/guest/integration/virtio_net_test_util/BUILD.gn b/garnet/bin/guest/integration/virtio_net_test_util/BUILD.gn similarity index 100% rename from bin/guest/integration/virtio_net_test_util/BUILD.gn rename to garnet/bin/guest/integration/virtio_net_test_util/BUILD.gn
diff --git a/bin/guest/integration/virtio_net_test_util/meta/virtio_net_test_util.cmx b/garnet/bin/guest/integration/virtio_net_test_util/meta/virtio_net_test_util.cmx similarity index 100% rename from bin/guest/integration/virtio_net_test_util/meta/virtio_net_test_util.cmx rename to garnet/bin/guest/integration/virtio_net_test_util/meta/virtio_net_test_util.cmx
diff --git a/bin/guest/integration/virtio_net_test_util/src/main.rs b/garnet/bin/guest/integration/virtio_net_test_util/src/main.rs similarity index 100% rename from bin/guest/integration/virtio_net_test_util/src/main.rs rename to garnet/bin/guest/integration/virtio_net_test_util/src/main.rs
diff --git a/bin/guest/integration/virtio_net_tests.cc b/garnet/bin/guest/integration/virtio_net_tests.cc similarity index 100% rename from bin/guest/integration/virtio_net_tests.cc rename to garnet/bin/guest/integration/virtio_net_tests.cc
diff --git a/bin/guest/integration/virtio_rng_test_util/BUILD.gn b/garnet/bin/guest/integration/virtio_rng_test_util/BUILD.gn similarity index 100% rename from bin/guest/integration/virtio_rng_test_util/BUILD.gn rename to garnet/bin/guest/integration/virtio_rng_test_util/BUILD.gn
diff --git a/bin/guest/integration/virtio_rng_test_util/meta/virtio_rng_test_util.cmx b/garnet/bin/guest/integration/virtio_rng_test_util/meta/virtio_rng_test_util.cmx similarity index 100% rename from bin/guest/integration/virtio_rng_test_util/meta/virtio_rng_test_util.cmx rename to garnet/bin/guest/integration/virtio_rng_test_util/meta/virtio_rng_test_util.cmx
diff --git a/bin/guest/integration/virtio_rng_test_util/src/main.rs b/garnet/bin/guest/integration/virtio_rng_test_util/src/main.rs similarity index 100% rename from bin/guest/integration/virtio_rng_test_util/src/main.rs rename to garnet/bin/guest/integration/virtio_rng_test_util/src/main.rs
diff --git a/bin/guest/integration/virtio_vsock_test_util/BUILD.gn b/garnet/bin/guest/integration/virtio_vsock_test_util/BUILD.gn similarity index 100% rename from bin/guest/integration/virtio_vsock_test_util/BUILD.gn rename to garnet/bin/guest/integration/virtio_vsock_test_util/BUILD.gn
diff --git a/bin/guest/integration/virtio_vsock_test_util/meta/virtio_vsock_test_util.cmx b/garnet/bin/guest/integration/virtio_vsock_test_util/meta/virtio_vsock_test_util.cmx similarity index 100% rename from bin/guest/integration/virtio_vsock_test_util/meta/virtio_vsock_test_util.cmx rename to garnet/bin/guest/integration/virtio_vsock_test_util/meta/virtio_vsock_test_util.cmx
diff --git a/bin/guest/integration/virtio_vsock_test_util/src/main.rs b/garnet/bin/guest/integration/virtio_vsock_test_util/src/main.rs similarity index 100% rename from bin/guest/integration/virtio_vsock_test_util/src/main.rs rename to garnet/bin/guest/integration/virtio_vsock_test_util/src/main.rs
diff --git a/bin/guest/integration/virtio_vsock_tests.cc b/garnet/bin/guest/integration/virtio_vsock_tests.cc similarity index 100% rename from bin/guest/integration/virtio_vsock_tests.cc rename to garnet/bin/guest/integration/virtio_vsock_tests.cc
diff --git a/bin/guest/manager/BUILD.gn b/garnet/bin/guest/manager/BUILD.gn similarity index 100% rename from bin/guest/manager/BUILD.gn rename to garnet/bin/guest/manager/BUILD.gn
diff --git a/bin/guest/manager/environment_controller_impl.cc b/garnet/bin/guest/manager/environment_controller_impl.cc similarity index 100% rename from bin/guest/manager/environment_controller_impl.cc rename to garnet/bin/guest/manager/environment_controller_impl.cc
diff --git a/bin/guest/manager/environment_controller_impl.h b/garnet/bin/guest/manager/environment_controller_impl.h similarity index 100% rename from bin/guest/manager/environment_controller_impl.h rename to garnet/bin/guest/manager/environment_controller_impl.h
diff --git a/bin/guest/manager/environment_manager_impl.cc b/garnet/bin/guest/manager/environment_manager_impl.cc similarity index 100% rename from bin/guest/manager/environment_manager_impl.cc rename to garnet/bin/guest/manager/environment_manager_impl.cc
diff --git a/bin/guest/manager/environment_manager_impl.h b/garnet/bin/guest/manager/environment_manager_impl.h similarity index 100% rename from bin/guest/manager/environment_manager_impl.h rename to garnet/bin/guest/manager/environment_manager_impl.h
diff --git a/bin/guest/manager/guest_component.cc b/garnet/bin/guest/manager/guest_component.cc similarity index 100% rename from bin/guest/manager/guest_component.cc rename to garnet/bin/guest/manager/guest_component.cc
diff --git a/bin/guest/manager/guest_component.h b/garnet/bin/guest/manager/guest_component.h similarity index 100% rename from bin/guest/manager/guest_component.h rename to garnet/bin/guest/manager/guest_component.h
diff --git a/bin/guest/manager/guest_services.cc b/garnet/bin/guest/manager/guest_services.cc similarity index 100% rename from bin/guest/manager/guest_services.cc rename to garnet/bin/guest/manager/guest_services.cc
diff --git a/bin/guest/manager/guest_services.h b/garnet/bin/guest/manager/guest_services.h similarity index 100% rename from bin/guest/manager/guest_services.h rename to garnet/bin/guest/manager/guest_services.h
diff --git a/bin/guest/manager/guest_vsock_endpoint.cc b/garnet/bin/guest/manager/guest_vsock_endpoint.cc similarity index 100% rename from bin/guest/manager/guest_vsock_endpoint.cc rename to garnet/bin/guest/manager/guest_vsock_endpoint.cc
diff --git a/bin/guest/manager/guest_vsock_endpoint.h b/garnet/bin/guest/manager/guest_vsock_endpoint.h similarity index 100% rename from bin/guest/manager/guest_vsock_endpoint.h rename to garnet/bin/guest/manager/guest_vsock_endpoint.h
diff --git a/bin/guest/manager/host_vsock_endpoint.cc b/garnet/bin/guest/manager/host_vsock_endpoint.cc similarity index 100% rename from bin/guest/manager/host_vsock_endpoint.cc rename to garnet/bin/guest/manager/host_vsock_endpoint.cc
diff --git a/bin/guest/manager/host_vsock_endpoint.h b/garnet/bin/guest/manager/host_vsock_endpoint.h similarity index 100% rename from bin/guest/manager/host_vsock_endpoint.h rename to garnet/bin/guest/manager/host_vsock_endpoint.h
diff --git a/bin/guest/manager/host_vsock_endpoint_unittest.cc b/garnet/bin/guest/manager/host_vsock_endpoint_unittest.cc similarity index 100% rename from bin/guest/manager/host_vsock_endpoint_unittest.cc rename to garnet/bin/guest/manager/host_vsock_endpoint_unittest.cc
diff --git a/bin/guest/manager/main.cc b/garnet/bin/guest/manager/main.cc similarity index 100% rename from bin/guest/manager/main.cc rename to garnet/bin/guest/manager/main.cc
diff --git a/bin/guest/manager/meta/guest_manager.cmx b/garnet/bin/guest/manager/meta/guest_manager.cmx similarity index 100% rename from bin/guest/manager/meta/guest_manager.cmx rename to garnet/bin/guest/manager/meta/guest_manager.cmx
diff --git a/bin/guest/manager/meta/guest_manager_unittests.cmx b/garnet/bin/guest/manager/meta/guest_manager_unittests.cmx similarity index 100% rename from bin/guest/manager/meta/guest_manager_unittests.cmx rename to garnet/bin/guest/manager/meta/guest_manager_unittests.cmx
diff --git a/bin/guest/pkg/biscotti_guest/.gitignore b/garnet/bin/guest/pkg/biscotti_guest/.gitignore similarity index 100% rename from bin/guest/pkg/biscotti_guest/.gitignore rename to garnet/bin/guest/pkg/biscotti_guest/.gitignore
diff --git a/bin/guest/pkg/biscotti_guest/BUILD.gn b/garnet/bin/guest/pkg/biscotti_guest/BUILD.gn similarity index 100% rename from bin/guest/pkg/biscotti_guest/BUILD.gn rename to garnet/bin/guest/pkg/biscotti_guest/BUILD.gn
diff --git a/bin/guest/pkg/biscotti_guest/README.md b/garnet/bin/guest/pkg/biscotti_guest/README.md similarity index 100% rename from bin/guest/pkg/biscotti_guest/README.md rename to garnet/bin/guest/pkg/biscotti_guest/README.md
diff --git a/bin/guest/pkg/biscotti_guest/bin/BUILD.gn b/garnet/bin/guest/pkg/biscotti_guest/bin/BUILD.gn similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/BUILD.gn rename to garnet/bin/guest/pkg/biscotti_guest/bin/BUILD.gn
diff --git a/bin/guest/pkg/biscotti_guest/bin/biscotti.cmx b/garnet/bin/guest/pkg/biscotti_guest/bin/biscotti.cmx similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/biscotti.cmx rename to garnet/bin/guest/pkg/biscotti_guest/bin/biscotti.cmx
diff --git a/bin/guest/pkg/biscotti_guest/bin/config/linux_scheme.config b/garnet/bin/guest/pkg/biscotti_guest/bin/config/linux_scheme.config similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/config/linux_scheme.config rename to garnet/bin/guest/pkg/biscotti_guest/bin/config/linux_scheme.config
diff --git a/bin/guest/pkg/biscotti_guest/bin/guest.cc b/garnet/bin/guest/pkg/biscotti_guest/bin/guest.cc similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/guest.cc rename to garnet/bin/guest/pkg/biscotti_guest/bin/guest.cc
diff --git a/bin/guest/pkg/biscotti_guest/bin/guest.h b/garnet/bin/guest/pkg/biscotti_guest/bin/guest.h similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/guest.h rename to garnet/bin/guest/pkg/biscotti_guest/bin/guest.h
diff --git a/bin/guest/pkg/biscotti_guest/bin/linux_component.cc b/garnet/bin/guest/pkg/biscotti_guest/bin/linux_component.cc similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/linux_component.cc rename to garnet/bin/guest/pkg/biscotti_guest/bin/linux_component.cc
diff --git a/bin/guest/pkg/biscotti_guest/bin/linux_component.h b/garnet/bin/guest/pkg/biscotti_guest/bin/linux_component.h similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/linux_component.h rename to garnet/bin/guest/pkg/biscotti_guest/bin/linux_component.h
diff --git a/bin/guest/pkg/biscotti_guest/bin/linux_runner.cc b/garnet/bin/guest/pkg/biscotti_guest/bin/linux_runner.cc similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/linux_runner.cc rename to garnet/bin/guest/pkg/biscotti_guest/bin/linux_runner.cc
diff --git a/bin/guest/pkg/biscotti_guest/bin/linux_runner.h b/garnet/bin/guest/pkg/biscotti_guest/bin/linux_runner.h similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/linux_runner.h rename to garnet/bin/guest/pkg/biscotti_guest/bin/linux_runner.h
diff --git a/bin/guest/pkg/biscotti_guest/bin/log_collector.cc b/garnet/bin/guest/pkg/biscotti_guest/bin/log_collector.cc similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/log_collector.cc rename to garnet/bin/guest/pkg/biscotti_guest/bin/log_collector.cc
diff --git a/bin/guest/pkg/biscotti_guest/bin/log_collector.h b/garnet/bin/guest/pkg/biscotti_guest/bin/log_collector.h similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/log_collector.h rename to garnet/bin/guest/pkg/biscotti_guest/bin/log_collector.h
diff --git a/bin/guest/pkg/biscotti_guest/bin/main.cc b/garnet/bin/guest/pkg/biscotti_guest/bin/main.cc similarity index 100% rename from bin/guest/pkg/biscotti_guest/bin/main.cc rename to garnet/bin/guest/pkg/biscotti_guest/bin/main.cc
diff --git a/bin/guest/pkg/biscotti_guest/mkdata.sh b/garnet/bin/guest/pkg/biscotti_guest/mkdata.sh similarity index 100% rename from bin/guest/pkg/biscotti_guest/mkdata.sh rename to garnet/bin/guest/pkg/biscotti_guest/mkdata.sh
diff --git a/bin/guest/pkg/biscotti_guest/mklinux.sh b/garnet/bin/guest/pkg/biscotti_guest/mklinux.sh similarity index 100% rename from bin/guest/pkg/biscotti_guest/mklinux.sh rename to garnet/bin/guest/pkg/biscotti_guest/mklinux.sh
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/LICENSE b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/LICENSE similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/LICENSE rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/LICENSE
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/README.fuchsia b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/README.fuchsia similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/README.fuchsia rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/README.fuchsia
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/common.proto b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/common.proto similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/common.proto rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/common.proto
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/container_guest.proto b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/container_guest.proto similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/container_guest.proto rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/container_guest.proto
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/container_host.proto b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/container_host.proto similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/container_host.proto rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/container_host.proto
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/tremplin.proto b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/tremplin.proto similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/tremplin.proto rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/tremplin.proto
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/vm_guest.proto b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/vm_guest.proto similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/vm_guest.proto rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/vm_guest.proto
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/vm_host.proto b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/vm_host.proto similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/vm_host.proto rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/vm_host.proto
diff --git a/bin/guest/pkg/biscotti_guest/third_party/protos/vsh.proto b/garnet/bin/guest/pkg/biscotti_guest/third_party/protos/vsh.proto similarity index 100% rename from bin/guest/pkg/biscotti_guest/third_party/protos/vsh.proto rename to garnet/bin/guest/pkg/biscotti_guest/third_party/protos/vsh.proto
diff --git a/bin/guest/pkg/debian_guest/.gitignore b/garnet/bin/guest/pkg/debian_guest/.gitignore similarity index 100% rename from bin/guest/pkg/debian_guest/.gitignore rename to garnet/bin/guest/pkg/debian_guest/.gitignore
diff --git a/bin/guest/pkg/debian_guest/BUILD.gn b/garnet/bin/guest/pkg/debian_guest/BUILD.gn similarity index 100% rename from bin/guest/pkg/debian_guest/BUILD.gn rename to garnet/bin/guest/pkg/debian_guest/BUILD.gn
diff --git a/bin/guest/pkg/debian_guest/README.md b/garnet/bin/guest/pkg/debian_guest/README.md similarity index 100% rename from bin/guest/pkg/debian_guest/README.md rename to garnet/bin/guest/pkg/debian_guest/README.md
diff --git a/bin/guest/pkg/debian_guest/build-image.sh b/garnet/bin/guest/pkg/debian_guest/build-image.sh similarity index 100% rename from bin/guest/pkg/debian_guest/build-image.sh rename to garnet/bin/guest/pkg/debian_guest/build-image.sh
diff --git a/bin/guest/pkg/debian_guest/multistrap/arm64.cfg b/garnet/bin/guest/pkg/debian_guest/multistrap/arm64.cfg similarity index 100% rename from bin/guest/pkg/debian_guest/multistrap/arm64.cfg rename to garnet/bin/guest/pkg/debian_guest/multistrap/arm64.cfg
diff --git a/bin/guest/pkg/debian_guest/multistrap/common.cfg b/garnet/bin/guest/pkg/debian_guest/multistrap/common.cfg similarity index 100% rename from bin/guest/pkg/debian_guest/multistrap/common.cfg rename to garnet/bin/guest/pkg/debian_guest/multistrap/common.cfg
diff --git a/bin/guest/pkg/debian_guest/multistrap/configscript.sh b/garnet/bin/guest/pkg/debian_guest/multistrap/configscript.sh similarity index 100% rename from bin/guest/pkg/debian_guest/multistrap/configscript.sh rename to garnet/bin/guest/pkg/debian_guest/multistrap/configscript.sh
diff --git a/bin/guest/pkg/debian_guest/multistrap/x86.cfg b/garnet/bin/guest/pkg/debian_guest/multistrap/x86.cfg similarity index 100% rename from bin/guest/pkg/debian_guest/multistrap/x86.cfg rename to garnet/bin/guest/pkg/debian_guest/multistrap/x86.cfg
diff --git a/bin/guest/pkg/generate_guest_config.py b/garnet/bin/guest/pkg/generate_guest_config.py similarity index 100% rename from bin/guest/pkg/generate_guest_config.py rename to garnet/bin/guest/pkg/generate_guest_config.py
diff --git a/bin/guest/pkg/guest_package.gni b/garnet/bin/guest/pkg/guest_package.gni similarity index 100% rename from bin/guest/pkg/guest_package.gni rename to garnet/bin/guest/pkg/guest_package.gni
diff --git a/bin/guest/pkg/linux_guest/.gitignore b/garnet/bin/guest/pkg/linux_guest/.gitignore similarity index 100% rename from bin/guest/pkg/linux_guest/.gitignore rename to garnet/bin/guest/pkg/linux_guest/.gitignore
diff --git a/bin/guest/pkg/linux_guest/BUILD.gn b/garnet/bin/guest/pkg/linux_guest/BUILD.gn similarity index 100% rename from bin/guest/pkg/linux_guest/BUILD.gn rename to garnet/bin/guest/pkg/linux_guest/BUILD.gn
diff --git a/bin/guest/pkg/linux_guest/README.md b/garnet/bin/guest/pkg/linux_guest/README.md similarity index 100% rename from bin/guest/pkg/linux_guest/README.md rename to garnet/bin/guest/pkg/linux_guest/README.md
diff --git a/bin/guest/pkg/linux_guest/check_image.sh b/garnet/bin/guest/pkg/linux_guest/check_image.sh similarity index 100% rename from bin/guest/pkg/linux_guest/check_image.sh rename to garnet/bin/guest/pkg/linux_guest/check_image.sh
diff --git a/bin/guest/pkg/linux_guest/mkcipd.sh b/garnet/bin/guest/pkg/linux_guest/mkcipd.sh similarity index 100% rename from bin/guest/pkg/linux_guest/mkcipd.sh rename to garnet/bin/guest/pkg/linux_guest/mkcipd.sh
diff --git a/bin/guest/pkg/linux_guest/mkextras.sh b/garnet/bin/guest/pkg/linux_guest/mkextras.sh similarity index 100% rename from bin/guest/pkg/linux_guest/mkextras.sh rename to garnet/bin/guest/pkg/linux_guest/mkextras.sh
diff --git a/bin/guest/pkg/linux_guest/mklinux.sh b/garnet/bin/guest/pkg/linux_guest/mklinux.sh similarity index 100% rename from bin/guest/pkg/linux_guest/mklinux.sh rename to garnet/bin/guest/pkg/linux_guest/mklinux.sh
diff --git a/bin/guest/pkg/linux_guest/mksysroot.sh b/garnet/bin/guest/pkg/linux_guest/mksysroot.sh similarity index 100% rename from bin/guest/pkg/linux_guest/mksysroot.sh rename to garnet/bin/guest/pkg/linux_guest/mksysroot.sh
diff --git a/bin/guest/pkg/linux_guest/mktests.sh b/garnet/bin/guest/pkg/linux_guest/mktests.sh similarity index 100% rename from bin/guest/pkg/linux_guest/mktests.sh rename to garnet/bin/guest/pkg/linux_guest/mktests.sh
diff --git a/bin/guest/pkg/meta/guest_package.cmx b/garnet/bin/guest/pkg/meta/guest_package.cmx similarity index 100% rename from bin/guest/pkg/meta/guest_package.cmx rename to garnet/bin/guest/pkg/meta/guest_package.cmx
diff --git a/bin/guest/pkg/zircon_guest/BUILD.gn b/garnet/bin/guest/pkg/zircon_guest/BUILD.gn similarity index 100% rename from bin/guest/pkg/zircon_guest/BUILD.gn rename to garnet/bin/guest/pkg/zircon_guest/BUILD.gn
diff --git a/bin/guest/pkg/zircon_guest/services.config b/garnet/bin/guest/pkg/zircon_guest/services.config similarity index 100% rename from bin/guest/pkg/zircon_guest/services.config rename to garnet/bin/guest/pkg/zircon_guest/services.config
diff --git a/bin/guest/runner/BUILD.gn b/garnet/bin/guest/runner/BUILD.gn similarity index 100% rename from bin/guest/runner/BUILD.gn rename to garnet/bin/guest/runner/BUILD.gn
diff --git a/bin/guest/runner/main.cc b/garnet/bin/guest/runner/main.cc similarity index 100% rename from bin/guest/runner/main.cc rename to garnet/bin/guest/runner/main.cc
diff --git a/bin/guest/runner/meta/guest_runner.cmx b/garnet/bin/guest/runner/meta/guest_runner.cmx similarity index 100% rename from bin/guest/runner/meta/guest_runner.cmx rename to garnet/bin/guest/runner/meta/guest_runner.cmx
diff --git a/bin/guest/runner/runner_impl.cc b/garnet/bin/guest/runner/runner_impl.cc similarity index 100% rename from bin/guest/runner/runner_impl.cc rename to garnet/bin/guest/runner/runner_impl.cc
diff --git a/bin/guest/runner/runner_impl.h b/garnet/bin/guest/runner/runner_impl.h similarity index 100% rename from bin/guest/runner/runner_impl.h rename to garnet/bin/guest/runner/runner_impl.h
diff --git a/bin/guest/scripts/bit-print.sh b/garnet/bin/guest/scripts/bit-print.sh similarity index 100% rename from bin/guest/scripts/bit-print.sh rename to garnet/bin/guest/scripts/bit-print.sh
diff --git a/bin/guest/scripts/build-blobs.sh b/garnet/bin/guest/scripts/build-blobs.sh similarity index 100% rename from bin/guest/scripts/build-blobs.sh rename to garnet/bin/guest/scripts/build-blobs.sh
diff --git a/bin/guest/third_party/fdt/BUILD.gn b/garnet/bin/guest/third_party/fdt/BUILD.gn similarity index 100% rename from bin/guest/third_party/fdt/BUILD.gn rename to garnet/bin/guest/third_party/fdt/BUILD.gn
diff --git a/bin/guest/third_party/fdt/LICENSE b/garnet/bin/guest/third_party/fdt/LICENSE similarity index 100% rename from bin/guest/third_party/fdt/LICENSE rename to garnet/bin/guest/third_party/fdt/LICENSE
diff --git a/bin/guest/third_party/fdt/Makefile.libfdt b/garnet/bin/guest/third_party/fdt/Makefile.libfdt similarity index 100% rename from bin/guest/third_party/fdt/Makefile.libfdt rename to garnet/bin/guest/third_party/fdt/Makefile.libfdt
diff --git a/bin/guest/third_party/fdt/TODO b/garnet/bin/guest/third_party/fdt/TODO similarity index 100% rename from bin/guest/third_party/fdt/TODO rename to garnet/bin/guest/third_party/fdt/TODO
diff --git a/bin/guest/third_party/fdt/fdt.c b/garnet/bin/guest/third_party/fdt/fdt.c similarity index 100% rename from bin/guest/third_party/fdt/fdt.c rename to garnet/bin/guest/third_party/fdt/fdt.c
diff --git a/bin/guest/third_party/fdt/fdt.h b/garnet/bin/guest/third_party/fdt/fdt.h similarity index 100% rename from bin/guest/third_party/fdt/fdt.h rename to garnet/bin/guest/third_party/fdt/fdt.h
diff --git a/bin/guest/third_party/fdt/fdt_addresses.c b/garnet/bin/guest/third_party/fdt/fdt_addresses.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_addresses.c rename to garnet/bin/guest/third_party/fdt/fdt_addresses.c
diff --git a/bin/guest/third_party/fdt/fdt_empty_tree.c b/garnet/bin/guest/third_party/fdt/fdt_empty_tree.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_empty_tree.c rename to garnet/bin/guest/third_party/fdt/fdt_empty_tree.c
diff --git a/bin/guest/third_party/fdt/fdt_overlay.c b/garnet/bin/guest/third_party/fdt/fdt_overlay.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_overlay.c rename to garnet/bin/guest/third_party/fdt/fdt_overlay.c
diff --git a/bin/guest/third_party/fdt/fdt_ro.c b/garnet/bin/guest/third_party/fdt/fdt_ro.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_ro.c rename to garnet/bin/guest/third_party/fdt/fdt_ro.c
diff --git a/bin/guest/third_party/fdt/fdt_rw.c b/garnet/bin/guest/third_party/fdt/fdt_rw.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_rw.c rename to garnet/bin/guest/third_party/fdt/fdt_rw.c
diff --git a/bin/guest/third_party/fdt/fdt_strerror.c b/garnet/bin/guest/third_party/fdt/fdt_strerror.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_strerror.c rename to garnet/bin/guest/third_party/fdt/fdt_strerror.c
diff --git a/bin/guest/third_party/fdt/fdt_sw.c b/garnet/bin/guest/third_party/fdt/fdt_sw.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_sw.c rename to garnet/bin/guest/third_party/fdt/fdt_sw.c
diff --git a/bin/guest/third_party/fdt/fdt_wip.c b/garnet/bin/guest/third_party/fdt/fdt_wip.c similarity index 100% rename from bin/guest/third_party/fdt/fdt_wip.c rename to garnet/bin/guest/third_party/fdt/fdt_wip.c
diff --git a/bin/guest/third_party/fdt/libfdt.h b/garnet/bin/guest/third_party/fdt/libfdt.h similarity index 100% rename from bin/guest/third_party/fdt/libfdt.h rename to garnet/bin/guest/third_party/fdt/libfdt.h
diff --git a/bin/guest/third_party/fdt/libfdt_env.h b/garnet/bin/guest/third_party/fdt/libfdt_env.h similarity index 100% rename from bin/guest/third_party/fdt/libfdt_env.h rename to garnet/bin/guest/third_party/fdt/libfdt_env.h
diff --git a/bin/guest/third_party/fdt/libfdt_internal.h b/garnet/bin/guest/third_party/fdt/libfdt_internal.h similarity index 100% rename from bin/guest/third_party/fdt/libfdt_internal.h rename to garnet/bin/guest/third_party/fdt/libfdt_internal.h
diff --git a/bin/guest/third_party/fdt/version.lds b/garnet/bin/guest/third_party/fdt/version.lds similarity index 100% rename from bin/guest/third_party/fdt/version.lds rename to garnet/bin/guest/third_party/fdt/version.lds
diff --git a/bin/guest/vmm/BUILD.gn b/garnet/bin/guest/vmm/BUILD.gn similarity index 100% rename from bin/guest/vmm/BUILD.gn rename to garnet/bin/guest/vmm/BUILD.gn
diff --git a/bin/guest/vmm/arch/arm64/dts/board.dtb b/garnet/bin/guest/vmm/arch/arm64/dts/board.dtb similarity index 100% rename from bin/guest/vmm/arch/arm64/dts/board.dtb rename to garnet/bin/guest/vmm/arch/arm64/dts/board.dtb Binary files differ
diff --git a/bin/guest/vmm/arch/arm64/dts/board.dts b/garnet/bin/guest/vmm/arch/arm64/dts/board.dts similarity index 100% rename from bin/guest/vmm/arch/arm64/dts/board.dts rename to garnet/bin/guest/vmm/arch/arm64/dts/board.dts
diff --git a/bin/guest/vmm/arch/arm64/gic_distributor.cc b/garnet/bin/guest/vmm/arch/arm64/gic_distributor.cc similarity index 100% rename from bin/guest/vmm/arch/arm64/gic_distributor.cc rename to garnet/bin/guest/vmm/arch/arm64/gic_distributor.cc
diff --git a/bin/guest/vmm/arch/arm64/gic_distributor.h b/garnet/bin/guest/vmm/arch/arm64/gic_distributor.h similarity index 100% rename from bin/guest/vmm/arch/arm64/gic_distributor.h rename to garnet/bin/guest/vmm/arch/arm64/gic_distributor.h
diff --git a/bin/guest/vmm/arch/arm64/pl011.cc b/garnet/bin/guest/vmm/arch/arm64/pl011.cc similarity index 100% rename from bin/guest/vmm/arch/arm64/pl011.cc rename to garnet/bin/guest/vmm/arch/arm64/pl011.cc
diff --git a/bin/guest/vmm/arch/arm64/pl011.h b/garnet/bin/guest/vmm/arch/arm64/pl011.h similarity index 100% rename from bin/guest/vmm/arch/arm64/pl011.h rename to garnet/bin/guest/vmm/arch/arm64/pl011.h
diff --git a/bin/guest/vmm/arch/arm64/pl031.cc b/garnet/bin/guest/vmm/arch/arm64/pl031.cc similarity index 100% rename from bin/guest/vmm/arch/arm64/pl031.cc rename to garnet/bin/guest/vmm/arch/arm64/pl031.cc
diff --git a/bin/guest/vmm/arch/arm64/pl031.h b/garnet/bin/guest/vmm/arch/arm64/pl031.h similarity index 100% rename from bin/guest/vmm/arch/arm64/pl031.h rename to garnet/bin/guest/vmm/arch/arm64/pl031.h
diff --git a/bin/guest/vmm/arch/x64/acpi.cc b/garnet/bin/guest/vmm/arch/x64/acpi.cc similarity index 100% rename from bin/guest/vmm/arch/x64/acpi.cc rename to garnet/bin/guest/vmm/arch/x64/acpi.cc
diff --git a/bin/guest/vmm/arch/x64/acpi.h b/garnet/bin/guest/vmm/arch/x64/acpi.h similarity index 100% rename from bin/guest/vmm/arch/x64/acpi.h rename to garnet/bin/guest/vmm/arch/x64/acpi.h
diff --git a/bin/guest/vmm/arch/x64/acpi_priv.h b/garnet/bin/guest/vmm/arch/x64/acpi_priv.h similarity index 100% rename from bin/guest/vmm/arch/x64/acpi_priv.h rename to garnet/bin/guest/vmm/arch/x64/acpi_priv.h
diff --git a/bin/guest/vmm/arch/x64/asl/dsdt.aml b/garnet/bin/guest/vmm/arch/x64/asl/dsdt.aml similarity index 100% rename from bin/guest/vmm/arch/x64/asl/dsdt.aml rename to garnet/bin/guest/vmm/arch/x64/asl/dsdt.aml Binary files differ
diff --git a/bin/guest/vmm/arch/x64/asl/dsdt.asl b/garnet/bin/guest/vmm/arch/x64/asl/dsdt.asl similarity index 100% rename from bin/guest/vmm/arch/x64/asl/dsdt.asl rename to garnet/bin/guest/vmm/arch/x64/asl/dsdt.asl
diff --git a/bin/guest/vmm/arch/x64/asl/mcfg.aml b/garnet/bin/guest/vmm/arch/x64/asl/mcfg.aml similarity index 100% rename from bin/guest/vmm/arch/x64/asl/mcfg.aml rename to garnet/bin/guest/vmm/arch/x64/asl/mcfg.aml Binary files differ
diff --git a/bin/guest/vmm/arch/x64/asl/mcfg.asl b/garnet/bin/guest/vmm/arch/x64/asl/mcfg.asl similarity index 100% rename from bin/guest/vmm/arch/x64/asl/mcfg.asl rename to garnet/bin/guest/vmm/arch/x64/asl/mcfg.asl
diff --git a/bin/guest/vmm/arch/x64/decode.cc b/garnet/bin/guest/vmm/arch/x64/decode.cc similarity index 100% rename from bin/guest/vmm/arch/x64/decode.cc rename to garnet/bin/guest/vmm/arch/x64/decode.cc
diff --git a/bin/guest/vmm/arch/x64/decode.h b/garnet/bin/guest/vmm/arch/x64/decode.h similarity index 100% rename from bin/guest/vmm/arch/x64/decode.h rename to garnet/bin/guest/vmm/arch/x64/decode.h
diff --git a/bin/guest/vmm/arch/x64/decode_unittest.cc b/garnet/bin/guest/vmm/arch/x64/decode_unittest.cc similarity index 100% rename from bin/guest/vmm/arch/x64/decode_unittest.cc rename to garnet/bin/guest/vmm/arch/x64/decode_unittest.cc
diff --git a/bin/guest/vmm/arch/x64/e820.cc b/garnet/bin/guest/vmm/arch/x64/e820.cc similarity index 100% rename from bin/guest/vmm/arch/x64/e820.cc rename to garnet/bin/guest/vmm/arch/x64/e820.cc
diff --git a/bin/guest/vmm/arch/x64/e820.h b/garnet/bin/guest/vmm/arch/x64/e820.h similarity index 100% rename from bin/guest/vmm/arch/x64/e820.h rename to garnet/bin/guest/vmm/arch/x64/e820.h
diff --git a/bin/guest/vmm/arch/x64/i8250.cc b/garnet/bin/guest/vmm/arch/x64/i8250.cc similarity index 100% rename from bin/guest/vmm/arch/x64/i8250.cc rename to garnet/bin/guest/vmm/arch/x64/i8250.cc
diff --git a/bin/guest/vmm/arch/x64/i8250.h b/garnet/bin/guest/vmm/arch/x64/i8250.h similarity index 100% rename from bin/guest/vmm/arch/x64/i8250.h rename to garnet/bin/guest/vmm/arch/x64/i8250.h
diff --git a/bin/guest/vmm/arch/x64/io_apic.cc b/garnet/bin/guest/vmm/arch/x64/io_apic.cc similarity index 100% rename from bin/guest/vmm/arch/x64/io_apic.cc rename to garnet/bin/guest/vmm/arch/x64/io_apic.cc
diff --git a/bin/guest/vmm/arch/x64/io_apic.h b/garnet/bin/guest/vmm/arch/x64/io_apic.h similarity index 100% rename from bin/guest/vmm/arch/x64/io_apic.h rename to garnet/bin/guest/vmm/arch/x64/io_apic.h
diff --git a/bin/guest/vmm/arch/x64/io_port.cc b/garnet/bin/guest/vmm/arch/x64/io_port.cc similarity index 100% rename from bin/guest/vmm/arch/x64/io_port.cc rename to garnet/bin/guest/vmm/arch/x64/io_port.cc
diff --git a/bin/guest/vmm/arch/x64/io_port.h b/garnet/bin/guest/vmm/arch/x64/io_port.h similarity index 100% rename from bin/guest/vmm/arch/x64/io_port.h rename to garnet/bin/guest/vmm/arch/x64/io_port.h
diff --git a/bin/guest/vmm/arch/x64/page_table.cc b/garnet/bin/guest/vmm/arch/x64/page_table.cc similarity index 100% rename from bin/guest/vmm/arch/x64/page_table.cc rename to garnet/bin/guest/vmm/arch/x64/page_table.cc
diff --git a/bin/guest/vmm/arch/x64/page_table.h b/garnet/bin/guest/vmm/arch/x64/page_table.h similarity index 100% rename from bin/guest/vmm/arch/x64/page_table.h rename to garnet/bin/guest/vmm/arch/x64/page_table.h
diff --git a/bin/guest/vmm/arch/x64/page_table_unittest.cc b/garnet/bin/guest/vmm/arch/x64/page_table_unittest.cc similarity index 100% rename from bin/guest/vmm/arch/x64/page_table_unittest.cc rename to garnet/bin/guest/vmm/arch/x64/page_table_unittest.cc
diff --git a/bin/guest/vmm/bits.h b/garnet/bin/guest/vmm/bits.h similarity index 100% rename from bin/guest/vmm/bits.h rename to garnet/bin/guest/vmm/bits.h
diff --git a/bin/guest/vmm/controller/virtio_balloon.cc b/garnet/bin/guest/vmm/controller/virtio_balloon.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_balloon.cc rename to garnet/bin/guest/vmm/controller/virtio_balloon.cc
diff --git a/bin/guest/vmm/controller/virtio_balloon.h b/garnet/bin/guest/vmm/controller/virtio_balloon.h similarity index 100% rename from bin/guest/vmm/controller/virtio_balloon.h rename to garnet/bin/guest/vmm/controller/virtio_balloon.h
diff --git a/bin/guest/vmm/controller/virtio_block.cc b/garnet/bin/guest/vmm/controller/virtio_block.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_block.cc rename to garnet/bin/guest/vmm/controller/virtio_block.cc
diff --git a/bin/guest/vmm/controller/virtio_block.h b/garnet/bin/guest/vmm/controller/virtio_block.h similarity index 100% rename from bin/guest/vmm/controller/virtio_block.h rename to garnet/bin/guest/vmm/controller/virtio_block.h
diff --git a/bin/guest/vmm/controller/virtio_console.cc b/garnet/bin/guest/vmm/controller/virtio_console.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_console.cc rename to garnet/bin/guest/vmm/controller/virtio_console.cc
diff --git a/bin/guest/vmm/controller/virtio_console.h b/garnet/bin/guest/vmm/controller/virtio_console.h similarity index 100% rename from bin/guest/vmm/controller/virtio_console.h rename to garnet/bin/guest/vmm/controller/virtio_console.h
diff --git a/bin/guest/vmm/controller/virtio_gpu.cc b/garnet/bin/guest/vmm/controller/virtio_gpu.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_gpu.cc rename to garnet/bin/guest/vmm/controller/virtio_gpu.cc
diff --git a/bin/guest/vmm/controller/virtio_gpu.h b/garnet/bin/guest/vmm/controller/virtio_gpu.h similarity index 100% rename from bin/guest/vmm/controller/virtio_gpu.h rename to garnet/bin/guest/vmm/controller/virtio_gpu.h
diff --git a/bin/guest/vmm/controller/virtio_input.cc b/garnet/bin/guest/vmm/controller/virtio_input.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_input.cc rename to garnet/bin/guest/vmm/controller/virtio_input.cc
diff --git a/bin/guest/vmm/controller/virtio_input.h b/garnet/bin/guest/vmm/controller/virtio_input.h similarity index 100% rename from bin/guest/vmm/controller/virtio_input.h rename to garnet/bin/guest/vmm/controller/virtio_input.h
diff --git a/bin/guest/vmm/controller/virtio_net.cc b/garnet/bin/guest/vmm/controller/virtio_net.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_net.cc rename to garnet/bin/guest/vmm/controller/virtio_net.cc
diff --git a/bin/guest/vmm/controller/virtio_net.h b/garnet/bin/guest/vmm/controller/virtio_net.h similarity index 100% rename from bin/guest/vmm/controller/virtio_net.h rename to garnet/bin/guest/vmm/controller/virtio_net.h
diff --git a/bin/guest/vmm/controller/virtio_rng.cc b/garnet/bin/guest/vmm/controller/virtio_rng.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_rng.cc rename to garnet/bin/guest/vmm/controller/virtio_rng.cc
diff --git a/bin/guest/vmm/controller/virtio_rng.h b/garnet/bin/guest/vmm/controller/virtio_rng.h similarity index 100% rename from bin/guest/vmm/controller/virtio_rng.h rename to garnet/bin/guest/vmm/controller/virtio_rng.h
diff --git a/bin/guest/vmm/controller/virtio_wl.cc b/garnet/bin/guest/vmm/controller/virtio_wl.cc similarity index 100% rename from bin/guest/vmm/controller/virtio_wl.cc rename to garnet/bin/guest/vmm/controller/virtio_wl.cc
diff --git a/bin/guest/vmm/controller/virtio_wl.h b/garnet/bin/guest/vmm/controller/virtio_wl.h similarity index 100% rename from bin/guest/vmm/controller/virtio_wl.h rename to garnet/bin/guest/vmm/controller/virtio_wl.h
diff --git a/bin/guest/vmm/dev_mem.h b/garnet/bin/guest/vmm/dev_mem.h similarity index 100% rename from bin/guest/vmm/dev_mem.h rename to garnet/bin/guest/vmm/dev_mem.h
diff --git a/bin/guest/vmm/dev_mem_unittest.cc b/garnet/bin/guest/vmm/dev_mem_unittest.cc similarity index 100% rename from bin/guest/vmm/dev_mem_unittest.cc rename to garnet/bin/guest/vmm/dev_mem_unittest.cc
diff --git a/bin/guest/vmm/device/BUILD.gn b/garnet/bin/guest/vmm/device/BUILD.gn similarity index 100% rename from bin/guest/vmm/device/BUILD.gn rename to garnet/bin/guest/vmm/device/BUILD.gn
diff --git a/bin/guest/vmm/device/block.h b/garnet/bin/guest/vmm/device/block.h similarity index 100% rename from bin/guest/vmm/device/block.h rename to garnet/bin/guest/vmm/device/block.h
diff --git a/bin/guest/vmm/device/block_dispatcher.cc b/garnet/bin/guest/vmm/device/block_dispatcher.cc similarity index 100% rename from bin/guest/vmm/device/block_dispatcher.cc rename to garnet/bin/guest/vmm/device/block_dispatcher.cc
diff --git a/bin/guest/vmm/device/block_dispatcher.h b/garnet/bin/guest/vmm/device/block_dispatcher.h similarity index 100% rename from bin/guest/vmm/device/block_dispatcher.h rename to garnet/bin/guest/vmm/device/block_dispatcher.h
diff --git a/bin/guest/vmm/device/config.h b/garnet/bin/guest/vmm/device/config.h similarity index 100% rename from bin/guest/vmm/device/config.h rename to garnet/bin/guest/vmm/device/config.h
diff --git a/bin/guest/vmm/device/device_base.h b/garnet/bin/guest/vmm/device/device_base.h similarity index 100% rename from bin/guest/vmm/device/device_base.h rename to garnet/bin/guest/vmm/device/device_base.h
diff --git a/bin/guest/vmm/device/gpu.h b/garnet/bin/guest/vmm/device/gpu.h similarity index 100% rename from bin/guest/vmm/device/gpu.h rename to garnet/bin/guest/vmm/device/gpu.h
diff --git a/bin/guest/vmm/device/gpu_resource.cc b/garnet/bin/guest/vmm/device/gpu_resource.cc similarity index 100% rename from bin/guest/vmm/device/gpu_resource.cc rename to garnet/bin/guest/vmm/device/gpu_resource.cc
diff --git a/bin/guest/vmm/device/gpu_resource.h b/garnet/bin/guest/vmm/device/gpu_resource.h similarity index 100% rename from bin/guest/vmm/device/gpu_resource.h rename to garnet/bin/guest/vmm/device/gpu_resource.h
diff --git a/bin/guest/vmm/device/gpu_scanout.cc b/garnet/bin/guest/vmm/device/gpu_scanout.cc similarity index 100% rename from bin/guest/vmm/device/gpu_scanout.cc rename to garnet/bin/guest/vmm/device/gpu_scanout.cc
diff --git a/bin/guest/vmm/device/gpu_scanout.h b/garnet/bin/guest/vmm/device/gpu_scanout.h similarity index 100% rename from bin/guest/vmm/device/gpu_scanout.h rename to garnet/bin/guest/vmm/device/gpu_scanout.h
diff --git a/bin/guest/vmm/device/guest_ethernet.cc b/garnet/bin/guest/vmm/device/guest_ethernet.cc similarity index 100% rename from bin/guest/vmm/device/guest_ethernet.cc rename to garnet/bin/guest/vmm/device/guest_ethernet.cc
diff --git a/bin/guest/vmm/device/guest_ethernet.h b/garnet/bin/guest/vmm/device/guest_ethernet.h similarity index 100% rename from bin/guest/vmm/device/guest_ethernet.h rename to garnet/bin/guest/vmm/device/guest_ethernet.h
diff --git a/bin/guest/vmm/device/guest_view.cc b/garnet/bin/guest/vmm/device/guest_view.cc similarity index 100% rename from bin/guest/vmm/device/guest_view.cc rename to garnet/bin/guest/vmm/device/guest_view.cc
diff --git a/bin/guest/vmm/device/guest_view.h b/garnet/bin/guest/vmm/device/guest_view.h similarity index 100% rename from bin/guest/vmm/device/guest_view.h rename to garnet/bin/guest/vmm/device/guest_view.h
diff --git a/bin/guest/vmm/device/input.h b/garnet/bin/guest/vmm/device/input.h similarity index 100% rename from bin/guest/vmm/device/input.h rename to garnet/bin/guest/vmm/device/input.h
diff --git a/bin/guest/vmm/device/phys_mem.cc b/garnet/bin/guest/vmm/device/phys_mem.cc similarity index 100% rename from bin/guest/vmm/device/phys_mem.cc rename to garnet/bin/guest/vmm/device/phys_mem.cc
diff --git a/bin/guest/vmm/device/phys_mem.h b/garnet/bin/guest/vmm/device/phys_mem.h similarity index 100% rename from bin/guest/vmm/device/phys_mem.h rename to garnet/bin/guest/vmm/device/phys_mem.h
diff --git a/bin/guest/vmm/device/qcow.cc b/garnet/bin/guest/vmm/device/qcow.cc similarity index 100% rename from bin/guest/vmm/device/qcow.cc rename to garnet/bin/guest/vmm/device/qcow.cc
diff --git a/bin/guest/vmm/device/qcow.h b/garnet/bin/guest/vmm/device/qcow.h similarity index 100% rename from bin/guest/vmm/device/qcow.h rename to garnet/bin/guest/vmm/device/qcow.h
diff --git a/bin/guest/vmm/device/qcow_test_data.h b/garnet/bin/guest/vmm/device/qcow_test_data.h similarity index 100% rename from bin/guest/vmm/device/qcow_test_data.h rename to garnet/bin/guest/vmm/device/qcow_test_data.h
diff --git a/bin/guest/vmm/device/qcow_unittest.cc b/garnet/bin/guest/vmm/device/qcow_unittest.cc similarity index 100% rename from bin/guest/vmm/device/qcow_unittest.cc rename to garnet/bin/guest/vmm/device/qcow_unittest.cc
diff --git a/bin/guest/vmm/device/stream_base.h b/garnet/bin/guest/vmm/device/stream_base.h similarity index 100% rename from bin/guest/vmm/device/stream_base.h rename to garnet/bin/guest/vmm/device/stream_base.h
diff --git a/bin/guest/vmm/device/test_with_device.cc b/garnet/bin/guest/vmm/device/test_with_device.cc similarity index 100% rename from bin/guest/vmm/device/test_with_device.cc rename to garnet/bin/guest/vmm/device/test_with_device.cc
diff --git a/bin/guest/vmm/device/test_with_device.h b/garnet/bin/guest/vmm/device/test_with_device.h similarity index 100% rename from bin/guest/vmm/device/test_with_device.h rename to garnet/bin/guest/vmm/device/test_with_device.h
diff --git a/bin/guest/vmm/device/virtio_balloon.cc b/garnet/bin/guest/vmm/device/virtio_balloon.cc similarity index 100% rename from bin/guest/vmm/device/virtio_balloon.cc rename to garnet/bin/guest/vmm/device/virtio_balloon.cc
diff --git a/bin/guest/vmm/device/virtio_balloon_test.cc b/garnet/bin/guest/vmm/device/virtio_balloon_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_balloon_test.cc rename to garnet/bin/guest/vmm/device/virtio_balloon_test.cc
diff --git a/bin/guest/vmm/device/virtio_block.cc b/garnet/bin/guest/vmm/device/virtio_block.cc similarity index 100% rename from bin/guest/vmm/device/virtio_block.cc rename to garnet/bin/guest/vmm/device/virtio_block.cc
diff --git a/bin/guest/vmm/device/virtio_block_test.cc b/garnet/bin/guest/vmm/device/virtio_block_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_block_test.cc rename to garnet/bin/guest/vmm/device/virtio_block_test.cc
diff --git a/bin/guest/vmm/device/virtio_console.cc b/garnet/bin/guest/vmm/device/virtio_console.cc similarity index 100% rename from bin/guest/vmm/device/virtio_console.cc rename to garnet/bin/guest/vmm/device/virtio_console.cc
diff --git a/bin/guest/vmm/device/virtio_console_test.cc b/garnet/bin/guest/vmm/device/virtio_console_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_console_test.cc rename to garnet/bin/guest/vmm/device/virtio_console_test.cc
diff --git a/bin/guest/vmm/device/virtio_gpu.cc b/garnet/bin/guest/vmm/device/virtio_gpu.cc similarity index 100% rename from bin/guest/vmm/device/virtio_gpu.cc rename to garnet/bin/guest/vmm/device/virtio_gpu.cc
diff --git a/bin/guest/vmm/device/virtio_gpu_test.cc b/garnet/bin/guest/vmm/device/virtio_gpu_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_gpu_test.cc rename to garnet/bin/guest/vmm/device/virtio_gpu_test.cc
diff --git a/bin/guest/vmm/device/virtio_input.cc b/garnet/bin/guest/vmm/device/virtio_input.cc similarity index 100% rename from bin/guest/vmm/device/virtio_input.cc rename to garnet/bin/guest/vmm/device/virtio_input.cc
diff --git a/bin/guest/vmm/device/virtio_input_test.cc b/garnet/bin/guest/vmm/device/virtio_input_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_input_test.cc rename to garnet/bin/guest/vmm/device/virtio_input_test.cc
diff --git a/bin/guest/vmm/device/virtio_magma.cc b/garnet/bin/guest/vmm/device/virtio_magma.cc similarity index 100% rename from bin/guest/vmm/device/virtio_magma.cc rename to garnet/bin/guest/vmm/device/virtio_magma.cc
diff --git a/bin/guest/vmm/device/virtio_magma.h b/garnet/bin/guest/vmm/device/virtio_magma.h similarity index 100% rename from bin/guest/vmm/device/virtio_magma.h rename to garnet/bin/guest/vmm/device/virtio_magma.h
diff --git a/bin/guest/vmm/device/virtio_net.cc b/garnet/bin/guest/vmm/device/virtio_net.cc similarity index 100% rename from bin/guest/vmm/device/virtio_net.cc rename to garnet/bin/guest/vmm/device/virtio_net.cc
diff --git a/bin/guest/vmm/device/virtio_net_test.cc b/garnet/bin/guest/vmm/device/virtio_net_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_net_test.cc rename to garnet/bin/guest/vmm/device/virtio_net_test.cc
diff --git a/bin/guest/vmm/device/virtio_queue.cc b/garnet/bin/guest/vmm/device/virtio_queue.cc similarity index 100% rename from bin/guest/vmm/device/virtio_queue.cc rename to garnet/bin/guest/vmm/device/virtio_queue.cc
diff --git a/bin/guest/vmm/device/virtio_queue.h b/garnet/bin/guest/vmm/device/virtio_queue.h similarity index 100% rename from bin/guest/vmm/device/virtio_queue.h rename to garnet/bin/guest/vmm/device/virtio_queue.h
diff --git a/bin/guest/vmm/device/virtio_queue_fake.cc b/garnet/bin/guest/vmm/device/virtio_queue_fake.cc similarity index 100% rename from bin/guest/vmm/device/virtio_queue_fake.cc rename to garnet/bin/guest/vmm/device/virtio_queue_fake.cc
diff --git a/bin/guest/vmm/device/virtio_queue_fake.h b/garnet/bin/guest/vmm/device/virtio_queue_fake.h similarity index 100% rename from bin/guest/vmm/device/virtio_queue_fake.h rename to garnet/bin/guest/vmm/device/virtio_queue_fake.h
diff --git a/bin/guest/vmm/device/virtio_queue_test.cc b/garnet/bin/guest/vmm/device/virtio_queue_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_queue_test.cc rename to garnet/bin/guest/vmm/device/virtio_queue_test.cc
diff --git a/bin/guest/vmm/device/virtio_rng.cc b/garnet/bin/guest/vmm/device/virtio_rng.cc similarity index 100% rename from bin/guest/vmm/device/virtio_rng.cc rename to garnet/bin/guest/vmm/device/virtio_rng.cc
diff --git a/bin/guest/vmm/device/virtio_rng_test.cc b/garnet/bin/guest/vmm/device/virtio_rng_test.cc similarity index 100% rename from bin/guest/vmm/device/virtio_rng_test.cc rename to garnet/bin/guest/vmm/device/virtio_rng_test.cc
diff --git a/bin/guest/vmm/device/virtio_wl.cc b/garnet/bin/guest/vmm/device/virtio_wl.cc similarity index 100% rename from bin/guest/vmm/device/virtio_wl.cc rename to garnet/bin/guest/vmm/device/virtio_wl.cc
diff --git a/bin/guest/vmm/device/virtio_wl.h b/garnet/bin/guest/vmm/device/virtio_wl.h similarity index 100% rename from bin/guest/vmm/device/virtio_wl.h rename to garnet/bin/guest/vmm/device/virtio_wl.h
diff --git a/bin/guest/vmm/device/virtio_wl_unittest.cc b/garnet/bin/guest/vmm/device/virtio_wl_unittest.cc similarity index 100% rename from bin/guest/vmm/device/virtio_wl_unittest.cc rename to garnet/bin/guest/vmm/device/virtio_wl_unittest.cc
diff --git a/bin/guest/vmm/device/volatile_write_block_dispatcher_unittest.cc b/garnet/bin/guest/vmm/device/volatile_write_block_dispatcher_unittest.cc similarity index 100% rename from bin/guest/vmm/device/volatile_write_block_dispatcher_unittest.cc rename to garnet/bin/guest/vmm/device/volatile_write_block_dispatcher_unittest.cc
diff --git a/bin/guest/vmm/fidl/BUILD.gn b/garnet/bin/guest/vmm/fidl/BUILD.gn similarity index 100% rename from bin/guest/vmm/fidl/BUILD.gn rename to garnet/bin/guest/vmm/fidl/BUILD.gn
diff --git a/bin/guest/vmm/fidl/device.fidl b/garnet/bin/guest/vmm/fidl/device.fidl similarity index 100% rename from bin/guest/vmm/fidl/device.fidl rename to garnet/bin/guest/vmm/fidl/device.fidl
diff --git a/bin/guest/vmm/fidl/launch_info_provider.fidl b/garnet/bin/guest/vmm/fidl/launch_info_provider.fidl similarity index 100% rename from bin/guest/vmm/fidl/launch_info_provider.fidl rename to garnet/bin/guest/vmm/fidl/launch_info_provider.fidl
diff --git a/bin/guest/vmm/guest.cc b/garnet/bin/guest/vmm/guest.cc similarity index 100% rename from bin/guest/vmm/guest.cc rename to garnet/bin/guest/vmm/guest.cc
diff --git a/bin/guest/vmm/guest.h b/garnet/bin/guest/vmm/guest.h similarity index 100% rename from bin/guest/vmm/guest.h rename to garnet/bin/guest/vmm/guest.h
diff --git a/bin/guest/vmm/guest_config.cc b/garnet/bin/guest/vmm/guest_config.cc similarity index 100% rename from bin/guest/vmm/guest_config.cc rename to garnet/bin/guest/vmm/guest_config.cc
diff --git a/bin/guest/vmm/guest_config.h b/garnet/bin/guest/vmm/guest_config.h similarity index 100% rename from bin/guest/vmm/guest_config.h rename to garnet/bin/guest/vmm/guest_config.h
diff --git a/bin/guest/vmm/guest_config_unittest.cc b/garnet/bin/guest/vmm/guest_config_unittest.cc similarity index 100% rename from bin/guest/vmm/guest_config_unittest.cc rename to garnet/bin/guest/vmm/guest_config_unittest.cc
diff --git a/bin/guest/vmm/instance_controller_impl.cc b/garnet/bin/guest/vmm/instance_controller_impl.cc similarity index 100% rename from bin/guest/vmm/instance_controller_impl.cc rename to garnet/bin/guest/vmm/instance_controller_impl.cc
diff --git a/bin/guest/vmm/instance_controller_impl.h b/garnet/bin/guest/vmm/instance_controller_impl.h similarity index 100% rename from bin/guest/vmm/instance_controller_impl.h rename to garnet/bin/guest/vmm/instance_controller_impl.h
diff --git a/bin/guest/vmm/interrupt_controller.h b/garnet/bin/guest/vmm/interrupt_controller.h similarity index 100% rename from bin/guest/vmm/interrupt_controller.h rename to garnet/bin/guest/vmm/interrupt_controller.h
diff --git a/bin/guest/vmm/io.cc b/garnet/bin/guest/vmm/io.cc similarity index 100% rename from bin/guest/vmm/io.cc rename to garnet/bin/guest/vmm/io.cc
diff --git a/bin/guest/vmm/io.h b/garnet/bin/guest/vmm/io.h similarity index 100% rename from bin/guest/vmm/io.h rename to garnet/bin/guest/vmm/io.h
diff --git a/bin/guest/vmm/linux.cc b/garnet/bin/guest/vmm/linux.cc similarity index 100% rename from bin/guest/vmm/linux.cc rename to garnet/bin/guest/vmm/linux.cc
diff --git a/bin/guest/vmm/linux.h b/garnet/bin/guest/vmm/linux.h similarity index 100% rename from bin/guest/vmm/linux.h rename to garnet/bin/guest/vmm/linux.h
diff --git a/bin/guest/vmm/main.cc b/garnet/bin/guest/vmm/main.cc similarity index 100% rename from bin/guest/vmm/main.cc rename to garnet/bin/guest/vmm/main.cc
diff --git a/bin/guest/vmm/meta/device_tests.cmx b/garnet/bin/guest/vmm/meta/device_tests.cmx similarity index 100% rename from bin/guest/vmm/meta/device_tests.cmx rename to garnet/bin/guest/vmm/meta/device_tests.cmx
diff --git a/bin/guest/vmm/meta/device_unittests.cmx b/garnet/bin/guest/vmm/meta/device_unittests.cmx similarity index 100% rename from bin/guest/vmm/meta/device_unittests.cmx rename to garnet/bin/guest/vmm/meta/device_unittests.cmx
diff --git a/bin/guest/vmm/meta/virtio_balloon.cmx b/garnet/bin/guest/vmm/meta/virtio_balloon.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_balloon.cmx rename to garnet/bin/guest/vmm/meta/virtio_balloon.cmx
diff --git a/bin/guest/vmm/meta/virtio_block.cmx b/garnet/bin/guest/vmm/meta/virtio_block.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_block.cmx rename to garnet/bin/guest/vmm/meta/virtio_block.cmx
diff --git a/bin/guest/vmm/meta/virtio_console.cmx b/garnet/bin/guest/vmm/meta/virtio_console.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_console.cmx rename to garnet/bin/guest/vmm/meta/virtio_console.cmx
diff --git a/bin/guest/vmm/meta/virtio_gpu.cmx b/garnet/bin/guest/vmm/meta/virtio_gpu.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_gpu.cmx rename to garnet/bin/guest/vmm/meta/virtio_gpu.cmx
diff --git a/bin/guest/vmm/meta/virtio_input.cmx b/garnet/bin/guest/vmm/meta/virtio_input.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_input.cmx rename to garnet/bin/guest/vmm/meta/virtio_input.cmx
diff --git a/bin/guest/vmm/meta/virtio_net.cmx b/garnet/bin/guest/vmm/meta/virtio_net.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_net.cmx rename to garnet/bin/guest/vmm/meta/virtio_net.cmx
diff --git a/bin/guest/vmm/meta/virtio_rng.cmx b/garnet/bin/guest/vmm/meta/virtio_rng.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_rng.cmx rename to garnet/bin/guest/vmm/meta/virtio_rng.cmx
diff --git a/bin/guest/vmm/meta/virtio_wl.cmx b/garnet/bin/guest/vmm/meta/virtio_wl.cmx similarity index 100% rename from bin/guest/vmm/meta/virtio_wl.cmx rename to garnet/bin/guest/vmm/meta/virtio_wl.cmx
diff --git a/bin/guest/vmm/meta/vmm.cmx b/garnet/bin/guest/vmm/meta/vmm.cmx similarity index 100% rename from bin/guest/vmm/meta/vmm.cmx rename to garnet/bin/guest/vmm/meta/vmm.cmx
diff --git a/bin/guest/vmm/meta/vmm_unittests.cmx b/garnet/bin/guest/vmm/meta/vmm_unittests.cmx similarity index 100% rename from bin/guest/vmm/meta/vmm_unittests.cmx rename to garnet/bin/guest/vmm/meta/vmm_unittests.cmx
diff --git a/bin/guest/vmm/pci.cc b/garnet/bin/guest/vmm/pci.cc similarity index 100% rename from bin/guest/vmm/pci.cc rename to garnet/bin/guest/vmm/pci.cc
diff --git a/bin/guest/vmm/pci.h b/garnet/bin/guest/vmm/pci.h similarity index 100% rename from bin/guest/vmm/pci.h rename to garnet/bin/guest/vmm/pci.h
diff --git a/bin/guest/vmm/pci_unittest.cc b/garnet/bin/guest/vmm/pci_unittest.cc similarity index 100% rename from bin/guest/vmm/pci_unittest.cc rename to garnet/bin/guest/vmm/pci_unittest.cc
diff --git a/bin/guest/vmm/phys_mem_fake.h b/garnet/bin/guest/vmm/phys_mem_fake.h similarity index 100% rename from bin/guest/vmm/phys_mem_fake.h rename to garnet/bin/guest/vmm/phys_mem_fake.h
diff --git a/bin/guest/vmm/platform_device.h b/garnet/bin/guest/vmm/platform_device.h similarity index 100% rename from bin/guest/vmm/platform_device.h rename to garnet/bin/guest/vmm/platform_device.h
diff --git a/bin/guest/vmm/rtc.h b/garnet/bin/guest/vmm/rtc.h similarity index 100% rename from bin/guest/vmm/rtc.h rename to garnet/bin/guest/vmm/rtc.h
diff --git a/bin/guest/vmm/sysinfo.h b/garnet/bin/guest/vmm/sysinfo.h similarity index 100% rename from bin/guest/vmm/sysinfo.h rename to garnet/bin/guest/vmm/sysinfo.h
diff --git a/bin/guest/vmm/uart.h b/garnet/bin/guest/vmm/uart.h similarity index 100% rename from bin/guest/vmm/uart.h rename to garnet/bin/guest/vmm/uart.h
diff --git a/bin/guest/vmm/vcpu.cc b/garnet/bin/guest/vmm/vcpu.cc similarity index 100% rename from bin/guest/vmm/vcpu.cc rename to garnet/bin/guest/vmm/vcpu.cc
diff --git a/bin/guest/vmm/vcpu.h b/garnet/bin/guest/vmm/vcpu.h similarity index 100% rename from bin/guest/vmm/vcpu.h rename to garnet/bin/guest/vmm/vcpu.h
diff --git a/bin/guest/vmm/virtio_device.h b/garnet/bin/guest/vmm/virtio_device.h similarity index 100% rename from bin/guest/vmm/virtio_device.h rename to garnet/bin/guest/vmm/virtio_device.h
diff --git a/bin/guest/vmm/virtio_device_fake.h b/garnet/bin/guest/vmm/virtio_device_fake.h similarity index 100% rename from bin/guest/vmm/virtio_device_fake.h rename to garnet/bin/guest/vmm/virtio_device_fake.h
diff --git a/bin/guest/vmm/virtio_net_legacy.cc b/garnet/bin/guest/vmm/virtio_net_legacy.cc similarity index 100% rename from bin/guest/vmm/virtio_net_legacy.cc rename to garnet/bin/guest/vmm/virtio_net_legacy.cc
diff --git a/bin/guest/vmm/virtio_net_legacy.h b/garnet/bin/guest/vmm/virtio_net_legacy.h similarity index 100% rename from bin/guest/vmm/virtio_net_legacy.h rename to garnet/bin/guest/vmm/virtio_net_legacy.h
diff --git a/bin/guest/vmm/virtio_net_legacy_unittest.cc b/garnet/bin/guest/vmm/virtio_net_legacy_unittest.cc similarity index 100% rename from bin/guest/vmm/virtio_net_legacy_unittest.cc rename to garnet/bin/guest/vmm/virtio_net_legacy_unittest.cc
diff --git a/bin/guest/vmm/virtio_pci.cc b/garnet/bin/guest/vmm/virtio_pci.cc similarity index 100% rename from bin/guest/vmm/virtio_pci.cc rename to garnet/bin/guest/vmm/virtio_pci.cc
diff --git a/bin/guest/vmm/virtio_pci.h b/garnet/bin/guest/vmm/virtio_pci.h similarity index 100% rename from bin/guest/vmm/virtio_pci.h rename to garnet/bin/guest/vmm/virtio_pci.h
diff --git a/bin/guest/vmm/virtio_queue_fake.cc b/garnet/bin/guest/vmm/virtio_queue_fake.cc similarity index 100% rename from bin/guest/vmm/virtio_queue_fake.cc rename to garnet/bin/guest/vmm/virtio_queue_fake.cc
diff --git a/bin/guest/vmm/virtio_queue_fake.h b/garnet/bin/guest/vmm/virtio_queue_fake.h similarity index 100% rename from bin/guest/vmm/virtio_queue_fake.h rename to garnet/bin/guest/vmm/virtio_queue_fake.h
diff --git a/bin/guest/vmm/virtio_queue_unittest.cc b/garnet/bin/guest/vmm/virtio_queue_unittest.cc similarity index 100% rename from bin/guest/vmm/virtio_queue_unittest.cc rename to garnet/bin/guest/vmm/virtio_queue_unittest.cc
diff --git a/bin/guest/vmm/virtio_queue_waiter.cc b/garnet/bin/guest/vmm/virtio_queue_waiter.cc similarity index 100% rename from bin/guest/vmm/virtio_queue_waiter.cc rename to garnet/bin/guest/vmm/virtio_queue_waiter.cc
diff --git a/bin/guest/vmm/virtio_queue_waiter.h b/garnet/bin/guest/vmm/virtio_queue_waiter.h similarity index 100% rename from bin/guest/vmm/virtio_queue_waiter.h rename to garnet/bin/guest/vmm/virtio_queue_waiter.h
diff --git a/bin/guest/vmm/virtio_queue_waiter_unittest.cc b/garnet/bin/guest/vmm/virtio_queue_waiter_unittest.cc similarity index 100% rename from bin/guest/vmm/virtio_queue_waiter_unittest.cc rename to garnet/bin/guest/vmm/virtio_queue_waiter_unittest.cc
diff --git a/bin/guest/vmm/virtio_vsock.cc b/garnet/bin/guest/vmm/virtio_vsock.cc similarity index 100% rename from bin/guest/vmm/virtio_vsock.cc rename to garnet/bin/guest/vmm/virtio_vsock.cc
diff --git a/bin/guest/vmm/virtio_vsock.h b/garnet/bin/guest/vmm/virtio_vsock.h similarity index 100% rename from bin/guest/vmm/virtio_vsock.h rename to garnet/bin/guest/vmm/virtio_vsock.h
diff --git a/bin/guest/vmm/virtio_vsock_unittest.cc b/garnet/bin/guest/vmm/virtio_vsock_unittest.cc similarity index 100% rename from bin/guest/vmm/virtio_vsock_unittest.cc rename to garnet/bin/guest/vmm/virtio_vsock_unittest.cc
diff --git a/bin/guest/vmm/zircon.cc b/garnet/bin/guest/vmm/zircon.cc similarity index 100% rename from bin/guest/vmm/zircon.cc rename to garnet/bin/guest/vmm/zircon.cc
diff --git a/bin/guest/vmm/zircon.h b/garnet/bin/guest/vmm/zircon.h similarity index 100% rename from bin/guest/vmm/zircon.h rename to garnet/bin/guest/vmm/zircon.h
diff --git a/bin/http/BUILD.gn b/garnet/bin/http/BUILD.gn similarity index 100% rename from bin/http/BUILD.gn rename to garnet/bin/http/BUILD.gn
diff --git a/bin/http/MAINTAINERS b/garnet/bin/http/MAINTAINERS similarity index 100% rename from bin/http/MAINTAINERS rename to garnet/bin/http/MAINTAINERS
diff --git a/bin/http/README.md b/garnet/bin/http/README.md similarity index 100% rename from bin/http/README.md rename to garnet/bin/http/README.md
diff --git a/bin/http/http_adapters.cc b/garnet/bin/http/http_adapters.cc similarity index 100% rename from bin/http/http_adapters.cc rename to garnet/bin/http/http_adapters.cc
diff --git a/bin/http/http_adapters.h b/garnet/bin/http/http_adapters.h similarity index 100% rename from bin/http/http_adapters.h rename to garnet/bin/http/http_adapters.h
diff --git a/bin/http/http_client.h b/garnet/bin/http/http_client.h similarity index 100% rename from bin/http/http_client.h rename to garnet/bin/http/http_client.h
diff --git a/bin/http/http_error_list.h b/garnet/bin/http/http_error_list.h similarity index 100% rename from bin/http/http_error_list.h rename to garnet/bin/http/http_error_list.h
diff --git a/bin/http/http_errors.cc b/garnet/bin/http/http_errors.cc similarity index 100% rename from bin/http/http_errors.cc rename to garnet/bin/http/http_errors.cc
diff --git a/bin/http/http_errors.h b/garnet/bin/http/http_errors.h similarity index 100% rename from bin/http/http_errors.h rename to garnet/bin/http/http_errors.h
diff --git a/bin/http/http_service_delegate.cc b/garnet/bin/http/http_service_delegate.cc similarity index 100% rename from bin/http/http_service_delegate.cc rename to garnet/bin/http/http_service_delegate.cc
diff --git a/bin/http/http_service_delegate.h b/garnet/bin/http/http_service_delegate.h similarity index 100% rename from bin/http/http_service_delegate.h rename to garnet/bin/http/http_service_delegate.h
diff --git a/bin/http/http_service_impl.cc b/garnet/bin/http/http_service_impl.cc similarity index 100% rename from bin/http/http_service_impl.cc rename to garnet/bin/http/http_service_impl.cc
diff --git a/bin/http/http_service_impl.h b/garnet/bin/http/http_service_impl.h similarity index 100% rename from bin/http/http_service_impl.h rename to garnet/bin/http/http_service_impl.h
diff --git a/bin/http/http_url_loader_impl.cc b/garnet/bin/http/http_url_loader_impl.cc similarity index 100% rename from bin/http/http_url_loader_impl.cc rename to garnet/bin/http/http_url_loader_impl.cc
diff --git a/bin/http/http_url_loader_impl.h b/garnet/bin/http/http_url_loader_impl.h similarity index 100% rename from bin/http/http_url_loader_impl.h rename to garnet/bin/http/http_url_loader_impl.h
diff --git a/bin/http/main.cc b/garnet/bin/http/main.cc similarity index 100% rename from bin/http/main.cc rename to garnet/bin/http/main.cc
diff --git a/bin/http/meta/http.cmx b/garnet/bin/http/meta/http.cmx similarity index 100% rename from bin/http/meta/http.cmx rename to garnet/bin/http/meta/http.cmx
diff --git a/bin/http/meta/http_service_tests.cmx b/garnet/bin/http/meta/http_service_tests.cmx similarity index 100% rename from bin/http/meta/http_service_tests.cmx rename to garnet/bin/http/meta/http_service_tests.cmx
diff --git a/bin/http/tests/manual/mwget/BUILD.gn b/garnet/bin/http/tests/manual/mwget/BUILD.gn similarity index 100% rename from bin/http/tests/manual/mwget/BUILD.gn rename to garnet/bin/http/tests/manual/mwget/BUILD.gn
diff --git a/bin/http/tests/manual/mwget/mwget.cc b/garnet/bin/http/tests/manual/mwget/mwget.cc similarity index 100% rename from bin/http/tests/manual/mwget/mwget.cc rename to garnet/bin/http/tests/manual/mwget/mwget.cc
diff --git a/bin/http/upload_element_reader.cc b/garnet/bin/http/upload_element_reader.cc similarity index 100% rename from bin/http/upload_element_reader.cc rename to garnet/bin/http/upload_element_reader.cc
diff --git a/bin/http/upload_element_reader.h b/garnet/bin/http/upload_element_reader.h similarity index 100% rename from bin/http/upload_element_reader.h rename to garnet/bin/http/upload_element_reader.h
diff --git a/bin/http/upload_element_reader_unittest.cc b/garnet/bin/http/upload_element_reader_unittest.cc similarity index 100% rename from bin/http/upload_element_reader_unittest.cc rename to garnet/bin/http/upload_element_reader_unittest.cc
diff --git a/bin/insntrace/BUILD.gn b/garnet/bin/insntrace/BUILD.gn similarity index 100% rename from bin/insntrace/BUILD.gn rename to garnet/bin/insntrace/BUILD.gn
diff --git a/bin/insntrace/MAINTAINERS b/garnet/bin/insntrace/MAINTAINERS similarity index 100% rename from bin/insntrace/MAINTAINERS rename to garnet/bin/insntrace/MAINTAINERS
diff --git a/bin/insntrace/README.md b/garnet/bin/insntrace/README.md similarity index 100% rename from bin/insntrace/README.md rename to garnet/bin/insntrace/README.md
diff --git a/bin/insntrace/control.cc b/garnet/bin/insntrace/control.cc similarity index 100% rename from bin/insntrace/control.cc rename to garnet/bin/insntrace/control.cc
diff --git a/bin/insntrace/control.h b/garnet/bin/insntrace/control.h similarity index 100% rename from bin/insntrace/control.h rename to garnet/bin/insntrace/control.h
diff --git a/bin/insntrace/copy_ptout.sh b/garnet/bin/insntrace/copy_ptout.sh similarity index 100% rename from bin/insntrace/copy_ptout.sh rename to garnet/bin/insntrace/copy_ptout.sh
diff --git a/bin/insntrace/main.cc b/garnet/bin/insntrace/main.cc similarity index 100% rename from bin/insntrace/main.cc rename to garnet/bin/insntrace/main.cc
diff --git a/bin/insntrace/meta/README.md b/garnet/bin/insntrace/meta/README.md similarity index 100% rename from bin/insntrace/meta/README.md rename to garnet/bin/insntrace/meta/README.md
diff --git a/bin/insntrace/meta/insntrace.cmx b/garnet/bin/insntrace/meta/insntrace.cmx similarity index 100% rename from bin/insntrace/meta/insntrace.cmx rename to garnet/bin/insntrace/meta/insntrace.cmx
diff --git a/bin/insntrace/print/BUILD.gn b/garnet/bin/insntrace/print/BUILD.gn similarity index 100% rename from bin/insntrace/print/BUILD.gn rename to garnet/bin/insntrace/print/BUILD.gn
diff --git a/bin/insntrace/print/README.md b/garnet/bin/insntrace/print/README.md similarity index 100% rename from bin/insntrace/print/README.md rename to garnet/bin/insntrace/print/README.md
diff --git a/bin/insntrace/print/command_line_settings.cc b/garnet/bin/insntrace/print/command_line_settings.cc similarity index 100% rename from bin/insntrace/print/command_line_settings.cc rename to garnet/bin/insntrace/print/command_line_settings.cc
diff --git a/bin/insntrace/print/command_line_settings.h b/garnet/bin/insntrace/print/command_line_settings.h similarity index 100% rename from bin/insntrace/print/command_line_settings.h rename to garnet/bin/insntrace/print/command_line_settings.h
diff --git a/bin/insntrace/print/main.cc b/garnet/bin/insntrace/print/main.cc similarity index 100% rename from bin/insntrace/print/main.cc rename to garnet/bin/insntrace/print/main.cc
diff --git a/bin/insntrace/print/printer_config.h b/garnet/bin/insntrace/print/printer_config.h similarity index 100% rename from bin/insntrace/print/printer_config.h rename to garnet/bin/insntrace/print/printer_config.h
diff --git a/bin/insntrace/print/raw_printer.cc b/garnet/bin/insntrace/print/raw_printer.cc similarity index 100% rename from bin/insntrace/print/raw_printer.cc rename to garnet/bin/insntrace/print/raw_printer.cc
diff --git a/bin/insntrace/print/raw_printer.h b/garnet/bin/insntrace/print/raw_printer.h similarity index 100% rename from bin/insntrace/print/raw_printer.h rename to garnet/bin/insntrace/print/raw_printer.h
diff --git a/bin/insntrace/print/third_party/simple-pt/BUILD.gn b/garnet/bin/insntrace/print/third_party/simple-pt/BUILD.gn similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/BUILD.gn rename to garnet/bin/insntrace/print/third_party/simple-pt/BUILD.gn
diff --git a/bin/insntrace/print/third_party/simple-pt/LICENSE b/garnet/bin/insntrace/print/third_party/simple-pt/LICENSE similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/LICENSE rename to garnet/bin/insntrace/print/third_party/simple-pt/LICENSE
diff --git a/bin/insntrace/print/third_party/simple-pt/README.fuchsia.md b/garnet/bin/insntrace/print/third_party/simple-pt/README.fuchsia.md similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/README.fuchsia.md rename to garnet/bin/insntrace/print/third_party/simple-pt/README.fuchsia.md
diff --git a/bin/insntrace/print/third_party/simple-pt/call-printer.cc b/garnet/bin/insntrace/print/third_party/simple-pt/call-printer.cc similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/call-printer.cc rename to garnet/bin/insntrace/print/third_party/simple-pt/call-printer.cc
diff --git a/bin/insntrace/print/third_party/simple-pt/call-printer.h b/garnet/bin/insntrace/print/third_party/simple-pt/call-printer.h similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/call-printer.h rename to garnet/bin/insntrace/print/third_party/simple-pt/call-printer.h
diff --git a/bin/insntrace/print/third_party/simple-pt/instruction.cc b/garnet/bin/insntrace/print/third_party/simple-pt/instruction.cc similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/instruction.cc rename to garnet/bin/insntrace/print/third_party/simple-pt/instruction.cc
diff --git a/bin/insntrace/print/third_party/simple-pt/instruction.h b/garnet/bin/insntrace/print/third_party/simple-pt/instruction.h similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/instruction.h rename to garnet/bin/insntrace/print/third_party/simple-pt/instruction.h
diff --git a/bin/insntrace/print/third_party/simple-pt/printer-util.cc b/garnet/bin/insntrace/print/third_party/simple-pt/printer-util.cc similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/printer-util.cc rename to garnet/bin/insntrace/print/third_party/simple-pt/printer-util.cc
diff --git a/bin/insntrace/print/third_party/simple-pt/printer-util.h b/garnet/bin/insntrace/print/third_party/simple-pt/printer-util.h similarity index 100% rename from bin/insntrace/print/third_party/simple-pt/printer-util.h rename to garnet/bin/insntrace/print/third_party/simple-pt/printer-util.h
diff --git a/bin/insntrace/server.cc b/garnet/bin/insntrace/server.cc similarity index 100% rename from bin/insntrace/server.cc rename to garnet/bin/insntrace/server.cc
diff --git a/bin/insntrace/server.h b/garnet/bin/insntrace/server.h similarity index 100% rename from bin/insntrace/server.h rename to garnet/bin/insntrace/server.h
diff --git a/bin/inspect_unittests/BUILD.gn b/garnet/bin/inspect_unittests/BUILD.gn similarity index 100% rename from bin/inspect_unittests/BUILD.gn rename to garnet/bin/inspect_unittests/BUILD.gn
diff --git a/bin/inspect_unittests/expose_unittest.cc b/garnet/bin/inspect_unittests/expose_unittest.cc similarity index 100% rename from bin/inspect_unittests/expose_unittest.cc rename to garnet/bin/inspect_unittests/expose_unittest.cc
diff --git a/bin/inspect_unittests/inspect_unittest.cc b/garnet/bin/inspect_unittests/inspect_unittest.cc similarity index 100% rename from bin/inspect_unittests/inspect_unittest.cc rename to garnet/bin/inspect_unittests/inspect_unittest.cc
diff --git a/bin/inspect_unittests/matchers.h b/garnet/bin/inspect_unittests/matchers.h similarity index 100% rename from bin/inspect_unittests/matchers.h rename to garnet/bin/inspect_unittests/matchers.h
diff --git a/bin/inspect_unittests/meta/inspect_unittests.cmx b/garnet/bin/inspect_unittests/meta/inspect_unittests.cmx similarity index 100% rename from bin/inspect_unittests/meta/inspect_unittests.cmx rename to garnet/bin/inspect_unittests/meta/inspect_unittests.cmx
diff --git a/bin/installer/BUILD.gn b/garnet/bin/installer/BUILD.gn similarity index 100% rename from bin/installer/BUILD.gn rename to garnet/bin/installer/BUILD.gn
diff --git a/bin/installer/install-fuchsia.sh b/garnet/bin/installer/install-fuchsia.sh similarity index 100% rename from bin/installer/install-fuchsia.sh rename to garnet/bin/installer/install-fuchsia.sh
diff --git a/bin/instrumentation_benchmarks/BUILD.gn b/garnet/bin/instrumentation_benchmarks/BUILD.gn similarity index 100% rename from bin/instrumentation_benchmarks/BUILD.gn rename to garnet/bin/instrumentation_benchmarks/BUILD.gn
diff --git a/bin/instrumentation_benchmarks/README.md b/garnet/bin/instrumentation_benchmarks/README.md similarity index 100% rename from bin/instrumentation_benchmarks/README.md rename to garnet/bin/instrumentation_benchmarks/README.md
diff --git a/bin/instrumentation_benchmarks/inspect.cc b/garnet/bin/instrumentation_benchmarks/inspect.cc similarity index 100% rename from bin/instrumentation_benchmarks/inspect.cc rename to garnet/bin/instrumentation_benchmarks/inspect.cc
diff --git a/bin/instrumentation_benchmarks/test_runner.cc b/garnet/bin/instrumentation_benchmarks/test_runner.cc similarity index 100% rename from bin/instrumentation_benchmarks/test_runner.cc rename to garnet/bin/instrumentation_benchmarks/test_runner.cc
diff --git a/bin/instrumentation_benchmarks/test_runner.h b/garnet/bin/instrumentation_benchmarks/test_runner.h similarity index 100% rename from bin/instrumentation_benchmarks/test_runner.h rename to garnet/bin/instrumentation_benchmarks/test_runner.h
diff --git a/bin/iquery/BUILD.gn b/garnet/bin/iquery/BUILD.gn similarity index 100% rename from bin/iquery/BUILD.gn rename to garnet/bin/iquery/BUILD.gn
diff --git a/bin/iquery/connect.cc b/garnet/bin/iquery/connect.cc similarity index 100% rename from bin/iquery/connect.cc rename to garnet/bin/iquery/connect.cc
diff --git a/bin/iquery/connect.h b/garnet/bin/iquery/connect.h similarity index 100% rename from bin/iquery/connect.h rename to garnet/bin/iquery/connect.h
diff --git a/bin/iquery/formatter.h b/garnet/bin/iquery/formatter.h similarity index 100% rename from bin/iquery/formatter.h rename to garnet/bin/iquery/formatter.h
diff --git a/bin/iquery/formatters/json.cc b/garnet/bin/iquery/formatters/json.cc similarity index 100% rename from bin/iquery/formatters/json.cc rename to garnet/bin/iquery/formatters/json.cc
diff --git a/bin/iquery/formatters/json.h b/garnet/bin/iquery/formatters/json.h similarity index 100% rename from bin/iquery/formatters/json.h rename to garnet/bin/iquery/formatters/json.h
diff --git a/bin/iquery/formatters/text.cc b/garnet/bin/iquery/formatters/text.cc similarity index 100% rename from bin/iquery/formatters/text.cc rename to garnet/bin/iquery/formatters/text.cc
diff --git a/bin/iquery/formatters/text.h b/garnet/bin/iquery/formatters/text.h similarity index 100% rename from bin/iquery/formatters/text.h rename to garnet/bin/iquery/formatters/text.h
diff --git a/bin/iquery/main.cc b/garnet/bin/iquery/main.cc similarity index 100% rename from bin/iquery/main.cc rename to garnet/bin/iquery/main.cc
diff --git a/bin/iquery/meta/iquery_test.cmx b/garnet/bin/iquery/meta/iquery_test.cmx similarity index 100% rename from bin/iquery/meta/iquery_test.cmx rename to garnet/bin/iquery/meta/iquery_test.cmx
diff --git a/bin/iquery/modes.cc b/garnet/bin/iquery/modes.cc similarity index 100% rename from bin/iquery/modes.cc rename to garnet/bin/iquery/modes.cc
diff --git a/bin/iquery/modes.h b/garnet/bin/iquery/modes.h similarity index 100% rename from bin/iquery/modes.h rename to garnet/bin/iquery/modes.h
diff --git a/bin/iquery/options.cc b/garnet/bin/iquery/options.cc similarity index 100% rename from bin/iquery/options.cc rename to garnet/bin/iquery/options.cc
diff --git a/bin/iquery/options.h b/garnet/bin/iquery/options.h similarity index 100% rename from bin/iquery/options.h rename to garnet/bin/iquery/options.h
diff --git a/bin/iquery/testing/BUILD.gn b/garnet/bin/iquery/testing/BUILD.gn similarity index 100% rename from bin/iquery/testing/BUILD.gn rename to garnet/bin/iquery/testing/BUILD.gn
diff --git a/bin/iquery/testing/example.cc b/garnet/bin/iquery/testing/example.cc similarity index 100% rename from bin/iquery/testing/example.cc rename to garnet/bin/iquery/testing/example.cc
diff --git a/bin/iquery/testing/goldens/cat-recursive-absolute.txt b/garnet/bin/iquery/testing/goldens/cat-recursive-absolute.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-recursive-absolute.txt rename to garnet/bin/iquery/testing/goldens/cat-recursive-absolute.txt
diff --git a/bin/iquery/testing/goldens/cat-recursive-full.txt b/garnet/bin/iquery/testing/goldens/cat-recursive-full.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-recursive-full.txt rename to garnet/bin/iquery/testing/goldens/cat-recursive-full.txt
diff --git a/bin/iquery/testing/goldens/cat-recursive-json-absolute.txt b/garnet/bin/iquery/testing/goldens/cat-recursive-json-absolute.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-recursive-json-absolute.txt rename to garnet/bin/iquery/testing/goldens/cat-recursive-json-absolute.txt
diff --git a/bin/iquery/testing/goldens/cat-recursive-json-full.txt b/garnet/bin/iquery/testing/goldens/cat-recursive-json-full.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-recursive-json-full.txt rename to garnet/bin/iquery/testing/goldens/cat-recursive-json-full.txt
diff --git a/bin/iquery/testing/goldens/cat-recursive-json.txt b/garnet/bin/iquery/testing/goldens/cat-recursive-json.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-recursive-json.txt rename to garnet/bin/iquery/testing/goldens/cat-recursive-json.txt
diff --git a/bin/iquery/testing/goldens/cat-recursive.txt b/garnet/bin/iquery/testing/goldens/cat-recursive.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-recursive.txt rename to garnet/bin/iquery/testing/goldens/cat-recursive.txt
diff --git a/bin/iquery/testing/goldens/cat-single-absolute.txt b/garnet/bin/iquery/testing/goldens/cat-single-absolute.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-single-absolute.txt rename to garnet/bin/iquery/testing/goldens/cat-single-absolute.txt
diff --git a/bin/iquery/testing/goldens/cat-single-full.txt b/garnet/bin/iquery/testing/goldens/cat-single-full.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-single-full.txt rename to garnet/bin/iquery/testing/goldens/cat-single-full.txt
diff --git a/bin/iquery/testing/goldens/cat-single.txt b/garnet/bin/iquery/testing/goldens/cat-single.txt similarity index 100% rename from bin/iquery/testing/goldens/cat-single.txt rename to garnet/bin/iquery/testing/goldens/cat-single.txt
diff --git a/bin/iquery/testing/goldens/find-recursive-json.txt b/garnet/bin/iquery/testing/goldens/find-recursive-json.txt similarity index 100% rename from bin/iquery/testing/goldens/find-recursive-json.txt rename to garnet/bin/iquery/testing/goldens/find-recursive-json.txt
diff --git a/bin/iquery/testing/goldens/find-recursive.txt b/garnet/bin/iquery/testing/goldens/find-recursive.txt similarity index 100% rename from bin/iquery/testing/goldens/find-recursive.txt rename to garnet/bin/iquery/testing/goldens/find-recursive.txt
diff --git a/bin/iquery/testing/goldens/find.txt b/garnet/bin/iquery/testing/goldens/find.txt similarity index 100% rename from bin/iquery/testing/goldens/find.txt rename to garnet/bin/iquery/testing/goldens/find.txt
diff --git a/bin/iquery/testing/goldens/ls-json-absolute.txt b/garnet/bin/iquery/testing/goldens/ls-json-absolute.txt similarity index 100% rename from bin/iquery/testing/goldens/ls-json-absolute.txt rename to garnet/bin/iquery/testing/goldens/ls-json-absolute.txt
diff --git a/bin/iquery/testing/goldens/ls-json-full.txt b/garnet/bin/iquery/testing/goldens/ls-json-full.txt similarity index 100% rename from bin/iquery/testing/goldens/ls-json-full.txt rename to garnet/bin/iquery/testing/goldens/ls-json-full.txt
diff --git a/bin/iquery/testing/goldens/ls-json.txt b/garnet/bin/iquery/testing/goldens/ls-json.txt similarity index 100% rename from bin/iquery/testing/goldens/ls-json.txt rename to garnet/bin/iquery/testing/goldens/ls-json.txt
diff --git a/bin/iquery/testing/goldens/ls.txt b/garnet/bin/iquery/testing/goldens/ls.txt similarity index 100% rename from bin/iquery/testing/goldens/ls.txt rename to garnet/bin/iquery/testing/goldens/ls.txt
diff --git a/bin/iquery/testing/meta/iquery_example_component.cmx b/garnet/bin/iquery/testing/meta/iquery_example_component.cmx similarity index 100% rename from bin/iquery/testing/meta/iquery_example_component.cmx rename to garnet/bin/iquery/testing/meta/iquery_example_component.cmx
diff --git a/bin/iquery/testing/meta/iquery_golden_test.cmx b/garnet/bin/iquery/testing/meta/iquery_golden_test.cmx similarity index 100% rename from bin/iquery/testing/meta/iquery_golden_test.cmx rename to garnet/bin/iquery/testing/meta/iquery_golden_test.cmx
diff --git a/bin/iquery/testing/test.cc b/garnet/bin/iquery/testing/test.cc similarity index 100% rename from bin/iquery/testing/test.cc rename to garnet/bin/iquery/testing/test.cc
diff --git a/bin/iquery/utils.cc b/garnet/bin/iquery/utils.cc similarity index 100% rename from bin/iquery/utils.cc rename to garnet/bin/iquery/utils.cc
diff --git a/bin/iquery/utils.h b/garnet/bin/iquery/utils.h similarity index 100% rename from bin/iquery/utils.h rename to garnet/bin/iquery/utils.h
diff --git a/bin/iquery/utils_test.cc b/garnet/bin/iquery/utils_test.cc similarity index 100% rename from bin/iquery/utils_test.cc rename to garnet/bin/iquery/utils_test.cc
diff --git a/bin/kernel_crash_checker/BUILD.gn b/garnet/bin/kernel_crash_checker/BUILD.gn similarity index 100% rename from bin/kernel_crash_checker/BUILD.gn rename to garnet/bin/kernel_crash_checker/BUILD.gn
diff --git a/bin/kernel_crash_checker/MAINTAINERS b/garnet/bin/kernel_crash_checker/MAINTAINERS similarity index 100% rename from bin/kernel_crash_checker/MAINTAINERS rename to garnet/bin/kernel_crash_checker/MAINTAINERS
diff --git a/bin/kernel_crash_checker/kernel_crash_checker.config b/garnet/bin/kernel_crash_checker/kernel_crash_checker.config similarity index 100% rename from bin/kernel_crash_checker/kernel_crash_checker.config rename to garnet/bin/kernel_crash_checker/kernel_crash_checker.config
diff --git a/bin/kernel_crash_checker/main.cc b/garnet/bin/kernel_crash_checker/main.cc similarity index 100% rename from bin/kernel_crash_checker/main.cc rename to garnet/bin/kernel_crash_checker/main.cc
diff --git a/bin/kernel_crash_checker/meta/kernel_crash_checker.cmx b/garnet/bin/kernel_crash_checker/meta/kernel_crash_checker.cmx similarity index 100% rename from bin/kernel_crash_checker/meta/kernel_crash_checker.cmx rename to garnet/bin/kernel_crash_checker/meta/kernel_crash_checker.cmx
diff --git a/bin/ktrace_provider/BUILD.gn b/garnet/bin/ktrace_provider/BUILD.gn similarity index 100% rename from bin/ktrace_provider/BUILD.gn rename to garnet/bin/ktrace_provider/BUILD.gn
diff --git a/bin/ktrace_provider/MAINTAINERS b/garnet/bin/ktrace_provider/MAINTAINERS similarity index 100% rename from bin/ktrace_provider/MAINTAINERS rename to garnet/bin/ktrace_provider/MAINTAINERS
diff --git a/bin/ktrace_provider/app.cc b/garnet/bin/ktrace_provider/app.cc similarity index 100% rename from bin/ktrace_provider/app.cc rename to garnet/bin/ktrace_provider/app.cc
diff --git a/bin/ktrace_provider/app.h b/garnet/bin/ktrace_provider/app.h similarity index 100% rename from bin/ktrace_provider/app.h rename to garnet/bin/ktrace_provider/app.h
diff --git a/bin/ktrace_provider/importer.cc b/garnet/bin/ktrace_provider/importer.cc similarity index 100% rename from bin/ktrace_provider/importer.cc rename to garnet/bin/ktrace_provider/importer.cc
diff --git a/bin/ktrace_provider/importer.h b/garnet/bin/ktrace_provider/importer.h similarity index 100% rename from bin/ktrace_provider/importer.h rename to garnet/bin/ktrace_provider/importer.h
diff --git a/bin/ktrace_provider/log_importer.cc b/garnet/bin/ktrace_provider/log_importer.cc similarity index 100% rename from bin/ktrace_provider/log_importer.cc rename to garnet/bin/ktrace_provider/log_importer.cc
diff --git a/bin/ktrace_provider/log_importer.h b/garnet/bin/ktrace_provider/log_importer.h similarity index 100% rename from bin/ktrace_provider/log_importer.h rename to garnet/bin/ktrace_provider/log_importer.h
diff --git a/bin/ktrace_provider/main.cc b/garnet/bin/ktrace_provider/main.cc similarity index 100% rename from bin/ktrace_provider/main.cc rename to garnet/bin/ktrace_provider/main.cc
diff --git a/bin/ktrace_provider/meta/README.md b/garnet/bin/ktrace_provider/meta/README.md similarity index 100% rename from bin/ktrace_provider/meta/README.md rename to garnet/bin/ktrace_provider/meta/README.md
diff --git a/bin/ktrace_provider/meta/ktrace_provider.cmx b/garnet/bin/ktrace_provider/meta/ktrace_provider.cmx similarity index 100% rename from bin/ktrace_provider/meta/ktrace_provider.cmx rename to garnet/bin/ktrace_provider/meta/ktrace_provider.cmx
diff --git a/bin/ktrace_provider/reader.cc b/garnet/bin/ktrace_provider/reader.cc similarity index 100% rename from bin/ktrace_provider/reader.cc rename to garnet/bin/ktrace_provider/reader.cc
diff --git a/bin/ktrace_provider/reader.h b/garnet/bin/ktrace_provider/reader.h similarity index 100% rename from bin/ktrace_provider/reader.h rename to garnet/bin/ktrace_provider/reader.h
diff --git a/bin/ktrace_provider/tags.cc b/garnet/bin/ktrace_provider/tags.cc similarity index 100% rename from bin/ktrace_provider/tags.cc rename to garnet/bin/ktrace_provider/tags.cc
diff --git a/bin/ktrace_provider/tags.h b/garnet/bin/ktrace_provider/tags.h similarity index 100% rename from bin/ktrace_provider/tags.h rename to garnet/bin/ktrace_provider/tags.h
diff --git a/bin/log_listener/BUILD.gn b/garnet/bin/log_listener/BUILD.gn similarity index 100% rename from bin/log_listener/BUILD.gn rename to garnet/bin/log_listener/BUILD.gn
diff --git a/bin/log_listener/README.md b/garnet/bin/log_listener/README.md similarity index 100% rename from bin/log_listener/README.md rename to garnet/bin/log_listener/README.md
diff --git a/bin/log_listener/meta/log_listener.cmx b/garnet/bin/log_listener/meta/log_listener.cmx similarity index 100% rename from bin/log_listener/meta/log_listener.cmx rename to garnet/bin/log_listener/meta/log_listener.cmx
diff --git a/bin/log_listener/src/main.rs b/garnet/bin/log_listener/src/main.rs similarity index 100% rename from bin/log_listener/src/main.rs rename to garnet/bin/log_listener/src/main.rs
diff --git a/bin/logger/BUILD.gn b/garnet/bin/logger/BUILD.gn similarity index 100% rename from bin/logger/BUILD.gn rename to garnet/bin/logger/BUILD.gn
diff --git a/bin/logger/meta/logger.cmx b/garnet/bin/logger/meta/logger.cmx similarity index 100% rename from bin/logger/meta/logger.cmx rename to garnet/bin/logger/meta/logger.cmx
diff --git a/bin/logger/meta/logger_bin_test.cmx b/garnet/bin/logger/meta/logger_bin_test.cmx similarity index 100% rename from bin/logger/meta/logger_bin_test.cmx rename to garnet/bin/logger/meta/logger_bin_test.cmx
diff --git a/bin/logger/src/klogger.rs b/garnet/bin/logger/src/klogger.rs similarity index 100% rename from bin/logger/src/klogger.rs rename to garnet/bin/logger/src/klogger.rs
diff --git a/bin/logger/src/logger.rs b/garnet/bin/logger/src/logger.rs similarity index 100% rename from bin/logger/src/logger.rs rename to garnet/bin/logger/src/logger.rs
diff --git a/bin/logger/src/main.rs b/garnet/bin/logger/src/main.rs similarity index 100% rename from bin/logger/src/main.rs rename to garnet/bin/logger/src/main.rs
diff --git a/bin/logger/tests/BUILD.gn b/garnet/bin/logger/tests/BUILD.gn similarity index 100% rename from bin/logger/tests/BUILD.gn rename to garnet/bin/logger/tests/BUILD.gn
diff --git a/bin/logger/tests/cpp/BUILD.gn b/garnet/bin/logger/tests/cpp/BUILD.gn similarity index 100% rename from bin/logger/tests/cpp/BUILD.gn rename to garnet/bin/logger/tests/cpp/BUILD.gn
diff --git a/bin/logger/tests/cpp/logger_tests.cc b/garnet/bin/logger/tests/cpp/logger_tests.cc similarity index 100% rename from bin/logger/tests/cpp/logger_tests.cc rename to garnet/bin/logger/tests/cpp/logger_tests.cc
diff --git a/bin/logger/tests/go/src/BUILD.gn b/garnet/bin/logger/tests/go/src/BUILD.gn similarity index 100% rename from bin/logger/tests/go/src/BUILD.gn rename to garnet/bin/logger/tests/go/src/BUILD.gn
diff --git a/bin/logger/tests/go/src/logger_integration_test.go b/garnet/bin/logger/tests/go/src/logger_integration_test.go similarity index 100% rename from bin/logger/tests/go/src/logger_integration_test.go rename to garnet/bin/logger/tests/go/src/logger_integration_test.go
diff --git a/bin/logger/tests/meta/logger_integration_bin_test.cmx b/garnet/bin/logger/tests/meta/logger_integration_bin_test.cmx similarity index 100% rename from bin/logger/tests/meta/logger_integration_bin_test.cmx rename to garnet/bin/logger/tests/meta/logger_integration_bin_test.cmx
diff --git a/bin/logger/tests/meta/logger_integration_cpp_tests.cmx b/garnet/bin/logger/tests/meta/logger_integration_cpp_tests.cmx similarity index 100% rename from bin/logger/tests/meta/logger_integration_cpp_tests.cmx rename to garnet/bin/logger/tests/meta/logger_integration_cpp_tests.cmx
diff --git a/bin/logger/tests/meta/logger_integration_go_tests.cmx b/garnet/bin/logger/tests/meta/logger_integration_go_tests.cmx similarity index 100% rename from bin/logger/tests/meta/logger_integration_go_tests.cmx rename to garnet/bin/logger/tests/meta/logger_integration_go_tests.cmx
diff --git a/bin/logger/tests/rust/BUILD.gn b/garnet/bin/logger/tests/rust/BUILD.gn similarity index 100% rename from bin/logger/tests/rust/BUILD.gn rename to garnet/bin/logger/tests/rust/BUILD.gn
diff --git a/bin/logger/tests/rust/src/main.rs b/garnet/bin/logger/tests/rust/src/main.rs similarity index 100% rename from bin/logger/tests/rust/src/main.rs rename to garnet/bin/logger/tests/rust/src/main.rs
diff --git a/bin/mdns/MAINTAINERS b/garnet/bin/mdns/MAINTAINERS similarity index 100% rename from bin/mdns/MAINTAINERS rename to garnet/bin/mdns/MAINTAINERS
diff --git a/bin/mdns/service/BUILD.gn b/garnet/bin/mdns/service/BUILD.gn similarity index 100% rename from bin/mdns/service/BUILD.gn rename to garnet/bin/mdns/service/BUILD.gn
diff --git a/bin/mdns/service/address_prober.cc b/garnet/bin/mdns/service/address_prober.cc similarity index 100% rename from bin/mdns/service/address_prober.cc rename to garnet/bin/mdns/service/address_prober.cc
diff --git a/bin/mdns/service/address_prober.h b/garnet/bin/mdns/service/address_prober.h similarity index 100% rename from bin/mdns/service/address_prober.h rename to garnet/bin/mdns/service/address_prober.h
diff --git a/bin/mdns/service/address_responder.cc b/garnet/bin/mdns/service/address_responder.cc similarity index 100% rename from bin/mdns/service/address_responder.cc rename to garnet/bin/mdns/service/address_responder.cc
diff --git a/bin/mdns/service/address_responder.h b/garnet/bin/mdns/service/address_responder.h similarity index 100% rename from bin/mdns/service/address_responder.h rename to garnet/bin/mdns/service/address_responder.h
diff --git a/bin/mdns/service/dns_formatting.cc b/garnet/bin/mdns/service/dns_formatting.cc similarity index 100% rename from bin/mdns/service/dns_formatting.cc rename to garnet/bin/mdns/service/dns_formatting.cc
diff --git a/bin/mdns/service/dns_formatting.h b/garnet/bin/mdns/service/dns_formatting.h similarity index 100% rename from bin/mdns/service/dns_formatting.h rename to garnet/bin/mdns/service/dns_formatting.h
diff --git a/bin/mdns/service/dns_message.cc b/garnet/bin/mdns/service/dns_message.cc similarity index 100% rename from bin/mdns/service/dns_message.cc rename to garnet/bin/mdns/service/dns_message.cc
diff --git a/bin/mdns/service/dns_message.h b/garnet/bin/mdns/service/dns_message.h similarity index 100% rename from bin/mdns/service/dns_message.h rename to garnet/bin/mdns/service/dns_message.h
diff --git a/bin/mdns/service/dns_reading.cc b/garnet/bin/mdns/service/dns_reading.cc similarity index 100% rename from bin/mdns/service/dns_reading.cc rename to garnet/bin/mdns/service/dns_reading.cc
diff --git a/bin/mdns/service/dns_reading.h b/garnet/bin/mdns/service/dns_reading.h similarity index 100% rename from bin/mdns/service/dns_reading.h rename to garnet/bin/mdns/service/dns_reading.h
diff --git a/bin/mdns/service/dns_writing.cc b/garnet/bin/mdns/service/dns_writing.cc similarity index 100% rename from bin/mdns/service/dns_writing.cc rename to garnet/bin/mdns/service/dns_writing.cc
diff --git a/bin/mdns/service/dns_writing.h b/garnet/bin/mdns/service/dns_writing.h similarity index 100% rename from bin/mdns/service/dns_writing.h rename to garnet/bin/mdns/service/dns_writing.h
diff --git a/bin/mdns/service/host_name_resolver.cc b/garnet/bin/mdns/service/host_name_resolver.cc similarity index 100% rename from bin/mdns/service/host_name_resolver.cc rename to garnet/bin/mdns/service/host_name_resolver.cc
diff --git a/bin/mdns/service/host_name_resolver.h b/garnet/bin/mdns/service/host_name_resolver.h similarity index 100% rename from bin/mdns/service/host_name_resolver.h rename to garnet/bin/mdns/service/host_name_resolver.h
diff --git a/bin/mdns/service/instance_prober.cc b/garnet/bin/mdns/service/instance_prober.cc similarity index 100% rename from bin/mdns/service/instance_prober.cc rename to garnet/bin/mdns/service/instance_prober.cc
diff --git a/bin/mdns/service/instance_prober.h b/garnet/bin/mdns/service/instance_prober.h similarity index 100% rename from bin/mdns/service/instance_prober.h rename to garnet/bin/mdns/service/instance_prober.h
diff --git a/bin/mdns/service/instance_requestor.cc b/garnet/bin/mdns/service/instance_requestor.cc similarity index 100% rename from bin/mdns/service/instance_requestor.cc rename to garnet/bin/mdns/service/instance_requestor.cc
diff --git a/bin/mdns/service/instance_requestor.h b/garnet/bin/mdns/service/instance_requestor.h similarity index 100% rename from bin/mdns/service/instance_requestor.h rename to garnet/bin/mdns/service/instance_requestor.h
diff --git a/bin/mdns/service/instance_responder.cc b/garnet/bin/mdns/service/instance_responder.cc similarity index 100% rename from bin/mdns/service/instance_responder.cc rename to garnet/bin/mdns/service/instance_responder.cc
diff --git a/bin/mdns/service/instance_responder.h b/garnet/bin/mdns/service/instance_responder.h similarity index 100% rename from bin/mdns/service/instance_responder.h rename to garnet/bin/mdns/service/instance_responder.h
diff --git a/bin/mdns/service/main.cc b/garnet/bin/mdns/service/main.cc similarity index 100% rename from bin/mdns/service/main.cc rename to garnet/bin/mdns/service/main.cc
diff --git a/bin/mdns/service/mdns.cc b/garnet/bin/mdns/service/mdns.cc similarity index 100% rename from bin/mdns/service/mdns.cc rename to garnet/bin/mdns/service/mdns.cc
diff --git a/bin/mdns/service/mdns.h b/garnet/bin/mdns/service/mdns.h similarity index 100% rename from bin/mdns/service/mdns.h rename to garnet/bin/mdns/service/mdns.h
diff --git a/bin/mdns/service/mdns_addresses.cc b/garnet/bin/mdns/service/mdns_addresses.cc similarity index 100% rename from bin/mdns/service/mdns_addresses.cc rename to garnet/bin/mdns/service/mdns_addresses.cc
diff --git a/bin/mdns/service/mdns_addresses.h b/garnet/bin/mdns/service/mdns_addresses.h similarity index 100% rename from bin/mdns/service/mdns_addresses.h rename to garnet/bin/mdns/service/mdns_addresses.h
diff --git a/bin/mdns/service/mdns_agent.h b/garnet/bin/mdns/service/mdns_agent.h similarity index 100% rename from bin/mdns/service/mdns_agent.h rename to garnet/bin/mdns/service/mdns_agent.h
diff --git a/bin/mdns/service/mdns_fidl_util.cc b/garnet/bin/mdns/service/mdns_fidl_util.cc similarity index 100% rename from bin/mdns/service/mdns_fidl_util.cc rename to garnet/bin/mdns/service/mdns_fidl_util.cc
diff --git a/bin/mdns/service/mdns_fidl_util.h b/garnet/bin/mdns/service/mdns_fidl_util.h similarity index 100% rename from bin/mdns/service/mdns_fidl_util.h rename to garnet/bin/mdns/service/mdns_fidl_util.h
diff --git a/bin/mdns/service/mdns_interface_transceiver.cc b/garnet/bin/mdns/service/mdns_interface_transceiver.cc similarity index 100% rename from bin/mdns/service/mdns_interface_transceiver.cc rename to garnet/bin/mdns/service/mdns_interface_transceiver.cc
diff --git a/bin/mdns/service/mdns_interface_transceiver.h b/garnet/bin/mdns/service/mdns_interface_transceiver.h similarity index 100% rename from bin/mdns/service/mdns_interface_transceiver.h rename to garnet/bin/mdns/service/mdns_interface_transceiver.h
diff --git a/bin/mdns/service/mdns_interface_transceiver_v4.cc b/garnet/bin/mdns/service/mdns_interface_transceiver_v4.cc similarity index 100% rename from bin/mdns/service/mdns_interface_transceiver_v4.cc rename to garnet/bin/mdns/service/mdns_interface_transceiver_v4.cc
diff --git a/bin/mdns/service/mdns_interface_transceiver_v4.h b/garnet/bin/mdns/service/mdns_interface_transceiver_v4.h similarity index 100% rename from bin/mdns/service/mdns_interface_transceiver_v4.h rename to garnet/bin/mdns/service/mdns_interface_transceiver_v4.h
diff --git a/bin/mdns/service/mdns_interface_transceiver_v6.cc b/garnet/bin/mdns/service/mdns_interface_transceiver_v6.cc similarity index 100% rename from bin/mdns/service/mdns_interface_transceiver_v6.cc rename to garnet/bin/mdns/service/mdns_interface_transceiver_v6.cc
diff --git a/bin/mdns/service/mdns_interface_transceiver_v6.h b/garnet/bin/mdns/service/mdns_interface_transceiver_v6.h similarity index 100% rename from bin/mdns/service/mdns_interface_transceiver_v6.h rename to garnet/bin/mdns/service/mdns_interface_transceiver_v6.h
diff --git a/bin/mdns/service/mdns_names.cc b/garnet/bin/mdns/service/mdns_names.cc similarity index 100% rename from bin/mdns/service/mdns_names.cc rename to garnet/bin/mdns/service/mdns_names.cc
diff --git a/bin/mdns/service/mdns_names.h b/garnet/bin/mdns/service/mdns_names.h similarity index 100% rename from bin/mdns/service/mdns_names.h rename to garnet/bin/mdns/service/mdns_names.h
diff --git a/bin/mdns/service/mdns_service_impl.cc b/garnet/bin/mdns/service/mdns_service_impl.cc similarity index 100% rename from bin/mdns/service/mdns_service_impl.cc rename to garnet/bin/mdns/service/mdns_service_impl.cc
diff --git a/bin/mdns/service/mdns_service_impl.h b/garnet/bin/mdns/service/mdns_service_impl.h similarity index 100% rename from bin/mdns/service/mdns_service_impl.h rename to garnet/bin/mdns/service/mdns_service_impl.h
diff --git a/bin/mdns/service/mdns_transceiver.cc b/garnet/bin/mdns/service/mdns_transceiver.cc similarity index 100% rename from bin/mdns/service/mdns_transceiver.cc rename to garnet/bin/mdns/service/mdns_transceiver.cc
diff --git a/bin/mdns/service/mdns_transceiver.h b/garnet/bin/mdns/service/mdns_transceiver.h similarity index 100% rename from bin/mdns/service/mdns_transceiver.h rename to garnet/bin/mdns/service/mdns_transceiver.h
diff --git a/bin/mdns/service/meta/mdns.cmx b/garnet/bin/mdns/service/meta/mdns.cmx similarity index 100% rename from bin/mdns/service/meta/mdns.cmx rename to garnet/bin/mdns/service/meta/mdns.cmx
diff --git a/bin/mdns/service/meta/mdns_tests.cmx b/garnet/bin/mdns/service/meta/mdns_tests.cmx similarity index 100% rename from bin/mdns/service/meta/mdns_tests.cmx rename to garnet/bin/mdns/service/meta/mdns_tests.cmx
diff --git a/bin/mdns/service/packet_reader.cc b/garnet/bin/mdns/service/packet_reader.cc similarity index 100% rename from bin/mdns/service/packet_reader.cc rename to garnet/bin/mdns/service/packet_reader.cc
diff --git a/bin/mdns/service/packet_reader.h b/garnet/bin/mdns/service/packet_reader.h similarity index 100% rename from bin/mdns/service/packet_reader.h rename to garnet/bin/mdns/service/packet_reader.h
diff --git a/bin/mdns/service/packet_reader_fuzzer.cc b/garnet/bin/mdns/service/packet_reader_fuzzer.cc similarity index 100% rename from bin/mdns/service/packet_reader_fuzzer.cc rename to garnet/bin/mdns/service/packet_reader_fuzzer.cc
diff --git a/bin/mdns/service/packet_writer.cc b/garnet/bin/mdns/service/packet_writer.cc similarity index 100% rename from bin/mdns/service/packet_writer.cc rename to garnet/bin/mdns/service/packet_writer.cc
diff --git a/bin/mdns/service/packet_writer.h b/garnet/bin/mdns/service/packet_writer.h similarity index 100% rename from bin/mdns/service/packet_writer.h rename to garnet/bin/mdns/service/packet_writer.h
diff --git a/bin/mdns/service/prober.cc b/garnet/bin/mdns/service/prober.cc similarity index 100% rename from bin/mdns/service/prober.cc rename to garnet/bin/mdns/service/prober.cc
diff --git a/bin/mdns/service/prober.h b/garnet/bin/mdns/service/prober.h similarity index 100% rename from bin/mdns/service/prober.h rename to garnet/bin/mdns/service/prober.h
diff --git a/bin/mdns/service/reply_address.cc b/garnet/bin/mdns/service/reply_address.cc similarity index 100% rename from bin/mdns/service/reply_address.cc rename to garnet/bin/mdns/service/reply_address.cc
diff --git a/bin/mdns/service/reply_address.h b/garnet/bin/mdns/service/reply_address.h similarity index 100% rename from bin/mdns/service/reply_address.h rename to garnet/bin/mdns/service/reply_address.h
diff --git a/bin/mdns/service/resource_renewer.cc b/garnet/bin/mdns/service/resource_renewer.cc similarity index 100% rename from bin/mdns/service/resource_renewer.cc rename to garnet/bin/mdns/service/resource_renewer.cc
diff --git a/bin/mdns/service/resource_renewer.h b/garnet/bin/mdns/service/resource_renewer.h similarity index 100% rename from bin/mdns/service/resource_renewer.h rename to garnet/bin/mdns/service/resource_renewer.h
diff --git a/bin/mdns/service/service.config b/garnet/bin/mdns/service/service.config similarity index 100% rename from bin/mdns/service/service.config rename to garnet/bin/mdns/service/service.config
diff --git a/bin/mdns/service/test/dns_reading_test.cc b/garnet/bin/mdns/service/test/dns_reading_test.cc similarity index 100% rename from bin/mdns/service/test/dns_reading_test.cc rename to garnet/bin/mdns/service/test/dns_reading_test.cc
diff --git a/bin/mdns/util/BUILD.gn b/garnet/bin/mdns/util/BUILD.gn similarity index 100% rename from bin/mdns/util/BUILD.gn rename to garnet/bin/mdns/util/BUILD.gn
diff --git a/bin/mdns/util/formatting.cc b/garnet/bin/mdns/util/formatting.cc similarity index 100% rename from bin/mdns/util/formatting.cc rename to garnet/bin/mdns/util/formatting.cc
diff --git a/bin/mdns/util/formatting.h b/garnet/bin/mdns/util/formatting.h similarity index 100% rename from bin/mdns/util/formatting.h rename to garnet/bin/mdns/util/formatting.h
diff --git a/bin/mdns/util/main.cc b/garnet/bin/mdns/util/main.cc similarity index 100% rename from bin/mdns/util/main.cc rename to garnet/bin/mdns/util/main.cc
diff --git a/bin/mdns/util/mdns_impl.cc b/garnet/bin/mdns/util/mdns_impl.cc similarity index 100% rename from bin/mdns/util/mdns_impl.cc rename to garnet/bin/mdns/util/mdns_impl.cc
diff --git a/bin/mdns/util/mdns_impl.h b/garnet/bin/mdns/util/mdns_impl.h similarity index 100% rename from bin/mdns/util/mdns_impl.h rename to garnet/bin/mdns/util/mdns_impl.h
diff --git a/bin/mdns/util/mdns_params.cc b/garnet/bin/mdns/util/mdns_params.cc similarity index 100% rename from bin/mdns/util/mdns_params.cc rename to garnet/bin/mdns/util/mdns_params.cc
diff --git a/bin/mdns/util/mdns_params.h b/garnet/bin/mdns/util/mdns_params.h similarity index 100% rename from bin/mdns/util/mdns_params.h rename to garnet/bin/mdns/util/mdns_params.h
diff --git a/bin/mdns/util/meta/mdns-util.cmx b/garnet/bin/mdns/util/meta/mdns-util.cmx similarity index 100% rename from bin/mdns/util/meta/mdns-util.cmx rename to garnet/bin/mdns/util/meta/mdns-util.cmx
diff --git a/bin/media/BUILD.gn b/garnet/bin/media/BUILD.gn similarity index 100% rename from bin/media/BUILD.gn rename to garnet/bin/media/BUILD.gn
diff --git a/bin/media/README.md b/garnet/bin/media/README.md similarity index 100% rename from bin/media/README.md rename to garnet/bin/media/README.md
diff --git a/bin/media/audio/BUILD.gn b/garnet/bin/media/audio/BUILD.gn similarity index 100% rename from bin/media/audio/BUILD.gn rename to garnet/bin/media/audio/BUILD.gn
diff --git a/bin/media/audio/audio_core_client.cc b/garnet/bin/media/audio/audio_core_client.cc similarity index 100% rename from bin/media/audio/audio_core_client.cc rename to garnet/bin/media/audio/audio_core_client.cc
diff --git a/bin/media/audio/audio_core_client.h b/garnet/bin/media/audio/audio_core_client.h similarity index 100% rename from bin/media/audio/audio_core_client.h rename to garnet/bin/media/audio/audio_core_client.h
diff --git a/bin/media/audio/main.cc b/garnet/bin/media/audio/main.cc similarity index 100% rename from bin/media/audio/main.cc rename to garnet/bin/media/audio/main.cc
diff --git a/bin/media/audio/meta/audio.cmx b/garnet/bin/media/audio/meta/audio.cmx similarity index 100% rename from bin/media/audio/meta/audio.cmx rename to garnet/bin/media/audio/meta/audio.cmx
diff --git a/bin/media/audio_core/BUILD.gn b/garnet/bin/media/audio_core/BUILD.gn similarity index 100% rename from bin/media/audio_core/BUILD.gn rename to garnet/bin/media/audio_core/BUILD.gn
diff --git a/bin/media/audio_core/audio_capturer_impl.cc b/garnet/bin/media/audio_core/audio_capturer_impl.cc similarity index 100% rename from bin/media/audio_core/audio_capturer_impl.cc rename to garnet/bin/media/audio_core/audio_capturer_impl.cc
diff --git a/bin/media/audio_core/audio_capturer_impl.h b/garnet/bin/media/audio_core/audio_capturer_impl.h similarity index 100% rename from bin/media/audio_core/audio_capturer_impl.h rename to garnet/bin/media/audio_core/audio_capturer_impl.h
diff --git a/bin/media/audio_core/audio_core_impl.cc b/garnet/bin/media/audio_core/audio_core_impl.cc similarity index 100% rename from bin/media/audio_core/audio_core_impl.cc rename to garnet/bin/media/audio_core/audio_core_impl.cc
diff --git a/bin/media/audio_core/audio_core_impl.h b/garnet/bin/media/audio_core/audio_core_impl.h similarity index 100% rename from bin/media/audio_core/audio_core_impl.h rename to garnet/bin/media/audio_core/audio_core_impl.h
diff --git a/bin/media/audio_core/audio_device.cc b/garnet/bin/media/audio_core/audio_device.cc similarity index 100% rename from bin/media/audio_core/audio_device.cc rename to garnet/bin/media/audio_core/audio_device.cc
diff --git a/bin/media/audio_core/audio_device.h b/garnet/bin/media/audio_core/audio_device.h similarity index 100% rename from bin/media/audio_core/audio_device.h rename to garnet/bin/media/audio_core/audio_device.h
diff --git a/bin/media/audio_core/audio_device_manager.cc b/garnet/bin/media/audio_core/audio_device_manager.cc similarity index 100% rename from bin/media/audio_core/audio_device_manager.cc rename to garnet/bin/media/audio_core/audio_device_manager.cc
diff --git a/bin/media/audio_core/audio_device_manager.h b/garnet/bin/media/audio_core/audio_device_manager.h similarity index 100% rename from bin/media/audio_core/audio_device_manager.h rename to garnet/bin/media/audio_core/audio_device_manager.h
diff --git a/bin/media/audio_core/audio_device_settings.cc b/garnet/bin/media/audio_core/audio_device_settings.cc similarity index 100% rename from bin/media/audio_core/audio_device_settings.cc rename to garnet/bin/media/audio_core/audio_device_settings.cc
diff --git a/bin/media/audio_core/audio_device_settings.h b/garnet/bin/media/audio_core/audio_device_settings.h similarity index 100% rename from bin/media/audio_core/audio_device_settings.h rename to garnet/bin/media/audio_core/audio_device_settings.h
diff --git a/bin/media/audio_core/audio_driver.cc b/garnet/bin/media/audio_core/audio_driver.cc similarity index 100% rename from bin/media/audio_core/audio_driver.cc rename to garnet/bin/media/audio_core/audio_driver.cc
diff --git a/bin/media/audio_core/audio_driver.h b/garnet/bin/media/audio_core/audio_driver.h similarity index 100% rename from bin/media/audio_core/audio_driver.h rename to garnet/bin/media/audio_core/audio_driver.h
diff --git a/bin/media/audio_core/audio_input.cc b/garnet/bin/media/audio_core/audio_input.cc similarity index 100% rename from bin/media/audio_core/audio_input.cc rename to garnet/bin/media/audio_core/audio_input.cc
diff --git a/bin/media/audio_core/audio_input.h b/garnet/bin/media/audio_core/audio_input.h similarity index 100% rename from bin/media/audio_core/audio_input.h rename to garnet/bin/media/audio_core/audio_input.h
diff --git a/bin/media/audio_core/audio_link.cc b/garnet/bin/media/audio_core/audio_link.cc similarity index 100% rename from bin/media/audio_core/audio_link.cc rename to garnet/bin/media/audio_core/audio_link.cc
diff --git a/bin/media/audio_core/audio_link.h b/garnet/bin/media/audio_core/audio_link.h similarity index 100% rename from bin/media/audio_core/audio_link.h rename to garnet/bin/media/audio_core/audio_link.h
diff --git a/bin/media/audio_core/audio_link_packet_source.cc b/garnet/bin/media/audio_core/audio_link_packet_source.cc similarity index 100% rename from bin/media/audio_core/audio_link_packet_source.cc rename to garnet/bin/media/audio_core/audio_link_packet_source.cc
diff --git a/bin/media/audio_core/audio_link_packet_source.h b/garnet/bin/media/audio_core/audio_link_packet_source.h similarity index 100% rename from bin/media/audio_core/audio_link_packet_source.h rename to garnet/bin/media/audio_core/audio_link_packet_source.h
diff --git a/bin/media/audio_core/audio_link_ring_buffer_source.cc b/garnet/bin/media/audio_core/audio_link_ring_buffer_source.cc similarity index 100% rename from bin/media/audio_core/audio_link_ring_buffer_source.cc rename to garnet/bin/media/audio_core/audio_link_ring_buffer_source.cc
diff --git a/bin/media/audio_core/audio_link_ring_buffer_source.h b/garnet/bin/media/audio_core/audio_link_ring_buffer_source.h similarity index 100% rename from bin/media/audio_core/audio_link_ring_buffer_source.h rename to garnet/bin/media/audio_core/audio_link_ring_buffer_source.h
diff --git a/bin/media/audio_core/audio_object.cc b/garnet/bin/media/audio_core/audio_object.cc similarity index 100% rename from bin/media/audio_core/audio_object.cc rename to garnet/bin/media/audio_core/audio_object.cc
diff --git a/bin/media/audio_core/audio_object.h b/garnet/bin/media/audio_core/audio_object.h similarity index 100% rename from bin/media/audio_core/audio_object.h rename to garnet/bin/media/audio_core/audio_object.h
diff --git a/bin/media/audio_core/audio_output.cc b/garnet/bin/media/audio_core/audio_output.cc similarity index 100% rename from bin/media/audio_core/audio_output.cc rename to garnet/bin/media/audio_core/audio_output.cc
diff --git a/bin/media/audio_core/audio_output.h b/garnet/bin/media/audio_core/audio_output.h similarity index 100% rename from bin/media/audio_core/audio_output.h rename to garnet/bin/media/audio_core/audio_output.h
diff --git a/bin/media/audio_core/audio_packet_ref.cc b/garnet/bin/media/audio_core/audio_packet_ref.cc similarity index 100% rename from bin/media/audio_core/audio_packet_ref.cc rename to garnet/bin/media/audio_core/audio_packet_ref.cc
diff --git a/bin/media/audio_core/audio_packet_ref.h b/garnet/bin/media/audio_core/audio_packet_ref.h similarity index 100% rename from bin/media/audio_core/audio_packet_ref.h rename to garnet/bin/media/audio_core/audio_packet_ref.h
diff --git a/bin/media/audio_core/audio_plug_detector.cc b/garnet/bin/media/audio_core/audio_plug_detector.cc similarity index 100% rename from bin/media/audio_core/audio_plug_detector.cc rename to garnet/bin/media/audio_core/audio_plug_detector.cc
diff --git a/bin/media/audio_core/audio_plug_detector.h b/garnet/bin/media/audio_core/audio_plug_detector.h similarity index 100% rename from bin/media/audio_core/audio_plug_detector.h rename to garnet/bin/media/audio_core/audio_plug_detector.h
diff --git a/bin/media/audio_core/audio_renderer_format_info.cc b/garnet/bin/media/audio_core/audio_renderer_format_info.cc similarity index 100% rename from bin/media/audio_core/audio_renderer_format_info.cc rename to garnet/bin/media/audio_core/audio_renderer_format_info.cc
diff --git a/bin/media/audio_core/audio_renderer_format_info.h b/garnet/bin/media/audio_core/audio_renderer_format_info.h similarity index 100% rename from bin/media/audio_core/audio_renderer_format_info.h rename to garnet/bin/media/audio_core/audio_renderer_format_info.h
diff --git a/bin/media/audio_core/audio_renderer_impl.cc b/garnet/bin/media/audio_core/audio_renderer_impl.cc similarity index 100% rename from bin/media/audio_core/audio_renderer_impl.cc rename to garnet/bin/media/audio_core/audio_renderer_impl.cc
diff --git a/bin/media/audio_core/audio_renderer_impl.h b/garnet/bin/media/audio_core/audio_renderer_impl.h similarity index 100% rename from bin/media/audio_core/audio_renderer_impl.h rename to garnet/bin/media/audio_core/audio_renderer_impl.h
diff --git a/bin/media/audio_core/audiofx/BUILD.gn b/garnet/bin/media/audio_core/audiofx/BUILD.gn similarity index 100% rename from bin/media/audio_core/audiofx/BUILD.gn rename to garnet/bin/media/audio_core/audiofx/BUILD.gn
diff --git a/bin/media/audio_core/audiofx/audiofx.cc b/garnet/bin/media/audio_core/audiofx/audiofx.cc similarity index 100% rename from bin/media/audio_core/audiofx/audiofx.cc rename to garnet/bin/media/audio_core/audiofx/audiofx.cc
diff --git a/bin/media/audio_core/driver_output.cc b/garnet/bin/media/audio_core/driver_output.cc similarity index 100% rename from bin/media/audio_core/driver_output.cc rename to garnet/bin/media/audio_core/driver_output.cc
diff --git a/bin/media/audio_core/driver_output.h b/garnet/bin/media/audio_core/driver_output.h similarity index 100% rename from bin/media/audio_core/driver_output.h rename to garnet/bin/media/audio_core/driver_output.h
diff --git a/bin/media/audio_core/driver_ring_buffer.cc b/garnet/bin/media/audio_core/driver_ring_buffer.cc similarity index 100% rename from bin/media/audio_core/driver_ring_buffer.cc rename to garnet/bin/media/audio_core/driver_ring_buffer.cc
diff --git a/bin/media/audio_core/driver_ring_buffer.h b/garnet/bin/media/audio_core/driver_ring_buffer.h similarity index 100% rename from bin/media/audio_core/driver_ring_buffer.h rename to garnet/bin/media/audio_core/driver_ring_buffer.h
diff --git a/bin/media/audio_core/driver_utils.cc b/garnet/bin/media/audio_core/driver_utils.cc similarity index 100% rename from bin/media/audio_core/driver_utils.cc rename to garnet/bin/media/audio_core/driver_utils.cc
diff --git a/bin/media/audio_core/driver_utils.h b/garnet/bin/media/audio_core/driver_utils.h similarity index 100% rename from bin/media/audio_core/driver_utils.h rename to garnet/bin/media/audio_core/driver_utils.h
diff --git a/bin/media/audio_core/fwd_decls.h b/garnet/bin/media/audio_core/fwd_decls.h similarity index 100% rename from bin/media/audio_core/fwd_decls.h rename to garnet/bin/media/audio_core/fwd_decls.h
diff --git a/bin/media/audio_core/main.cc b/garnet/bin/media/audio_core/main.cc similarity index 100% rename from bin/media/audio_core/main.cc rename to garnet/bin/media/audio_core/main.cc
diff --git a/bin/media/audio_core/meta/audio_core.cmx b/garnet/bin/media/audio_core/meta/audio_core.cmx similarity index 100% rename from bin/media/audio_core/meta/audio_core.cmx rename to garnet/bin/media/audio_core/meta/audio_core.cmx
diff --git a/bin/media/audio_core/mixer/BUILD.gn b/garnet/bin/media/audio_core/mixer/BUILD.gn similarity index 100% rename from bin/media/audio_core/mixer/BUILD.gn rename to garnet/bin/media/audio_core/mixer/BUILD.gn
diff --git a/bin/media/audio_core/mixer/constants.h b/garnet/bin/media/audio_core/mixer/constants.h similarity index 100% rename from bin/media/audio_core/mixer/constants.h rename to garnet/bin/media/audio_core/mixer/constants.h
diff --git a/bin/media/audio_core/mixer/fx_loader.cc b/garnet/bin/media/audio_core/mixer/fx_loader.cc similarity index 100% rename from bin/media/audio_core/mixer/fx_loader.cc rename to garnet/bin/media/audio_core/mixer/fx_loader.cc
diff --git a/bin/media/audio_core/mixer/fx_loader.h b/garnet/bin/media/audio_core/mixer/fx_loader.h similarity index 100% rename from bin/media/audio_core/mixer/fx_loader.h rename to garnet/bin/media/audio_core/mixer/fx_loader.h
diff --git a/bin/media/audio_core/mixer/fx_processor.cc b/garnet/bin/media/audio_core/mixer/fx_processor.cc similarity index 100% rename from bin/media/audio_core/mixer/fx_processor.cc rename to garnet/bin/media/audio_core/mixer/fx_processor.cc
diff --git a/bin/media/audio_core/mixer/fx_processor.h b/garnet/bin/media/audio_core/mixer/fx_processor.h similarity index 100% rename from bin/media/audio_core/mixer/fx_processor.h rename to garnet/bin/media/audio_core/mixer/fx_processor.h
diff --git a/bin/media/audio_core/mixer/gain.cc b/garnet/bin/media/audio_core/mixer/gain.cc similarity index 100% rename from bin/media/audio_core/mixer/gain.cc rename to garnet/bin/media/audio_core/mixer/gain.cc
diff --git a/bin/media/audio_core/mixer/gain.h b/garnet/bin/media/audio_core/mixer/gain.h similarity index 100% rename from bin/media/audio_core/mixer/gain.h rename to garnet/bin/media/audio_core/mixer/gain.h
diff --git a/bin/media/audio_core/mixer/linear_sampler.cc b/garnet/bin/media/audio_core/mixer/linear_sampler.cc similarity index 100% rename from bin/media/audio_core/mixer/linear_sampler.cc rename to garnet/bin/media/audio_core/mixer/linear_sampler.cc
diff --git a/bin/media/audio_core/mixer/linear_sampler.h b/garnet/bin/media/audio_core/mixer/linear_sampler.h similarity index 100% rename from bin/media/audio_core/mixer/linear_sampler.h rename to garnet/bin/media/audio_core/mixer/linear_sampler.h
diff --git a/bin/media/audio_core/mixer/meta/audio_mixer_tests.cmx b/garnet/bin/media/audio_core/mixer/meta/audio_mixer_tests.cmx similarity index 100% rename from bin/media/audio_core/mixer/meta/audio_mixer_tests.cmx rename to garnet/bin/media/audio_core/mixer/meta/audio_mixer_tests.cmx
diff --git a/bin/media/audio_core/mixer/mixer.cc b/garnet/bin/media/audio_core/mixer/mixer.cc similarity index 100% rename from bin/media/audio_core/mixer/mixer.cc rename to garnet/bin/media/audio_core/mixer/mixer.cc
diff --git a/bin/media/audio_core/mixer/mixer.h b/garnet/bin/media/audio_core/mixer/mixer.h similarity index 100% rename from bin/media/audio_core/mixer/mixer.h rename to garnet/bin/media/audio_core/mixer/mixer.h
diff --git a/bin/media/audio_core/mixer/mixer_utils.h b/garnet/bin/media/audio_core/mixer/mixer_utils.h similarity index 100% rename from bin/media/audio_core/mixer/mixer_utils.h rename to garnet/bin/media/audio_core/mixer/mixer_utils.h
diff --git a/bin/media/audio_core/mixer/no_op.cc b/garnet/bin/media/audio_core/mixer/no_op.cc similarity index 100% rename from bin/media/audio_core/mixer/no_op.cc rename to garnet/bin/media/audio_core/mixer/no_op.cc
diff --git a/bin/media/audio_core/mixer/no_op.h b/garnet/bin/media/audio_core/mixer/no_op.h similarity index 100% rename from bin/media/audio_core/mixer/no_op.h rename to garnet/bin/media/audio_core/mixer/no_op.h
diff --git a/bin/media/audio_core/mixer/output_producer.cc b/garnet/bin/media/audio_core/mixer/output_producer.cc similarity index 100% rename from bin/media/audio_core/mixer/output_producer.cc rename to garnet/bin/media/audio_core/mixer/output_producer.cc
diff --git a/bin/media/audio_core/mixer/output_producer.h b/garnet/bin/media/audio_core/mixer/output_producer.h similarity index 100% rename from bin/media/audio_core/mixer/output_producer.h rename to garnet/bin/media/audio_core/mixer/output_producer.h
diff --git a/bin/media/audio_core/mixer/point_sampler.cc b/garnet/bin/media/audio_core/mixer/point_sampler.cc similarity index 100% rename from bin/media/audio_core/mixer/point_sampler.cc rename to garnet/bin/media/audio_core/mixer/point_sampler.cc
diff --git a/bin/media/audio_core/mixer/point_sampler.h b/garnet/bin/media/audio_core/mixer/point_sampler.h similarity index 100% rename from bin/media/audio_core/mixer/point_sampler.h rename to garnet/bin/media/audio_core/mixer/point_sampler.h
diff --git a/bin/media/audio_core/mixer/test/README.md b/garnet/bin/media/audio_core/mixer/test/README.md similarity index 100% rename from bin/media/audio_core/mixer/test/README.md rename to garnet/bin/media/audio_core/mixer/test/README.md
diff --git a/bin/media/audio_core/mixer/test/audio_analysis.cc b/garnet/bin/media/audio_core/mixer/test/audio_analysis.cc similarity index 100% rename from bin/media/audio_core/mixer/test/audio_analysis.cc rename to garnet/bin/media/audio_core/mixer/test/audio_analysis.cc
diff --git a/bin/media/audio_core/mixer/test/audio_analysis.h b/garnet/bin/media/audio_core/mixer/test/audio_analysis.h similarity index 100% rename from bin/media/audio_core/mixer/test/audio_analysis.h rename to garnet/bin/media/audio_core/mixer/test/audio_analysis.h
diff --git a/bin/media/audio_core/mixer/test/audio_analysis_tests.cc b/garnet/bin/media/audio_core/mixer/test/audio_analysis_tests.cc similarity index 100% rename from bin/media/audio_core/mixer/test/audio_analysis_tests.cc rename to garnet/bin/media/audio_core/mixer/test/audio_analysis_tests.cc
diff --git a/bin/media/audio_core/mixer/test/audio_performance.cc b/garnet/bin/media/audio_core/mixer/test/audio_performance.cc similarity index 100% rename from bin/media/audio_core/mixer/test/audio_performance.cc rename to garnet/bin/media/audio_core/mixer/test/audio_performance.cc
diff --git a/bin/media/audio_core/mixer/test/audio_performance.h b/garnet/bin/media/audio_core/mixer/test/audio_performance.h similarity index 100% rename from bin/media/audio_core/mixer/test/audio_performance.h rename to garnet/bin/media/audio_core/mixer/test/audio_performance.h
diff --git a/bin/media/audio_core/mixer/test/audio_result.cc b/garnet/bin/media/audio_core/mixer/test/audio_result.cc similarity index 100% rename from bin/media/audio_core/mixer/test/audio_result.cc rename to garnet/bin/media/audio_core/mixer/test/audio_result.cc
diff --git a/bin/media/audio_core/mixer/test/audio_result.h b/garnet/bin/media/audio_core/mixer/test/audio_result.h similarity index 100% rename from bin/media/audio_core/mixer/test/audio_result.h rename to garnet/bin/media/audio_core/mixer/test/audio_result.h
diff --git a/bin/media/audio_core/mixer/test/frequency_set.cc b/garnet/bin/media/audio_core/mixer/test/frequency_set.cc similarity index 100% rename from bin/media/audio_core/mixer/test/frequency_set.cc rename to garnet/bin/media/audio_core/mixer/test/frequency_set.cc
diff --git a/bin/media/audio_core/mixer/test/frequency_set.h b/garnet/bin/media/audio_core/mixer/test/frequency_set.h similarity index 100% rename from bin/media/audio_core/mixer/test/frequency_set.h rename to garnet/bin/media/audio_core/mixer/test/frequency_set.h
diff --git a/bin/media/audio_core/mixer/test/main.cc b/garnet/bin/media/audio_core/mixer/test/main.cc similarity index 100% rename from bin/media/audio_core/mixer/test/main.cc rename to garnet/bin/media/audio_core/mixer/test/main.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_bitwise_tests.cc b/garnet/bin/media/audio_core/mixer/test/mixer_bitwise_tests.cc similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_bitwise_tests.cc rename to garnet/bin/media/audio_core/mixer/test/mixer_bitwise_tests.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_gain_tests.cc b/garnet/bin/media/audio_core/mixer/test/mixer_gain_tests.cc similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_gain_tests.cc rename to garnet/bin/media/audio_core/mixer/test/mixer_gain_tests.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_range_tests.cc b/garnet/bin/media/audio_core/mixer/test/mixer_range_tests.cc similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_range_tests.cc rename to garnet/bin/media/audio_core/mixer/test/mixer_range_tests.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_resampling_tests.cc b/garnet/bin/media/audio_core/mixer/test/mixer_resampling_tests.cc similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_resampling_tests.cc rename to garnet/bin/media/audio_core/mixer/test/mixer_resampling_tests.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_response_tests.cc b/garnet/bin/media/audio_core/mixer/test/mixer_response_tests.cc similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_response_tests.cc rename to garnet/bin/media/audio_core/mixer/test/mixer_response_tests.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_tests_recap.cc b/garnet/bin/media/audio_core/mixer/test/mixer_tests_recap.cc similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_tests_recap.cc rename to garnet/bin/media/audio_core/mixer/test/mixer_tests_recap.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_tests_shared.cc b/garnet/bin/media/audio_core/mixer/test/mixer_tests_shared.cc similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_tests_shared.cc rename to garnet/bin/media/audio_core/mixer/test/mixer_tests_shared.cc
diff --git a/bin/media/audio_core/mixer/test/mixer_tests_shared.h b/garnet/bin/media/audio_core/mixer/test/mixer_tests_shared.h similarity index 100% rename from bin/media/audio_core/mixer/test/mixer_tests_shared.h rename to garnet/bin/media/audio_core/mixer/test/mixer_tests_shared.h
diff --git a/bin/media/audio_core/pending_flush_token.cc b/garnet/bin/media/audio_core/pending_flush_token.cc similarity index 100% rename from bin/media/audio_core/pending_flush_token.cc rename to garnet/bin/media/audio_core/pending_flush_token.cc
diff --git a/bin/media/audio_core/pending_flush_token.h b/garnet/bin/media/audio_core/pending_flush_token.h similarity index 100% rename from bin/media/audio_core/pending_flush_token.h rename to garnet/bin/media/audio_core/pending_flush_token.h
diff --git a/bin/media/audio_core/schema/audio_device_settings_schema.jsx b/garnet/bin/media/audio_core/schema/audio_device_settings_schema.jsx similarity index 100% rename from bin/media/audio_core/schema/audio_device_settings_schema.jsx rename to garnet/bin/media/audio_core/schema/audio_device_settings_schema.jsx
diff --git a/bin/media/audio_core/schema/make_schema_header.py b/garnet/bin/media/audio_core/schema/make_schema_header.py similarity index 100% rename from bin/media/audio_core/schema/make_schema_header.py rename to garnet/bin/media/audio_core/schema/make_schema_header.py
diff --git a/bin/media/audio_core/standard_output_base.cc b/garnet/bin/media/audio_core/standard_output_base.cc similarity index 100% rename from bin/media/audio_core/standard_output_base.cc rename to garnet/bin/media/audio_core/standard_output_base.cc
diff --git a/bin/media/audio_core/standard_output_base.h b/garnet/bin/media/audio_core/standard_output_base.h similarity index 100% rename from bin/media/audio_core/standard_output_base.h rename to garnet/bin/media/audio_core/standard_output_base.h
diff --git a/bin/media/audio_core/test/BUILD.gn b/garnet/bin/media/audio_core/test/BUILD.gn similarity index 100% rename from bin/media/audio_core/test/BUILD.gn rename to garnet/bin/media/audio_core/test/BUILD.gn
diff --git a/bin/media/audio_core/test/audio_capturer_test.cc b/garnet/bin/media/audio_core/test/audio_capturer_test.cc similarity index 100% rename from bin/media/audio_core/test/audio_capturer_test.cc rename to garnet/bin/media/audio_core/test/audio_capturer_test.cc
diff --git a/bin/media/audio_core/test/audio_fidl_tests.cc b/garnet/bin/media/audio_core/test/audio_fidl_tests.cc similarity index 100% rename from bin/media/audio_core/test/audio_fidl_tests.cc rename to garnet/bin/media/audio_core/test/audio_fidl_tests.cc
diff --git a/bin/media/audio_core/test/audio_fidl_tests_shared.h b/garnet/bin/media/audio_core/test/audio_fidl_tests_shared.h similarity index 100% rename from bin/media/audio_core/test/audio_fidl_tests_shared.h rename to garnet/bin/media/audio_core/test/audio_fidl_tests_shared.h
diff --git a/bin/media/audio_core/test/audio_loopback_test.cc b/garnet/bin/media/audio_core/test/audio_loopback_test.cc similarity index 100% rename from bin/media/audio_core/test/audio_loopback_test.cc rename to garnet/bin/media/audio_core/test/audio_loopback_test.cc
diff --git a/bin/media/audio_core/test/audio_renderer_sync_test.cc b/garnet/bin/media/audio_core/test/audio_renderer_sync_test.cc similarity index 100% rename from bin/media/audio_core/test/audio_renderer_sync_test.cc rename to garnet/bin/media/audio_core/test/audio_renderer_sync_test.cc
diff --git a/bin/media/audio_core/test/audio_renderer_test.cc b/garnet/bin/media/audio_core/test/audio_renderer_test.cc similarity index 100% rename from bin/media/audio_core/test/audio_renderer_test.cc rename to garnet/bin/media/audio_core/test/audio_renderer_test.cc
diff --git a/bin/media/audio_core/test/audio_sync_test.cc b/garnet/bin/media/audio_core/test/audio_sync_test.cc similarity index 100% rename from bin/media/audio_core/test/audio_sync_test.cc rename to garnet/bin/media/audio_core/test/audio_sync_test.cc
diff --git a/bin/media/audio_core/test/audio_test.cc b/garnet/bin/media/audio_core/test/audio_test.cc similarity index 100% rename from bin/media/audio_core/test/audio_test.cc rename to garnet/bin/media/audio_core/test/audio_test.cc
diff --git a/bin/media/audio_core/test/gain_control_test.cc b/garnet/bin/media/audio_core/test/gain_control_test.cc similarity index 100% rename from bin/media/audio_core/test/gain_control_test.cc rename to garnet/bin/media/audio_core/test/gain_control_test.cc
diff --git a/bin/media/audio_core/test/gain_control_test.h b/garnet/bin/media/audio_core/test/gain_control_test.h similarity index 100% rename from bin/media/audio_core/test/gain_control_test.h rename to garnet/bin/media/audio_core/test/gain_control_test.h
diff --git a/bin/media/audio_core/test/meta/audio_fidl_tests.cmx b/garnet/bin/media/audio_core/test/meta/audio_fidl_tests.cmx similarity index 100% rename from bin/media/audio_core/test/meta/audio_fidl_tests.cmx rename to garnet/bin/media/audio_core/test/meta/audio_fidl_tests.cmx
diff --git a/bin/media/audio_core/throttle_output.cc b/garnet/bin/media/audio_core/throttle_output.cc similarity index 100% rename from bin/media/audio_core/throttle_output.cc rename to garnet/bin/media/audio_core/throttle_output.cc
diff --git a/bin/media/audio_core/throttle_output.h b/garnet/bin/media/audio_core/throttle_output.h similarity index 100% rename from bin/media/audio_core/throttle_output.h rename to garnet/bin/media/audio_core/throttle_output.h
diff --git a/bin/media/audio_core/utils.cc b/garnet/bin/media/audio_core/utils.cc similarity index 100% rename from bin/media/audio_core/utils.cc rename to garnet/bin/media/audio_core/utils.cc
diff --git a/bin/media/audio_core/utils.h b/garnet/bin/media/audio_core/utils.h similarity index 100% rename from bin/media/audio_core/utils.h rename to garnet/bin/media/audio_core/utils.h
diff --git a/bin/media/camera_manager/BUILD.gn b/garnet/bin/media/camera_manager/BUILD.gn similarity index 100% rename from bin/media/camera_manager/BUILD.gn rename to garnet/bin/media/camera_manager/BUILD.gn
diff --git a/bin/media/camera_manager/camera_manager.cc b/garnet/bin/media/camera_manager/camera_manager.cc similarity index 100% rename from bin/media/camera_manager/camera_manager.cc rename to garnet/bin/media/camera_manager/camera_manager.cc
diff --git a/bin/media/camera_manager/camera_manager_impl.cc b/garnet/bin/media/camera_manager/camera_manager_impl.cc similarity index 100% rename from bin/media/camera_manager/camera_manager_impl.cc rename to garnet/bin/media/camera_manager/camera_manager_impl.cc
diff --git a/bin/media/camera_manager/camera_manager_impl.h b/garnet/bin/media/camera_manager/camera_manager_impl.h similarity index 100% rename from bin/media/camera_manager/camera_manager_impl.h rename to garnet/bin/media/camera_manager/camera_manager_impl.h
diff --git a/bin/media/camera_manager/meta/camera_manager_cpp.cmx b/garnet/bin/media/camera_manager/meta/camera_manager_cpp.cmx similarity index 100% rename from bin/media/camera_manager/meta/camera_manager_cpp.cmx rename to garnet/bin/media/camera_manager/meta/camera_manager_cpp.cmx
diff --git a/bin/media/camera_manager/video_device_client.cc b/garnet/bin/media/camera_manager/video_device_client.cc similarity index 100% rename from bin/media/camera_manager/video_device_client.cc rename to garnet/bin/media/camera_manager/video_device_client.cc
diff --git a/bin/media/camera_manager/video_device_client.h b/garnet/bin/media/camera_manager/video_device_client.h similarity index 100% rename from bin/media/camera_manager/video_device_client.h rename to garnet/bin/media/camera_manager/video_device_client.h
diff --git a/bin/media/codec_factory/BUILD.gn b/garnet/bin/media/codec_factory/BUILD.gn similarity index 100% rename from bin/media/codec_factory/BUILD.gn rename to garnet/bin/media/codec_factory/BUILD.gn
diff --git a/bin/media/codec_factory/codec_factory_app.cc b/garnet/bin/media/codec_factory/codec_factory_app.cc similarity index 100% rename from bin/media/codec_factory/codec_factory_app.cc rename to garnet/bin/media/codec_factory/codec_factory_app.cc
diff --git a/bin/media/codec_factory/codec_factory_app.h b/garnet/bin/media/codec_factory/codec_factory_app.h similarity index 100% rename from bin/media/codec_factory/codec_factory_app.h rename to garnet/bin/media/codec_factory/codec_factory_app.h
diff --git a/bin/media/codec_factory/codec_factory_impl.cc b/garnet/bin/media/codec_factory/codec_factory_impl.cc similarity index 100% rename from bin/media/codec_factory/codec_factory_impl.cc rename to garnet/bin/media/codec_factory/codec_factory_impl.cc
diff --git a/bin/media/codec_factory/codec_factory_impl.h b/garnet/bin/media/codec_factory/codec_factory_impl.h similarity index 100% rename from bin/media/codec_factory/codec_factory_impl.h rename to garnet/bin/media/codec_factory/codec_factory_impl.h
diff --git a/bin/media/codec_factory/main.cc b/garnet/bin/media/codec_factory/main.cc similarity index 100% rename from bin/media/codec_factory/main.cc rename to garnet/bin/media/codec_factory/main.cc
diff --git a/bin/media/codec_factory/meta/codec_factory.cmx b/garnet/bin/media/codec_factory/meta/codec_factory.cmx similarity index 100% rename from bin/media/codec_factory/meta/codec_factory.cmx rename to garnet/bin/media/codec_factory/meta/codec_factory.cmx
diff --git a/bin/media/codecs/meta/codec_runner_sw_ffmpeg.cmx b/garnet/bin/media/codecs/meta/codec_runner_sw_ffmpeg.cmx similarity index 100% rename from bin/media/codecs/meta/codec_runner_sw_ffmpeg.cmx rename to garnet/bin/media/codecs/meta/codec_runner_sw_ffmpeg.cmx
diff --git a/bin/media/codecs/meta/codec_runner_sw_omx.cmx b/garnet/bin/media/codecs/meta/codec_runner_sw_omx.cmx similarity index 100% rename from bin/media/codecs/meta/codec_runner_sw_omx.cmx rename to garnet/bin/media/codecs/meta/codec_runner_sw_omx.cmx
diff --git a/bin/media/codecs/sw/ffmpeg/BUILD.gn b/garnet/bin/media/codecs/sw/ffmpeg/BUILD.gn similarity index 100% rename from bin/media/codecs/sw/ffmpeg/BUILD.gn rename to garnet/bin/media/codecs/sw/ffmpeg/BUILD.gn
diff --git a/bin/media/codecs/sw/ffmpeg/avcodec_context.cc b/garnet/bin/media/codecs/sw/ffmpeg/avcodec_context.cc similarity index 100% rename from bin/media/codecs/sw/ffmpeg/avcodec_context.cc rename to garnet/bin/media/codecs/sw/ffmpeg/avcodec_context.cc
diff --git a/bin/media/codecs/sw/ffmpeg/avcodec_context.h b/garnet/bin/media/codecs/sw/ffmpeg/avcodec_context.h similarity index 100% rename from bin/media/codecs/sw/ffmpeg/avcodec_context.h rename to garnet/bin/media/codecs/sw/ffmpeg/avcodec_context.h
diff --git a/bin/media/codecs/sw/ffmpeg/buffer_pool.cc b/garnet/bin/media/codecs/sw/ffmpeg/buffer_pool.cc similarity index 100% rename from bin/media/codecs/sw/ffmpeg/buffer_pool.cc rename to garnet/bin/media/codecs/sw/ffmpeg/buffer_pool.cc
diff --git a/bin/media/codecs/sw/ffmpeg/buffer_pool.h b/garnet/bin/media/codecs/sw/ffmpeg/buffer_pool.h similarity index 100% rename from bin/media/codecs/sw/ffmpeg/buffer_pool.h rename to garnet/bin/media/codecs/sw/ffmpeg/buffer_pool.h
diff --git a/bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.cc b/garnet/bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.cc similarity index 100% rename from bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.cc rename to garnet/bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.cc
diff --git a/bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.h b/garnet/bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.h similarity index 100% rename from bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.h rename to garnet/bin/media/codecs/sw/ffmpeg/codec_adapter_ffmpeg_decoder.h
diff --git a/bin/media/codecs/sw/ffmpeg/codec_runner_app.cc b/garnet/bin/media/codecs/sw/ffmpeg/codec_runner_app.cc similarity index 100% rename from bin/media/codecs/sw/ffmpeg/codec_runner_app.cc rename to garnet/bin/media/codecs/sw/ffmpeg/codec_runner_app.cc
diff --git a/bin/media/codecs/sw/ffmpeg/codec_runner_app.h b/garnet/bin/media/codecs/sw/ffmpeg/codec_runner_app.h similarity index 100% rename from bin/media/codecs/sw/ffmpeg/codec_runner_app.h rename to garnet/bin/media/codecs/sw/ffmpeg/codec_runner_app.h
diff --git a/bin/media/codecs/sw/ffmpeg/local_single_codec_factory.cc b/garnet/bin/media/codecs/sw/ffmpeg/local_single_codec_factory.cc similarity index 100% rename from bin/media/codecs/sw/ffmpeg/local_single_codec_factory.cc rename to garnet/bin/media/codecs/sw/ffmpeg/local_single_codec_factory.cc
diff --git a/bin/media/codecs/sw/ffmpeg/local_single_codec_factory.h b/garnet/bin/media/codecs/sw/ffmpeg/local_single_codec_factory.h similarity index 100% rename from bin/media/codecs/sw/ffmpeg/local_single_codec_factory.h rename to garnet/bin/media/codecs/sw/ffmpeg/local_single_codec_factory.h
diff --git a/bin/media/codecs/sw/ffmpeg/main.cc b/garnet/bin/media/codecs/sw/ffmpeg/main.cc similarity index 100% rename from bin/media/codecs/sw/ffmpeg/main.cc rename to garnet/bin/media/codecs/sw/ffmpeg/main.cc
diff --git a/bin/media/codecs/sw/ffmpeg/meta/codec_runner_sw_ffmpeg_tests.cmx b/garnet/bin/media/codecs/sw/ffmpeg/meta/codec_runner_sw_ffmpeg_tests.cmx similarity index 100% rename from bin/media/codecs/sw/ffmpeg/meta/codec_runner_sw_ffmpeg_tests.cmx rename to garnet/bin/media/codecs/sw/ffmpeg/meta/codec_runner_sw_ffmpeg_tests.cmx
diff --git a/bin/media/codecs/sw/ffmpeg/mpsc_queue.h b/garnet/bin/media/codecs/sw/ffmpeg/mpsc_queue.h similarity index 100% rename from bin/media/codecs/sw/ffmpeg/mpsc_queue.h rename to garnet/bin/media/codecs/sw/ffmpeg/mpsc_queue.h
diff --git a/bin/media/codecs/sw/ffmpeg/test/codec_runner_sw_ffmpeg_tests.cc b/garnet/bin/media/codecs/sw/ffmpeg/test/codec_runner_sw_ffmpeg_tests.cc similarity index 100% rename from bin/media/codecs/sw/ffmpeg/test/codec_runner_sw_ffmpeg_tests.cc rename to garnet/bin/media/codecs/sw/ffmpeg/test/codec_runner_sw_ffmpeg_tests.cc
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/BUILD.gn b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/BUILD.gn similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/BUILD.gn rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/BUILD.gn
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/array_size.h b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/array_size.h similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/array_size.h rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/array_size.h
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.cc b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.cc similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.cc rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.cc
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.h b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.h similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.h rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner.h
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.cc b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.cc similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.cc rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.cc
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.h b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.h similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.h rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/codec_runner_component.h
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.cc b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.cc similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.cc rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.cc
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.h b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.h similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.h rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/local_codec_factory.h
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/main.cc b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/main.cc similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/main.cc rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/main.cc
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.cc b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.cc similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.cc rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.cc
diff --git a/bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.h b/garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.h similarity index 100% rename from bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.h rename to garnet/bin/media/codecs/sw/omx/codec_runner_sw_omx/omx_codec_runner.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/AHandler.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/AHandler.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/AHandler.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/AHandler.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/ALooperRoster.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/ALooperRoster.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/ALooperRoster.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/ALooperRoster.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/AMessage.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/AMessage.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/AMessage.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/AMessage.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/AString.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/AString.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/AString.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/AString.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/BUILD.gn b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/BUILD.gn similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/BUILD.gn rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/BUILD.gn
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/Condition.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Condition.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/Condition.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Condition.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/Mutex.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Mutex.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/Mutex.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Mutex.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/String16.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/String16.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/String16.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/String16.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/String8.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/String8.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/String8.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/String8.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/Threads.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Threads.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/Threads.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Threads.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/Timers.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Timers.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/Timers.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/Timers.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/binder/Parcel.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/binder/Parcel.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/binder/Parcel.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/binder/Parcel.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/cutils/properties.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/cutils/properties.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/cutils/properties.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/cutils/properties.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/define_typeof_and_unused.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/define_typeof_and_unused.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/define_typeof_and_unused.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/define_typeof_and_unused.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/log/log.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/log/log.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/log/log.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/log/log.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AHandler.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AHandler.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AHandler.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AHandler.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/ALooperRoster.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/ALooperRoster.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/ALooperRoster.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/ALooperRoster.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AString.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AString.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AString.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/media/stagefright/foundation/AString.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/system/graphics.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/system/graphics.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/system/graphics.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/system/graphics.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/CallStack.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/CallStack.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/CallStack.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/CallStack.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Condition.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Condition.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Condition.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Condition.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/List.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/List.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/List.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/List.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Log.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Log.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Log.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Log.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Mutex.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Mutex.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Mutex.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Mutex.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String16.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String16.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String16.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String16.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String8.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String8.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String8.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/String8.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Thread.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Thread.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Thread.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Thread.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Vector.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Vector.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Vector.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/Vector.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/threads.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/threads.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/threads.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/include/utils/threads.h
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/not_Parcel.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/not_Parcel.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/not_Parcel.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/not_Parcel.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/port.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/port.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/port.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/port.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point.cc b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point.cc similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point.cc rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point.cc
diff --git a/bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point/so_entry_point.h b/garnet/bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point/so_entry_point.h similarity index 100% rename from bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point/so_entry_point.h rename to garnet/bin/media/codecs/sw/omx/common/omx_android_pal/so_entry_point/so_entry_point.h
diff --git a/bin/media/codecs/sw/omx/dec/aac/BUILD.gn b/garnet/bin/media/codecs/sw/omx/dec/aac/BUILD.gn similarity index 100% rename from bin/media/codecs/sw/omx/dec/aac/BUILD.gn rename to garnet/bin/media/codecs/sw/omx/dec/aac/BUILD.gn
diff --git a/bin/media/codecs/sw/omx/low_layer/aac/BUILD.gn b/garnet/bin/media/codecs/sw/omx/low_layer/aac/BUILD.gn similarity index 100% rename from bin/media/codecs/sw/omx/low_layer/aac/BUILD.gn rename to garnet/bin/media/codecs/sw/omx/low_layer/aac/BUILD.gn
diff --git a/bin/media/codecs/sw/omx/low_layer/codec_android_pal/BUILD.gn b/garnet/bin/media/codecs/sw/omx/low_layer/codec_android_pal/BUILD.gn similarity index 100% rename from bin/media/codecs/sw/omx/low_layer/codec_android_pal/BUILD.gn rename to garnet/bin/media/codecs/sw/omx/low_layer/codec_android_pal/BUILD.gn
diff --git a/bin/media/codecs/sw/omx/low_layer/codec_android_pal/include/log/log.h b/garnet/bin/media/codecs/sw/omx/low_layer/codec_android_pal/include/log/log.h similarity index 100% rename from bin/media/codecs/sw/omx/low_layer/codec_android_pal/include/log/log.h rename to garnet/bin/media/codecs/sw/omx/low_layer/codec_android_pal/include/log/log.h
diff --git a/bin/media/codecs/test/BUILD.gn b/garnet/bin/media/codecs/test/BUILD.gn similarity index 100% rename from bin/media/codecs/test/BUILD.gn rename to garnet/bin/media/codecs/test/BUILD.gn
diff --git a/bin/media/codecs/test/meta/raw_frames_test.cmx b/garnet/bin/media/codecs/test/meta/raw_frames_test.cmx similarity index 100% rename from bin/media/codecs/test/meta/raw_frames_test.cmx rename to garnet/bin/media/codecs/test/meta/raw_frames_test.cmx
diff --git a/bin/media/codecs/test/raw_frames.cc b/garnet/bin/media/codecs/test/raw_frames.cc similarity index 100% rename from bin/media/codecs/test/raw_frames.cc rename to garnet/bin/media/codecs/test/raw_frames.cc
diff --git a/bin/media/codecs/test/raw_frames.h b/garnet/bin/media/codecs/test/raw_frames.h similarity index 100% rename from bin/media/codecs/test/raw_frames.h rename to garnet/bin/media/codecs/test/raw_frames.h
diff --git a/bin/media/codecs/test/test/raw_frames_test.cc b/garnet/bin/media/codecs/test/test/raw_frames_test.cc similarity index 100% rename from bin/media/codecs/test/test/raw_frames_test.cc rename to garnet/bin/media/codecs/test/test/raw_frames_test.cc
diff --git a/bin/media/frank_media_config/BUILD.gn b/garnet/bin/media/frank_media_config/BUILD.gn similarity index 100% rename from bin/media/frank_media_config/BUILD.gn rename to garnet/bin/media/frank_media_config/BUILD.gn
diff --git a/bin/media/frank_media_config/media/audio/settings/default/34384e7da9d52c8062a9765baeb6053a-output.json b/garnet/bin/media/frank_media_config/media/audio/settings/default/34384e7da9d52c8062a9765baeb6053a-output.json similarity index 100% rename from bin/media/frank_media_config/media/audio/settings/default/34384e7da9d52c8062a9765baeb6053a-output.json rename to garnet/bin/media/frank_media_config/media/audio/settings/default/34384e7da9d52c8062a9765baeb6053a-output.json
diff --git a/bin/media/signal_generator/BUILD.gn b/garnet/bin/media/signal_generator/BUILD.gn similarity index 100% rename from bin/media/signal_generator/BUILD.gn rename to garnet/bin/media/signal_generator/BUILD.gn
diff --git a/bin/media/signal_generator/README.md b/garnet/bin/media/signal_generator/README.md similarity index 100% rename from bin/media/signal_generator/README.md rename to garnet/bin/media/signal_generator/README.md
diff --git a/bin/media/signal_generator/main.cc b/garnet/bin/media/signal_generator/main.cc similarity index 100% rename from bin/media/signal_generator/main.cc rename to garnet/bin/media/signal_generator/main.cc
diff --git a/bin/media/signal_generator/signal_generator.cc b/garnet/bin/media/signal_generator/signal_generator.cc similarity index 100% rename from bin/media/signal_generator/signal_generator.cc rename to garnet/bin/media/signal_generator/signal_generator.cc
diff --git a/bin/media/signal_generator/signal_generator.h b/garnet/bin/media/signal_generator/signal_generator.h similarity index 100% rename from bin/media/signal_generator/signal_generator.h rename to garnet/bin/media/signal_generator/signal_generator.h
diff --git a/bin/media/util/BUILD.gn b/garnet/bin/media/util/BUILD.gn similarity index 100% rename from bin/media/util/BUILD.gn rename to garnet/bin/media/util/BUILD.gn
diff --git a/bin/media/util/fidl_publisher.h b/garnet/bin/media/util/fidl_publisher.h similarity index 100% rename from bin/media/util/fidl_publisher.h rename to garnet/bin/media/util/fidl_publisher.h
diff --git a/bin/media/vol/BUILD.gn b/garnet/bin/media/vol/BUILD.gn similarity index 100% rename from bin/media/vol/BUILD.gn rename to garnet/bin/media/vol/BUILD.gn
diff --git a/bin/media/vol/README.md b/garnet/bin/media/vol/README.md similarity index 100% rename from bin/media/vol/README.md rename to garnet/bin/media/vol/README.md
diff --git a/bin/media/vol/vol_app.cc b/garnet/bin/media/vol/vol_app.cc similarity index 100% rename from bin/media/vol/vol_app.cc rename to garnet/bin/media/vol/vol_app.cc
diff --git a/bin/media/wav_recorder/BUILD.gn b/garnet/bin/media/wav_recorder/BUILD.gn similarity index 100% rename from bin/media/wav_recorder/BUILD.gn rename to garnet/bin/media/wav_recorder/BUILD.gn
diff --git a/bin/media/wav_recorder/README.md b/garnet/bin/media/wav_recorder/README.md similarity index 100% rename from bin/media/wav_recorder/README.md rename to garnet/bin/media/wav_recorder/README.md
diff --git a/bin/media/wav_recorder/main.cc b/garnet/bin/media/wav_recorder/main.cc similarity index 100% rename from bin/media/wav_recorder/main.cc rename to garnet/bin/media/wav_recorder/main.cc
diff --git a/bin/media/wav_recorder/wav_recorder.cc b/garnet/bin/media/wav_recorder/wav_recorder.cc similarity index 100% rename from bin/media/wav_recorder/wav_recorder.cc rename to garnet/bin/media/wav_recorder/wav_recorder.cc
diff --git a/bin/media/wav_recorder/wav_recorder.h b/garnet/bin/media/wav_recorder/wav_recorder.h similarity index 100% rename from bin/media/wav_recorder/wav_recorder.h rename to garnet/bin/media/wav_recorder/wav_recorder.h
diff --git a/bin/mediaplayer/BUILD.gn b/garnet/bin/mediaplayer/BUILD.gn similarity index 100% rename from bin/mediaplayer/BUILD.gn rename to garnet/bin/mediaplayer/BUILD.gn
diff --git a/bin/mediaplayer/MAINTAINERS b/garnet/bin/mediaplayer/MAINTAINERS similarity index 100% rename from bin/mediaplayer/MAINTAINERS rename to garnet/bin/mediaplayer/MAINTAINERS
diff --git a/bin/mediaplayer/core/BUILD.gn b/garnet/bin/mediaplayer/core/BUILD.gn similarity index 100% rename from bin/mediaplayer/core/BUILD.gn rename to garnet/bin/mediaplayer/core/BUILD.gn
diff --git a/bin/mediaplayer/core/README.md b/garnet/bin/mediaplayer/core/README.md similarity index 100% rename from bin/mediaplayer/core/README.md rename to garnet/bin/mediaplayer/core/README.md
diff --git a/bin/mediaplayer/core/conversion_pipeline_builder.cc b/garnet/bin/mediaplayer/core/conversion_pipeline_builder.cc similarity index 100% rename from bin/mediaplayer/core/conversion_pipeline_builder.cc rename to garnet/bin/mediaplayer/core/conversion_pipeline_builder.cc
diff --git a/bin/mediaplayer/core/conversion_pipeline_builder.h b/garnet/bin/mediaplayer/core/conversion_pipeline_builder.h similarity index 100% rename from bin/mediaplayer/core/conversion_pipeline_builder.h rename to garnet/bin/mediaplayer/core/conversion_pipeline_builder.h
diff --git a/bin/mediaplayer/core/demux_source_segment.cc b/garnet/bin/mediaplayer/core/demux_source_segment.cc similarity index 100% rename from bin/mediaplayer/core/demux_source_segment.cc rename to garnet/bin/mediaplayer/core/demux_source_segment.cc
diff --git a/bin/mediaplayer/core/demux_source_segment.h b/garnet/bin/mediaplayer/core/demux_source_segment.h similarity index 100% rename from bin/mediaplayer/core/demux_source_segment.h rename to garnet/bin/mediaplayer/core/demux_source_segment.h
diff --git a/bin/mediaplayer/core/player_core.cc b/garnet/bin/mediaplayer/core/player_core.cc similarity index 100% rename from bin/mediaplayer/core/player_core.cc rename to garnet/bin/mediaplayer/core/player_core.cc
diff --git a/bin/mediaplayer/core/player_core.h b/garnet/bin/mediaplayer/core/player_core.h similarity index 100% rename from bin/mediaplayer/core/player_core.h rename to garnet/bin/mediaplayer/core/player_core.h
diff --git a/bin/mediaplayer/core/renderer_sink_segment.cc b/garnet/bin/mediaplayer/core/renderer_sink_segment.cc similarity index 100% rename from bin/mediaplayer/core/renderer_sink_segment.cc rename to garnet/bin/mediaplayer/core/renderer_sink_segment.cc
diff --git a/bin/mediaplayer/core/renderer_sink_segment.h b/garnet/bin/mediaplayer/core/renderer_sink_segment.h similarity index 100% rename from bin/mediaplayer/core/renderer_sink_segment.h rename to garnet/bin/mediaplayer/core/renderer_sink_segment.h
diff --git a/bin/mediaplayer/core/segment.cc b/garnet/bin/mediaplayer/core/segment.cc similarity index 100% rename from bin/mediaplayer/core/segment.cc rename to garnet/bin/mediaplayer/core/segment.cc
diff --git a/bin/mediaplayer/core/segment.h b/garnet/bin/mediaplayer/core/segment.h similarity index 100% rename from bin/mediaplayer/core/segment.h rename to garnet/bin/mediaplayer/core/segment.h
diff --git a/bin/mediaplayer/core/sink_segment.cc b/garnet/bin/mediaplayer/core/sink_segment.cc similarity index 100% rename from bin/mediaplayer/core/sink_segment.cc rename to garnet/bin/mediaplayer/core/sink_segment.cc
diff --git a/bin/mediaplayer/core/sink_segment.h b/garnet/bin/mediaplayer/core/sink_segment.h similarity index 100% rename from bin/mediaplayer/core/sink_segment.h rename to garnet/bin/mediaplayer/core/sink_segment.h
diff --git a/bin/mediaplayer/core/source_segment.cc b/garnet/bin/mediaplayer/core/source_segment.cc similarity index 100% rename from bin/mediaplayer/core/source_segment.cc rename to garnet/bin/mediaplayer/core/source_segment.cc
diff --git a/bin/mediaplayer/core/source_segment.h b/garnet/bin/mediaplayer/core/source_segment.h similarity index 100% rename from bin/mediaplayer/core/source_segment.h rename to garnet/bin/mediaplayer/core/source_segment.h
diff --git a/bin/mediaplayer/core/stream_source_segment.cc b/garnet/bin/mediaplayer/core/stream_source_segment.cc similarity index 100% rename from bin/mediaplayer/core/stream_source_segment.cc rename to garnet/bin/mediaplayer/core/stream_source_segment.cc
diff --git a/bin/mediaplayer/core/stream_source_segment.h b/garnet/bin/mediaplayer/core/stream_source_segment.h similarity index 100% rename from bin/mediaplayer/core/stream_source_segment.h rename to garnet/bin/mediaplayer/core/stream_source_segment.h
diff --git a/bin/mediaplayer/core/test/fake_audio_renderer.cc b/garnet/bin/mediaplayer/core/test/fake_audio_renderer.cc similarity index 100% rename from bin/mediaplayer/core/test/fake_audio_renderer.cc rename to garnet/bin/mediaplayer/core/test/fake_audio_renderer.cc
diff --git a/bin/mediaplayer/core/test/fake_audio_renderer.h b/garnet/bin/mediaplayer/core/test/fake_audio_renderer.h similarity index 100% rename from bin/mediaplayer/core/test/fake_audio_renderer.h rename to garnet/bin/mediaplayer/core/test/fake_audio_renderer.h
diff --git a/bin/mediaplayer/core/test/fake_decoder.cc b/garnet/bin/mediaplayer/core/test/fake_decoder.cc similarity index 100% rename from bin/mediaplayer/core/test/fake_decoder.cc rename to garnet/bin/mediaplayer/core/test/fake_decoder.cc
diff --git a/bin/mediaplayer/core/test/fake_decoder.h b/garnet/bin/mediaplayer/core/test/fake_decoder.h similarity index 100% rename from bin/mediaplayer/core/test/fake_decoder.h rename to garnet/bin/mediaplayer/core/test/fake_decoder.h
diff --git a/bin/mediaplayer/core/test/fake_demux.cc b/garnet/bin/mediaplayer/core/test/fake_demux.cc similarity index 100% rename from bin/mediaplayer/core/test/fake_demux.cc rename to garnet/bin/mediaplayer/core/test/fake_demux.cc
diff --git a/bin/mediaplayer/core/test/fake_demux.h b/garnet/bin/mediaplayer/core/test/fake_demux.h similarity index 100% rename from bin/mediaplayer/core/test/fake_demux.h rename to garnet/bin/mediaplayer/core/test/fake_demux.h
diff --git a/bin/mediaplayer/core/test/fake_sink_segment.h b/garnet/bin/mediaplayer/core/test/fake_sink_segment.h similarity index 100% rename from bin/mediaplayer/core/test/fake_sink_segment.h rename to garnet/bin/mediaplayer/core/test/fake_sink_segment.h
diff --git a/bin/mediaplayer/core/test/fake_source_segment.h b/garnet/bin/mediaplayer/core/test/fake_source_segment.h similarity index 100% rename from bin/mediaplayer/core/test/fake_source_segment.h rename to garnet/bin/mediaplayer/core/test/fake_source_segment.h
diff --git a/bin/mediaplayer/core/test/fake_video_renderer.cc b/garnet/bin/mediaplayer/core/test/fake_video_renderer.cc similarity index 100% rename from bin/mediaplayer/core/test/fake_video_renderer.cc rename to garnet/bin/mediaplayer/core/test/fake_video_renderer.cc
diff --git a/bin/mediaplayer/core/test/fake_video_renderer.h b/garnet/bin/mediaplayer/core/test/fake_video_renderer.h similarity index 100% rename from bin/mediaplayer/core/test/fake_video_renderer.h rename to garnet/bin/mediaplayer/core/test/fake_video_renderer.h
diff --git a/bin/mediaplayer/core/test/player_core_test.cc b/garnet/bin/mediaplayer/core/test/player_core_test.cc similarity index 100% rename from bin/mediaplayer/core/test/player_core_test.cc rename to garnet/bin/mediaplayer/core/test/player_core_test.cc
diff --git a/bin/mediaplayer/decode/BUILD.gn b/garnet/bin/mediaplayer/decode/BUILD.gn similarity index 100% rename from bin/mediaplayer/decode/BUILD.gn rename to garnet/bin/mediaplayer/decode/BUILD.gn
diff --git a/bin/mediaplayer/decode/decoder.h b/garnet/bin/mediaplayer/decode/decoder.h similarity index 100% rename from bin/mediaplayer/decode/decoder.h rename to garnet/bin/mediaplayer/decode/decoder.h
diff --git a/bin/mediaplayer/decode/software_decoder.cc b/garnet/bin/mediaplayer/decode/software_decoder.cc similarity index 100% rename from bin/mediaplayer/decode/software_decoder.cc rename to garnet/bin/mediaplayer/decode/software_decoder.cc
diff --git a/bin/mediaplayer/decode/software_decoder.h b/garnet/bin/mediaplayer/decode/software_decoder.h similarity index 100% rename from bin/mediaplayer/decode/software_decoder.h rename to garnet/bin/mediaplayer/decode/software_decoder.h
diff --git a/bin/mediaplayer/demux/BUILD.gn b/garnet/bin/mediaplayer/demux/BUILD.gn similarity index 100% rename from bin/mediaplayer/demux/BUILD.gn rename to garnet/bin/mediaplayer/demux/BUILD.gn
diff --git a/bin/mediaplayer/demux/byte_rate_estimator.cc b/garnet/bin/mediaplayer/demux/byte_rate_estimator.cc similarity index 100% rename from bin/mediaplayer/demux/byte_rate_estimator.cc rename to garnet/bin/mediaplayer/demux/byte_rate_estimator.cc
diff --git a/bin/mediaplayer/demux/byte_rate_estimator.h b/garnet/bin/mediaplayer/demux/byte_rate_estimator.h similarity index 100% rename from bin/mediaplayer/demux/byte_rate_estimator.h rename to garnet/bin/mediaplayer/demux/byte_rate_estimator.h
diff --git a/bin/mediaplayer/demux/demux.h b/garnet/bin/mediaplayer/demux/demux.h similarity index 100% rename from bin/mediaplayer/demux/demux.h rename to garnet/bin/mediaplayer/demux/demux.h
diff --git a/bin/mediaplayer/demux/file_reader.cc b/garnet/bin/mediaplayer/demux/file_reader.cc similarity index 100% rename from bin/mediaplayer/demux/file_reader.cc rename to garnet/bin/mediaplayer/demux/file_reader.cc
diff --git a/bin/mediaplayer/demux/file_reader.h b/garnet/bin/mediaplayer/demux/file_reader.h similarity index 100% rename from bin/mediaplayer/demux/file_reader.h rename to garnet/bin/mediaplayer/demux/file_reader.h
diff --git a/bin/mediaplayer/demux/http_reader.cc b/garnet/bin/mediaplayer/demux/http_reader.cc similarity index 100% rename from bin/mediaplayer/demux/http_reader.cc rename to garnet/bin/mediaplayer/demux/http_reader.cc
diff --git a/bin/mediaplayer/demux/http_reader.h b/garnet/bin/mediaplayer/demux/http_reader.h similarity index 100% rename from bin/mediaplayer/demux/http_reader.h rename to garnet/bin/mediaplayer/demux/http_reader.h
diff --git a/bin/mediaplayer/demux/reader.h b/garnet/bin/mediaplayer/demux/reader.h similarity index 100% rename from bin/mediaplayer/demux/reader.h rename to garnet/bin/mediaplayer/demux/reader.h
diff --git a/bin/mediaplayer/demux/reader_cache.cc b/garnet/bin/mediaplayer/demux/reader_cache.cc similarity index 100% rename from bin/mediaplayer/demux/reader_cache.cc rename to garnet/bin/mediaplayer/demux/reader_cache.cc
diff --git a/bin/mediaplayer/demux/reader_cache.h b/garnet/bin/mediaplayer/demux/reader_cache.h similarity index 100% rename from bin/mediaplayer/demux/reader_cache.h rename to garnet/bin/mediaplayer/demux/reader_cache.h
diff --git a/bin/mediaplayer/demux/sparse_byte_buffer.cc b/garnet/bin/mediaplayer/demux/sparse_byte_buffer.cc similarity index 100% rename from bin/mediaplayer/demux/sparse_byte_buffer.cc rename to garnet/bin/mediaplayer/demux/sparse_byte_buffer.cc
diff --git a/bin/mediaplayer/demux/sparse_byte_buffer.h b/garnet/bin/mediaplayer/demux/sparse_byte_buffer.h similarity index 100% rename from bin/mediaplayer/demux/sparse_byte_buffer.h rename to garnet/bin/mediaplayer/demux/sparse_byte_buffer.h
diff --git a/bin/mediaplayer/demux/test/byte_rate_estimator_test.cc b/garnet/bin/mediaplayer/demux/test/byte_rate_estimator_test.cc similarity index 100% rename from bin/mediaplayer/demux/test/byte_rate_estimator_test.cc rename to garnet/bin/mediaplayer/demux/test/byte_rate_estimator_test.cc
diff --git a/bin/mediaplayer/demux/test/reader_cache_test.cc b/garnet/bin/mediaplayer/demux/test/reader_cache_test.cc similarity index 100% rename from bin/mediaplayer/demux/test/reader_cache_test.cc rename to garnet/bin/mediaplayer/demux/test/reader_cache_test.cc
diff --git a/bin/mediaplayer/demux/test/sparse_byte_buffer_test.cc b/garnet/bin/mediaplayer/demux/test/sparse_byte_buffer_test.cc similarity index 100% rename from bin/mediaplayer/demux/test/sparse_byte_buffer_test.cc rename to garnet/bin/mediaplayer/demux/test/sparse_byte_buffer_test.cc
diff --git a/bin/mediaplayer/ffmpeg/BUILD.gn b/garnet/bin/mediaplayer/ffmpeg/BUILD.gn similarity index 100% rename from bin/mediaplayer/ffmpeg/BUILD.gn rename to garnet/bin/mediaplayer/ffmpeg/BUILD.gn
diff --git a/bin/mediaplayer/ffmpeg/av_codec_context.cc b/garnet/bin/mediaplayer/ffmpeg/av_codec_context.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/av_codec_context.cc rename to garnet/bin/mediaplayer/ffmpeg/av_codec_context.cc
diff --git a/bin/mediaplayer/ffmpeg/av_codec_context.h b/garnet/bin/mediaplayer/ffmpeg/av_codec_context.h similarity index 100% rename from bin/mediaplayer/ffmpeg/av_codec_context.h rename to garnet/bin/mediaplayer/ffmpeg/av_codec_context.h
diff --git a/bin/mediaplayer/ffmpeg/av_format_context.h b/garnet/bin/mediaplayer/ffmpeg/av_format_context.h similarity index 100% rename from bin/mediaplayer/ffmpeg/av_format_context.h rename to garnet/bin/mediaplayer/ffmpeg/av_format_context.h
diff --git a/bin/mediaplayer/ffmpeg/av_frame.h b/garnet/bin/mediaplayer/ffmpeg/av_frame.h similarity index 100% rename from bin/mediaplayer/ffmpeg/av_frame.h rename to garnet/bin/mediaplayer/ffmpeg/av_frame.h
diff --git a/bin/mediaplayer/ffmpeg/av_io_context.cc b/garnet/bin/mediaplayer/ffmpeg/av_io_context.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/av_io_context.cc rename to garnet/bin/mediaplayer/ffmpeg/av_io_context.cc
diff --git a/bin/mediaplayer/ffmpeg/av_io_context.h b/garnet/bin/mediaplayer/ffmpeg/av_io_context.h similarity index 100% rename from bin/mediaplayer/ffmpeg/av_io_context.h rename to garnet/bin/mediaplayer/ffmpeg/av_io_context.h
diff --git a/bin/mediaplayer/ffmpeg/av_packet.h b/garnet/bin/mediaplayer/ffmpeg/av_packet.h similarity index 100% rename from bin/mediaplayer/ffmpeg/av_packet.h rename to garnet/bin/mediaplayer/ffmpeg/av_packet.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_audio_decoder.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_base.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_decoder_factory.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_demux.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_demux.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_demux.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_demux.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_demux_factory.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_formatting.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_formatting.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_formatting.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_formatting.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_formatting.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_formatting.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_formatting.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_formatting.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_init.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_init.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_init.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_init.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_init.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_init.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_init.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_init.h
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.cc b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.cc rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.cc
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.h b/garnet/bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.h similarity index 100% rename from bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.h rename to garnet/bin/mediaplayer/ffmpeg/ffmpeg_video_decoder.h
diff --git a/bin/mediaplayer/ffmpeg/lpcm_util.cc b/garnet/bin/mediaplayer/ffmpeg/lpcm_util.cc similarity index 100% rename from bin/mediaplayer/ffmpeg/lpcm_util.cc rename to garnet/bin/mediaplayer/ffmpeg/lpcm_util.cc
diff --git a/bin/mediaplayer/ffmpeg/lpcm_util.h b/garnet/bin/mediaplayer/ffmpeg/lpcm_util.h similarity index 100% rename from bin/mediaplayer/ffmpeg/lpcm_util.h rename to garnet/bin/mediaplayer/ffmpeg/lpcm_util.h
diff --git a/bin/mediaplayer/fidl/BUILD.gn b/garnet/bin/mediaplayer/fidl/BUILD.gn similarity index 100% rename from bin/mediaplayer/fidl/BUILD.gn rename to garnet/bin/mediaplayer/fidl/BUILD.gn
diff --git a/bin/mediaplayer/fidl/buffer_set.cc b/garnet/bin/mediaplayer/fidl/buffer_set.cc similarity index 100% rename from bin/mediaplayer/fidl/buffer_set.cc rename to garnet/bin/mediaplayer/fidl/buffer_set.cc
diff --git a/bin/mediaplayer/fidl/buffer_set.h b/garnet/bin/mediaplayer/fidl/buffer_set.h similarity index 100% rename from bin/mediaplayer/fidl/buffer_set.h rename to garnet/bin/mediaplayer/fidl/buffer_set.h
diff --git a/bin/mediaplayer/fidl/fidl_audio_renderer.cc b/garnet/bin/mediaplayer/fidl/fidl_audio_renderer.cc similarity index 100% rename from bin/mediaplayer/fidl/fidl_audio_renderer.cc rename to garnet/bin/mediaplayer/fidl/fidl_audio_renderer.cc
diff --git a/bin/mediaplayer/fidl/fidl_audio_renderer.h b/garnet/bin/mediaplayer/fidl/fidl_audio_renderer.h similarity index 100% rename from bin/mediaplayer/fidl/fidl_audio_renderer.h rename to garnet/bin/mediaplayer/fidl/fidl_audio_renderer.h
diff --git a/bin/mediaplayer/fidl/fidl_decoder.cc b/garnet/bin/mediaplayer/fidl/fidl_decoder.cc similarity index 100% rename from bin/mediaplayer/fidl/fidl_decoder.cc rename to garnet/bin/mediaplayer/fidl/fidl_decoder.cc
diff --git a/bin/mediaplayer/fidl/fidl_decoder.h b/garnet/bin/mediaplayer/fidl/fidl_decoder.h similarity index 100% rename from bin/mediaplayer/fidl/fidl_decoder.h rename to garnet/bin/mediaplayer/fidl/fidl_decoder.h
diff --git a/bin/mediaplayer/fidl/fidl_decoder_factory.cc b/garnet/bin/mediaplayer/fidl/fidl_decoder_factory.cc similarity index 100% rename from bin/mediaplayer/fidl/fidl_decoder_factory.cc rename to garnet/bin/mediaplayer/fidl/fidl_decoder_factory.cc
diff --git a/bin/mediaplayer/fidl/fidl_decoder_factory.h b/garnet/bin/mediaplayer/fidl/fidl_decoder_factory.h similarity index 100% rename from bin/mediaplayer/fidl/fidl_decoder_factory.h rename to garnet/bin/mediaplayer/fidl/fidl_decoder_factory.h
diff --git a/bin/mediaplayer/fidl/fidl_reader.cc b/garnet/bin/mediaplayer/fidl/fidl_reader.cc similarity index 100% rename from bin/mediaplayer/fidl/fidl_reader.cc rename to garnet/bin/mediaplayer/fidl/fidl_reader.cc
diff --git a/bin/mediaplayer/fidl/fidl_reader.h b/garnet/bin/mediaplayer/fidl/fidl_reader.h similarity index 100% rename from bin/mediaplayer/fidl/fidl_reader.h rename to garnet/bin/mediaplayer/fidl/fidl_reader.h
diff --git a/bin/mediaplayer/fidl/fidl_type_conversions.cc b/garnet/bin/mediaplayer/fidl/fidl_type_conversions.cc similarity index 100% rename from bin/mediaplayer/fidl/fidl_type_conversions.cc rename to garnet/bin/mediaplayer/fidl/fidl_type_conversions.cc
diff --git a/bin/mediaplayer/fidl/fidl_type_conversions.h b/garnet/bin/mediaplayer/fidl/fidl_type_conversions.h similarity index 100% rename from bin/mediaplayer/fidl/fidl_type_conversions.h rename to garnet/bin/mediaplayer/fidl/fidl_type_conversions.h
diff --git a/bin/mediaplayer/fidl/fidl_video_renderer.cc b/garnet/bin/mediaplayer/fidl/fidl_video_renderer.cc similarity index 100% rename from bin/mediaplayer/fidl/fidl_video_renderer.cc rename to garnet/bin/mediaplayer/fidl/fidl_video_renderer.cc
diff --git a/bin/mediaplayer/fidl/fidl_video_renderer.h b/garnet/bin/mediaplayer/fidl/fidl_video_renderer.h similarity index 100% rename from bin/mediaplayer/fidl/fidl_video_renderer.h rename to garnet/bin/mediaplayer/fidl/fidl_video_renderer.h
diff --git a/bin/mediaplayer/fidl/simple_stream_sink_impl.cc b/garnet/bin/mediaplayer/fidl/simple_stream_sink_impl.cc similarity index 100% rename from bin/mediaplayer/fidl/simple_stream_sink_impl.cc rename to garnet/bin/mediaplayer/fidl/simple_stream_sink_impl.cc
diff --git a/bin/mediaplayer/fidl/simple_stream_sink_impl.h b/garnet/bin/mediaplayer/fidl/simple_stream_sink_impl.h similarity index 100% rename from bin/mediaplayer/fidl/simple_stream_sink_impl.h rename to garnet/bin/mediaplayer/fidl/simple_stream_sink_impl.h
diff --git a/bin/mediaplayer/graph/BUILD.gn b/garnet/bin/mediaplayer/graph/BUILD.gn similarity index 100% rename from bin/mediaplayer/graph/BUILD.gn rename to garnet/bin/mediaplayer/graph/BUILD.gn
diff --git a/bin/mediaplayer/graph/README.md b/garnet/bin/mediaplayer/graph/README.md similarity index 100% rename from bin/mediaplayer/graph/README.md rename to garnet/bin/mediaplayer/graph/README.md
diff --git a/bin/mediaplayer/graph/formatting.cc b/garnet/bin/mediaplayer/graph/formatting.cc similarity index 100% rename from bin/mediaplayer/graph/formatting.cc rename to garnet/bin/mediaplayer/graph/formatting.cc
diff --git a/bin/mediaplayer/graph/formatting.h b/garnet/bin/mediaplayer/graph/formatting.h similarity index 100% rename from bin/mediaplayer/graph/formatting.h rename to garnet/bin/mediaplayer/graph/formatting.h
diff --git a/bin/mediaplayer/graph/graph.cc b/garnet/bin/mediaplayer/graph/graph.cc similarity index 100% rename from bin/mediaplayer/graph/graph.cc rename to garnet/bin/mediaplayer/graph/graph.cc
diff --git a/bin/mediaplayer/graph/graph.h b/garnet/bin/mediaplayer/graph/graph.h similarity index 100% rename from bin/mediaplayer/graph/graph.h rename to garnet/bin/mediaplayer/graph/graph.h
diff --git a/bin/mediaplayer/graph/metadata.h b/garnet/bin/mediaplayer/graph/metadata.h similarity index 100% rename from bin/mediaplayer/graph/metadata.h rename to garnet/bin/mediaplayer/graph/metadata.h
diff --git a/bin/mediaplayer/graph/nodes/input.cc b/garnet/bin/mediaplayer/graph/nodes/input.cc similarity index 100% rename from bin/mediaplayer/graph/nodes/input.cc rename to garnet/bin/mediaplayer/graph/nodes/input.cc
diff --git a/bin/mediaplayer/graph/nodes/input.h b/garnet/bin/mediaplayer/graph/nodes/input.h similarity index 100% rename from bin/mediaplayer/graph/nodes/input.h rename to garnet/bin/mediaplayer/graph/nodes/input.h
diff --git a/bin/mediaplayer/graph/nodes/node.cc b/garnet/bin/mediaplayer/graph/nodes/node.cc similarity index 100% rename from bin/mediaplayer/graph/nodes/node.cc rename to garnet/bin/mediaplayer/graph/nodes/node.cc
diff --git a/bin/mediaplayer/graph/nodes/node.h b/garnet/bin/mediaplayer/graph/nodes/node.h similarity index 100% rename from bin/mediaplayer/graph/nodes/node.h rename to garnet/bin/mediaplayer/graph/nodes/node.h
diff --git a/bin/mediaplayer/graph/nodes/output.cc b/garnet/bin/mediaplayer/graph/nodes/output.cc similarity index 100% rename from bin/mediaplayer/graph/nodes/output.cc rename to garnet/bin/mediaplayer/graph/nodes/output.cc
diff --git a/bin/mediaplayer/graph/nodes/output.h b/garnet/bin/mediaplayer/graph/nodes/output.h similarity index 100% rename from bin/mediaplayer/graph/nodes/output.h rename to garnet/bin/mediaplayer/graph/nodes/output.h
diff --git a/bin/mediaplayer/graph/packet.cc b/garnet/bin/mediaplayer/graph/packet.cc similarity index 100% rename from bin/mediaplayer/graph/packet.cc rename to garnet/bin/mediaplayer/graph/packet.cc
diff --git a/bin/mediaplayer/graph/packet.h b/garnet/bin/mediaplayer/graph/packet.h similarity index 100% rename from bin/mediaplayer/graph/packet.h rename to garnet/bin/mediaplayer/graph/packet.h
diff --git a/bin/mediaplayer/graph/payloads/local_memory_payload_allocator.cc b/garnet/bin/mediaplayer/graph/payloads/local_memory_payload_allocator.cc similarity index 100% rename from bin/mediaplayer/graph/payloads/local_memory_payload_allocator.cc rename to garnet/bin/mediaplayer/graph/payloads/local_memory_payload_allocator.cc
diff --git a/bin/mediaplayer/graph/payloads/local_memory_payload_allocator.h b/garnet/bin/mediaplayer/graph/payloads/local_memory_payload_allocator.h similarity index 100% rename from bin/mediaplayer/graph/payloads/local_memory_payload_allocator.h rename to garnet/bin/mediaplayer/graph/payloads/local_memory_payload_allocator.h
diff --git a/bin/mediaplayer/graph/payloads/payload_allocator.h b/garnet/bin/mediaplayer/graph/payloads/payload_allocator.h similarity index 100% rename from bin/mediaplayer/graph/payloads/payload_allocator.h rename to garnet/bin/mediaplayer/graph/payloads/payload_allocator.h
diff --git a/bin/mediaplayer/graph/payloads/payload_buffer.cc b/garnet/bin/mediaplayer/graph/payloads/payload_buffer.cc similarity index 100% rename from bin/mediaplayer/graph/payloads/payload_buffer.cc rename to garnet/bin/mediaplayer/graph/payloads/payload_buffer.cc
diff --git a/bin/mediaplayer/graph/payloads/payload_buffer.h b/garnet/bin/mediaplayer/graph/payloads/payload_buffer.h similarity index 100% rename from bin/mediaplayer/graph/payloads/payload_buffer.h rename to garnet/bin/mediaplayer/graph/payloads/payload_buffer.h
diff --git a/bin/mediaplayer/graph/payloads/payload_config.h b/garnet/bin/mediaplayer/graph/payloads/payload_config.h similarity index 100% rename from bin/mediaplayer/graph/payloads/payload_config.h rename to garnet/bin/mediaplayer/graph/payloads/payload_config.h
diff --git a/bin/mediaplayer/graph/payloads/payload_manager.cc b/garnet/bin/mediaplayer/graph/payloads/payload_manager.cc similarity index 100% rename from bin/mediaplayer/graph/payloads/payload_manager.cc rename to garnet/bin/mediaplayer/graph/payloads/payload_manager.cc
diff --git a/bin/mediaplayer/graph/payloads/payload_manager.h b/garnet/bin/mediaplayer/graph/payloads/payload_manager.h similarity index 100% rename from bin/mediaplayer/graph/payloads/payload_manager.h rename to garnet/bin/mediaplayer/graph/payloads/payload_manager.h
diff --git a/bin/mediaplayer/graph/payloads/vmo_payload_allocator.cc b/garnet/bin/mediaplayer/graph/payloads/vmo_payload_allocator.cc similarity index 100% rename from bin/mediaplayer/graph/payloads/vmo_payload_allocator.cc rename to garnet/bin/mediaplayer/graph/payloads/vmo_payload_allocator.cc
diff --git a/bin/mediaplayer/graph/payloads/vmo_payload_allocator.h b/garnet/bin/mediaplayer/graph/payloads/vmo_payload_allocator.h similarity index 100% rename from bin/mediaplayer/graph/payloads/vmo_payload_allocator.h rename to garnet/bin/mediaplayer/graph/payloads/vmo_payload_allocator.h
diff --git a/bin/mediaplayer/graph/refs.cc b/garnet/bin/mediaplayer/graph/refs.cc similarity index 100% rename from bin/mediaplayer/graph/refs.cc rename to garnet/bin/mediaplayer/graph/refs.cc
diff --git a/bin/mediaplayer/graph/refs.h b/garnet/bin/mediaplayer/graph/refs.h similarity index 100% rename from bin/mediaplayer/graph/refs.h rename to garnet/bin/mediaplayer/graph/refs.h
diff --git a/bin/mediaplayer/graph/result.h b/garnet/bin/mediaplayer/graph/result.h similarity index 100% rename from bin/mediaplayer/graph/result.h rename to garnet/bin/mediaplayer/graph/result.h
diff --git a/bin/mediaplayer/graph/types/audio_stream_type.cc b/garnet/bin/mediaplayer/graph/types/audio_stream_type.cc similarity index 100% rename from bin/mediaplayer/graph/types/audio_stream_type.cc rename to garnet/bin/mediaplayer/graph/types/audio_stream_type.cc
diff --git a/bin/mediaplayer/graph/types/audio_stream_type.h b/garnet/bin/mediaplayer/graph/types/audio_stream_type.h similarity index 100% rename from bin/mediaplayer/graph/types/audio_stream_type.h rename to garnet/bin/mediaplayer/graph/types/audio_stream_type.h
diff --git a/bin/mediaplayer/graph/types/bytes.cc b/garnet/bin/mediaplayer/graph/types/bytes.cc similarity index 100% rename from bin/mediaplayer/graph/types/bytes.cc rename to garnet/bin/mediaplayer/graph/types/bytes.cc
diff --git a/bin/mediaplayer/graph/types/bytes.h b/garnet/bin/mediaplayer/graph/types/bytes.h similarity index 100% rename from bin/mediaplayer/graph/types/bytes.h rename to garnet/bin/mediaplayer/graph/types/bytes.h
diff --git a/bin/mediaplayer/graph/types/stream_type.cc b/garnet/bin/mediaplayer/graph/types/stream_type.cc similarity index 100% rename from bin/mediaplayer/graph/types/stream_type.cc rename to garnet/bin/mediaplayer/graph/types/stream_type.cc
diff --git a/bin/mediaplayer/graph/types/stream_type.h b/garnet/bin/mediaplayer/graph/types/stream_type.h similarity index 100% rename from bin/mediaplayer/graph/types/stream_type.h rename to garnet/bin/mediaplayer/graph/types/stream_type.h
diff --git a/bin/mediaplayer/graph/types/subpicture_stream_type.cc b/garnet/bin/mediaplayer/graph/types/subpicture_stream_type.cc similarity index 100% rename from bin/mediaplayer/graph/types/subpicture_stream_type.cc rename to garnet/bin/mediaplayer/graph/types/subpicture_stream_type.cc
diff --git a/bin/mediaplayer/graph/types/subpicture_stream_type.h b/garnet/bin/mediaplayer/graph/types/subpicture_stream_type.h similarity index 100% rename from bin/mediaplayer/graph/types/subpicture_stream_type.h rename to garnet/bin/mediaplayer/graph/types/subpicture_stream_type.h
diff --git a/bin/mediaplayer/graph/types/text_stream_type.cc b/garnet/bin/mediaplayer/graph/types/text_stream_type.cc similarity index 100% rename from bin/mediaplayer/graph/types/text_stream_type.cc rename to garnet/bin/mediaplayer/graph/types/text_stream_type.cc
diff --git a/bin/mediaplayer/graph/types/text_stream_type.h b/garnet/bin/mediaplayer/graph/types/text_stream_type.h similarity index 100% rename from bin/mediaplayer/graph/types/text_stream_type.h rename to garnet/bin/mediaplayer/graph/types/text_stream_type.h
diff --git a/bin/mediaplayer/graph/types/video_stream_type.cc b/garnet/bin/mediaplayer/graph/types/video_stream_type.cc similarity index 100% rename from bin/mediaplayer/graph/types/video_stream_type.cc rename to garnet/bin/mediaplayer/graph/types/video_stream_type.cc
diff --git a/bin/mediaplayer/graph/types/video_stream_type.h b/garnet/bin/mediaplayer/graph/types/video_stream_type.h similarity index 100% rename from bin/mediaplayer/graph/types/video_stream_type.h rename to garnet/bin/mediaplayer/graph/types/video_stream_type.h
diff --git a/bin/mediaplayer/graph_create/BUILD.gn b/garnet/bin/mediaplayer/graph_create/BUILD.gn similarity index 100% rename from bin/mediaplayer/graph_create/BUILD.gn rename to garnet/bin/mediaplayer/graph_create/BUILD.gn
diff --git a/bin/mediaplayer/graph_create/decoder.cc b/garnet/bin/mediaplayer/graph_create/decoder.cc similarity index 100% rename from bin/mediaplayer/graph_create/decoder.cc rename to garnet/bin/mediaplayer/graph_create/decoder.cc
diff --git a/bin/mediaplayer/graph_create/demux.cc b/garnet/bin/mediaplayer/graph_create/demux.cc similarity index 100% rename from bin/mediaplayer/graph_create/demux.cc rename to garnet/bin/mediaplayer/graph_create/demux.cc
diff --git a/bin/mediaplayer/main.cc b/garnet/bin/mediaplayer/main.cc similarity index 100% rename from bin/mediaplayer/main.cc rename to garnet/bin/mediaplayer/main.cc
diff --git a/bin/mediaplayer/meta/mediaplayer.cmx b/garnet/bin/mediaplayer/meta/mediaplayer.cmx similarity index 100% rename from bin/mediaplayer/meta/mediaplayer.cmx rename to garnet/bin/mediaplayer/meta/mediaplayer.cmx
diff --git a/bin/mediaplayer/meta/mediaplayer_core_tests.cmx b/garnet/bin/mediaplayer/meta/mediaplayer_core_tests.cmx similarity index 100% rename from bin/mediaplayer/meta/mediaplayer_core_tests.cmx rename to garnet/bin/mediaplayer/meta/mediaplayer_core_tests.cmx
diff --git a/bin/mediaplayer/meta/mediaplayer_demux_tests.cmx b/garnet/bin/mediaplayer/meta/mediaplayer_demux_tests.cmx similarity index 100% rename from bin/mediaplayer/meta/mediaplayer_demux_tests.cmx rename to garnet/bin/mediaplayer/meta/mediaplayer_demux_tests.cmx
diff --git a/bin/mediaplayer/meta/mediaplayer_test_util.cmx b/garnet/bin/mediaplayer/meta/mediaplayer_test_util.cmx similarity index 100% rename from bin/mediaplayer/meta/mediaplayer_test_util.cmx rename to garnet/bin/mediaplayer/meta/mediaplayer_test_util.cmx
diff --git a/bin/mediaplayer/meta/mediaplayer_tests.cmx b/garnet/bin/mediaplayer/meta/mediaplayer_tests.cmx similarity index 100% rename from bin/mediaplayer/meta/mediaplayer_tests.cmx rename to garnet/bin/mediaplayer/meta/mediaplayer_tests.cmx
diff --git a/bin/mediaplayer/meta/mediaplayer_util_tests.cmx b/garnet/bin/mediaplayer/meta/mediaplayer_util_tests.cmx similarity index 100% rename from bin/mediaplayer/meta/mediaplayer_util_tests.cmx rename to garnet/bin/mediaplayer/meta/mediaplayer_util_tests.cmx
diff --git a/bin/mediaplayer/metrics/BUILD.gn b/garnet/bin/mediaplayer/metrics/BUILD.gn similarity index 100% rename from bin/mediaplayer/metrics/BUILD.gn rename to garnet/bin/mediaplayer/metrics/BUILD.gn
diff --git a/bin/mediaplayer/metrics/packet_timing_tracker.cc b/garnet/bin/mediaplayer/metrics/packet_timing_tracker.cc similarity index 100% rename from bin/mediaplayer/metrics/packet_timing_tracker.cc rename to garnet/bin/mediaplayer/metrics/packet_timing_tracker.cc
diff --git a/bin/mediaplayer/metrics/packet_timing_tracker.h b/garnet/bin/mediaplayer/metrics/packet_timing_tracker.h similarity index 100% rename from bin/mediaplayer/metrics/packet_timing_tracker.h rename to garnet/bin/mediaplayer/metrics/packet_timing_tracker.h
diff --git a/bin/mediaplayer/metrics/rate_tracker.cc b/garnet/bin/mediaplayer/metrics/rate_tracker.cc similarity index 100% rename from bin/mediaplayer/metrics/rate_tracker.cc rename to garnet/bin/mediaplayer/metrics/rate_tracker.cc
diff --git a/bin/mediaplayer/metrics/rate_tracker.h b/garnet/bin/mediaplayer/metrics/rate_tracker.h similarity index 100% rename from bin/mediaplayer/metrics/rate_tracker.h rename to garnet/bin/mediaplayer/metrics/rate_tracker.h
diff --git a/bin/mediaplayer/metrics/value_tracker.h b/garnet/bin/mediaplayer/metrics/value_tracker.h similarity index 100% rename from bin/mediaplayer/metrics/value_tracker.h rename to garnet/bin/mediaplayer/metrics/value_tracker.h
diff --git a/bin/mediaplayer/player_impl.cc b/garnet/bin/mediaplayer/player_impl.cc similarity index 100% rename from bin/mediaplayer/player_impl.cc rename to garnet/bin/mediaplayer/player_impl.cc
diff --git a/bin/mediaplayer/player_impl.h b/garnet/bin/mediaplayer/player_impl.h similarity index 100% rename from bin/mediaplayer/player_impl.h rename to garnet/bin/mediaplayer/player_impl.h
diff --git a/bin/mediaplayer/render/BUILD.gn b/garnet/bin/mediaplayer/render/BUILD.gn similarity index 100% rename from bin/mediaplayer/render/BUILD.gn rename to garnet/bin/mediaplayer/render/BUILD.gn
diff --git a/bin/mediaplayer/render/audio_renderer.h b/garnet/bin/mediaplayer/render/audio_renderer.h similarity index 100% rename from bin/mediaplayer/render/audio_renderer.h rename to garnet/bin/mediaplayer/render/audio_renderer.h
diff --git a/bin/mediaplayer/render/renderer.cc b/garnet/bin/mediaplayer/render/renderer.cc similarity index 100% rename from bin/mediaplayer/render/renderer.cc rename to garnet/bin/mediaplayer/render/renderer.cc
diff --git a/bin/mediaplayer/render/renderer.h b/garnet/bin/mediaplayer/render/renderer.h similarity index 100% rename from bin/mediaplayer/render/renderer.h rename to garnet/bin/mediaplayer/render/renderer.h
diff --git a/bin/mediaplayer/render/video_renderer.h b/garnet/bin/mediaplayer/render/video_renderer.h similarity index 100% rename from bin/mediaplayer/render/video_renderer.h rename to garnet/bin/mediaplayer/render/video_renderer.h
diff --git a/bin/mediaplayer/source_impl.cc b/garnet/bin/mediaplayer/source_impl.cc similarity index 100% rename from bin/mediaplayer/source_impl.cc rename to garnet/bin/mediaplayer/source_impl.cc
diff --git a/bin/mediaplayer/source_impl.h b/garnet/bin/mediaplayer/source_impl.h similarity index 100% rename from bin/mediaplayer/source_impl.h rename to garnet/bin/mediaplayer/source_impl.h
diff --git a/bin/mediaplayer/test/command_queue.cc b/garnet/bin/mediaplayer/test/command_queue.cc similarity index 100% rename from bin/mediaplayer/test/command_queue.cc rename to garnet/bin/mediaplayer/test/command_queue.cc
diff --git a/bin/mediaplayer/test/command_queue.h b/garnet/bin/mediaplayer/test/command_queue.h similarity index 100% rename from bin/mediaplayer/test/command_queue.h rename to garnet/bin/mediaplayer/test/command_queue.h
diff --git a/bin/mediaplayer/test/fakes/fake_audio.h b/garnet/bin/mediaplayer/test/fakes/fake_audio.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_audio.h rename to garnet/bin/mediaplayer/test/fakes/fake_audio.h
diff --git a/bin/mediaplayer/test/fakes/fake_audio_renderer.cc b/garnet/bin/mediaplayer/test/fakes/fake_audio_renderer.cc similarity index 100% rename from bin/mediaplayer/test/fakes/fake_audio_renderer.cc rename to garnet/bin/mediaplayer/test/fakes/fake_audio_renderer.cc
diff --git a/bin/mediaplayer/test/fakes/fake_audio_renderer.h b/garnet/bin/mediaplayer/test/fakes/fake_audio_renderer.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_audio_renderer.h rename to garnet/bin/mediaplayer/test/fakes/fake_audio_renderer.h
diff --git a/bin/mediaplayer/test/fakes/fake_image_pipe.cc b/garnet/bin/mediaplayer/test/fakes/fake_image_pipe.cc similarity index 100% rename from bin/mediaplayer/test/fakes/fake_image_pipe.cc rename to garnet/bin/mediaplayer/test/fakes/fake_image_pipe.cc
diff --git a/bin/mediaplayer/test/fakes/fake_image_pipe.h b/garnet/bin/mediaplayer/test/fakes/fake_image_pipe.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_image_pipe.h rename to garnet/bin/mediaplayer/test/fakes/fake_image_pipe.h
diff --git a/bin/mediaplayer/test/fakes/fake_scenic.cc b/garnet/bin/mediaplayer/test/fakes/fake_scenic.cc similarity index 100% rename from bin/mediaplayer/test/fakes/fake_scenic.cc rename to garnet/bin/mediaplayer/test/fakes/fake_scenic.cc
diff --git a/bin/mediaplayer/test/fakes/fake_scenic.h b/garnet/bin/mediaplayer/test/fakes/fake_scenic.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_scenic.h rename to garnet/bin/mediaplayer/test/fakes/fake_scenic.h
diff --git a/bin/mediaplayer/test/fakes/fake_session.cc b/garnet/bin/mediaplayer/test/fakes/fake_session.cc similarity index 100% rename from bin/mediaplayer/test/fakes/fake_session.cc rename to garnet/bin/mediaplayer/test/fakes/fake_session.cc
diff --git a/bin/mediaplayer/test/fakes/fake_session.h b/garnet/bin/mediaplayer/test/fakes/fake_session.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_session.h rename to garnet/bin/mediaplayer/test/fakes/fake_session.h
diff --git a/bin/mediaplayer/test/fakes/fake_view.cc b/garnet/bin/mediaplayer/test/fakes/fake_view.cc similarity index 100% rename from bin/mediaplayer/test/fakes/fake_view.cc rename to garnet/bin/mediaplayer/test/fakes/fake_view.cc
diff --git a/bin/mediaplayer/test/fakes/fake_view.h b/garnet/bin/mediaplayer/test/fakes/fake_view.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_view.h rename to garnet/bin/mediaplayer/test/fakes/fake_view.h
diff --git a/bin/mediaplayer/test/fakes/fake_view_manager.cc b/garnet/bin/mediaplayer/test/fakes/fake_view_manager.cc similarity index 100% rename from bin/mediaplayer/test/fakes/fake_view_manager.cc rename to garnet/bin/mediaplayer/test/fakes/fake_view_manager.cc
diff --git a/bin/mediaplayer/test/fakes/fake_view_manager.h b/garnet/bin/mediaplayer/test/fakes/fake_view_manager.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_view_manager.h rename to garnet/bin/mediaplayer/test/fakes/fake_view_manager.h
diff --git a/bin/mediaplayer/test/fakes/fake_wav_reader.cc b/garnet/bin/mediaplayer/test/fakes/fake_wav_reader.cc similarity index 100% rename from bin/mediaplayer/test/fakes/fake_wav_reader.cc rename to garnet/bin/mediaplayer/test/fakes/fake_wav_reader.cc
diff --git a/bin/mediaplayer/test/fakes/fake_wav_reader.h b/garnet/bin/mediaplayer/test/fakes/fake_wav_reader.h similarity index 100% rename from bin/mediaplayer/test/fakes/fake_wav_reader.h rename to garnet/bin/mediaplayer/test/fakes/fake_wav_reader.h
diff --git a/bin/mediaplayer/test/fakes/packet_info.cc b/garnet/bin/mediaplayer/test/fakes/packet_info.cc similarity index 100% rename from bin/mediaplayer/test/fakes/packet_info.cc rename to garnet/bin/mediaplayer/test/fakes/packet_info.cc
diff --git a/bin/mediaplayer/test/fakes/packet_info.h b/garnet/bin/mediaplayer/test/fakes/packet_info.h similarity index 100% rename from bin/mediaplayer/test/fakes/packet_info.h rename to garnet/bin/mediaplayer/test/fakes/packet_info.h
diff --git a/bin/mediaplayer/test/mediaplayer_test_util_params.cc b/garnet/bin/mediaplayer/test/mediaplayer_test_util_params.cc similarity index 100% rename from bin/mediaplayer/test/mediaplayer_test_util_params.cc rename to garnet/bin/mediaplayer/test/mediaplayer_test_util_params.cc
diff --git a/bin/mediaplayer/test/mediaplayer_test_util_params.h b/garnet/bin/mediaplayer/test/mediaplayer_test_util_params.h similarity index 100% rename from bin/mediaplayer/test/mediaplayer_test_util_params.h rename to garnet/bin/mediaplayer/test/mediaplayer_test_util_params.h
diff --git a/bin/mediaplayer/test/mediaplayer_test_util_view.cc b/garnet/bin/mediaplayer/test/mediaplayer_test_util_view.cc similarity index 100% rename from bin/mediaplayer/test/mediaplayer_test_util_view.cc rename to garnet/bin/mediaplayer/test/mediaplayer_test_util_view.cc
diff --git a/bin/mediaplayer/test/mediaplayer_test_util_view.h b/garnet/bin/mediaplayer/test/mediaplayer_test_util_view.h similarity index 100% rename from bin/mediaplayer/test/mediaplayer_test_util_view.h rename to garnet/bin/mediaplayer/test/mediaplayer_test_util_view.h
diff --git a/bin/mediaplayer/test/mediaplayer_tests.cc b/garnet/bin/mediaplayer/test/mediaplayer_tests.cc similarity index 100% rename from bin/mediaplayer/test/mediaplayer_tests.cc rename to garnet/bin/mediaplayer/test/mediaplayer_tests.cc
diff --git a/bin/mediaplayer/test/sink_feeder.cc b/garnet/bin/mediaplayer/test/sink_feeder.cc similarity index 100% rename from bin/mediaplayer/test/sink_feeder.cc rename to garnet/bin/mediaplayer/test/sink_feeder.cc
diff --git a/bin/mediaplayer/test/sink_feeder.h b/garnet/bin/mediaplayer/test/sink_feeder.h similarity index 100% rename from bin/mediaplayer/test/sink_feeder.h rename to garnet/bin/mediaplayer/test/sink_feeder.h
diff --git a/bin/mediaplayer/test/test_util_main.cc b/garnet/bin/mediaplayer/test/test_util_main.cc similarity index 100% rename from bin/mediaplayer/test/test_util_main.cc rename to garnet/bin/mediaplayer/test/test_util_main.cc
diff --git a/bin/mediaplayer/util/BUILD.gn b/garnet/bin/mediaplayer/util/BUILD.gn similarity index 100% rename from bin/mediaplayer/util/BUILD.gn rename to garnet/bin/mediaplayer/util/BUILD.gn
diff --git a/bin/mediaplayer/util/callback_joiner.cc b/garnet/bin/mediaplayer/util/callback_joiner.cc similarity index 100% rename from bin/mediaplayer/util/callback_joiner.cc rename to garnet/bin/mediaplayer/util/callback_joiner.cc
diff --git a/bin/mediaplayer/util/callback_joiner.h b/garnet/bin/mediaplayer/util/callback_joiner.h similarity index 100% rename from bin/mediaplayer/util/callback_joiner.h rename to garnet/bin/mediaplayer/util/callback_joiner.h
diff --git a/bin/mediaplayer/util/incident.cc b/garnet/bin/mediaplayer/util/incident.cc similarity index 100% rename from bin/mediaplayer/util/incident.cc rename to garnet/bin/mediaplayer/util/incident.cc
diff --git a/bin/mediaplayer/util/incident.h b/garnet/bin/mediaplayer/util/incident.h similarity index 100% rename from bin/mediaplayer/util/incident.h rename to garnet/bin/mediaplayer/util/incident.h
diff --git a/bin/mediaplayer/util/safe_clone.h b/garnet/bin/mediaplayer/util/safe_clone.h similarity index 100% rename from bin/mediaplayer/util/safe_clone.h rename to garnet/bin/mediaplayer/util/safe_clone.h
diff --git a/bin/mediaplayer/util/test/incident_test.cc b/garnet/bin/mediaplayer/util/test/incident_test.cc similarity index 100% rename from bin/mediaplayer/util/test/incident_test.cc rename to garnet/bin/mediaplayer/util/test/incident_test.cc
diff --git a/bin/mediaplayer/util/threadsafe_callback_joiner.cc b/garnet/bin/mediaplayer/util/threadsafe_callback_joiner.cc similarity index 100% rename from bin/mediaplayer/util/threadsafe_callback_joiner.cc rename to garnet/bin/mediaplayer/util/threadsafe_callback_joiner.cc
diff --git a/bin/mediaplayer/util/threadsafe_callback_joiner.h b/garnet/bin/mediaplayer/util/threadsafe_callback_joiner.h similarity index 100% rename from bin/mediaplayer/util/threadsafe_callback_joiner.h rename to garnet/bin/mediaplayer/util/threadsafe_callback_joiner.h
diff --git a/bin/mediasession/BUILD.gn b/garnet/bin/mediasession/BUILD.gn similarity index 100% rename from bin/mediasession/BUILD.gn rename to garnet/bin/mediasession/BUILD.gn
diff --git a/bin/mediasession/meta/mediasession.cmx b/garnet/bin/mediasession/meta/mediasession.cmx similarity index 100% rename from bin/mediasession/meta/mediasession.cmx rename to garnet/bin/mediasession/meta/mediasession.cmx
diff --git a/bin/mediasession/meta/mediasession_tests.cmx b/garnet/bin/mediasession/meta/mediasession_tests.cmx similarity index 100% rename from bin/mediasession/meta/mediasession_tests.cmx rename to garnet/bin/mediasession/meta/mediasession_tests.cmx
diff --git a/bin/mediasession/src/controller.rs b/garnet/bin/mediasession/src/controller.rs similarity index 100% rename from bin/mediasession/src/controller.rs rename to garnet/bin/mediasession/src/controller.rs
diff --git a/bin/mediasession/src/log_error.rs b/garnet/bin/mediasession/src/log_error.rs similarity index 100% rename from bin/mediasession/src/log_error.rs rename to garnet/bin/mediasession/src/log_error.rs
diff --git a/bin/mediasession/src/main.rs b/garnet/bin/mediasession/src/main.rs similarity index 100% rename from bin/mediasession/src/main.rs rename to garnet/bin/mediasession/src/main.rs
diff --git a/bin/mediasession/src/publisher.rs b/garnet/bin/mediasession/src/publisher.rs similarity index 100% rename from bin/mediasession/src/publisher.rs rename to garnet/bin/mediasession/src/publisher.rs
diff --git a/bin/mediasession/src/service.rs b/garnet/bin/mediasession/src/service.rs similarity index 100% rename from bin/mediasession/src/service.rs rename to garnet/bin/mediasession/src/service.rs
diff --git a/bin/mediasession/src/session.rs b/garnet/bin/mediasession/src/session.rs similarity index 100% rename from bin/mediasession/src/session.rs rename to garnet/bin/mediasession/src/session.rs
diff --git a/bin/mediasession/src/test.rs b/garnet/bin/mediasession/src/test.rs similarity index 100% rename from bin/mediasession/src/test.rs rename to garnet/bin/mediasession/src/test.rs
diff --git a/bin/mediasession/src/test/integration.rs b/garnet/bin/mediasession/src/test/integration.rs similarity index 100% rename from bin/mediasession/src/test/integration.rs rename to garnet/bin/mediasession/src/test/integration.rs
diff --git a/bin/memory_monitor/BUILD.gn b/garnet/bin/memory_monitor/BUILD.gn similarity index 100% rename from bin/memory_monitor/BUILD.gn rename to garnet/bin/memory_monitor/BUILD.gn
diff --git a/bin/memory_monitor/main.cc b/garnet/bin/memory_monitor/main.cc similarity index 100% rename from bin/memory_monitor/main.cc rename to garnet/bin/memory_monitor/main.cc
diff --git a/bin/memory_monitor/memory_monitor.config b/garnet/bin/memory_monitor/memory_monitor.config similarity index 100% rename from bin/memory_monitor/memory_monitor.config rename to garnet/bin/memory_monitor/memory_monitor.config
diff --git a/bin/memory_monitor/meta/README.md b/garnet/bin/memory_monitor/meta/README.md similarity index 100% rename from bin/memory_monitor/meta/README.md rename to garnet/bin/memory_monitor/meta/README.md
diff --git a/bin/memory_monitor/meta/memory_monitor.cmx b/garnet/bin/memory_monitor/meta/memory_monitor.cmx similarity index 100% rename from bin/memory_monitor/meta/memory_monitor.cmx rename to garnet/bin/memory_monitor/meta/memory_monitor.cmx
diff --git a/bin/memory_monitor/monitor.cc b/garnet/bin/memory_monitor/monitor.cc similarity index 100% rename from bin/memory_monitor/monitor.cc rename to garnet/bin/memory_monitor/monitor.cc
diff --git a/bin/memory_monitor/monitor.h b/garnet/bin/memory_monitor/monitor.h similarity index 100% rename from bin/memory_monitor/monitor.h rename to garnet/bin/memory_monitor/monitor.h
diff --git a/bin/memory_monitor/test/BUILD.gn b/garnet/bin/memory_monitor/test/BUILD.gn similarity index 100% rename from bin/memory_monitor/test/BUILD.gn rename to garnet/bin/memory_monitor/test/BUILD.gn
diff --git a/bin/memory_monitor/test/meta/memory_monitor_unittests.cmx b/garnet/bin/memory_monitor/test/meta/memory_monitor_unittests.cmx similarity index 100% rename from bin/memory_monitor/test/meta/memory_monitor_unittests.cmx rename to garnet/bin/memory_monitor/test/meta/memory_monitor_unittests.cmx
diff --git a/bin/memory_monitor/test/monitor_unittest.cc b/garnet/bin/memory_monitor/test/monitor_unittest.cc similarity index 100% rename from bin/memory_monitor/test/monitor_unittest.cc rename to garnet/bin/memory_monitor/test/monitor_unittest.cc
diff --git a/bin/net-cli/BUILD.gn b/garnet/bin/net-cli/BUILD.gn similarity index 100% rename from bin/net-cli/BUILD.gn rename to garnet/bin/net-cli/BUILD.gn
diff --git a/bin/net-cli/meta/net-cli.cmx b/garnet/bin/net-cli/meta/net-cli.cmx similarity index 100% rename from bin/net-cli/meta/net-cli.cmx rename to garnet/bin/net-cli/meta/net-cli.cmx
diff --git a/bin/net-cli/src/main.rs b/garnet/bin/net-cli/src/main.rs similarity index 100% rename from bin/net-cli/src/main.rs rename to garnet/bin/net-cli/src/main.rs
diff --git a/bin/net-cli/src/opts.rs b/garnet/bin/net-cli/src/opts.rs similarity index 100% rename from bin/net-cli/src/opts.rs rename to garnet/bin/net-cli/src/opts.rs
diff --git a/bin/net_ctl/BUILD.gn b/garnet/bin/net_ctl/BUILD.gn similarity index 100% rename from bin/net_ctl/BUILD.gn rename to garnet/bin/net_ctl/BUILD.gn
diff --git a/bin/net_ctl/meta/net_ctl.cmx b/garnet/bin/net_ctl/meta/net_ctl.cmx similarity index 100% rename from bin/net_ctl/meta/net_ctl.cmx rename to garnet/bin/net_ctl/meta/net_ctl.cmx
diff --git a/bin/net_ctl/src/main.rs b/garnet/bin/net_ctl/src/main.rs similarity index 100% rename from bin/net_ctl/src/main.rs rename to garnet/bin/net_ctl/src/main.rs
diff --git a/bin/net_ctl/src/opts.rs b/garnet/bin/net_ctl/src/opts.rs similarity index 100% rename from bin/net_ctl/src/opts.rs rename to garnet/bin/net_ctl/src/opts.rs
diff --git a/bin/netcfg/BUILD.gn b/garnet/bin/netcfg/BUILD.gn similarity index 100% rename from bin/netcfg/BUILD.gn rename to garnet/bin/netcfg/BUILD.gn
diff --git a/bin/netcfg/MAINTAINERS b/garnet/bin/netcfg/MAINTAINERS similarity index 100% rename from bin/netcfg/MAINTAINERS rename to garnet/bin/netcfg/MAINTAINERS
diff --git a/bin/netcfg/README.md b/garnet/bin/netcfg/README.md similarity index 100% rename from bin/netcfg/README.md rename to garnet/bin/netcfg/README.md
diff --git a/bin/netcfg/config/default.json b/garnet/bin/netcfg/config/default.json similarity index 100% rename from bin/netcfg/config/default.json rename to garnet/bin/netcfg/config/default.json
diff --git a/bin/netcfg/meta/netcfg.cmx b/garnet/bin/netcfg/meta/netcfg.cmx similarity index 100% rename from bin/netcfg/meta/netcfg.cmx rename to garnet/bin/netcfg/meta/netcfg.cmx
diff --git a/bin/netcfg/netcfg.config b/garnet/bin/netcfg/netcfg.config similarity index 100% rename from bin/netcfg/netcfg.config rename to garnet/bin/netcfg/netcfg.config
diff --git a/bin/netcfg/src/device_id.rs b/garnet/bin/netcfg/src/device_id.rs similarity index 100% rename from bin/netcfg/src/device_id.rs rename to garnet/bin/netcfg/src/device_id.rs
diff --git a/bin/netcfg/src/dns_policy_service.rs b/garnet/bin/netcfg/src/dns_policy_service.rs similarity index 100% rename from bin/netcfg/src/dns_policy_service.rs rename to garnet/bin/netcfg/src/dns_policy_service.rs
diff --git a/bin/netcfg/src/interface.rs b/garnet/bin/netcfg/src/interface.rs similarity index 100% rename from bin/netcfg/src/interface.rs rename to garnet/bin/netcfg/src/interface.rs
diff --git a/bin/netcfg/src/main.rs b/garnet/bin/netcfg/src/main.rs similarity index 100% rename from bin/netcfg/src/main.rs rename to garnet/bin/netcfg/src/main.rs
diff --git a/bin/netcfg/src/matchers.rs b/garnet/bin/netcfg/src/matchers.rs similarity index 100% rename from bin/netcfg/src/matchers.rs rename to garnet/bin/netcfg/src/matchers.rs
diff --git a/bin/netcfg/src/observer_service.rs b/garnet/bin/netcfg/src/observer_service.rs similarity index 100% rename from bin/netcfg/src/observer_service.rs rename to garnet/bin/netcfg/src/observer_service.rs
diff --git a/bin/netconnector/BUILD.gn b/garnet/bin/netconnector/BUILD.gn similarity index 100% rename from bin/netconnector/BUILD.gn rename to garnet/bin/netconnector/BUILD.gn
diff --git a/bin/netconnector/MAINTAINERS b/garnet/bin/netconnector/MAINTAINERS similarity index 100% rename from bin/netconnector/MAINTAINERS rename to garnet/bin/netconnector/MAINTAINERS
diff --git a/bin/netconnector/README.md b/garnet/bin/netconnector/README.md similarity index 100% rename from bin/netconnector/README.md rename to garnet/bin/netconnector/README.md
diff --git a/bin/netconnector/device_service_provider.cc b/garnet/bin/netconnector/device_service_provider.cc similarity index 100% rename from bin/netconnector/device_service_provider.cc rename to garnet/bin/netconnector/device_service_provider.cc
diff --git a/bin/netconnector/device_service_provider.h b/garnet/bin/netconnector/device_service_provider.h similarity index 100% rename from bin/netconnector/device_service_provider.h rename to garnet/bin/netconnector/device_service_provider.h
diff --git a/bin/netconnector/host_name.cc b/garnet/bin/netconnector/host_name.cc similarity index 100% rename from bin/netconnector/host_name.cc rename to garnet/bin/netconnector/host_name.cc
diff --git a/bin/netconnector/host_name.h b/garnet/bin/netconnector/host_name.h similarity index 100% rename from bin/netconnector/host_name.h rename to garnet/bin/netconnector/host_name.h
diff --git a/bin/netconnector/listener.cc b/garnet/bin/netconnector/listener.cc similarity index 100% rename from bin/netconnector/listener.cc rename to garnet/bin/netconnector/listener.cc
diff --git a/bin/netconnector/listener.h b/garnet/bin/netconnector/listener.h similarity index 100% rename from bin/netconnector/listener.h rename to garnet/bin/netconnector/listener.h
diff --git a/bin/netconnector/main.cc b/garnet/bin/netconnector/main.cc similarity index 100% rename from bin/netconnector/main.cc rename to garnet/bin/netconnector/main.cc
diff --git a/bin/netconnector/message_transceiver.cc b/garnet/bin/netconnector/message_transceiver.cc similarity index 100% rename from bin/netconnector/message_transceiver.cc rename to garnet/bin/netconnector/message_transceiver.cc
diff --git a/bin/netconnector/message_transceiver.h b/garnet/bin/netconnector/message_transceiver.h similarity index 100% rename from bin/netconnector/message_transceiver.h rename to garnet/bin/netconnector/message_transceiver.h
diff --git a/bin/netconnector/meta/netconnector.cmx b/garnet/bin/netconnector/meta/netconnector.cmx similarity index 100% rename from bin/netconnector/meta/netconnector.cmx rename to garnet/bin/netconnector/meta/netconnector.cmx
diff --git a/bin/netconnector/netconnector.config b/garnet/bin/netconnector/netconnector.config similarity index 100% rename from bin/netconnector/netconnector.config rename to garnet/bin/netconnector/netconnector.config
diff --git a/bin/netconnector/netconnector_impl.cc b/garnet/bin/netconnector/netconnector_impl.cc similarity index 100% rename from bin/netconnector/netconnector_impl.cc rename to garnet/bin/netconnector/netconnector_impl.cc
diff --git a/bin/netconnector/netconnector_impl.h b/garnet/bin/netconnector/netconnector_impl.h similarity index 100% rename from bin/netconnector/netconnector_impl.h rename to garnet/bin/netconnector/netconnector_impl.h
diff --git a/bin/netconnector/netconnector_params.cc b/garnet/bin/netconnector/netconnector_params.cc similarity index 100% rename from bin/netconnector/netconnector_params.cc rename to garnet/bin/netconnector/netconnector_params.cc
diff --git a/bin/netconnector/netconnector_params.h b/garnet/bin/netconnector/netconnector_params.h similarity index 100% rename from bin/netconnector/netconnector_params.h rename to garnet/bin/netconnector/netconnector_params.h
diff --git a/bin/netconnector/requestor_agent.cc b/garnet/bin/netconnector/requestor_agent.cc similarity index 100% rename from bin/netconnector/requestor_agent.cc rename to garnet/bin/netconnector/requestor_agent.cc
diff --git a/bin/netconnector/requestor_agent.h b/garnet/bin/netconnector/requestor_agent.h similarity index 100% rename from bin/netconnector/requestor_agent.h rename to garnet/bin/netconnector/requestor_agent.h
diff --git a/bin/netconnector/responding_service_host.cc b/garnet/bin/netconnector/responding_service_host.cc similarity index 100% rename from bin/netconnector/responding_service_host.cc rename to garnet/bin/netconnector/responding_service_host.cc
diff --git a/bin/netconnector/responding_service_host.h b/garnet/bin/netconnector/responding_service_host.h similarity index 100% rename from bin/netconnector/responding_service_host.h rename to garnet/bin/netconnector/responding_service_host.h
diff --git a/bin/netconnector/service.config b/garnet/bin/netconnector/service.config similarity index 100% rename from bin/netconnector/service.config rename to garnet/bin/netconnector/service.config
diff --git a/bin/netconnector/service_agent.cc b/garnet/bin/netconnector/service_agent.cc similarity index 100% rename from bin/netconnector/service_agent.cc rename to garnet/bin/netconnector/service_agent.cc
diff --git a/bin/netconnector/service_agent.h b/garnet/bin/netconnector/service_agent.h similarity index 100% rename from bin/netconnector/service_agent.h rename to garnet/bin/netconnector/service_agent.h
diff --git a/bin/netemul_runner/BUILD.gn b/garnet/bin/netemul_runner/BUILD.gn similarity index 100% rename from bin/netemul_runner/BUILD.gn rename to garnet/bin/netemul_runner/BUILD.gn
diff --git a/bin/netemul_runner/MAINTAINERS b/garnet/bin/netemul_runner/MAINTAINERS similarity index 100% rename from bin/netemul_runner/MAINTAINERS rename to garnet/bin/netemul_runner/MAINTAINERS
diff --git a/bin/netemul_runner/main.cc b/garnet/bin/netemul_runner/main.cc similarity index 100% rename from bin/netemul_runner/main.cc rename to garnet/bin/netemul_runner/main.cc
diff --git a/bin/netemul_runner/managed_environment.cc b/garnet/bin/netemul_runner/managed_environment.cc similarity index 100% rename from bin/netemul_runner/managed_environment.cc rename to garnet/bin/netemul_runner/managed_environment.cc
diff --git a/bin/netemul_runner/managed_environment.h b/garnet/bin/netemul_runner/managed_environment.h similarity index 100% rename from bin/netemul_runner/managed_environment.h rename to garnet/bin/netemul_runner/managed_environment.h
diff --git a/bin/netemul_runner/managed_launcher.cc b/garnet/bin/netemul_runner/managed_launcher.cc similarity index 100% rename from bin/netemul_runner/managed_launcher.cc rename to garnet/bin/netemul_runner/managed_launcher.cc
diff --git a/bin/netemul_runner/managed_launcher.h b/garnet/bin/netemul_runner/managed_launcher.h similarity index 100% rename from bin/netemul_runner/managed_launcher.h rename to garnet/bin/netemul_runner/managed_launcher.h
diff --git a/bin/netemul_runner/meta/netemul_sandbox.cmx b/garnet/bin/netemul_runner/meta/netemul_sandbox.cmx similarity index 100% rename from bin/netemul_runner/meta/netemul_sandbox.cmx rename to garnet/bin/netemul_runner/meta/netemul_sandbox.cmx
diff --git a/bin/netemul_runner/model/BUILD.gn b/garnet/bin/netemul_runner/model/BUILD.gn similarity index 100% rename from bin/netemul_runner/model/BUILD.gn rename to garnet/bin/netemul_runner/model/BUILD.gn
diff --git a/bin/netemul_runner/model/config.cc b/garnet/bin/netemul_runner/model/config.cc similarity index 100% rename from bin/netemul_runner/model/config.cc rename to garnet/bin/netemul_runner/model/config.cc
diff --git a/bin/netemul_runner/model/config.h b/garnet/bin/netemul_runner/model/config.h similarity index 100% rename from bin/netemul_runner/model/config.h rename to garnet/bin/netemul_runner/model/config.h
diff --git a/bin/netemul_runner/model/endpoint.cc b/garnet/bin/netemul_runner/model/endpoint.cc similarity index 100% rename from bin/netemul_runner/model/endpoint.cc rename to garnet/bin/netemul_runner/model/endpoint.cc
diff --git a/bin/netemul_runner/model/endpoint.h b/garnet/bin/netemul_runner/model/endpoint.h similarity index 100% rename from bin/netemul_runner/model/endpoint.h rename to garnet/bin/netemul_runner/model/endpoint.h
diff --git a/bin/netemul_runner/model/environment.cc b/garnet/bin/netemul_runner/model/environment.cc similarity index 100% rename from bin/netemul_runner/model/environment.cc rename to garnet/bin/netemul_runner/model/environment.cc
diff --git a/bin/netemul_runner/model/environment.h b/garnet/bin/netemul_runner/model/environment.h similarity index 100% rename from bin/netemul_runner/model/environment.h rename to garnet/bin/netemul_runner/model/environment.h
diff --git a/bin/netemul_runner/model/launch_app.cc b/garnet/bin/netemul_runner/model/launch_app.cc similarity index 100% rename from bin/netemul_runner/model/launch_app.cc rename to garnet/bin/netemul_runner/model/launch_app.cc
diff --git a/bin/netemul_runner/model/launch_app.h b/garnet/bin/netemul_runner/model/launch_app.h similarity index 100% rename from bin/netemul_runner/model/launch_app.h rename to garnet/bin/netemul_runner/model/launch_app.h
diff --git a/bin/netemul_runner/model/launch_service.cc b/garnet/bin/netemul_runner/model/launch_service.cc similarity index 100% rename from bin/netemul_runner/model/launch_service.cc rename to garnet/bin/netemul_runner/model/launch_service.cc
diff --git a/bin/netemul_runner/model/launch_service.h b/garnet/bin/netemul_runner/model/launch_service.h similarity index 100% rename from bin/netemul_runner/model/launch_service.h rename to garnet/bin/netemul_runner/model/launch_service.h
diff --git a/bin/netemul_runner/model/model_unittest.cc b/garnet/bin/netemul_runner/model/model_unittest.cc similarity index 100% rename from bin/netemul_runner/model/model_unittest.cc rename to garnet/bin/netemul_runner/model/model_unittest.cc
diff --git a/bin/netemul_runner/model/network.cc b/garnet/bin/netemul_runner/model/network.cc similarity index 100% rename from bin/netemul_runner/model/network.cc rename to garnet/bin/netemul_runner/model/network.cc
diff --git a/bin/netemul_runner/model/network.h b/garnet/bin/netemul_runner/model/network.h similarity index 100% rename from bin/netemul_runner/model/network.h rename to garnet/bin/netemul_runner/model/network.h
diff --git a/bin/netemul_runner/runner/BUILD.gn b/garnet/bin/netemul_runner/runner/BUILD.gn similarity index 100% rename from bin/netemul_runner/runner/BUILD.gn rename to garnet/bin/netemul_runner/runner/BUILD.gn
diff --git a/bin/netemul_runner/runner/main.cc b/garnet/bin/netemul_runner/runner/main.cc similarity index 100% rename from bin/netemul_runner/runner/main.cc rename to garnet/bin/netemul_runner/runner/main.cc
diff --git a/bin/netemul_runner/runner/meta/netemul_runner.cmx b/garnet/bin/netemul_runner/runner/meta/netemul_runner.cmx similarity index 100% rename from bin/netemul_runner/runner/meta/netemul_runner.cmx rename to garnet/bin/netemul_runner/runner/meta/netemul_runner.cmx
diff --git a/bin/netemul_runner/runner/runner.cc b/garnet/bin/netemul_runner/runner/runner.cc similarity index 100% rename from bin/netemul_runner/runner/runner.cc rename to garnet/bin/netemul_runner/runner/runner.cc
diff --git a/bin/netemul_runner/runner/runner.h b/garnet/bin/netemul_runner/runner/runner.h similarity index 100% rename from bin/netemul_runner/runner/runner.h rename to garnet/bin/netemul_runner/runner/runner.h
diff --git a/bin/netemul_runner/sandbox.cc b/garnet/bin/netemul_runner/sandbox.cc similarity index 100% rename from bin/netemul_runner/sandbox.cc rename to garnet/bin/netemul_runner/sandbox.cc
diff --git a/bin/netemul_runner/sandbox.h b/garnet/bin/netemul_runner/sandbox.h similarity index 100% rename from bin/netemul_runner/sandbox.h rename to garnet/bin/netemul_runner/sandbox.h
diff --git a/bin/netemul_runner/sandbox_env.h b/garnet/bin/netemul_runner/sandbox_env.h similarity index 100% rename from bin/netemul_runner/sandbox_env.h rename to garnet/bin/netemul_runner/sandbox_env.h
diff --git a/bin/netemul_runner/test/BUILD.gn b/garnet/bin/netemul_runner/test/BUILD.gn similarity index 100% rename from bin/netemul_runner/test/BUILD.gn rename to garnet/bin/netemul_runner/test/BUILD.gn
diff --git a/bin/netemul_runner/test/env_build/BUILD.gn b/garnet/bin/netemul_runner/test/env_build/BUILD.gn similarity index 100% rename from bin/netemul_runner/test/env_build/BUILD.gn rename to garnet/bin/netemul_runner/test/env_build/BUILD.gn
diff --git a/bin/netemul_runner/test/env_build/src/main.rs b/garnet/bin/netemul_runner/test/env_build/src/main.rs similarity index 100% rename from bin/netemul_runner/test/env_build/src/main.rs rename to garnet/bin/netemul_runner/test/env_build/src/main.rs
diff --git a/bin/netemul_runner/test/meta/env_build.cmx b/garnet/bin/netemul_runner/test/meta/env_build.cmx similarity index 100% rename from bin/netemul_runner/test/meta/env_build.cmx rename to garnet/bin/netemul_runner/test/meta/env_build.cmx
diff --git a/bin/netemul_runner/test/meta/env_build_run.cmx b/garnet/bin/netemul_runner/test/meta/env_build_run.cmx similarity index 100% rename from bin/netemul_runner/test/meta/env_build_run.cmx rename to garnet/bin/netemul_runner/test/meta/env_build_run.cmx
diff --git a/bin/netemul_runner/test/meta/model_unittest.cmx b/garnet/bin/netemul_runner/test/meta/model_unittest.cmx similarity index 100% rename from bin/netemul_runner/test/meta/model_unittest.cmx rename to garnet/bin/netemul_runner/test/meta/model_unittest.cmx
diff --git a/bin/netemul_runner/test/meta/netstack_socks.cmx b/garnet/bin/netemul_runner/test/meta/netstack_socks.cmx similarity index 100% rename from bin/netemul_runner/test/meta/netstack_socks.cmx rename to garnet/bin/netemul_runner/test/meta/netstack_socks.cmx
diff --git a/bin/netemul_runner/test/meta/netstack_socks_run.cmx b/garnet/bin/netemul_runner/test/meta/netstack_socks_run.cmx similarity index 100% rename from bin/netemul_runner/test/meta/netstack_socks_run.cmx rename to garnet/bin/netemul_runner/test/meta/netstack_socks_run.cmx
diff --git a/bin/netemul_runner/test/meta/svc_list.cmx b/garnet/bin/netemul_runner/test/meta/svc_list.cmx similarity index 100% rename from bin/netemul_runner/test/meta/svc_list.cmx rename to garnet/bin/netemul_runner/test/meta/svc_list.cmx
diff --git a/bin/netemul_runner/test/meta/svc_list_run.cmx b/garnet/bin/netemul_runner/test/meta/svc_list_run.cmx similarity index 100% rename from bin/netemul_runner/test/meta/svc_list_run.cmx rename to garnet/bin/netemul_runner/test/meta/svc_list_run.cmx
diff --git a/bin/netemul_runner/test/netstack_socks/BUILD.gn b/garnet/bin/netemul_runner/test/netstack_socks/BUILD.gn similarity index 100% rename from bin/netemul_runner/test/netstack_socks/BUILD.gn rename to garnet/bin/netemul_runner/test/netstack_socks/BUILD.gn
diff --git a/bin/netemul_runner/test/netstack_socks/src/child.rs b/garnet/bin/netemul_runner/test/netstack_socks/src/child.rs similarity index 100% rename from bin/netemul_runner/test/netstack_socks/src/child.rs rename to garnet/bin/netemul_runner/test/netstack_socks/src/child.rs
diff --git a/bin/netemul_runner/test/netstack_socks/src/common.rs b/garnet/bin/netemul_runner/test/netstack_socks/src/common.rs similarity index 100% rename from bin/netemul_runner/test/netstack_socks/src/common.rs rename to garnet/bin/netemul_runner/test/netstack_socks/src/common.rs
diff --git a/bin/netemul_runner/test/netstack_socks/src/main.rs b/garnet/bin/netemul_runner/test/netstack_socks/src/main.rs similarity index 100% rename from bin/netemul_runner/test/netstack_socks/src/main.rs rename to garnet/bin/netemul_runner/test/netstack_socks/src/main.rs
diff --git a/bin/netemul_runner/test/svc_list/BUILD.gn b/garnet/bin/netemul_runner/test/svc_list/BUILD.gn similarity index 100% rename from bin/netemul_runner/test/svc_list/BUILD.gn rename to garnet/bin/netemul_runner/test/svc_list/BUILD.gn
diff --git a/bin/netemul_runner/test/svc_list/src/main.rs b/garnet/bin/netemul_runner/test/svc_list/src/main.rs similarity index 100% rename from bin/netemul_runner/test/svc_list/src/main.rs rename to garnet/bin/netemul_runner/test/svc_list/src/main.rs
diff --git a/bin/netemul_runner/virtual_data.cc b/garnet/bin/netemul_runner/virtual_data.cc similarity index 100% rename from bin/netemul_runner/virtual_data.cc rename to garnet/bin/netemul_runner/virtual_data.cc
diff --git a/bin/netemul_runner/virtual_data.h b/garnet/bin/netemul_runner/virtual_data.h similarity index 100% rename from bin/netemul_runner/virtual_data.h rename to garnet/bin/netemul_runner/virtual_data.h
diff --git a/bin/netemul_runner/virtual_devices.cc b/garnet/bin/netemul_runner/virtual_devices.cc similarity index 100% rename from bin/netemul_runner/virtual_devices.cc rename to garnet/bin/netemul_runner/virtual_devices.cc
diff --git a/bin/netemul_runner/virtual_devices.h b/garnet/bin/netemul_runner/virtual_devices.h similarity index 100% rename from bin/netemul_runner/virtual_devices.h rename to garnet/bin/netemul_runner/virtual_devices.h
diff --git a/bin/netstack_tests/BUILD.gn b/garnet/bin/netstack_tests/BUILD.gn similarity index 100% rename from bin/netstack_tests/BUILD.gn rename to garnet/bin/netstack_tests/BUILD.gn
diff --git a/bin/netstack_tests/meta/netstack_integration_test.cmx b/garnet/bin/netstack_tests/meta/netstack_integration_test.cmx similarity index 100% rename from bin/netstack_tests/meta/netstack_integration_test.cmx rename to garnet/bin/netstack_tests/meta/netstack_integration_test.cmx
diff --git a/bin/netstack_tests/netstack_add_eth_test.cc b/garnet/bin/netstack_tests/netstack_add_eth_test.cc similarity index 100% rename from bin/netstack_tests/netstack_add_eth_test.cc rename to garnet/bin/netstack_tests/netstack_add_eth_test.cc
diff --git a/bin/netstack_tests/netstack_filter_test.cc b/garnet/bin/netstack_tests/netstack_filter_test.cc similarity index 100% rename from bin/netstack_tests/netstack_filter_test.cc rename to garnet/bin/netstack_tests/netstack_filter_test.cc
diff --git a/bin/netstack_tests/test_filter_client/BUILD.gn b/garnet/bin/netstack_tests/test_filter_client/BUILD.gn similarity index 100% rename from bin/netstack_tests/test_filter_client/BUILD.gn rename to garnet/bin/netstack_tests/test_filter_client/BUILD.gn
diff --git a/bin/netstack_tests/test_filter_client/meta/test_filter_client.cmx b/garnet/bin/netstack_tests/test_filter_client/meta/test_filter_client.cmx similarity index 100% rename from bin/netstack_tests/test_filter_client/meta/test_filter_client.cmx rename to garnet/bin/netstack_tests/test_filter_client/meta/test_filter_client.cmx
diff --git a/bin/netstack_tests/test_filter_client/src/main.rs b/garnet/bin/netstack_tests/test_filter_client/src/main.rs similarity index 100% rename from bin/netstack_tests/test_filter_client/src/main.rs rename to garnet/bin/netstack_tests/test_filter_client/src/main.rs
diff --git a/bin/network-speed-test/BUILD.gn b/garnet/bin/network-speed-test/BUILD.gn similarity index 100% rename from bin/network-speed-test/BUILD.gn rename to garnet/bin/network-speed-test/BUILD.gn
diff --git a/bin/network-speed-test/meta/network-speed-test.cmx b/garnet/bin/network-speed-test/meta/network-speed-test.cmx similarity index 100% rename from bin/network-speed-test/meta/network-speed-test.cmx rename to garnet/bin/network-speed-test/meta/network-speed-test.cmx
diff --git a/bin/network-speed-test/src/main.rs b/garnet/bin/network-speed-test/src/main.rs similarity index 100% rename from bin/network-speed-test/src/main.rs rename to garnet/bin/network-speed-test/src/main.rs
diff --git a/bin/network-speed-test/src/opts.rs b/garnet/bin/network-speed-test/src/opts.rs similarity index 100% rename from bin/network-speed-test/src/opts.rs rename to garnet/bin/network-speed-test/src/opts.rs
diff --git a/bin/network_loader/BUILD.gn b/garnet/bin/network_loader/BUILD.gn similarity index 100% rename from bin/network_loader/BUILD.gn rename to garnet/bin/network_loader/BUILD.gn
diff --git a/bin/network_loader/README.md b/garnet/bin/network_loader/README.md similarity index 100% rename from bin/network_loader/README.md rename to garnet/bin/network_loader/README.md
diff --git a/bin/network_loader/main.cc b/garnet/bin/network_loader/main.cc similarity index 100% rename from bin/network_loader/main.cc rename to garnet/bin/network_loader/main.cc
diff --git a/bin/network_loader/meta/network_loader.cmx b/garnet/bin/network_loader/meta/network_loader.cmx similarity index 100% rename from bin/network_loader/meta/network_loader.cmx rename to garnet/bin/network_loader/meta/network_loader.cmx
diff --git a/bin/network_settings_server/BUILD.gn b/garnet/bin/network_settings_server/BUILD.gn similarity index 100% rename from bin/network_settings_server/BUILD.gn rename to garnet/bin/network_settings_server/BUILD.gn
diff --git a/bin/network_settings_server/MAINTAINERS b/garnet/bin/network_settings_server/MAINTAINERS similarity index 100% rename from bin/network_settings_server/MAINTAINERS rename to garnet/bin/network_settings_server/MAINTAINERS
diff --git a/bin/network_settings_server/meta/network_settings_server.cmx b/garnet/bin/network_settings_server/meta/network_settings_server.cmx similarity index 100% rename from bin/network_settings_server/meta/network_settings_server.cmx rename to garnet/bin/network_settings_server/meta/network_settings_server.cmx
diff --git a/bin/network_settings_server/resources/index.html b/garnet/bin/network_settings_server/resources/index.html similarity index 100% rename from bin/network_settings_server/resources/index.html rename to garnet/bin/network_settings_server/resources/index.html
diff --git a/bin/network_settings_server/src/main.rs b/garnet/bin/network_settings_server/src/main.rs similarity index 100% rename from bin/network_settings_server/src/main.rs rename to garnet/bin/network_settings_server/src/main.rs
diff --git a/bin/network_settings_server/src/net_settings_types.rs b/garnet/bin/network_settings_server/src/net_settings_types.rs similarity index 100% rename from bin/network_settings_server/src/net_settings_types.rs rename to garnet/bin/network_settings_server/src/net_settings_types.rs
diff --git a/bin/network_settings_server/src/server.rs b/garnet/bin/network_settings_server/src/server.rs similarity index 100% rename from bin/network_settings_server/src/server.rs rename to garnet/bin/network_settings_server/src/server.rs
diff --git a/bin/network_time/BUILD.gn b/garnet/bin/network_time/BUILD.gn similarity index 100% rename from bin/network_time/BUILD.gn rename to garnet/bin/network_time/BUILD.gn
diff --git a/bin/network_time/README.md b/garnet/bin/network_time/README.md similarity index 100% rename from bin/network_time/README.md rename to garnet/bin/network_time/README.md
diff --git a/bin/network_time/main.cc b/garnet/bin/network_time/main.cc similarity index 100% rename from bin/network_time/main.cc rename to garnet/bin/network_time/main.cc
diff --git a/bin/network_time/meta/network_time.cmx b/garnet/bin/network_time/meta/network_time.cmx similarity index 100% rename from bin/network_time/meta/network_time.cmx rename to garnet/bin/network_time/meta/network_time.cmx
diff --git a/bin/network_time/roughtime-servers.json b/garnet/bin/network_time/roughtime-servers.json similarity index 100% rename from bin/network_time/roughtime-servers.json rename to garnet/bin/network_time/roughtime-servers.json
diff --git a/bin/network_time/roughtime_server.cc b/garnet/bin/network_time/roughtime_server.cc similarity index 100% rename from bin/network_time/roughtime_server.cc rename to garnet/bin/network_time/roughtime_server.cc
diff --git a/bin/network_time/roughtime_server.h b/garnet/bin/network_time/roughtime_server.h similarity index 100% rename from bin/network_time/roughtime_server.h rename to garnet/bin/network_time/roughtime_server.h
diff --git a/bin/network_time/roughtime_server_test.cc b/garnet/bin/network_time/roughtime_server_test.cc similarity index 100% rename from bin/network_time/roughtime_server_test.cc rename to garnet/bin/network_time/roughtime_server_test.cc
diff --git a/bin/network_time/test/BUILD.gn b/garnet/bin/network_time/test/BUILD.gn similarity index 100% rename from bin/network_time/test/BUILD.gn rename to garnet/bin/network_time/test/BUILD.gn
diff --git a/bin/network_time/test/local_roughtime_server.cc b/garnet/bin/network_time/test/local_roughtime_server.cc similarity index 100% rename from bin/network_time/test/local_roughtime_server.cc rename to garnet/bin/network_time/test/local_roughtime_server.cc
diff --git a/bin/network_time/test/local_roughtime_server.h b/garnet/bin/network_time/test/local_roughtime_server.h similarity index 100% rename from bin/network_time/test/local_roughtime_server.h rename to garnet/bin/network_time/test/local_roughtime_server.h
diff --git a/bin/network_time/test/meta/system_time_updater_test.cmx b/garnet/bin/network_time/test/meta/system_time_updater_test.cmx similarity index 100% rename from bin/network_time/test/meta/system_time_updater_test.cmx rename to garnet/bin/network_time/test/meta/system_time_updater_test.cmx
diff --git a/bin/network_time/test/settable_time_source.cc b/garnet/bin/network_time/test/settable_time_source.cc similarity index 100% rename from bin/network_time/test/settable_time_source.cc rename to garnet/bin/network_time/test/settable_time_source.cc
diff --git a/bin/network_time/test/settable_time_source.h b/garnet/bin/network_time/test/settable_time_source.h similarity index 100% rename from bin/network_time/test/settable_time_source.h rename to garnet/bin/network_time/test/settable_time_source.h
diff --git a/bin/network_time/test/system_time_updater_test.cc b/garnet/bin/network_time/test/system_time_updater_test.cc similarity index 100% rename from bin/network_time/test/system_time_updater_test.cc rename to garnet/bin/network_time/test/system_time_updater_test.cc
diff --git a/bin/network_time/time_server_config.cc b/garnet/bin/network_time/time_server_config.cc similarity index 100% rename from bin/network_time/time_server_config.cc rename to garnet/bin/network_time/time_server_config.cc
diff --git a/bin/network_time/time_server_config.h b/garnet/bin/network_time/time_server_config.h similarity index 100% rename from bin/network_time/time_server_config.h rename to garnet/bin/network_time/time_server_config.h
diff --git a/bin/network_time/time_server_config_test.cc b/garnet/bin/network_time/time_server_config_test.cc similarity index 100% rename from bin/network_time/time_server_config_test.cc rename to garnet/bin/network_time/time_server_config_test.cc
diff --git a/bin/network_time/time_util.cc b/garnet/bin/network_time/time_util.cc similarity index 100% rename from bin/network_time/time_util.cc rename to garnet/bin/network_time/time_util.cc
diff --git a/bin/network_time/time_util.h b/garnet/bin/network_time/time_util.h similarity index 100% rename from bin/network_time/time_util.h rename to garnet/bin/network_time/time_util.h
diff --git a/bin/network_time/timezone.cc b/garnet/bin/network_time/timezone.cc similarity index 100% rename from bin/network_time/timezone.cc rename to garnet/bin/network_time/timezone.cc
diff --git a/bin/network_time/timezone.h b/garnet/bin/network_time/timezone.h similarity index 100% rename from bin/network_time/timezone.h rename to garnet/bin/network_time/timezone.h
diff --git a/bin/network_time_service/BUILD.gn b/garnet/bin/network_time_service/BUILD.gn similarity index 100% rename from bin/network_time_service/BUILD.gn rename to garnet/bin/network_time_service/BUILD.gn
diff --git a/bin/network_time_service/main.cc b/garnet/bin/network_time_service/main.cc similarity index 100% rename from bin/network_time_service/main.cc rename to garnet/bin/network_time_service/main.cc
diff --git a/bin/network_time_service/meta/network_time_service.cmx b/garnet/bin/network_time_service/meta/network_time_service.cmx similarity index 100% rename from bin/network_time_service/meta/network_time_service.cmx rename to garnet/bin/network_time_service/meta/network_time_service.cmx
diff --git a/bin/network_time_service/roughtime-servers.json b/garnet/bin/network_time_service/roughtime-servers.json similarity index 100% rename from bin/network_time_service/roughtime-servers.json rename to garnet/bin/network_time_service/roughtime-servers.json
diff --git a/bin/network_time_service/service.cc b/garnet/bin/network_time_service/service.cc similarity index 100% rename from bin/network_time_service/service.cc rename to garnet/bin/network_time_service/service.cc
diff --git a/bin/network_time_service/service.h b/garnet/bin/network_time_service/service.h similarity index 100% rename from bin/network_time_service/service.h rename to garnet/bin/network_time_service/service.h
diff --git a/bin/overnet/onet/BUILD.gn b/garnet/bin/overnet/onet/BUILD.gn similarity index 100% rename from bin/overnet/onet/BUILD.gn rename to garnet/bin/overnet/onet/BUILD.gn
diff --git a/bin/overnet/onet/meta/onet.cmx b/garnet/bin/overnet/onet/meta/onet.cmx similarity index 100% rename from bin/overnet/onet/meta/onet.cmx rename to garnet/bin/overnet/onet/meta/onet.cmx
diff --git a/bin/overnet/onet/src/main.rs b/garnet/bin/overnet/onet/src/main.rs similarity index 100% rename from bin/overnet/onet/src/main.rs rename to garnet/bin/overnet/onet/src/main.rs
diff --git a/bin/overnet/overnetstack/BUILD.gn b/garnet/bin/overnet/overnetstack/BUILD.gn similarity index 100% rename from bin/overnet/overnetstack/BUILD.gn rename to garnet/bin/overnet/overnetstack/BUILD.gn
diff --git a/bin/overnet/overnetstack/bound_channel.cc b/garnet/bin/overnet/overnetstack/bound_channel.cc similarity index 100% rename from bin/overnet/overnetstack/bound_channel.cc rename to garnet/bin/overnet/overnetstack/bound_channel.cc
diff --git a/bin/overnet/overnetstack/bound_channel.h b/garnet/bin/overnet/overnetstack/bound_channel.h similarity index 100% rename from bin/overnet/overnetstack/bound_channel.h rename to garnet/bin/overnet/overnetstack/bound_channel.h
diff --git a/bin/overnet/overnetstack/fuchsia_port.h b/garnet/bin/overnet/overnetstack/fuchsia_port.h similarity index 100% rename from bin/overnet/overnetstack/fuchsia_port.h rename to garnet/bin/overnet/overnetstack/fuchsia_port.h
diff --git a/bin/overnet/overnetstack/main.cc b/garnet/bin/overnet/overnetstack/main.cc similarity index 100% rename from bin/overnet/overnetstack/main.cc rename to garnet/bin/overnet/overnetstack/main.cc
diff --git a/bin/overnet/overnetstack/mdns.cc b/garnet/bin/overnet/overnetstack/mdns.cc similarity index 100% rename from bin/overnet/overnetstack/mdns.cc rename to garnet/bin/overnet/overnetstack/mdns.cc
diff --git a/bin/overnet/overnetstack/mdns.h b/garnet/bin/overnet/overnetstack/mdns.h similarity index 100% rename from bin/overnet/overnetstack/mdns.h rename to garnet/bin/overnet/overnetstack/mdns.h
diff --git a/bin/overnet/overnetstack/meta/overnetstack.cmx b/garnet/bin/overnet/overnetstack/meta/overnetstack.cmx similarity index 100% rename from bin/overnet/overnetstack/meta/overnetstack.cmx rename to garnet/bin/overnet/overnetstack/meta/overnetstack.cmx
diff --git a/bin/overnet/overnetstack/overnet_app.cc b/garnet/bin/overnet/overnetstack/overnet_app.cc similarity index 100% rename from bin/overnet/overnetstack/overnet_app.cc rename to garnet/bin/overnet/overnetstack/overnet_app.cc
diff --git a/bin/overnet/overnetstack/overnet_app.h b/garnet/bin/overnet/overnetstack/overnet_app.h similarity index 100% rename from bin/overnet/overnetstack/overnet_app.h rename to garnet/bin/overnet/overnetstack/overnet_app.h
diff --git a/bin/overnet/overnetstack/run_all_tests.cc b/garnet/bin/overnet/overnetstack/run_all_tests.cc similarity index 100% rename from bin/overnet/overnetstack/run_all_tests.cc rename to garnet/bin/overnet/overnetstack/run_all_tests.cc
diff --git a/bin/overnet/overnetstack/service.cc b/garnet/bin/overnet/overnetstack/service.cc similarity index 100% rename from bin/overnet/overnetstack/service.cc rename to garnet/bin/overnet/overnetstack/service.cc
diff --git a/bin/overnet/overnetstack/service.h b/garnet/bin/overnet/overnetstack/service.h similarity index 100% rename from bin/overnet/overnetstack/service.h rename to garnet/bin/overnet/overnetstack/service.h
diff --git a/bin/overnet/overnetstack/udp_nub.h b/garnet/bin/overnet/overnetstack/udp_nub.h similarity index 100% rename from bin/overnet/overnetstack/udp_nub.h rename to garnet/bin/overnet/overnetstack/udp_nub.h
diff --git a/bin/perfcompare/perfcompare.py b/garnet/bin/perfcompare/perfcompare.py similarity index 100% rename from bin/perfcompare/perfcompare.py rename to garnet/bin/perfcompare/perfcompare.py
diff --git a/bin/pkg_cache/BUILD.gn b/garnet/bin/pkg_cache/BUILD.gn similarity index 100% rename from bin/pkg_cache/BUILD.gn rename to garnet/bin/pkg_cache/BUILD.gn
diff --git a/bin/pkg_cache/meta/pkg_cache.cmx b/garnet/bin/pkg_cache/meta/pkg_cache.cmx similarity index 100% rename from bin/pkg_cache/meta/pkg_cache.cmx rename to garnet/bin/pkg_cache/meta/pkg_cache.cmx
diff --git a/bin/pkg_cache/meta/pkg_cache_bin_test.cmx b/garnet/bin/pkg_cache/meta/pkg_cache_bin_test.cmx similarity index 100% rename from bin/pkg_cache/meta/pkg_cache_bin_test.cmx rename to garnet/bin/pkg_cache/meta/pkg_cache_bin_test.cmx
diff --git a/bin/pkg_cache/src/cache_service.rs b/garnet/bin/pkg_cache/src/cache_service.rs similarity index 100% rename from bin/pkg_cache/src/cache_service.rs rename to garnet/bin/pkg_cache/src/cache_service.rs
diff --git a/bin/pkg_cache/src/main.rs b/garnet/bin/pkg_cache/src/main.rs similarity index 100% rename from bin/pkg_cache/src/main.rs rename to garnet/bin/pkg_cache/src/main.rs
diff --git a/bin/pkg_ctl/BUILD.gn b/garnet/bin/pkg_ctl/BUILD.gn similarity index 100% rename from bin/pkg_ctl/BUILD.gn rename to garnet/bin/pkg_ctl/BUILD.gn
diff --git a/bin/pkg_ctl/README.md b/garnet/bin/pkg_ctl/README.md similarity index 100% rename from bin/pkg_ctl/README.md rename to garnet/bin/pkg_ctl/README.md
diff --git a/bin/pkg_ctl/meta/pkgctl.cmx b/garnet/bin/pkg_ctl/meta/pkgctl.cmx similarity index 100% rename from bin/pkg_ctl/meta/pkgctl.cmx rename to garnet/bin/pkg_ctl/meta/pkgctl.cmx
diff --git a/bin/pkg_ctl/meta/pkgctl_bin_test.cmx b/garnet/bin/pkg_ctl/meta/pkgctl_bin_test.cmx similarity index 100% rename from bin/pkg_ctl/meta/pkgctl_bin_test.cmx rename to garnet/bin/pkg_ctl/meta/pkgctl_bin_test.cmx
diff --git a/bin/pkg_ctl/src/main.rs b/garnet/bin/pkg_ctl/src/main.rs similarity index 100% rename from bin/pkg_ctl/src/main.rs rename to garnet/bin/pkg_ctl/src/main.rs
diff --git a/bin/pkg_resolver/BUILD.gn b/garnet/bin/pkg_resolver/BUILD.gn similarity index 100% rename from bin/pkg_resolver/BUILD.gn rename to garnet/bin/pkg_resolver/BUILD.gn
diff --git a/bin/pkg_resolver/meta/pkg_resolver.cmx b/garnet/bin/pkg_resolver/meta/pkg_resolver.cmx similarity index 100% rename from bin/pkg_resolver/meta/pkg_resolver.cmx rename to garnet/bin/pkg_resolver/meta/pkg_resolver.cmx
diff --git a/bin/pkg_resolver/meta/pkg_resolver_bin_test.cmx b/garnet/bin/pkg_resolver/meta/pkg_resolver_bin_test.cmx similarity index 100% rename from bin/pkg_resolver/meta/pkg_resolver_bin_test.cmx rename to garnet/bin/pkg_resolver/meta/pkg_resolver_bin_test.cmx
diff --git a/bin/pkg_resolver/src/main.rs b/garnet/bin/pkg_resolver/src/main.rs similarity index 100% rename from bin/pkg_resolver/src/main.rs rename to garnet/bin/pkg_resolver/src/main.rs
diff --git a/bin/pkg_resolver/src/resolver_service.rs b/garnet/bin/pkg_resolver/src/resolver_service.rs similarity index 100% rename from bin/pkg_resolver/src/resolver_service.rs rename to garnet/bin/pkg_resolver/src/resolver_service.rs
diff --git a/bin/power_manager/BUILD.gn b/garnet/bin/power_manager/BUILD.gn similarity index 100% rename from bin/power_manager/BUILD.gn rename to garnet/bin/power_manager/BUILD.gn
diff --git a/bin/power_manager/meta/power_manager.cmx b/garnet/bin/power_manager/meta/power_manager.cmx similarity index 100% rename from bin/power_manager/meta/power_manager.cmx rename to garnet/bin/power_manager/meta/power_manager.cmx
diff --git a/bin/power_manager/src/main.rs b/garnet/bin/power_manager/src/main.rs similarity index 100% rename from bin/power_manager/src/main.rs rename to garnet/bin/power_manager/src/main.rs
diff --git a/bin/power_manager/src/power.rs b/garnet/bin/power_manager/src/power.rs similarity index 100% rename from bin/power_manager/src/power.rs rename to garnet/bin/power_manager/src/power.rs
diff --git a/bin/recovery_netstack/BUILD.gn b/garnet/bin/recovery_netstack/BUILD.gn similarity index 100% rename from bin/recovery_netstack/BUILD.gn rename to garnet/bin/recovery_netstack/BUILD.gn
diff --git a/bin/recovery_netstack/DESIGN.md b/garnet/bin/recovery_netstack/DESIGN.md similarity index 100% rename from bin/recovery_netstack/DESIGN.md rename to garnet/bin/recovery_netstack/DESIGN.md
diff --git a/bin/recovery_netstack/DETAILS.md b/garnet/bin/recovery_netstack/DETAILS.md similarity index 100% rename from bin/recovery_netstack/DETAILS.md rename to garnet/bin/recovery_netstack/DETAILS.md
diff --git a/bin/recovery_netstack/HACKING.md b/garnet/bin/recovery_netstack/HACKING.md similarity index 100% rename from bin/recovery_netstack/HACKING.md rename to garnet/bin/recovery_netstack/HACKING.md
diff --git a/bin/recovery_netstack/IMPROVEMENTS.md b/garnet/bin/recovery_netstack/IMPROVEMENTS.md similarity index 100% rename from bin/recovery_netstack/IMPROVEMENTS.md rename to garnet/bin/recovery_netstack/IMPROVEMENTS.md
diff --git a/bin/recovery_netstack/MAINTAINERS b/garnet/bin/recovery_netstack/MAINTAINERS similarity index 100% rename from bin/recovery_netstack/MAINTAINERS rename to garnet/bin/recovery_netstack/MAINTAINERS
diff --git a/bin/recovery_netstack/core/BUILD.gn b/garnet/bin/recovery_netstack/core/BUILD.gn similarity index 100% rename from bin/recovery_netstack/core/BUILD.gn rename to garnet/bin/recovery_netstack/core/BUILD.gn
diff --git a/bin/recovery_netstack/core/src/device/arp.rs b/garnet/bin/recovery_netstack/core/src/device/arp.rs similarity index 100% rename from bin/recovery_netstack/core/src/device/arp.rs rename to garnet/bin/recovery_netstack/core/src/device/arp.rs
diff --git a/bin/recovery_netstack/core/src/device/ethernet.rs b/garnet/bin/recovery_netstack/core/src/device/ethernet.rs similarity index 100% rename from bin/recovery_netstack/core/src/device/ethernet.rs rename to garnet/bin/recovery_netstack/core/src/device/ethernet.rs
diff --git a/bin/recovery_netstack/core/src/device/mod.rs b/garnet/bin/recovery_netstack/core/src/device/mod.rs similarity index 100% rename from bin/recovery_netstack/core/src/device/mod.rs rename to garnet/bin/recovery_netstack/core/src/device/mod.rs
diff --git a/bin/recovery_netstack/core/src/error.rs b/garnet/bin/recovery_netstack/core/src/error.rs similarity index 100% rename from bin/recovery_netstack/core/src/error.rs rename to garnet/bin/recovery_netstack/core/src/error.rs
diff --git a/bin/recovery_netstack/core/src/ip/forwarding.rs b/garnet/bin/recovery_netstack/core/src/ip/forwarding.rs similarity index 100% rename from bin/recovery_netstack/core/src/ip/forwarding.rs rename to garnet/bin/recovery_netstack/core/src/ip/forwarding.rs
diff --git a/bin/recovery_netstack/core/src/ip/icmp.rs b/garnet/bin/recovery_netstack/core/src/ip/icmp.rs similarity index 100% rename from bin/recovery_netstack/core/src/ip/icmp.rs rename to garnet/bin/recovery_netstack/core/src/ip/icmp.rs
diff --git a/bin/recovery_netstack/core/src/ip/mod.rs b/garnet/bin/recovery_netstack/core/src/ip/mod.rs similarity index 100% rename from bin/recovery_netstack/core/src/ip/mod.rs rename to garnet/bin/recovery_netstack/core/src/ip/mod.rs
diff --git a/bin/recovery_netstack/core/src/ip/testdata.rs b/garnet/bin/recovery_netstack/core/src/ip/testdata.rs similarity index 100% rename from bin/recovery_netstack/core/src/ip/testdata.rs rename to garnet/bin/recovery_netstack/core/src/ip/testdata.rs
diff --git a/bin/recovery_netstack/core/src/ip/types.rs b/garnet/bin/recovery_netstack/core/src/ip/types.rs similarity index 100% rename from bin/recovery_netstack/core/src/ip/types.rs rename to garnet/bin/recovery_netstack/core/src/ip/types.rs
diff --git a/bin/recovery_netstack/core/src/lib.rs b/garnet/bin/recovery_netstack/core/src/lib.rs similarity index 100% rename from bin/recovery_netstack/core/src/lib.rs rename to garnet/bin/recovery_netstack/core/src/lib.rs
diff --git a/bin/recovery_netstack/core/src/macros.rs b/garnet/bin/recovery_netstack/core/src/macros.rs similarity index 100% rename from bin/recovery_netstack/core/src/macros.rs rename to garnet/bin/recovery_netstack/core/src/macros.rs
diff --git a/bin/recovery_netstack/core/src/testutil.rs b/garnet/bin/recovery_netstack/core/src/testutil.rs similarity index 100% rename from bin/recovery_netstack/core/src/testutil.rs rename to garnet/bin/recovery_netstack/core/src/testutil.rs
diff --git a/bin/recovery_netstack/core/src/transport/mod.rs b/garnet/bin/recovery_netstack/core/src/transport/mod.rs similarity index 100% rename from bin/recovery_netstack/core/src/transport/mod.rs rename to garnet/bin/recovery_netstack/core/src/transport/mod.rs
diff --git a/bin/recovery_netstack/core/src/transport/tcp/conn.rs b/garnet/bin/recovery_netstack/core/src/transport/tcp/conn.rs similarity index 100% rename from bin/recovery_netstack/core/src/transport/tcp/conn.rs rename to garnet/bin/recovery_netstack/core/src/transport/tcp/conn.rs
diff --git a/bin/recovery_netstack/core/src/transport/tcp/listen.rs b/garnet/bin/recovery_netstack/core/src/transport/tcp/listen.rs similarity index 100% rename from bin/recovery_netstack/core/src/transport/tcp/listen.rs rename to garnet/bin/recovery_netstack/core/src/transport/tcp/listen.rs
diff --git a/bin/recovery_netstack/core/src/transport/tcp/mod.rs b/garnet/bin/recovery_netstack/core/src/transport/tcp/mod.rs similarity index 100% rename from bin/recovery_netstack/core/src/transport/tcp/mod.rs rename to garnet/bin/recovery_netstack/core/src/transport/tcp/mod.rs
diff --git a/bin/recovery_netstack/core/src/transport/tcp/types.rs b/garnet/bin/recovery_netstack/core/src/transport/tcp/types.rs similarity index 100% rename from bin/recovery_netstack/core/src/transport/tcp/types.rs rename to garnet/bin/recovery_netstack/core/src/transport/tcp/types.rs
diff --git a/bin/recovery_netstack/core/src/transport/udp.rs b/garnet/bin/recovery_netstack/core/src/transport/udp.rs similarity index 100% rename from bin/recovery_netstack/core/src/transport/udp.rs rename to garnet/bin/recovery_netstack/core/src/transport/udp.rs
diff --git a/bin/recovery_netstack/core/src/types.rs b/garnet/bin/recovery_netstack/core/src/types.rs similarity index 100% rename from bin/recovery_netstack/core/src/types.rs rename to garnet/bin/recovery_netstack/core/src/types.rs
diff --git a/bin/recovery_netstack/core/src/wire/arp.rs b/garnet/bin/recovery_netstack/core/src/wire/arp.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/arp.rs rename to garnet/bin/recovery_netstack/core/src/wire/arp.rs
diff --git a/bin/recovery_netstack/core/src/wire/ethernet.rs b/garnet/bin/recovery_netstack/core/src/wire/ethernet.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/ethernet.rs rename to garnet/bin/recovery_netstack/core/src/wire/ethernet.rs
diff --git a/bin/recovery_netstack/core/src/wire/icmp/common.rs b/garnet/bin/recovery_netstack/core/src/wire/icmp/common.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/icmp/common.rs rename to garnet/bin/recovery_netstack/core/src/wire/icmp/common.rs
diff --git a/bin/recovery_netstack/core/src/wire/icmp/icmpv4.rs b/garnet/bin/recovery_netstack/core/src/wire/icmp/icmpv4.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/icmp/icmpv4.rs rename to garnet/bin/recovery_netstack/core/src/wire/icmp/icmpv4.rs
diff --git a/bin/recovery_netstack/core/src/wire/icmp/icmpv6.rs b/garnet/bin/recovery_netstack/core/src/wire/icmp/icmpv6.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/icmp/icmpv6.rs rename to garnet/bin/recovery_netstack/core/src/wire/icmp/icmpv6.rs
diff --git a/bin/recovery_netstack/core/src/wire/icmp/macros.rs b/garnet/bin/recovery_netstack/core/src/wire/icmp/macros.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/icmp/macros.rs rename to garnet/bin/recovery_netstack/core/src/wire/icmp/macros.rs
diff --git a/bin/recovery_netstack/core/src/wire/icmp/mod.rs b/garnet/bin/recovery_netstack/core/src/wire/icmp/mod.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/icmp/mod.rs rename to garnet/bin/recovery_netstack/core/src/wire/icmp/mod.rs
diff --git a/bin/recovery_netstack/core/src/wire/icmp/ndp.rs b/garnet/bin/recovery_netstack/core/src/wire/icmp/ndp.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/icmp/ndp.rs rename to garnet/bin/recovery_netstack/core/src/wire/icmp/ndp.rs
diff --git a/bin/recovery_netstack/core/src/wire/icmp/testdata.rs b/garnet/bin/recovery_netstack/core/src/wire/icmp/testdata.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/icmp/testdata.rs rename to garnet/bin/recovery_netstack/core/src/wire/icmp/testdata.rs
diff --git a/bin/recovery_netstack/core/src/wire/ipv4.rs b/garnet/bin/recovery_netstack/core/src/wire/ipv4.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/ipv4.rs rename to garnet/bin/recovery_netstack/core/src/wire/ipv4.rs
diff --git a/bin/recovery_netstack/core/src/wire/ipv6.rs b/garnet/bin/recovery_netstack/core/src/wire/ipv6.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/ipv6.rs rename to garnet/bin/recovery_netstack/core/src/wire/ipv6.rs
diff --git a/bin/recovery_netstack/core/src/wire/mod.rs b/garnet/bin/recovery_netstack/core/src/wire/mod.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/mod.rs rename to garnet/bin/recovery_netstack/core/src/wire/mod.rs
diff --git a/bin/recovery_netstack/core/src/wire/tcp.rs b/garnet/bin/recovery_netstack/core/src/wire/tcp.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/tcp.rs rename to garnet/bin/recovery_netstack/core/src/wire/tcp.rs
diff --git a/bin/recovery_netstack/core/src/wire/testdata.rs b/garnet/bin/recovery_netstack/core/src/wire/testdata.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/testdata.rs rename to garnet/bin/recovery_netstack/core/src/wire/testdata.rs
diff --git a/bin/recovery_netstack/core/src/wire/udp.rs b/garnet/bin/recovery_netstack/core/src/wire/udp.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/udp.rs rename to garnet/bin/recovery_netstack/core/src/wire/udp.rs
diff --git a/bin/recovery_netstack/core/src/wire/util.rs b/garnet/bin/recovery_netstack/core/src/wire/util.rs similarity index 100% rename from bin/recovery_netstack/core/src/wire/util.rs rename to garnet/bin/recovery_netstack/core/src/wire/util.rs
diff --git a/bin/recovery_netstack/meta/recovery_netstack.cmx b/garnet/bin/recovery_netstack/meta/recovery_netstack.cmx similarity index 100% rename from bin/recovery_netstack/meta/recovery_netstack.cmx rename to garnet/bin/recovery_netstack/meta/recovery_netstack.cmx
diff --git a/bin/recovery_netstack/src/eventloop.rs b/garnet/bin/recovery_netstack/src/eventloop.rs similarity index 100% rename from bin/recovery_netstack/src/eventloop.rs rename to garnet/bin/recovery_netstack/src/eventloop.rs
diff --git a/bin/recovery_netstack/src/fidl_worker.rs b/garnet/bin/recovery_netstack/src/fidl_worker.rs similarity index 100% rename from bin/recovery_netstack/src/fidl_worker.rs rename to garnet/bin/recovery_netstack/src/fidl_worker.rs
diff --git a/bin/recovery_netstack/src/main.rs b/garnet/bin/recovery_netstack/src/main.rs similarity index 100% rename from bin/recovery_netstack/src/main.rs rename to garnet/bin/recovery_netstack/src/main.rs
diff --git a/bin/rolldice/BUILD.gn b/garnet/bin/rolldice/BUILD.gn similarity index 100% rename from bin/rolldice/BUILD.gn rename to garnet/bin/rolldice/BUILD.gn
diff --git a/bin/rolldice/README.md b/garnet/bin/rolldice/README.md similarity index 100% rename from bin/rolldice/README.md rename to garnet/bin/rolldice/README.md
diff --git a/bin/rolldice/meta/rolldice.cmx b/garnet/bin/rolldice/meta/rolldice.cmx similarity index 100% rename from bin/rolldice/meta/rolldice.cmx rename to garnet/bin/rolldice/meta/rolldice.cmx
diff --git a/bin/rolldice/src/lib.rs b/garnet/bin/rolldice/src/lib.rs similarity index 100% rename from bin/rolldice/src/lib.rs rename to garnet/bin/rolldice/src/lib.rs
diff --git a/bin/rolldice/src/main.rs b/garnet/bin/rolldice/src/main.rs similarity index 100% rename from bin/rolldice/src/main.rs rename to garnet/bin/rolldice/src/main.rs
diff --git a/bin/run/BUILD.gn b/garnet/bin/run/BUILD.gn similarity index 100% rename from bin/run/BUILD.gn rename to garnet/bin/run/BUILD.gn
diff --git a/bin/run/MAINTAINERS b/garnet/bin/run/MAINTAINERS similarity index 100% rename from bin/run/MAINTAINERS rename to garnet/bin/run/MAINTAINERS
diff --git a/bin/run/main.cc b/garnet/bin/run/main.cc similarity index 100% rename from bin/run/main.cc rename to garnet/bin/run/main.cc
diff --git a/bin/run/run.cmx b/garnet/bin/run/run.cmx similarity index 100% rename from bin/run/run.cmx rename to garnet/bin/run/run.cmx
diff --git a/bin/run/test/BUILD.gn b/garnet/bin/run/test/BUILD.gn similarity index 100% rename from bin/run/test/BUILD.gn rename to garnet/bin/run/test/BUILD.gn
diff --git a/bin/run/test/exiter.cc b/garnet/bin/run/test/exiter.cc similarity index 100% rename from bin/run/test/exiter.cc rename to garnet/bin/run/test/exiter.cc
diff --git a/bin/run/test/meta/run_test_exiter.cmx b/garnet/bin/run/test/meta/run_test_exiter.cmx similarity index 100% rename from bin/run/test/meta/run_test_exiter.cmx rename to garnet/bin/run/test/meta/run_test_exiter.cmx
diff --git a/bin/run/test/run_return_value_shell_test b/garnet/bin/run/test/run_return_value_shell_test similarity index 100% rename from bin/run/test/run_return_value_shell_test rename to garnet/bin/run/test/run_return_value_shell_test
diff --git a/bin/run/test/run_return_value_shell_test.cmx b/garnet/bin/run/test/run_return_value_shell_test.cmx similarity index 100% rename from bin/run/test/run_return_value_shell_test.cmx rename to garnet/bin/run/test/run_return_value_shell_test.cmx
diff --git a/bin/run/test/run_return_value_test.cc b/garnet/bin/run/test/run_return_value_test.cc similarity index 100% rename from bin/run/test/run_return_value_test.cc rename to garnet/bin/run/test/run_return_value_test.cc
diff --git a/bin/run/test/run_return_value_test.cmx b/garnet/bin/run/test/run_return_value_test.cmx similarity index 100% rename from bin/run/test/run_return_value_test.cmx rename to garnet/bin/run/test/run_return_value_test.cmx
diff --git a/bin/run/test/run_tests.cc b/garnet/bin/run/test/run_tests.cc similarity index 100% rename from bin/run/test/run_tests.cc rename to garnet/bin/run/test/run_tests.cc
diff --git a/bin/run_test_component/BUILD.gn b/garnet/bin/run_test_component/BUILD.gn similarity index 100% rename from bin/run_test_component/BUILD.gn rename to garnet/bin/run_test_component/BUILD.gn
diff --git a/bin/run_test_component/env_config.cc b/garnet/bin/run_test_component/env_config.cc similarity index 100% rename from bin/run_test_component/env_config.cc rename to garnet/bin/run_test_component/env_config.cc
diff --git a/bin/run_test_component/env_config.h b/garnet/bin/run_test_component/env_config.h similarity index 100% rename from bin/run_test_component/env_config.h rename to garnet/bin/run_test_component/env_config.h
diff --git a/bin/run_test_component/env_config_unittest.cc b/garnet/bin/run_test_component/env_config_unittest.cc similarity index 100% rename from bin/run_test_component/env_config_unittest.cc rename to garnet/bin/run_test_component/env_config_unittest.cc
diff --git a/bin/run_test_component/environment.config b/garnet/bin/run_test_component/environment.config similarity index 100% rename from bin/run_test_component/environment.config rename to garnet/bin/run_test_component/environment.config
diff --git a/bin/run_test_component/main.cc b/garnet/bin/run_test_component/main.cc similarity index 100% rename from bin/run_test_component/main.cc rename to garnet/bin/run_test_component/main.cc
diff --git a/bin/run_test_component/meta/run_test_component_unittests.cmx b/garnet/bin/run_test_component/meta/run_test_component_unittests.cmx similarity index 100% rename from bin/run_test_component/meta/run_test_component_unittests.cmx rename to garnet/bin/run_test_component/meta/run_test_component_unittests.cmx
diff --git a/bin/run_test_component/run_test_component.cc b/garnet/bin/run_test_component/run_test_component.cc similarity index 100% rename from bin/run_test_component/run_test_component.cc rename to garnet/bin/run_test_component/run_test_component.cc
diff --git a/bin/run_test_component/run_test_component.h b/garnet/bin/run_test_component/run_test_component.h similarity index 100% rename from bin/run_test_component/run_test_component.h rename to garnet/bin/run_test_component/run_test_component.h
diff --git a/bin/run_test_component/run_test_component_unittest.cc b/garnet/bin/run_test_component/run_test_component_unittest.cc similarity index 100% rename from bin/run_test_component/run_test_component_unittest.cc rename to garnet/bin/run_test_component/run_test_component_unittest.cc
diff --git a/bin/run_test_component/test/BUILD.gn b/garnet/bin/run_test_component/test/BUILD.gn similarity index 100% rename from bin/run_test_component/test/BUILD.gn rename to garnet/bin/run_test_component/test/BUILD.gn
diff --git a/bin/run_test_component/test/meta/run_test_component_test.cmx b/garnet/bin/run_test_component/test/meta/run_test_component_test.cmx similarity index 100% rename from bin/run_test_component/test/meta/run_test_component_test.cmx rename to garnet/bin/run_test_component/test/meta/run_test_component_test.cmx
diff --git a/bin/run_test_component/test/run_test_component_test.cc b/garnet/bin/run_test_component/test/run_test_component_test.cc similarity index 100% rename from bin/run_test_component/test/run_test_component_test.cc rename to garnet/bin/run_test_component/test/run_test_component_test.cc
diff --git a/bin/run_test_component/test_metadata.cc b/garnet/bin/run_test_component/test_metadata.cc similarity index 100% rename from bin/run_test_component/test_metadata.cc rename to garnet/bin/run_test_component/test_metadata.cc
diff --git a/bin/run_test_component/test_metadata.h b/garnet/bin/run_test_component/test_metadata.h similarity index 100% rename from bin/run_test_component/test_metadata.h rename to garnet/bin/run_test_component/test_metadata.h
diff --git a/bin/run_test_component/test_metadata_unittest.cc b/garnet/bin/run_test_component/test_metadata_unittest.cc similarity index 100% rename from bin/run_test_component/test_metadata_unittest.cc rename to garnet/bin/run_test_component/test_metadata_unittest.cc
diff --git a/bin/runmany/BUILD.gn b/garnet/bin/runmany/BUILD.gn similarity index 100% rename from bin/runmany/BUILD.gn rename to garnet/bin/runmany/BUILD.gn
diff --git a/bin/runmany/src/runmany.c b/garnet/bin/runmany/src/runmany.c similarity index 100% rename from bin/runmany/src/runmany.c rename to garnet/bin/runmany/src/runmany.c
diff --git a/bin/scpi/BUILD.gn b/garnet/bin/scpi/BUILD.gn similarity index 100% rename from bin/scpi/BUILD.gn rename to garnet/bin/scpi/BUILD.gn
diff --git a/bin/scpi/app.cc b/garnet/bin/scpi/app.cc similarity index 100% rename from bin/scpi/app.cc rename to garnet/bin/scpi/app.cc
diff --git a/bin/scpi/app.h b/garnet/bin/scpi/app.h similarity index 100% rename from bin/scpi/app.h rename to garnet/bin/scpi/app.h
diff --git a/bin/scpi/app_unittest.cc b/garnet/bin/scpi/app_unittest.cc similarity index 100% rename from bin/scpi/app_unittest.cc rename to garnet/bin/scpi/app_unittest.cc
diff --git a/bin/scpi/main.cc b/garnet/bin/scpi/main.cc similarity index 100% rename from bin/scpi/main.cc rename to garnet/bin/scpi/main.cc
diff --git a/bin/scpi/meta/scpi.cmx b/garnet/bin/scpi/meta/scpi.cmx similarity index 100% rename from bin/scpi/meta/scpi.cmx rename to garnet/bin/scpi/meta/scpi.cmx
diff --git a/bin/sl4f/BUILD.gn b/garnet/bin/sl4f/BUILD.gn similarity index 100% rename from bin/sl4f/BUILD.gn rename to garnet/bin/sl4f/BUILD.gn
diff --git a/bin/sl4f/meta/sl4f.cmx b/garnet/bin/sl4f/meta/sl4f.cmx similarity index 100% rename from bin/sl4f/meta/sl4f.cmx rename to garnet/bin/sl4f/meta/sl4f.cmx
diff --git a/bin/sl4f/src/bluetooth/ble_advertise_facade.rs b/garnet/bin/sl4f/src/bluetooth/ble_advertise_facade.rs similarity index 100% rename from bin/sl4f/src/bluetooth/ble_advertise_facade.rs rename to garnet/bin/sl4f/src/bluetooth/ble_advertise_facade.rs
diff --git a/bin/sl4f/src/bluetooth/commands.rs b/garnet/bin/sl4f/src/bluetooth/commands.rs similarity index 100% rename from bin/sl4f/src/bluetooth/commands.rs rename to garnet/bin/sl4f/src/bluetooth/commands.rs
diff --git a/bin/sl4f/src/bluetooth/constants.rs b/garnet/bin/sl4f/src/bluetooth/constants.rs similarity index 100% rename from bin/sl4f/src/bluetooth/constants.rs rename to garnet/bin/sl4f/src/bluetooth/constants.rs
diff --git a/bin/sl4f/src/bluetooth/facade.rs b/garnet/bin/sl4f/src/bluetooth/facade.rs similarity index 100% rename from bin/sl4f/src/bluetooth/facade.rs rename to garnet/bin/sl4f/src/bluetooth/facade.rs
diff --git a/bin/sl4f/src/bluetooth/gatt_client_facade.rs b/garnet/bin/sl4f/src/bluetooth/gatt_client_facade.rs similarity index 100% rename from bin/sl4f/src/bluetooth/gatt_client_facade.rs rename to garnet/bin/sl4f/src/bluetooth/gatt_client_facade.rs
diff --git a/bin/sl4f/src/bluetooth/gatt_server_facade.rs b/garnet/bin/sl4f/src/bluetooth/gatt_server_facade.rs similarity index 100% rename from bin/sl4f/src/bluetooth/gatt_server_facade.rs rename to garnet/bin/sl4f/src/bluetooth/gatt_server_facade.rs
diff --git a/bin/sl4f/src/bluetooth/mod.rs b/garnet/bin/sl4f/src/bluetooth/mod.rs similarity index 100% rename from bin/sl4f/src/bluetooth/mod.rs rename to garnet/bin/sl4f/src/bluetooth/mod.rs
diff --git a/bin/sl4f/src/bluetooth/types.rs b/garnet/bin/sl4f/src/bluetooth/types.rs similarity index 100% rename from bin/sl4f/src/bluetooth/types.rs rename to garnet/bin/sl4f/src/bluetooth/types.rs
diff --git a/bin/sl4f/src/main.rs b/garnet/bin/sl4f/src/main.rs similarity index 100% rename from bin/sl4f/src/main.rs rename to garnet/bin/sl4f/src/main.rs
diff --git a/bin/sl4f/src/netstack/commands.rs b/garnet/bin/sl4f/src/netstack/commands.rs similarity index 100% rename from bin/sl4f/src/netstack/commands.rs rename to garnet/bin/sl4f/src/netstack/commands.rs
diff --git a/bin/sl4f/src/netstack/facade.rs b/garnet/bin/sl4f/src/netstack/facade.rs similarity index 100% rename from bin/sl4f/src/netstack/facade.rs rename to garnet/bin/sl4f/src/netstack/facade.rs
diff --git a/bin/sl4f/src/netstack/mod.rs b/garnet/bin/sl4f/src/netstack/mod.rs similarity index 100% rename from bin/sl4f/src/netstack/mod.rs rename to garnet/bin/sl4f/src/netstack/mod.rs
diff --git a/bin/sl4f/src/netstack/types.rs b/garnet/bin/sl4f/src/netstack/types.rs similarity index 100% rename from bin/sl4f/src/netstack/types.rs rename to garnet/bin/sl4f/src/netstack/types.rs
diff --git a/bin/sl4f/src/server/constants.rs b/garnet/bin/sl4f/src/server/constants.rs similarity index 100% rename from bin/sl4f/src/server/constants.rs rename to garnet/bin/sl4f/src/server/constants.rs
diff --git a/bin/sl4f/src/server/mod.rs b/garnet/bin/sl4f/src/server/mod.rs similarity index 100% rename from bin/sl4f/src/server/mod.rs rename to garnet/bin/sl4f/src/server/mod.rs
diff --git a/bin/sl4f/src/server/sl4f.rs b/garnet/bin/sl4f/src/server/sl4f.rs similarity index 100% rename from bin/sl4f/src/server/sl4f.rs rename to garnet/bin/sl4f/src/server/sl4f.rs
diff --git a/bin/sl4f/src/server/sl4f_executor.rs b/garnet/bin/sl4f/src/server/sl4f_executor.rs similarity index 100% rename from bin/sl4f/src/server/sl4f_executor.rs rename to garnet/bin/sl4f/src/server/sl4f_executor.rs
diff --git a/bin/sl4f/src/server/sl4f_types.rs b/garnet/bin/sl4f/src/server/sl4f_types.rs similarity index 100% rename from bin/sl4f/src/server/sl4f_types.rs rename to garnet/bin/sl4f/src/server/sl4f_types.rs
diff --git a/bin/sl4f/src/wlan/commands.rs b/garnet/bin/sl4f/src/wlan/commands.rs similarity index 100% rename from bin/sl4f/src/wlan/commands.rs rename to garnet/bin/sl4f/src/wlan/commands.rs
diff --git a/bin/sl4f/src/wlan/facade.rs b/garnet/bin/sl4f/src/wlan/facade.rs similarity index 100% rename from bin/sl4f/src/wlan/facade.rs rename to garnet/bin/sl4f/src/wlan/facade.rs
diff --git a/bin/sl4f/src/wlan/mod.rs b/garnet/bin/sl4f/src/wlan/mod.rs similarity index 100% rename from bin/sl4f/src/wlan/mod.rs rename to garnet/bin/sl4f/src/wlan/mod.rs
diff --git a/bin/sshd-host/BUILD.gn b/garnet/bin/sshd-host/BUILD.gn similarity index 100% rename from bin/sshd-host/BUILD.gn rename to garnet/bin/sshd-host/BUILD.gn
diff --git a/bin/sshd-host/MAINTAINERS b/garnet/bin/sshd-host/MAINTAINERS similarity index 100% rename from bin/sshd-host/MAINTAINERS rename to garnet/bin/sshd-host/MAINTAINERS
diff --git a/bin/sshd-host/README.md b/garnet/bin/sshd-host/README.md similarity index 100% rename from bin/sshd-host/README.md rename to garnet/bin/sshd-host/README.md
diff --git a/bin/sshd-host/meta/sshd-host.cmx b/garnet/bin/sshd-host/meta/sshd-host.cmx similarity index 100% rename from bin/sshd-host/meta/sshd-host.cmx rename to garnet/bin/sshd-host/meta/sshd-host.cmx
diff --git a/bin/sshd-host/sshd-host.cc b/garnet/bin/sshd-host/sshd-host.cc similarity index 100% rename from bin/sshd-host/sshd-host.cc rename to garnet/bin/sshd-host/sshd-host.cc
diff --git a/bin/stash/BUILD.gn b/garnet/bin/stash/BUILD.gn similarity index 100% rename from bin/stash/BUILD.gn rename to garnet/bin/stash/BUILD.gn
diff --git a/bin/stash/README.md b/garnet/bin/stash/README.md similarity index 100% rename from bin/stash/README.md rename to garnet/bin/stash/README.md
diff --git a/bin/stash/meta/stash.cmx b/garnet/bin/stash/meta/stash.cmx similarity index 100% rename from bin/stash/meta/stash.cmx rename to garnet/bin/stash/meta/stash.cmx
diff --git a/bin/stash/meta/stash_secure.cmx b/garnet/bin/stash/meta/stash_secure.cmx similarity index 100% rename from bin/stash/meta/stash_secure.cmx rename to garnet/bin/stash/meta/stash_secure.cmx
diff --git a/bin/stash/meta/stash_tests.cmx b/garnet/bin/stash/meta/stash_tests.cmx similarity index 100% rename from bin/stash/meta/stash_tests.cmx rename to garnet/bin/stash/meta/stash_tests.cmx
diff --git a/bin/stash/src/accessor.rs b/garnet/bin/stash/src/accessor.rs similarity index 100% rename from bin/stash/src/accessor.rs rename to garnet/bin/stash/src/accessor.rs
diff --git a/bin/stash/src/instance.rs b/garnet/bin/stash/src/instance.rs similarity index 100% rename from bin/stash/src/instance.rs rename to garnet/bin/stash/src/instance.rs
diff --git a/bin/stash/src/main.rs b/garnet/bin/stash/src/main.rs similarity index 100% rename from bin/stash/src/main.rs rename to garnet/bin/stash/src/main.rs
diff --git a/bin/stash/src/store.rs b/garnet/bin/stash/src/store.rs similarity index 100% rename from bin/stash/src/store.rs rename to garnet/bin/stash/src/store.rs
diff --git a/bin/stash_ctl/BUILD.gn b/garnet/bin/stash_ctl/BUILD.gn similarity index 100% rename from bin/stash_ctl/BUILD.gn rename to garnet/bin/stash_ctl/BUILD.gn
diff --git a/bin/stash_ctl/README.md b/garnet/bin/stash_ctl/README.md similarity index 100% rename from bin/stash_ctl/README.md rename to garnet/bin/stash_ctl/README.md
diff --git a/bin/stash_ctl/meta/stash_ctl.cmx b/garnet/bin/stash_ctl/meta/stash_ctl.cmx similarity index 100% rename from bin/stash_ctl/meta/stash_ctl.cmx rename to garnet/bin/stash_ctl/meta/stash_ctl.cmx
diff --git a/bin/stash_ctl/src/main.rs b/garnet/bin/stash_ctl/src/main.rs similarity index 100% rename from bin/stash_ctl/src/main.rs rename to garnet/bin/stash_ctl/src/main.rs
diff --git a/bin/sys/component_manager/BUILD.gn b/garnet/bin/sys/component_manager/BUILD.gn similarity index 100% rename from bin/sys/component_manager/BUILD.gn rename to garnet/bin/sys/component_manager/BUILD.gn
diff --git a/bin/sys/component_manager/meta/component_manager.cmx b/garnet/bin/sys/component_manager/meta/component_manager.cmx similarity index 100% rename from bin/sys/component_manager/meta/component_manager.cmx rename to garnet/bin/sys/component_manager/meta/component_manager.cmx
diff --git a/bin/sys/component_manager/meta/component_manager_tests.cmx b/garnet/bin/sys/component_manager/meta/component_manager_tests.cmx similarity index 100% rename from bin/sys/component_manager/meta/component_manager_tests.cmx rename to garnet/bin/sys/component_manager/meta/component_manager_tests.cmx
diff --git a/bin/sys/component_manager/src/data.rs b/garnet/bin/sys/component_manager/src/data.rs similarity index 100% rename from bin/sys/component_manager/src/data.rs rename to garnet/bin/sys/component_manager/src/data.rs
diff --git a/bin/sys/component_manager/src/elf_runner.rs b/garnet/bin/sys/component_manager/src/elf_runner.rs similarity index 100% rename from bin/sys/component_manager/src/elf_runner.rs rename to garnet/bin/sys/component_manager/src/elf_runner.rs
diff --git a/bin/sys/component_manager/src/fuchsia_boot_resolver.rs b/garnet/bin/sys/component_manager/src/fuchsia_boot_resolver.rs similarity index 100% rename from bin/sys/component_manager/src/fuchsia_boot_resolver.rs rename to garnet/bin/sys/component_manager/src/fuchsia_boot_resolver.rs
diff --git a/bin/sys/component_manager/src/main.rs b/garnet/bin/sys/component_manager/src/main.rs similarity index 100% rename from bin/sys/component_manager/src/main.rs rename to garnet/bin/sys/component_manager/src/main.rs
diff --git a/bin/sys/component_manager/src/model/mod.rs b/garnet/bin/sys/component_manager/src/model/mod.rs similarity index 100% rename from bin/sys/component_manager/src/model/mod.rs rename to garnet/bin/sys/component_manager/src/model/mod.rs
diff --git a/bin/sys/component_manager/src/model/moniker.rs b/garnet/bin/sys/component_manager/src/model/moniker.rs similarity index 100% rename from bin/sys/component_manager/src/model/moniker.rs rename to garnet/bin/sys/component_manager/src/model/moniker.rs
diff --git a/bin/sys/component_manager/src/model/resolver.rs b/garnet/bin/sys/component_manager/src/model/resolver.rs similarity index 100% rename from bin/sys/component_manager/src/model/resolver.rs rename to garnet/bin/sys/component_manager/src/model/resolver.rs
diff --git a/bin/sys/component_manager/src/model/runner.rs b/garnet/bin/sys/component_manager/src/model/runner.rs similarity index 100% rename from bin/sys/component_manager/src/model/runner.rs rename to garnet/bin/sys/component_manager/src/model/runner.rs
diff --git a/bin/sysmgr/BUILD.gn b/garnet/bin/sysmgr/BUILD.gn similarity index 100% rename from bin/sysmgr/BUILD.gn rename to garnet/bin/sysmgr/BUILD.gn
diff --git a/bin/sysmgr/README.md b/garnet/bin/sysmgr/README.md similarity index 100% rename from bin/sysmgr/README.md rename to garnet/bin/sysmgr/README.md
diff --git a/bin/sysmgr/app.cc b/garnet/bin/sysmgr/app.cc similarity index 100% rename from bin/sysmgr/app.cc rename to garnet/bin/sysmgr/app.cc
diff --git a/bin/sysmgr/app.h b/garnet/bin/sysmgr/app.h similarity index 100% rename from bin/sysmgr/app.h rename to garnet/bin/sysmgr/app.h
diff --git a/bin/sysmgr/config.cc b/garnet/bin/sysmgr/config.cc similarity index 100% rename from bin/sysmgr/config.cc rename to garnet/bin/sysmgr/config.cc
diff --git a/bin/sysmgr/config.h b/garnet/bin/sysmgr/config.h similarity index 100% rename from bin/sysmgr/config.h rename to garnet/bin/sysmgr/config.h
diff --git a/bin/sysmgr/config/network.config b/garnet/bin/sysmgr/config/network.config similarity index 100% rename from bin/sysmgr/config/network.config rename to garnet/bin/sysmgr/config/network.config
diff --git a/bin/sysmgr/config/router.config b/garnet/bin/sysmgr/config/router.config similarity index 100% rename from bin/sysmgr/config/router.config rename to garnet/bin/sysmgr/config/router.config
diff --git a/bin/sysmgr/config/services.config b/garnet/bin/sysmgr/config/services.config similarity index 100% rename from bin/sysmgr/config/services.config rename to garnet/bin/sysmgr/config/services.config
diff --git a/bin/sysmgr/delegating_loader.cc b/garnet/bin/sysmgr/delegating_loader.cc similarity index 100% rename from bin/sysmgr/delegating_loader.cc rename to garnet/bin/sysmgr/delegating_loader.cc
diff --git a/bin/sysmgr/delegating_loader.h b/garnet/bin/sysmgr/delegating_loader.h similarity index 100% rename from bin/sysmgr/delegating_loader.h rename to garnet/bin/sysmgr/delegating_loader.h
diff --git a/bin/sysmgr/integration_tests/BUILD.gn b/garnet/bin/sysmgr/integration_tests/BUILD.gn similarity index 100% rename from bin/sysmgr/integration_tests/BUILD.gn rename to garnet/bin/sysmgr/integration_tests/BUILD.gn
diff --git a/bin/sysmgr/integration_tests/interface.fidl b/garnet/bin/sysmgr/integration_tests/interface.fidl similarity index 100% rename from bin/sysmgr/integration_tests/interface.fidl rename to garnet/bin/sysmgr/integration_tests/interface.fidl
diff --git a/bin/sysmgr/integration_tests/meta/mock_resolver.cmx b/garnet/bin/sysmgr/integration_tests/meta/mock_resolver.cmx similarity index 100% rename from bin/sysmgr/integration_tests/meta/mock_resolver.cmx rename to garnet/bin/sysmgr/integration_tests/meta/mock_resolver.cmx
diff --git a/bin/sysmgr/integration_tests/meta/package_updating_loader_test.cmx b/garnet/bin/sysmgr/integration_tests/meta/package_updating_loader_test.cmx similarity index 100% rename from bin/sysmgr/integration_tests/meta/package_updating_loader_test.cmx rename to garnet/bin/sysmgr/integration_tests/meta/package_updating_loader_test.cmx
diff --git a/bin/sysmgr/integration_tests/meta/service_startup_test.cmx b/garnet/bin/sysmgr/integration_tests/meta/service_startup_test.cmx similarity index 100% rename from bin/sysmgr/integration_tests/meta/service_startup_test.cmx rename to garnet/bin/sysmgr/integration_tests/meta/service_startup_test.cmx
diff --git a/bin/sysmgr/integration_tests/meta/test_sysmgr_service.cmx b/garnet/bin/sysmgr/integration_tests/meta/test_sysmgr_service.cmx similarity index 100% rename from bin/sysmgr/integration_tests/meta/test_sysmgr_service.cmx rename to garnet/bin/sysmgr/integration_tests/meta/test_sysmgr_service.cmx
diff --git a/bin/sysmgr/integration_tests/mock_resolver.cc b/garnet/bin/sysmgr/integration_tests/mock_resolver.cc similarity index 100% rename from bin/sysmgr/integration_tests/mock_resolver.cc rename to garnet/bin/sysmgr/integration_tests/mock_resolver.cc
diff --git a/bin/sysmgr/integration_tests/package_updating_loader_test.cc b/garnet/bin/sysmgr/integration_tests/package_updating_loader_test.cc similarity index 100% rename from bin/sysmgr/integration_tests/package_updating_loader_test.cc rename to garnet/bin/sysmgr/integration_tests/package_updating_loader_test.cc
diff --git a/bin/sysmgr/integration_tests/service_startup_test.cc b/garnet/bin/sysmgr/integration_tests/service_startup_test.cc similarity index 100% rename from bin/sysmgr/integration_tests/service_startup_test.cc rename to garnet/bin/sysmgr/integration_tests/service_startup_test.cc
diff --git a/bin/sysmgr/integration_tests/test_sysmgr_service.cc b/garnet/bin/sysmgr/integration_tests/test_sysmgr_service.cc similarity index 100% rename from bin/sysmgr/integration_tests/test_sysmgr_service.cc rename to garnet/bin/sysmgr/integration_tests/test_sysmgr_service.cc
diff --git a/bin/sysmgr/main.cc b/garnet/bin/sysmgr/main.cc similarity index 100% rename from bin/sysmgr/main.cc rename to garnet/bin/sysmgr/main.cc
diff --git a/bin/sysmgr/meta/sysmgr.cmx b/garnet/bin/sysmgr/meta/sysmgr.cmx similarity index 100% rename from bin/sysmgr/meta/sysmgr.cmx rename to garnet/bin/sysmgr/meta/sysmgr.cmx
diff --git a/bin/sysmgr/package_updating_loader.cc b/garnet/bin/sysmgr/package_updating_loader.cc similarity index 100% rename from bin/sysmgr/package_updating_loader.cc rename to garnet/bin/sysmgr/package_updating_loader.cc
diff --git a/bin/sysmgr/package_updating_loader.h b/garnet/bin/sysmgr/package_updating_loader.h similarity index 100% rename from bin/sysmgr/package_updating_loader.h rename to garnet/bin/sysmgr/package_updating_loader.h
diff --git a/bin/sysmgr/test/BUILD.gn b/garnet/bin/sysmgr/test/BUILD.gn similarity index 100% rename from bin/sysmgr/test/BUILD.gn rename to garnet/bin/sysmgr/test/BUILD.gn
diff --git a/bin/sysmgr/test/config_test.cc b/garnet/bin/sysmgr/test/config_test.cc similarity index 100% rename from bin/sysmgr/test/config_test.cc rename to garnet/bin/sysmgr/test/config_test.cc
diff --git a/bin/system_monitor/BUILD.gn b/garnet/bin/system_monitor/BUILD.gn similarity index 100% rename from bin/system_monitor/BUILD.gn rename to garnet/bin/system_monitor/BUILD.gn
diff --git a/bin/system_monitor/MAINTAINERS b/garnet/bin/system_monitor/MAINTAINERS similarity index 100% rename from bin/system_monitor/MAINTAINERS rename to garnet/bin/system_monitor/MAINTAINERS
diff --git a/bin/system_monitor/README.md b/garnet/bin/system_monitor/README.md similarity index 100% rename from bin/system_monitor/README.md rename to garnet/bin/system_monitor/README.md
diff --git a/bin/system_monitor/dockyard_host/BUILD.gn b/garnet/bin/system_monitor/dockyard_host/BUILD.gn similarity index 100% rename from bin/system_monitor/dockyard_host/BUILD.gn rename to garnet/bin/system_monitor/dockyard_host/BUILD.gn
diff --git a/bin/system_monitor/dockyard_host/README.md b/garnet/bin/system_monitor/dockyard_host/README.md similarity index 100% rename from bin/system_monitor/dockyard_host/README.md rename to garnet/bin/system_monitor/dockyard_host/README.md
diff --git a/bin/system_monitor/dockyard_host/dockyard_host.cc b/garnet/bin/system_monitor/dockyard_host/dockyard_host.cc similarity index 100% rename from bin/system_monitor/dockyard_host/dockyard_host.cc rename to garnet/bin/system_monitor/dockyard_host/dockyard_host.cc
diff --git a/bin/system_monitor/harvester/BUILD.gn b/garnet/bin/system_monitor/harvester/BUILD.gn similarity index 100% rename from bin/system_monitor/harvester/BUILD.gn rename to garnet/bin/system_monitor/harvester/BUILD.gn
diff --git a/bin/system_monitor/harvester/README.md b/garnet/bin/system_monitor/harvester/README.md similarity index 100% rename from bin/system_monitor/harvester/README.md rename to garnet/bin/system_monitor/harvester/README.md
diff --git a/bin/system_monitor/harvester/harvester.cc b/garnet/bin/system_monitor/harvester/harvester.cc similarity index 100% rename from bin/system_monitor/harvester/harvester.cc rename to garnet/bin/system_monitor/harvester/harvester.cc
diff --git a/bin/system_monitor/third_party/README.md b/garnet/bin/system_monitor/third_party/README.md similarity index 100% rename from bin/system_monitor/third_party/README.md rename to garnet/bin/system_monitor/third_party/README.md
diff --git a/bin/telephony/MAINTAINERS b/garnet/bin/telephony/MAINTAINERS similarity index 100% rename from bin/telephony/MAINTAINERS rename to garnet/bin/telephony/MAINTAINERS
diff --git a/bin/telephony/README.md b/garnet/bin/telephony/README.md similarity index 100% rename from bin/telephony/README.md rename to garnet/bin/telephony/README.md
diff --git a/bin/telephony/modem-mgr/BUILD.gn b/garnet/bin/telephony/modem-mgr/BUILD.gn similarity index 100% rename from bin/telephony/modem-mgr/BUILD.gn rename to garnet/bin/telephony/modem-mgr/BUILD.gn
diff --git a/bin/telephony/modem-mgr/meta/modem-mgr.cmx b/garnet/bin/telephony/modem-mgr/meta/modem-mgr.cmx similarity index 100% rename from bin/telephony/modem-mgr/meta/modem-mgr.cmx rename to garnet/bin/telephony/modem-mgr/meta/modem-mgr.cmx
diff --git a/bin/telephony/modem-mgr/src/main.rs b/garnet/bin/telephony/modem-mgr/src/main.rs similarity index 100% rename from bin/telephony/modem-mgr/src/main.rs rename to garnet/bin/telephony/modem-mgr/src/main.rs
diff --git a/bin/telephony/ril-qmi/BUILD.gn b/garnet/bin/telephony/ril-qmi/BUILD.gn similarity index 100% rename from bin/telephony/ril-qmi/BUILD.gn rename to garnet/bin/telephony/ril-qmi/BUILD.gn
diff --git a/bin/telephony/ril-qmi/meta/ril-qmi.cmx b/garnet/bin/telephony/ril-qmi/meta/ril-qmi.cmx similarity index 100% rename from bin/telephony/ril-qmi/meta/ril-qmi.cmx rename to garnet/bin/telephony/ril-qmi/meta/ril-qmi.cmx
diff --git a/bin/telephony/ril-qmi/src/client.rs b/garnet/bin/telephony/ril-qmi/src/client.rs similarity index 100% rename from bin/telephony/ril-qmi/src/client.rs rename to garnet/bin/telephony/ril-qmi/src/client.rs
diff --git a/bin/telephony/ril-qmi/src/errors.rs b/garnet/bin/telephony/ril-qmi/src/errors.rs similarity index 100% rename from bin/telephony/ril-qmi/src/errors.rs rename to garnet/bin/telephony/ril-qmi/src/errors.rs
diff --git a/bin/telephony/ril-qmi/src/main.rs b/garnet/bin/telephony/ril-qmi/src/main.rs similarity index 100% rename from bin/telephony/ril-qmi/src/main.rs rename to garnet/bin/telephony/ril-qmi/src/main.rs
diff --git a/bin/telephony/ril-qmi/src/transport.rs b/garnet/bin/telephony/ril-qmi/src/transport.rs similarity index 100% rename from bin/telephony/ril-qmi/src/transport.rs rename to garnet/bin/telephony/ril-qmi/src/transport.rs
diff --git a/bin/telephony/tools/ril-ctl/BUILD.gn b/garnet/bin/telephony/tools/ril-ctl/BUILD.gn similarity index 100% rename from bin/telephony/tools/ril-ctl/BUILD.gn rename to garnet/bin/telephony/tools/ril-ctl/BUILD.gn
diff --git a/bin/telephony/tools/ril-ctl/meta/ril-ctl.cmx b/garnet/bin/telephony/tools/ril-ctl/meta/ril-ctl.cmx similarity index 100% rename from bin/telephony/tools/ril-ctl/meta/ril-ctl.cmx rename to garnet/bin/telephony/tools/ril-ctl/meta/ril-ctl.cmx
diff --git a/bin/telephony/tools/ril-ctl/src/commands.rs b/garnet/bin/telephony/tools/ril-ctl/src/commands.rs similarity index 100% rename from bin/telephony/tools/ril-ctl/src/commands.rs rename to garnet/bin/telephony/tools/ril-ctl/src/commands.rs
diff --git a/bin/telephony/tools/ril-ctl/src/main.rs b/garnet/bin/telephony/tools/ril-ctl/src/main.rs similarity index 100% rename from bin/telephony/tools/ril-ctl/src/main.rs rename to garnet/bin/telephony/tools/ril-ctl/src/main.rs
diff --git a/bin/telephony/tools/ril-ctl/src/repl.rs b/garnet/bin/telephony/tools/ril-ctl/src/repl.rs similarity index 100% rename from bin/telephony/tools/ril-ctl/src/repl.rs rename to garnet/bin/telephony/tools/ril-ctl/src/repl.rs
diff --git a/bin/tennis/BUILD.gn b/garnet/bin/tennis/BUILD.gn similarity index 100% rename from bin/tennis/BUILD.gn rename to garnet/bin/tennis/BUILD.gn
diff --git a/bin/tennis/README.md b/garnet/bin/tennis/README.md similarity index 100% rename from bin/tennis/README.md rename to garnet/bin/tennis/README.md
diff --git a/bin/tennis/bots/example_ai/BUILD.gn b/garnet/bin/tennis/bots/example_ai/BUILD.gn similarity index 100% rename from bin/tennis/bots/example_ai/BUILD.gn rename to garnet/bin/tennis/bots/example_ai/BUILD.gn
diff --git a/bin/tennis/bots/example_ai/meta/tennis_example_ai.cmx b/garnet/bin/tennis/bots/example_ai/meta/tennis_example_ai.cmx similarity index 100% rename from bin/tennis/bots/example_ai/meta/tennis_example_ai.cmx rename to garnet/bin/tennis/bots/example_ai/meta/tennis_example_ai.cmx
diff --git a/bin/tennis/bots/example_ai/src/main.rs b/garnet/bin/tennis/bots/example_ai/src/main.rs similarity index 100% rename from bin/tennis/bots/example_ai/src/main.rs rename to garnet/bin/tennis/bots/example_ai/src/main.rs
diff --git a/bin/tennis/bots/manual_player/BUILD.gn b/garnet/bin/tennis/bots/manual_player/BUILD.gn similarity index 100% rename from bin/tennis/bots/manual_player/BUILD.gn rename to garnet/bin/tennis/bots/manual_player/BUILD.gn
diff --git a/bin/tennis/bots/manual_player/meta/tennis_manual_player.cmx b/garnet/bin/tennis/bots/manual_player/meta/tennis_manual_player.cmx similarity index 100% rename from bin/tennis/bots/manual_player/meta/tennis_manual_player.cmx rename to garnet/bin/tennis/bots/manual_player/meta/tennis_manual_player.cmx
diff --git a/bin/tennis/bots/manual_player/src/main.rs b/garnet/bin/tennis/bots/manual_player/src/main.rs similarity index 100% rename from bin/tennis/bots/manual_player/src/main.rs rename to garnet/bin/tennis/bots/manual_player/src/main.rs
diff --git a/bin/tennis/meta/tennis_service.cmx b/garnet/bin/tennis/meta/tennis_service.cmx similarity index 100% rename from bin/tennis/meta/tennis_service.cmx rename to garnet/bin/tennis/meta/tennis_service.cmx
diff --git a/bin/tennis/meta/tennis_viewer.cmx b/garnet/bin/tennis/meta/tennis_viewer.cmx similarity index 100% rename from bin/tennis/meta/tennis_viewer.cmx rename to garnet/bin/tennis/meta/tennis_viewer.cmx
diff --git a/bin/tennis/src/game.rs b/garnet/bin/tennis/src/game.rs similarity index 100% rename from bin/tennis/src/game.rs rename to garnet/bin/tennis/src/game.rs
diff --git a/bin/tennis/src/main.rs b/garnet/bin/tennis/src/main.rs similarity index 100% rename from bin/tennis/src/main.rs rename to garnet/bin/tennis/src/main.rs
diff --git a/bin/tennis/src/tennis_service.rs b/garnet/bin/tennis/src/tennis_service.rs similarity index 100% rename from bin/tennis/src/tennis_service.rs rename to garnet/bin/tennis/src/tennis_service.rs
diff --git a/bin/tennis/tennis_sysmgr.config b/garnet/bin/tennis/tennis_sysmgr.config similarity index 100% rename from bin/tennis/tennis_sysmgr.config rename to garnet/bin/tennis/tennis_sysmgr.config
diff --git a/bin/tennis/viewer/main.rs b/garnet/bin/tennis/viewer/main.rs similarity index 100% rename from bin/tennis/viewer/main.rs rename to garnet/bin/tennis/viewer/main.rs
diff --git a/bin/terminal/BUILD.gn b/garnet/bin/terminal/BUILD.gn similarity index 100% rename from bin/terminal/BUILD.gn rename to garnet/bin/terminal/BUILD.gn
diff --git a/bin/terminal/MAINTAINERS b/garnet/bin/terminal/MAINTAINERS similarity index 100% rename from bin/terminal/MAINTAINERS rename to garnet/bin/terminal/MAINTAINERS
diff --git a/bin/terminal/config/tiles_with_terminal.config b/garnet/bin/terminal/config/tiles_with_terminal.config similarity index 100% rename from bin/terminal/config/tiles_with_terminal.config rename to garnet/bin/terminal/config/tiles_with_terminal.config
diff --git a/bin/terminal/meta/terminal.cmx b/garnet/bin/terminal/meta/terminal.cmx similarity index 100% rename from bin/terminal/meta/terminal.cmx rename to garnet/bin/terminal/meta/terminal.cmx
diff --git a/bin/terminal/src/main.rs b/garnet/bin/terminal/src/main.rs similarity index 100% rename from bin/terminal/src/main.rs rename to garnet/bin/terminal/src/main.rs
diff --git a/bin/terminal/third_party/term-model/BUILD.gn b/garnet/bin/terminal/third_party/term-model/BUILD.gn similarity index 100% rename from bin/terminal/third_party/term-model/BUILD.gn rename to garnet/bin/terminal/third_party/term-model/BUILD.gn
diff --git a/bin/terminal/third_party/term-model/LICENSE-APACHE b/garnet/bin/terminal/third_party/term-model/LICENSE-APACHE similarity index 100% rename from bin/terminal/third_party/term-model/LICENSE-APACHE rename to garnet/bin/terminal/third_party/term-model/LICENSE-APACHE
diff --git a/bin/terminal/third_party/term-model/src/ansi.rs b/garnet/bin/terminal/third_party/term-model/src/ansi.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/ansi.rs rename to garnet/bin/terminal/third_party/term-model/src/ansi.rs
diff --git a/bin/terminal/third_party/term-model/src/cell.rs b/garnet/bin/terminal/third_party/term-model/src/cell.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/cell.rs rename to garnet/bin/terminal/third_party/term-model/src/cell.rs
diff --git a/bin/terminal/third_party/term-model/src/color.rs b/garnet/bin/terminal/third_party/term-model/src/color.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/color.rs rename to garnet/bin/terminal/third_party/term-model/src/color.rs
diff --git a/bin/terminal/third_party/term-model/src/config.rs b/garnet/bin/terminal/third_party/term-model/src/config.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/config.rs rename to garnet/bin/terminal/third_party/term-model/src/config.rs
diff --git a/bin/terminal/third_party/term-model/src/font.rs b/garnet/bin/terminal/third_party/term-model/src/font.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/font.rs rename to garnet/bin/terminal/third_party/term-model/src/font.rs
diff --git a/bin/terminal/third_party/term-model/src/grid.rs b/garnet/bin/terminal/third_party/term-model/src/grid.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/grid.rs rename to garnet/bin/terminal/third_party/term-model/src/grid.rs
diff --git a/bin/terminal/third_party/term-model/src/index.rs b/garnet/bin/terminal/third_party/term-model/src/index.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/index.rs rename to garnet/bin/terminal/third_party/term-model/src/index.rs
diff --git a/bin/terminal/third_party/term-model/src/lib.rs b/garnet/bin/terminal/third_party/term-model/src/lib.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/lib.rs rename to garnet/bin/terminal/third_party/term-model/src/lib.rs
diff --git a/bin/terminal/third_party/term-model/src/main.rs b/garnet/bin/terminal/third_party/term-model/src/main.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/main.rs rename to garnet/bin/terminal/third_party/term-model/src/main.rs
diff --git a/bin/terminal/third_party/term-model/src/rgb.rs b/garnet/bin/terminal/third_party/term-model/src/rgb.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/rgb.rs rename to garnet/bin/terminal/third_party/term-model/src/rgb.rs
diff --git a/bin/terminal/third_party/term-model/src/selection.rs b/garnet/bin/terminal/third_party/term-model/src/selection.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/selection.rs rename to garnet/bin/terminal/third_party/term-model/src/selection.rs
diff --git a/bin/terminal/third_party/term-model/src/term.rs b/garnet/bin/terminal/third_party/term-model/src/term.rs similarity index 100% rename from bin/terminal/third_party/term-model/src/term.rs rename to garnet/bin/terminal/third_party/term-model/src/term.rs
diff --git a/bin/test_runner/BUILD.gn b/garnet/bin/test_runner/BUILD.gn similarity index 100% rename from bin/test_runner/BUILD.gn rename to garnet/bin/test_runner/BUILD.gn
diff --git a/bin/test_runner/README.md b/garnet/bin/test_runner/README.md similarity index 100% rename from bin/test_runner/README.md rename to garnet/bin/test_runner/README.md
diff --git a/bin/test_runner/report_result/BUILD.gn b/garnet/bin/test_runner/report_result/BUILD.gn similarity index 100% rename from bin/test_runner/report_result/BUILD.gn rename to garnet/bin/test_runner/report_result/BUILD.gn
diff --git a/bin/test_runner/report_result/report_result.cc b/garnet/bin/test_runner/report_result/report_result.cc similarity index 100% rename from bin/test_runner/report_result/report_result.cc rename to garnet/bin/test_runner/report_result/report_result.cc
diff --git a/bin/test_runner/run_integration_tests/BUILD.gn b/garnet/bin/test_runner/run_integration_tests/BUILD.gn similarity index 100% rename from bin/test_runner/run_integration_tests/BUILD.gn rename to garnet/bin/test_runner/run_integration_tests/BUILD.gn
diff --git a/bin/test_runner/run_integration_tests/run_integration_tests.cc b/garnet/bin/test_runner/run_integration_tests/run_integration_tests.cc similarity index 100% rename from bin/test_runner/run_integration_tests/run_integration_tests.cc rename to garnet/bin/test_runner/run_integration_tests/run_integration_tests.cc
diff --git a/bin/test_runner/run_integration_tests/test_runner_config.cc b/garnet/bin/test_runner/run_integration_tests/test_runner_config.cc similarity index 100% rename from bin/test_runner/run_integration_tests/test_runner_config.cc rename to garnet/bin/test_runner/run_integration_tests/test_runner_config.cc
diff --git a/bin/test_runner/run_integration_tests/test_runner_config.h b/garnet/bin/test_runner/run_integration_tests/test_runner_config.h similarity index 100% rename from bin/test_runner/run_integration_tests/test_runner_config.h rename to garnet/bin/test_runner/run_integration_tests/test_runner_config.h
diff --git a/bin/test_runner/run_test/BUILD.gn b/garnet/bin/test_runner/run_test/BUILD.gn similarity index 100% rename from bin/test_runner/run_test/BUILD.gn rename to garnet/bin/test_runner/run_test/BUILD.gn
diff --git a/bin/test_runner/run_test/run_test.cc b/garnet/bin/test_runner/run_test/run_test.cc similarity index 100% rename from bin/test_runner/run_test/run_test.cc rename to garnet/bin/test_runner/run_test/run_test.cc
diff --git a/bin/test_runner/test/BUILD.gn b/garnet/bin/test_runner/test/BUILD.gn similarity index 100% rename from bin/test_runner/test/BUILD.gn rename to garnet/bin/test_runner/test/BUILD.gn
diff --git a/bin/test_runner/test/fake_command.cc b/garnet/bin/test_runner/test/fake_command.cc similarity index 100% rename from bin/test_runner/test/fake_command.cc rename to garnet/bin/test_runner/test/fake_command.cc
diff --git a/bin/test_runner/test/fake_failing_test.cc b/garnet/bin/test_runner/test/fake_failing_test.cc similarity index 100% rename from bin/test_runner/test/fake_failing_test.cc rename to garnet/bin/test_runner/test/fake_failing_test.cc
diff --git a/bin/test_runner/test/fake_passing_test.cc b/garnet/bin/test_runner/test/fake_passing_test.cc similarity index 100% rename from bin/test_runner/test/fake_passing_test.cc rename to garnet/bin/test_runner/test/fake_passing_test.cc
diff --git a/bin/test_runner/test/fake_tests.json b/garnet/bin/test_runner/test/fake_tests.json similarity index 100% rename from bin/test_runner/test/fake_tests.json rename to garnet/bin/test_runner/test/fake_tests.json
diff --git a/bin/thermd/BUILD.gn b/garnet/bin/thermd/BUILD.gn similarity index 100% rename from bin/thermd/BUILD.gn rename to garnet/bin/thermd/BUILD.gn
diff --git a/bin/thermd/meta/thermd.cmx b/garnet/bin/thermd/meta/thermd.cmx similarity index 100% rename from bin/thermd/meta/thermd.cmx rename to garnet/bin/thermd/meta/thermd.cmx
diff --git a/bin/thermd/thermd.cc b/garnet/bin/thermd/thermd.cc similarity index 100% rename from bin/thermd/thermd.cc rename to garnet/bin/thermd/thermd.cc
diff --git a/bin/thermd/thermd.config b/garnet/bin/thermd/thermd.config similarity index 100% rename from bin/thermd/thermd.config rename to garnet/bin/thermd/thermd.config
diff --git a/bin/thermd/thermd_arm.cc b/garnet/bin/thermd/thermd_arm.cc similarity index 100% rename from bin/thermd/thermd_arm.cc rename to garnet/bin/thermd/thermd_arm.cc
diff --git a/bin/time/BUILD.gn b/garnet/bin/time/BUILD.gn similarity index 100% rename from bin/time/BUILD.gn rename to garnet/bin/time/BUILD.gn
diff --git a/bin/time/time.c b/garnet/bin/time/time.c similarity index 100% rename from bin/time/time.c rename to garnet/bin/time/time.c
diff --git a/bin/timezone/BUILD.gn b/garnet/bin/timezone/BUILD.gn similarity index 100% rename from bin/timezone/BUILD.gn rename to garnet/bin/timezone/BUILD.gn
diff --git a/bin/timezone/main.cc b/garnet/bin/timezone/main.cc similarity index 100% rename from bin/timezone/main.cc rename to garnet/bin/timezone/main.cc
diff --git a/bin/timezone/meta/timezone.cmx b/garnet/bin/timezone/meta/timezone.cmx similarity index 100% rename from bin/timezone/meta/timezone.cmx rename to garnet/bin/timezone/meta/timezone.cmx
diff --git a/bin/timezone/test/BUILD.gn b/garnet/bin/timezone/test/BUILD.gn similarity index 100% rename from bin/timezone/test/BUILD.gn rename to garnet/bin/timezone/test/BUILD.gn
diff --git a/bin/timezone/test/meta/timezone_unittests.cmx b/garnet/bin/timezone/test/meta/timezone_unittests.cmx similarity index 100% rename from bin/timezone/test/meta/timezone_unittests.cmx rename to garnet/bin/timezone/test/meta/timezone_unittests.cmx
diff --git a/bin/timezone/test/timezone_unittest.cc b/garnet/bin/timezone/test/timezone_unittest.cc similarity index 100% rename from bin/timezone/test/timezone_unittest.cc rename to garnet/bin/timezone/test/timezone_unittest.cc
diff --git a/bin/timezone/timezone.cc b/garnet/bin/timezone/timezone.cc similarity index 100% rename from bin/timezone/timezone.cc rename to garnet/bin/timezone/timezone.cc
diff --git a/bin/timezone/timezone.h b/garnet/bin/timezone/timezone.h similarity index 100% rename from bin/timezone/timezone.h rename to garnet/bin/timezone/timezone.h
diff --git a/bin/trace/BUILD.gn b/garnet/bin/trace/BUILD.gn similarity index 100% rename from bin/trace/BUILD.gn rename to garnet/bin/trace/BUILD.gn
diff --git a/bin/trace/MAINTAINERS b/garnet/bin/trace/MAINTAINERS similarity index 100% rename from bin/trace/MAINTAINERS rename to garnet/bin/trace/MAINTAINERS
diff --git a/bin/trace/README.md b/garnet/bin/trace/README.md similarity index 100% rename from bin/trace/README.md rename to garnet/bin/trace/README.md
diff --git a/bin/trace/app.cc b/garnet/bin/trace/app.cc similarity index 100% rename from bin/trace/app.cc rename to garnet/bin/trace/app.cc
diff --git a/bin/trace/app.h b/garnet/bin/trace/app.h similarity index 100% rename from bin/trace/app.h rename to garnet/bin/trace/app.h
diff --git a/bin/trace/command.cc b/garnet/bin/trace/command.cc similarity index 100% rename from bin/trace/command.cc rename to garnet/bin/trace/command.cc
diff --git a/bin/trace/command.h b/garnet/bin/trace/command.h similarity index 100% rename from bin/trace/command.h rename to garnet/bin/trace/command.h
diff --git a/bin/trace/commands/list_categories.cc b/garnet/bin/trace/commands/list_categories.cc similarity index 100% rename from bin/trace/commands/list_categories.cc rename to garnet/bin/trace/commands/list_categories.cc
diff --git a/bin/trace/commands/list_categories.h b/garnet/bin/trace/commands/list_categories.h similarity index 100% rename from bin/trace/commands/list_categories.h rename to garnet/bin/trace/commands/list_categories.h
diff --git a/bin/trace/commands/record.cc b/garnet/bin/trace/commands/record.cc similarity index 100% rename from bin/trace/commands/record.cc rename to garnet/bin/trace/commands/record.cc
diff --git a/bin/trace/commands/record.h b/garnet/bin/trace/commands/record.h similarity index 100% rename from bin/trace/commands/record.h rename to garnet/bin/trace/commands/record.h
diff --git a/bin/trace/main.cc b/garnet/bin/trace/main.cc similarity index 100% rename from bin/trace/main.cc rename to garnet/bin/trace/main.cc
diff --git a/bin/trace/results_export.cc b/garnet/bin/trace/results_export.cc similarity index 100% rename from bin/trace/results_export.cc rename to garnet/bin/trace/results_export.cc
diff --git a/bin/trace/results_export.h b/garnet/bin/trace/results_export.h similarity index 100% rename from bin/trace/results_export.h rename to garnet/bin/trace/results_export.h
diff --git a/bin/trace/results_output.cc b/garnet/bin/trace/results_output.cc similarity index 100% rename from bin/trace/results_output.cc rename to garnet/bin/trace/results_output.cc
diff --git a/bin/trace/results_output.h b/garnet/bin/trace/results_output.h similarity index 100% rename from bin/trace/results_output.h rename to garnet/bin/trace/results_output.h
diff --git a/bin/trace/spec.cc b/garnet/bin/trace/spec.cc similarity index 100% rename from bin/trace/spec.cc rename to garnet/bin/trace/spec.cc
diff --git a/bin/trace/spec.h b/garnet/bin/trace/spec.h similarity index 100% rename from bin/trace/spec.h rename to garnet/bin/trace/spec.h
diff --git a/bin/trace/spec_unittest.cc b/garnet/bin/trace/spec_unittest.cc similarity index 100% rename from bin/trace/spec_unittest.cc rename to garnet/bin/trace/spec_unittest.cc
diff --git a/bin/trace/tests/BUILD.gn b/garnet/bin/trace/tests/BUILD.gn similarity index 100% rename from bin/trace/tests/BUILD.gn rename to garnet/bin/trace/tests/BUILD.gn
diff --git a/bin/trace/tests/basic_integration_tests.cc b/garnet/bin/trace/tests/basic_integration_tests.cc similarity index 100% rename from bin/trace/tests/basic_integration_tests.cc rename to garnet/bin/trace/tests/basic_integration_tests.cc
diff --git a/bin/trace/tests/basic_integration_tests.h b/garnet/bin/trace/tests/basic_integration_tests.h similarity index 100% rename from bin/trace/tests/basic_integration_tests.h rename to garnet/bin/trace/tests/basic_integration_tests.h
diff --git a/bin/trace/tests/circular.tspec b/garnet/bin/trace/tests/circular.tspec similarity index 100% rename from bin/trace/tests/circular.tspec rename to garnet/bin/trace/tests/circular.tspec
diff --git a/bin/trace/tests/fill_buffer_integration_test.cc b/garnet/bin/trace/tests/fill_buffer_integration_test.cc similarity index 100% rename from bin/trace/tests/fill_buffer_integration_test.cc rename to garnet/bin/trace/tests/fill_buffer_integration_test.cc
diff --git a/bin/trace/tests/integration_test_main.cc b/garnet/bin/trace/tests/integration_test_main.cc similarity index 100% rename from bin/trace/tests/integration_test_main.cc rename to garnet/bin/trace/tests/integration_test_main.cc
diff --git a/bin/trace/tests/integration_test_utils.cc b/garnet/bin/trace/tests/integration_test_utils.cc similarity index 100% rename from bin/trace/tests/integration_test_utils.cc rename to garnet/bin/trace/tests/integration_test_utils.cc
diff --git a/bin/trace/tests/integration_test_utils.h b/garnet/bin/trace/tests/integration_test_utils.h similarity index 100% rename from bin/trace/tests/integration_test_utils.h rename to garnet/bin/trace/tests/integration_test_utils.h
diff --git a/bin/trace/tests/meta/basic_integration_test_app.cmx b/garnet/bin/trace/tests/meta/basic_integration_test_app.cmx similarity index 100% rename from bin/trace/tests/meta/basic_integration_test_app.cmx rename to garnet/bin/trace/tests/meta/basic_integration_test_app.cmx
diff --git a/bin/trace/tests/meta/run_integration_test.cmx b/garnet/bin/trace/tests/meta/run_integration_test.cmx similarity index 100% rename from bin/trace/tests/meta/run_integration_test.cmx rename to garnet/bin/trace/tests/meta/run_integration_test.cmx
diff --git a/bin/trace/tests/meta/trace_integration_tests.cmx b/garnet/bin/trace/tests/meta/trace_integration_tests.cmx similarity index 100% rename from bin/trace/tests/meta/trace_integration_tests.cmx rename to garnet/bin/trace/tests/meta/trace_integration_tests.cmx
diff --git a/bin/trace/tests/meta/two_providers_two_engines_test_app.cmx b/garnet/bin/trace/tests/meta/two_providers_two_engines_test_app.cmx similarity index 100% rename from bin/trace/tests/meta/two_providers_two_engines_test_app.cmx rename to garnet/bin/trace/tests/meta/two_providers_two_engines_test_app.cmx
diff --git a/bin/trace/tests/oneshot.tspec b/garnet/bin/trace/tests/oneshot.tspec similarity index 100% rename from bin/trace/tests/oneshot.tspec rename to garnet/bin/trace/tests/oneshot.tspec
diff --git a/bin/trace/tests/run_integration_test.cc b/garnet/bin/trace/tests/run_integration_test.cc similarity index 100% rename from bin/trace/tests/run_integration_test.cc rename to garnet/bin/trace/tests/run_integration_test.cc
diff --git a/bin/trace/tests/run_test.cc b/garnet/bin/trace/tests/run_test.cc similarity index 100% rename from bin/trace/tests/run_test.cc rename to garnet/bin/trace/tests/run_test.cc
diff --git a/bin/trace/tests/run_test.h b/garnet/bin/trace/tests/run_test.h similarity index 100% rename from bin/trace/tests/run_test.h rename to garnet/bin/trace/tests/run_test.h
diff --git a/bin/trace/tests/self_contained_provider.cc b/garnet/bin/trace/tests/self_contained_provider.cc similarity index 100% rename from bin/trace/tests/self_contained_provider.cc rename to garnet/bin/trace/tests/self_contained_provider.cc
diff --git a/bin/trace/tests/self_contained_provider.h b/garnet/bin/trace/tests/self_contained_provider.h similarity index 100% rename from bin/trace/tests/self_contained_provider.h rename to garnet/bin/trace/tests/self_contained_provider.h
diff --git a/bin/trace/tests/simple.tspec b/garnet/bin/trace/tests/simple.tspec similarity index 100% rename from bin/trace/tests/simple.tspec rename to garnet/bin/trace/tests/simple.tspec
diff --git a/bin/trace/tests/simple_integration_test.cc b/garnet/bin/trace/tests/simple_integration_test.cc similarity index 100% rename from bin/trace/tests/simple_integration_test.cc rename to garnet/bin/trace/tests/simple_integration_test.cc
diff --git a/bin/trace/tests/streaming.tspec b/garnet/bin/trace/tests/streaming.tspec similarity index 100% rename from bin/trace/tests/streaming.tspec rename to garnet/bin/trace/tests/streaming.tspec
diff --git a/bin/trace/tests/trace_integration_tests.cc b/garnet/bin/trace/tests/trace_integration_tests.cc similarity index 100% rename from bin/trace/tests/trace_integration_tests.cc rename to garnet/bin/trace/tests/trace_integration_tests.cc
diff --git a/bin/trace/tests/two_providers_one_engine.cc b/garnet/bin/trace/tests/two_providers_one_engine.cc similarity index 100% rename from bin/trace/tests/two_providers_one_engine.cc rename to garnet/bin/trace/tests/two_providers_one_engine.cc
diff --git a/bin/trace/tests/two_providers_two_engines.cc b/garnet/bin/trace/tests/two_providers_two_engines.cc similarity index 100% rename from bin/trace/tests/two_providers_two_engines.cc rename to garnet/bin/trace/tests/two_providers_two_engines.cc
diff --git a/bin/trace/tests/two_providers_two_engines.tspec b/garnet/bin/trace/tests/two_providers_two_engines.tspec similarity index 100% rename from bin/trace/tests/two_providers_two_engines.tspec rename to garnet/bin/trace/tests/two_providers_two_engines.tspec
diff --git a/bin/trace/trace.cmx b/garnet/bin/trace/trace.cmx similarity index 100% rename from bin/trace/trace.cmx rename to garnet/bin/trace/trace.cmx
diff --git a/bin/trace/tracer.cc b/garnet/bin/trace/tracer.cc similarity index 100% rename from bin/trace/tracer.cc rename to garnet/bin/trace/tracer.cc
diff --git a/bin/trace/tracer.h b/garnet/bin/trace/tracer.h similarity index 100% rename from bin/trace/tracer.h rename to garnet/bin/trace/tracer.h
diff --git a/bin/trace_manager/BUILD.gn b/garnet/bin/trace_manager/BUILD.gn similarity index 100% rename from bin/trace_manager/BUILD.gn rename to garnet/bin/trace_manager/BUILD.gn
diff --git a/bin/trace_manager/MAINTAINERS b/garnet/bin/trace_manager/MAINTAINERS similarity index 100% rename from bin/trace_manager/MAINTAINERS rename to garnet/bin/trace_manager/MAINTAINERS
diff --git a/bin/trace_manager/README.md b/garnet/bin/trace_manager/README.md similarity index 100% rename from bin/trace_manager/README.md rename to garnet/bin/trace_manager/README.md
diff --git a/bin/trace_manager/app.cc b/garnet/bin/trace_manager/app.cc similarity index 100% rename from bin/trace_manager/app.cc rename to garnet/bin/trace_manager/app.cc
diff --git a/bin/trace_manager/app.h b/garnet/bin/trace_manager/app.h similarity index 100% rename from bin/trace_manager/app.h rename to garnet/bin/trace_manager/app.h
diff --git a/bin/trace_manager/config.cc b/garnet/bin/trace_manager/config.cc similarity index 100% rename from bin/trace_manager/config.cc rename to garnet/bin/trace_manager/config.cc
diff --git a/bin/trace_manager/config.h b/garnet/bin/trace_manager/config.h similarity index 100% rename from bin/trace_manager/config.h rename to garnet/bin/trace_manager/config.h
diff --git a/bin/trace_manager/main.cc b/garnet/bin/trace_manager/main.cc similarity index 100% rename from bin/trace_manager/main.cc rename to garnet/bin/trace_manager/main.cc
diff --git a/bin/trace_manager/meta/trace_manager.cmx b/garnet/bin/trace_manager/meta/trace_manager.cmx similarity index 100% rename from bin/trace_manager/meta/trace_manager.cmx rename to garnet/bin/trace_manager/meta/trace_manager.cmx
diff --git a/bin/trace_manager/trace_manager.cc b/garnet/bin/trace_manager/trace_manager.cc similarity index 100% rename from bin/trace_manager/trace_manager.cc rename to garnet/bin/trace_manager/trace_manager.cc
diff --git a/bin/trace_manager/trace_manager.h b/garnet/bin/trace_manager/trace_manager.h similarity index 100% rename from bin/trace_manager/trace_manager.h rename to garnet/bin/trace_manager/trace_manager.h
diff --git a/bin/trace_manager/trace_provider_bundle.cc b/garnet/bin/trace_manager/trace_provider_bundle.cc similarity index 100% rename from bin/trace_manager/trace_provider_bundle.cc rename to garnet/bin/trace_manager/trace_provider_bundle.cc
diff --git a/bin/trace_manager/trace_provider_bundle.h b/garnet/bin/trace_manager/trace_provider_bundle.h similarity index 100% rename from bin/trace_manager/trace_provider_bundle.h rename to garnet/bin/trace_manager/trace_provider_bundle.h
diff --git a/bin/trace_manager/trace_session.cc b/garnet/bin/trace_manager/trace_session.cc similarity index 100% rename from bin/trace_manager/trace_session.cc rename to garnet/bin/trace_manager/trace_session.cc
diff --git a/bin/trace_manager/trace_session.h b/garnet/bin/trace_manager/trace_session.h similarity index 100% rename from bin/trace_manager/trace_session.h rename to garnet/bin/trace_manager/trace_session.h
diff --git a/bin/trace_manager/tracee.cc b/garnet/bin/trace_manager/tracee.cc similarity index 100% rename from bin/trace_manager/tracee.cc rename to garnet/bin/trace_manager/tracee.cc
diff --git a/bin/trace_manager/tracee.h b/garnet/bin/trace_manager/tracee.h similarity index 100% rename from bin/trace_manager/tracee.h rename to garnet/bin/trace_manager/tracee.h
diff --git a/bin/trace_manager/tracing.config b/garnet/bin/trace_manager/tracing.config similarity index 100% rename from bin/trace_manager/tracing.config rename to garnet/bin/trace_manager/tracing.config
diff --git a/bin/trace_stress/BUILD.gn b/garnet/bin/trace_stress/BUILD.gn similarity index 100% rename from bin/trace_stress/BUILD.gn rename to garnet/bin/trace_stress/BUILD.gn
diff --git a/bin/trace_stress/README.md b/garnet/bin/trace_stress/README.md similarity index 100% rename from bin/trace_stress/README.md rename to garnet/bin/trace_stress/README.md
diff --git a/bin/trace_stress/main.cc b/garnet/bin/trace_stress/main.cc similarity index 100% rename from bin/trace_stress/main.cc rename to garnet/bin/trace_stress/main.cc
diff --git a/bin/trace_stress/meta/trace_stress.cmx b/garnet/bin/trace_stress/meta/trace_stress.cmx similarity index 100% rename from bin/trace_stress/meta/trace_stress.cmx rename to garnet/bin/trace_stress/meta/trace_stress.cmx
diff --git a/bin/traceutil/BUILD.gn b/garnet/bin/traceutil/BUILD.gn similarity index 100% rename from bin/traceutil/BUILD.gn rename to garnet/bin/traceutil/BUILD.gn
diff --git a/bin/traceutil/MAINTAINERS b/garnet/bin/traceutil/MAINTAINERS similarity index 100% rename from bin/traceutil/MAINTAINERS rename to garnet/bin/traceutil/MAINTAINERS
diff --git a/bin/traceutil/actions.go b/garnet/bin/traceutil/actions.go similarity index 100% rename from bin/traceutil/actions.go rename to garnet/bin/traceutil/actions.go
diff --git a/bin/traceutil/cmd_convert.go b/garnet/bin/traceutil/cmd_convert.go similarity index 100% rename from bin/traceutil/cmd_convert.go rename to garnet/bin/traceutil/cmd_convert.go
diff --git a/bin/traceutil/cmd_record.go b/garnet/bin/traceutil/cmd_record.go similarity index 100% rename from bin/traceutil/cmd_record.go rename to garnet/bin/traceutil/cmd_record.go
diff --git a/bin/traceutil/main.go b/garnet/bin/traceutil/main.go similarity index 100% rename from bin/traceutil/main.go rename to garnet/bin/traceutil/main.go
diff --git a/bin/traceutil/target_connection.go b/garnet/bin/traceutil/target_connection.go similarity index 100% rename from bin/traceutil/target_connection.go rename to garnet/bin/traceutil/target_connection.go
diff --git a/bin/traceutil/util.go b/garnet/bin/traceutil/util.go similarity index 100% rename from bin/traceutil/util.go rename to garnet/bin/traceutil/util.go
diff --git a/bin/tts/BUILD.gn b/garnet/bin/tts/BUILD.gn similarity index 100% rename from bin/tts/BUILD.gn rename to garnet/bin/tts/BUILD.gn
diff --git a/bin/tts/main.cc b/garnet/bin/tts/main.cc similarity index 100% rename from bin/tts/main.cc rename to garnet/bin/tts/main.cc
diff --git a/bin/tts/meta/tts_service.cmx b/garnet/bin/tts/meta/tts_service.cmx similarity index 100% rename from bin/tts/meta/tts_service.cmx rename to garnet/bin/tts/meta/tts_service.cmx
diff --git a/bin/tts/tts_service_impl.cc b/garnet/bin/tts/tts_service_impl.cc similarity index 100% rename from bin/tts/tts_service_impl.cc rename to garnet/bin/tts/tts_service_impl.cc
diff --git a/bin/tts/tts_service_impl.h b/garnet/bin/tts/tts_service_impl.h similarity index 100% rename from bin/tts/tts_service_impl.h rename to garnet/bin/tts/tts_service_impl.h
diff --git a/bin/tts/tts_speaker.cc b/garnet/bin/tts/tts_speaker.cc similarity index 100% rename from bin/tts/tts_speaker.cc rename to garnet/bin/tts/tts_speaker.cc
diff --git a/bin/tts/tts_speaker.h b/garnet/bin/tts/tts_speaker.h similarity index 100% rename from bin/tts/tts_speaker.h rename to garnet/bin/tts/tts_speaker.h
diff --git a/bin/tz-util/BUILD.gn b/garnet/bin/tz-util/BUILD.gn similarity index 100% rename from bin/tz-util/BUILD.gn rename to garnet/bin/tz-util/BUILD.gn
diff --git a/bin/tz-util/README.md b/garnet/bin/tz-util/README.md similarity index 100% rename from bin/tz-util/README.md rename to garnet/bin/tz-util/README.md
diff --git a/bin/tz-util/tz-util.cc b/garnet/bin/tz-util/tz-util.cc similarity index 100% rename from bin/tz-util/tz-util.cc rename to garnet/bin/tz-util/tz-util.cc
diff --git a/bin/ui/BUILD.gn b/garnet/bin/ui/BUILD.gn similarity index 100% rename from bin/ui/BUILD.gn rename to garnet/bin/ui/BUILD.gn
diff --git a/bin/ui/MAINTAINERS b/garnet/bin/ui/MAINTAINERS similarity index 100% rename from bin/ui/MAINTAINERS rename to garnet/bin/ui/MAINTAINERS
diff --git a/bin/ui/README.md b/garnet/bin/ui/README.md similarity index 100% rename from bin/ui/README.md rename to garnet/bin/ui/README.md
diff --git a/bin/ui/benchmarks/image_grid_cpp/BUILD.gn b/garnet/bin/ui/benchmarks/image_grid_cpp/BUILD.gn similarity index 100% rename from bin/ui/benchmarks/image_grid_cpp/BUILD.gn rename to garnet/bin/ui/benchmarks/image_grid_cpp/BUILD.gn
diff --git a/bin/ui/benchmarks/image_grid_cpp/README.md b/garnet/bin/ui/benchmarks/image_grid_cpp/README.md similarity index 100% rename from bin/ui/benchmarks/image_grid_cpp/README.md rename to garnet/bin/ui/benchmarks/image_grid_cpp/README.md
diff --git a/bin/ui/benchmarks/image_grid_cpp/image_grid_cpp.cmx b/garnet/bin/ui/benchmarks/image_grid_cpp/image_grid_cpp.cmx similarity index 100% rename from bin/ui/benchmarks/image_grid_cpp/image_grid_cpp.cmx rename to garnet/bin/ui/benchmarks/image_grid_cpp/image_grid_cpp.cmx
diff --git a/bin/ui/benchmarks/image_grid_cpp/image_grid_view.cc b/garnet/bin/ui/benchmarks/image_grid_cpp/image_grid_view.cc similarity index 100% rename from bin/ui/benchmarks/image_grid_cpp/image_grid_view.cc rename to garnet/bin/ui/benchmarks/image_grid_cpp/image_grid_view.cc
diff --git a/bin/ui/benchmarks/image_grid_cpp/image_grid_view.h b/garnet/bin/ui/benchmarks/image_grid_cpp/image_grid_view.h similarity index 100% rename from bin/ui/benchmarks/image_grid_cpp/image_grid_view.h rename to garnet/bin/ui/benchmarks/image_grid_cpp/image_grid_view.h
diff --git a/bin/ui/benchmarks/image_grid_cpp/main.cc b/garnet/bin/ui/benchmarks/image_grid_cpp/main.cc similarity index 100% rename from bin/ui/benchmarks/image_grid_cpp/main.cc rename to garnet/bin/ui/benchmarks/image_grid_cpp/main.cc
diff --git a/bin/ui/gltf_export/BUILD.gn b/garnet/bin/ui/gltf_export/BUILD.gn similarity index 100% rename from bin/ui/gltf_export/BUILD.gn rename to garnet/bin/ui/gltf_export/BUILD.gn
diff --git a/bin/ui/gltf_export/README.md b/garnet/bin/ui/gltf_export/README.md similarity index 100% rename from bin/ui/gltf_export/README.md rename to garnet/bin/ui/gltf_export/README.md
diff --git a/bin/ui/gltf_export/main.cc b/garnet/bin/ui/gltf_export/main.cc similarity index 100% rename from bin/ui/gltf_export/main.cc rename to garnet/bin/ui/gltf_export/main.cc
diff --git a/bin/ui/gltf_export/meta/gltf_export.cmx b/garnet/bin/ui/gltf_export/meta/gltf_export.cmx similarity index 100% rename from bin/ui/gltf_export/meta/gltf_export.cmx rename to garnet/bin/ui/gltf_export/meta/gltf_export.cmx
diff --git a/bin/ui/ime/BUILD.gn b/garnet/bin/ui/ime/BUILD.gn similarity index 100% rename from bin/ui/ime/BUILD.gn rename to garnet/bin/ui/ime/BUILD.gn
diff --git a/bin/ui/ime/meta/ime_service.cmx b/garnet/bin/ui/ime/meta/ime_service.cmx similarity index 100% rename from bin/ui/ime/meta/ime_service.cmx rename to garnet/bin/ui/ime/meta/ime_service.cmx
diff --git a/bin/ui/ime/src/ime.rs b/garnet/bin/ui/ime/src/ime.rs similarity index 100% rename from bin/ui/ime/src/ime.rs rename to garnet/bin/ui/ime/src/ime.rs
diff --git a/bin/ui/ime/src/ime_service.rs b/garnet/bin/ui/ime/src/ime_service.rs similarity index 100% rename from bin/ui/ime/src/ime_service.rs rename to garnet/bin/ui/ime/src/ime_service.rs
diff --git a/bin/ui/ime/src/main.rs b/garnet/bin/ui/ime/src/main.rs similarity index 100% rename from bin/ui/ime/src/main.rs rename to garnet/bin/ui/ime/src/main.rs
diff --git a/bin/ui/ime/src/test_helpers.rs b/garnet/bin/ui/ime/src/test_helpers.rs similarity index 100% rename from bin/ui/ime/src/test_helpers.rs rename to garnet/bin/ui/ime/src/test_helpers.rs
diff --git a/bin/ui/input/BUILD.gn b/garnet/bin/ui/input/BUILD.gn similarity index 100% rename from bin/ui/input/BUILD.gn rename to garnet/bin/ui/input/BUILD.gn
diff --git a/bin/ui/input/README.md b/garnet/bin/ui/input/README.md similarity index 100% rename from bin/ui/input/README.md rename to garnet/bin/ui/input/README.md
diff --git a/bin/ui/input/inverse_keymap.cc b/garnet/bin/ui/input/inverse_keymap.cc similarity index 100% rename from bin/ui/input/inverse_keymap.cc rename to garnet/bin/ui/input/inverse_keymap.cc
diff --git a/bin/ui/input/inverse_keymap.h b/garnet/bin/ui/input/inverse_keymap.h similarity index 100% rename from bin/ui/input/inverse_keymap.h rename to garnet/bin/ui/input/inverse_keymap.h
diff --git a/bin/ui/input/main.cc b/garnet/bin/ui/input/main.cc similarity index 100% rename from bin/ui/input/main.cc rename to garnet/bin/ui/input/main.cc
diff --git a/bin/ui/input/tests/BUILD.gn b/garnet/bin/ui/input/tests/BUILD.gn similarity index 100% rename from bin/ui/input/tests/BUILD.gn rename to garnet/bin/ui/input/tests/BUILD.gn
diff --git a/bin/ui/input/tests/inverse_keymap_unittest.cc b/garnet/bin/ui/input/tests/inverse_keymap_unittest.cc similarity index 100% rename from bin/ui/input/tests/inverse_keymap_unittest.cc rename to garnet/bin/ui/input/tests/inverse_keymap_unittest.cc
diff --git a/bin/ui/input_reader/BUILD.gn b/garnet/bin/ui/input_reader/BUILD.gn similarity index 100% rename from bin/ui/input_reader/BUILD.gn rename to garnet/bin/ui/input_reader/BUILD.gn
diff --git a/bin/ui/input_reader/device_watcher.h b/garnet/bin/ui/input_reader/device_watcher.h similarity index 100% rename from bin/ui/input_reader/device_watcher.h rename to garnet/bin/ui/input_reader/device_watcher.h
diff --git a/bin/ui/input_reader/fdio_device_watcher.cc b/garnet/bin/ui/input_reader/fdio_device_watcher.cc similarity index 100% rename from bin/ui/input_reader/fdio_device_watcher.cc rename to garnet/bin/ui/input_reader/fdio_device_watcher.cc
diff --git a/bin/ui/input_reader/fdio_device_watcher.h b/garnet/bin/ui/input_reader/fdio_device_watcher.h similarity index 100% rename from bin/ui/input_reader/fdio_device_watcher.h rename to garnet/bin/ui/input_reader/fdio_device_watcher.h
diff --git a/bin/ui/input_reader/fdio_hid_decoder.cc b/garnet/bin/ui/input_reader/fdio_hid_decoder.cc similarity index 100% rename from bin/ui/input_reader/fdio_hid_decoder.cc rename to garnet/bin/ui/input_reader/fdio_hid_decoder.cc
diff --git a/bin/ui/input_reader/fdio_hid_decoder.h b/garnet/bin/ui/input_reader/fdio_hid_decoder.h similarity index 100% rename from bin/ui/input_reader/fdio_hid_decoder.h rename to garnet/bin/ui/input_reader/fdio_hid_decoder.h
diff --git a/bin/ui/input_reader/hid_decoder.cc b/garnet/bin/ui/input_reader/hid_decoder.cc similarity index 100% rename from bin/ui/input_reader/hid_decoder.cc rename to garnet/bin/ui/input_reader/hid_decoder.cc
diff --git a/bin/ui/input_reader/hid_decoder.h b/garnet/bin/ui/input_reader/hid_decoder.h similarity index 100% rename from bin/ui/input_reader/hid_decoder.h rename to garnet/bin/ui/input_reader/hid_decoder.h
diff --git a/bin/ui/input_reader/input_interpreter.cc b/garnet/bin/ui/input_reader/input_interpreter.cc similarity index 100% rename from bin/ui/input_reader/input_interpreter.cc rename to garnet/bin/ui/input_reader/input_interpreter.cc
diff --git a/bin/ui/input_reader/input_interpreter.h b/garnet/bin/ui/input_reader/input_interpreter.h similarity index 100% rename from bin/ui/input_reader/input_interpreter.h rename to garnet/bin/ui/input_reader/input_interpreter.h
diff --git a/bin/ui/input_reader/input_reader.cc b/garnet/bin/ui/input_reader/input_reader.cc similarity index 100% rename from bin/ui/input_reader/input_reader.cc rename to garnet/bin/ui/input_reader/input_reader.cc
diff --git a/bin/ui/input_reader/input_reader.h b/garnet/bin/ui/input_reader/input_reader.h similarity index 100% rename from bin/ui/input_reader/input_reader.h rename to garnet/bin/ui/input_reader/input_reader.h
diff --git a/bin/ui/input_reader/tests/BUILD.gn b/garnet/bin/ui/input_reader/tests/BUILD.gn similarity index 100% rename from bin/ui/input_reader/tests/BUILD.gn rename to garnet/bin/ui/input_reader/tests/BUILD.gn
diff --git a/bin/ui/input_reader/tests/interface_tests.cc b/garnet/bin/ui/input_reader/tests/interface_tests.cc similarity index 100% rename from bin/ui/input_reader/tests/interface_tests.cc rename to garnet/bin/ui/input_reader/tests/interface_tests.cc
diff --git a/bin/ui/input_reader/tests/mock_device_watcher.cc b/garnet/bin/ui/input_reader/tests/mock_device_watcher.cc similarity index 100% rename from bin/ui/input_reader/tests/mock_device_watcher.cc rename to garnet/bin/ui/input_reader/tests/mock_device_watcher.cc
diff --git a/bin/ui/input_reader/tests/mock_device_watcher.h b/garnet/bin/ui/input_reader/tests/mock_device_watcher.h similarity index 100% rename from bin/ui/input_reader/tests/mock_device_watcher.h rename to garnet/bin/ui/input_reader/tests/mock_device_watcher.h
diff --git a/bin/ui/input_reader/tests/mock_hid_decoder.cc b/garnet/bin/ui/input_reader/tests/mock_hid_decoder.cc similarity index 100% rename from bin/ui/input_reader/tests/mock_hid_decoder.cc rename to garnet/bin/ui/input_reader/tests/mock_hid_decoder.cc
diff --git a/bin/ui/input_reader/tests/mock_hid_decoder.h b/garnet/bin/ui/input_reader/tests/mock_hid_decoder.h similarity index 100% rename from bin/ui/input_reader/tests/mock_hid_decoder.h rename to garnet/bin/ui/input_reader/tests/mock_hid_decoder.h
diff --git a/bin/ui/input_reader/tests/reader_interpreter_tests.cc b/garnet/bin/ui/input_reader/tests/reader_interpreter_tests.cc similarity index 100% rename from bin/ui/input_reader/tests/reader_interpreter_tests.cc rename to garnet/bin/ui/input_reader/tests/reader_interpreter_tests.cc
diff --git a/bin/ui/input_reader/tests/touchpad_test.cc b/garnet/bin/ui/input_reader/tests/touchpad_test.cc similarity index 100% rename from bin/ui/input_reader/tests/touchpad_test.cc rename to garnet/bin/ui/input_reader/tests/touchpad_test.cc
diff --git a/bin/ui/input_reader/tests/touchscreen_test.cc b/garnet/bin/ui/input_reader/tests/touchscreen_test.cc similarity index 100% rename from bin/ui/input_reader/tests/touchscreen_test.cc rename to garnet/bin/ui/input_reader/tests/touchscreen_test.cc
diff --git a/bin/ui/input_reader/tests/touchscreen_test_data.h b/garnet/bin/ui/input_reader/tests/touchscreen_test_data.h similarity index 100% rename from bin/ui/input_reader/tests/touchscreen_test_data.h rename to garnet/bin/ui/input_reader/tests/touchscreen_test_data.h
diff --git a/bin/ui/input_reader/touchscreen.cc b/garnet/bin/ui/input_reader/touchscreen.cc similarity index 100% rename from bin/ui/input_reader/touchscreen.cc rename to garnet/bin/ui/input_reader/touchscreen.cc
diff --git a/bin/ui/input_reader/touchscreen.h b/garnet/bin/ui/input_reader/touchscreen.h similarity index 100% rename from bin/ui/input_reader/touchscreen.h rename to garnet/bin/ui/input_reader/touchscreen.h
diff --git a/bin/ui/meta/gfx_apptests.cmx b/garnet/bin/ui/meta/gfx_apptests.cmx similarity index 100% rename from bin/ui/meta/gfx_apptests.cmx rename to garnet/bin/ui/meta/gfx_apptests.cmx
diff --git a/bin/ui/meta/gfx_pixeltests.cmx b/garnet/bin/ui/meta/gfx_pixeltests.cmx similarity index 100% rename from bin/ui/meta/gfx_pixeltests.cmx rename to garnet/bin/ui/meta/gfx_pixeltests.cmx
diff --git a/bin/ui/meta/gfx_unittests.cmx b/garnet/bin/ui/meta/gfx_unittests.cmx similarity index 100% rename from bin/ui/meta/gfx_unittests.cmx rename to garnet/bin/ui/meta/gfx_unittests.cmx
diff --git a/bin/ui/meta/ime_service_unittests.cmx b/garnet/bin/ui/meta/ime_service_unittests.cmx similarity index 100% rename from bin/ui/meta/ime_service_unittests.cmx rename to garnet/bin/ui/meta/ime_service_unittests.cmx
diff --git a/bin/ui/meta/input_unittests.cmx b/garnet/bin/ui/meta/input_unittests.cmx similarity index 100% rename from bin/ui/meta/input_unittests.cmx rename to garnet/bin/ui/meta/input_unittests.cmx
diff --git a/bin/ui/meta/scenic_tests.cmx b/garnet/bin/ui/meta/scenic_tests.cmx similarity index 100% rename from bin/ui/meta/scenic_tests.cmx rename to garnet/bin/ui/meta/scenic_tests.cmx
diff --git a/bin/ui/meta/scenic_unittests.cmx b/garnet/bin/ui/meta/scenic_unittests.cmx similarity index 100% rename from bin/ui/meta/scenic_unittests.cmx rename to garnet/bin/ui/meta/scenic_unittests.cmx
diff --git a/bin/ui/meta/view_manager_apptests.cmx b/garnet/bin/ui/meta/view_manager_apptests.cmx similarity index 100% rename from bin/ui/meta/view_manager_apptests.cmx rename to garnet/bin/ui/meta/view_manager_apptests.cmx
diff --git a/bin/ui/present_view/BUILD.gn b/garnet/bin/ui/present_view/BUILD.gn similarity index 100% rename from bin/ui/present_view/BUILD.gn rename to garnet/bin/ui/present_view/BUILD.gn
diff --git a/bin/ui/present_view/README.md b/garnet/bin/ui/present_view/README.md similarity index 100% rename from bin/ui/present_view/README.md rename to garnet/bin/ui/present_view/README.md
diff --git a/bin/ui/present_view/main.cc b/garnet/bin/ui/present_view/main.cc similarity index 100% rename from bin/ui/present_view/main.cc rename to garnet/bin/ui/present_view/main.cc
diff --git a/bin/ui/presentation_mode/BUILD.gn b/garnet/bin/ui/presentation_mode/BUILD.gn similarity index 100% rename from bin/ui/presentation_mode/BUILD.gn rename to garnet/bin/ui/presentation_mode/BUILD.gn
diff --git a/bin/ui/presentation_mode/detector.cc b/garnet/bin/ui/presentation_mode/detector.cc similarity index 100% rename from bin/ui/presentation_mode/detector.cc rename to garnet/bin/ui/presentation_mode/detector.cc
diff --git a/bin/ui/presentation_mode/detector.h b/garnet/bin/ui/presentation_mode/detector.h similarity index 100% rename from bin/ui/presentation_mode/detector.h rename to garnet/bin/ui/presentation_mode/detector.h
diff --git a/bin/ui/presentation_mode/tests/BUILD.gn b/garnet/bin/ui/presentation_mode/tests/BUILD.gn similarity index 100% rename from bin/ui/presentation_mode/tests/BUILD.gn rename to garnet/bin/ui/presentation_mode/tests/BUILD.gn
diff --git a/bin/ui/presentation_mode/tests/detector_unittest.cc b/garnet/bin/ui/presentation_mode/tests/detector_unittest.cc similarity index 100% rename from bin/ui/presentation_mode/tests/detector_unittest.cc rename to garnet/bin/ui/presentation_mode/tests/detector_unittest.cc
diff --git a/bin/ui/print_input/BUILD.gn b/garnet/bin/ui/print_input/BUILD.gn similarity index 100% rename from bin/ui/print_input/BUILD.gn rename to garnet/bin/ui/print_input/BUILD.gn
diff --git a/bin/ui/print_input/main.cc b/garnet/bin/ui/print_input/main.cc similarity index 100% rename from bin/ui/print_input/main.cc rename to garnet/bin/ui/print_input/main.cc
diff --git a/bin/ui/recovery_ui/BUILD.gn b/garnet/bin/ui/recovery_ui/BUILD.gn similarity index 100% rename from bin/ui/recovery_ui/BUILD.gn rename to garnet/bin/ui/recovery_ui/BUILD.gn
diff --git a/bin/ui/recovery_ui/meta/recovery_ui.cmx b/garnet/bin/ui/recovery_ui/meta/recovery_ui.cmx similarity index 100% rename from bin/ui/recovery_ui/meta/recovery_ui.cmx rename to garnet/bin/ui/recovery_ui/meta/recovery_ui.cmx
diff --git a/bin/ui/recovery_ui/src/main.rs b/garnet/bin/ui/recovery_ui/src/main.rs similarity index 100% rename from bin/ui/recovery_ui/src/main.rs rename to garnet/bin/ui/recovery_ui/src/main.rs
diff --git a/bin/ui/root_presenter/BUILD.gn b/garnet/bin/ui/root_presenter/BUILD.gn similarity index 100% rename from bin/ui/root_presenter/BUILD.gn rename to garnet/bin/ui/root_presenter/BUILD.gn
diff --git a/bin/ui/root_presenter/README.md b/garnet/bin/ui/root_presenter/README.md similarity index 100% rename from bin/ui/root_presenter/README.md rename to garnet/bin/ui/root_presenter/README.md
diff --git a/bin/ui/root_presenter/app.cc b/garnet/bin/ui/root_presenter/app.cc similarity index 100% rename from bin/ui/root_presenter/app.cc rename to garnet/bin/ui/root_presenter/app.cc
diff --git a/bin/ui/root_presenter/app.h b/garnet/bin/ui/root_presenter/app.h similarity index 100% rename from bin/ui/root_presenter/app.h rename to garnet/bin/ui/root_presenter/app.h
diff --git a/bin/ui/root_presenter/display_rotater.cc b/garnet/bin/ui/root_presenter/display_rotater.cc similarity index 100% rename from bin/ui/root_presenter/display_rotater.cc rename to garnet/bin/ui/root_presenter/display_rotater.cc
diff --git a/bin/ui/root_presenter/display_rotater.h b/garnet/bin/ui/root_presenter/display_rotater.h similarity index 100% rename from bin/ui/root_presenter/display_rotater.h rename to garnet/bin/ui/root_presenter/display_rotater.h
diff --git a/bin/ui/root_presenter/display_size_switcher.cc b/garnet/bin/ui/root_presenter/display_size_switcher.cc similarity index 100% rename from bin/ui/root_presenter/display_size_switcher.cc rename to garnet/bin/ui/root_presenter/display_size_switcher.cc
diff --git a/bin/ui/root_presenter/display_size_switcher.h b/garnet/bin/ui/root_presenter/display_size_switcher.h similarity index 100% rename from bin/ui/root_presenter/display_size_switcher.h rename to garnet/bin/ui/root_presenter/display_size_switcher.h
diff --git a/bin/ui/root_presenter/display_usage_switcher.cc b/garnet/bin/ui/root_presenter/display_usage_switcher.cc similarity index 100% rename from bin/ui/root_presenter/display_usage_switcher.cc rename to garnet/bin/ui/root_presenter/display_usage_switcher.cc
diff --git a/bin/ui/root_presenter/display_usage_switcher.h b/garnet/bin/ui/root_presenter/display_usage_switcher.h similarity index 100% rename from bin/ui/root_presenter/display_usage_switcher.h rename to garnet/bin/ui/root_presenter/display_usage_switcher.h
diff --git a/bin/ui/root_presenter/displays/display_configuration.cc b/garnet/bin/ui/root_presenter/displays/display_configuration.cc similarity index 100% rename from bin/ui/root_presenter/displays/display_configuration.cc rename to garnet/bin/ui/root_presenter/displays/display_configuration.cc
diff --git a/bin/ui/root_presenter/displays/display_configuration.h b/garnet/bin/ui/root_presenter/displays/display_configuration.h similarity index 100% rename from bin/ui/root_presenter/displays/display_configuration.h rename to garnet/bin/ui/root_presenter/displays/display_configuration.h
diff --git a/bin/ui/root_presenter/displays/display_metrics.h b/garnet/bin/ui/root_presenter/displays/display_metrics.h similarity index 100% rename from bin/ui/root_presenter/displays/display_metrics.h rename to garnet/bin/ui/root_presenter/displays/display_metrics.h
diff --git a/bin/ui/root_presenter/displays/display_model.cc b/garnet/bin/ui/root_presenter/displays/display_model.cc similarity index 100% rename from bin/ui/root_presenter/displays/display_model.cc rename to garnet/bin/ui/root_presenter/displays/display_model.cc
diff --git a/bin/ui/root_presenter/displays/display_model.h b/garnet/bin/ui/root_presenter/displays/display_model.h similarity index 100% rename from bin/ui/root_presenter/displays/display_model.h rename to garnet/bin/ui/root_presenter/displays/display_model.h
diff --git a/bin/ui/root_presenter/main.cc b/garnet/bin/ui/root_presenter/main.cc similarity index 100% rename from bin/ui/root_presenter/main.cc rename to garnet/bin/ui/root_presenter/main.cc
diff --git a/bin/ui/root_presenter/meta/root_presenter.cmx b/garnet/bin/ui/root_presenter/meta/root_presenter.cmx similarity index 100% rename from bin/ui/root_presenter/meta/root_presenter.cmx rename to garnet/bin/ui/root_presenter/meta/root_presenter.cmx
diff --git a/bin/ui/root_presenter/perspective_demo_mode.cc b/garnet/bin/ui/root_presenter/perspective_demo_mode.cc similarity index 100% rename from bin/ui/root_presenter/perspective_demo_mode.cc rename to garnet/bin/ui/root_presenter/perspective_demo_mode.cc
diff --git a/bin/ui/root_presenter/perspective_demo_mode.h b/garnet/bin/ui/root_presenter/perspective_demo_mode.h similarity index 100% rename from bin/ui/root_presenter/perspective_demo_mode.h rename to garnet/bin/ui/root_presenter/perspective_demo_mode.h
diff --git a/bin/ui/root_presenter/presentation.h b/garnet/bin/ui/root_presenter/presentation.h similarity index 100% rename from bin/ui/root_presenter/presentation.h rename to garnet/bin/ui/root_presenter/presentation.h
diff --git a/bin/ui/root_presenter/presentation1.cc b/garnet/bin/ui/root_presenter/presentation1.cc similarity index 100% rename from bin/ui/root_presenter/presentation1.cc rename to garnet/bin/ui/root_presenter/presentation1.cc
diff --git a/bin/ui/root_presenter/presentation1.h b/garnet/bin/ui/root_presenter/presentation1.h similarity index 100% rename from bin/ui/root_presenter/presentation1.h rename to garnet/bin/ui/root_presenter/presentation1.h
diff --git a/bin/ui/root_presenter/presentation2.cc b/garnet/bin/ui/root_presenter/presentation2.cc similarity index 100% rename from bin/ui/root_presenter/presentation2.cc rename to garnet/bin/ui/root_presenter/presentation2.cc
diff --git a/bin/ui/root_presenter/presentation2.h b/garnet/bin/ui/root_presenter/presentation2.h similarity index 100% rename from bin/ui/root_presenter/presentation2.h rename to garnet/bin/ui/root_presenter/presentation2.h
diff --git a/bin/ui/root_presenter/presentation_switcher.cc b/garnet/bin/ui/root_presenter/presentation_switcher.cc similarity index 100% rename from bin/ui/root_presenter/presentation_switcher.cc rename to garnet/bin/ui/root_presenter/presentation_switcher.cc
diff --git a/bin/ui/root_presenter/presentation_switcher.h b/garnet/bin/ui/root_presenter/presentation_switcher.h similarity index 100% rename from bin/ui/root_presenter/presentation_switcher.h rename to garnet/bin/ui/root_presenter/presentation_switcher.h
diff --git a/bin/ui/root_presenter/renderer_params.cc b/garnet/bin/ui/root_presenter/renderer_params.cc similarity index 100% rename from bin/ui/root_presenter/renderer_params.cc rename to garnet/bin/ui/root_presenter/renderer_params.cc
diff --git a/bin/ui/root_presenter/renderer_params.h b/garnet/bin/ui/root_presenter/renderer_params.h similarity index 100% rename from bin/ui/root_presenter/renderer_params.h rename to garnet/bin/ui/root_presenter/renderer_params.h
diff --git a/bin/ui/root_presenter/resources/cursor32.png b/garnet/bin/ui/root_presenter/resources/cursor32.png similarity index 100% rename from bin/ui/root_presenter/resources/cursor32.png rename to garnet/bin/ui/root_presenter/resources/cursor32.png Binary files differ
diff --git a/bin/ui/scenic/BUILD.gn b/garnet/bin/ui/scenic/BUILD.gn similarity index 100% rename from bin/ui/scenic/BUILD.gn rename to garnet/bin/ui/scenic/BUILD.gn
diff --git a/bin/ui/scenic/app.cc b/garnet/bin/ui/scenic/app.cc similarity index 100% rename from bin/ui/scenic/app.cc rename to garnet/bin/ui/scenic/app.cc
diff --git a/bin/ui/scenic/app.h b/garnet/bin/ui/scenic/app.h similarity index 100% rename from bin/ui/scenic/app.h rename to garnet/bin/ui/scenic/app.h
diff --git a/bin/ui/scenic/config.gni b/garnet/bin/ui/scenic/config.gni similarity index 100% rename from bin/ui/scenic/config.gni rename to garnet/bin/ui/scenic/config.gni
diff --git a/bin/ui/scenic/main.cc b/garnet/bin/ui/scenic/main.cc similarity index 100% rename from bin/ui/scenic/main.cc rename to garnet/bin/ui/scenic/main.cc
diff --git a/bin/ui/scenic/meta/scenic.cmx b/garnet/bin/ui/scenic/meta/scenic.cmx similarity index 100% rename from bin/ui/scenic/meta/scenic.cmx rename to garnet/bin/ui/scenic/meta/scenic.cmx
diff --git a/bin/ui/screencap/BUILD.gn b/garnet/bin/ui/screencap/BUILD.gn similarity index 100% rename from bin/ui/screencap/BUILD.gn rename to garnet/bin/ui/screencap/BUILD.gn
diff --git a/bin/ui/screencap/README.md b/garnet/bin/ui/screencap/README.md similarity index 100% rename from bin/ui/screencap/README.md rename to garnet/bin/ui/screencap/README.md
diff --git a/bin/ui/screencap/main.cc b/garnet/bin/ui/screencap/main.cc similarity index 100% rename from bin/ui/screencap/main.cc rename to garnet/bin/ui/screencap/main.cc
diff --git a/bin/ui/screencap/meta/screencap.cmx b/garnet/bin/ui/screencap/meta/screencap.cmx similarity index 100% rename from bin/ui/screencap/meta/screencap.cmx rename to garnet/bin/ui/screencap/meta/screencap.cmx
diff --git a/bin/ui/set_renderer_params_HACK/BUILD.gn b/garnet/bin/ui/set_renderer_params_HACK/BUILD.gn similarity index 100% rename from bin/ui/set_renderer_params_HACK/BUILD.gn rename to garnet/bin/ui/set_renderer_params_HACK/BUILD.gn
diff --git a/bin/ui/set_renderer_params_HACK/main.cc b/garnet/bin/ui/set_renderer_params_HACK/main.cc similarity index 100% rename from bin/ui/set_renderer_params_HACK/main.cc rename to garnet/bin/ui/set_renderer_params_HACK/main.cc
diff --git a/bin/ui/set_renderer_params_HACK/meta/set_renderer_params.cmx b/garnet/bin/ui/set_renderer_params_HACK/meta/set_renderer_params.cmx similarity index 100% rename from bin/ui/set_renderer_params_HACK/meta/set_renderer_params.cmx rename to garnet/bin/ui/set_renderer_params_HACK/meta/set_renderer_params.cmx
diff --git a/bin/ui/set_root_view/BUILD.gn b/garnet/bin/ui/set_root_view/BUILD.gn similarity index 100% rename from bin/ui/set_root_view/BUILD.gn rename to garnet/bin/ui/set_root_view/BUILD.gn
diff --git a/bin/ui/set_root_view/README.md b/garnet/bin/ui/set_root_view/README.md similarity index 100% rename from bin/ui/set_root_view/README.md rename to garnet/bin/ui/set_root_view/README.md
diff --git a/bin/ui/set_root_view/main.cc b/garnet/bin/ui/set_root_view/main.cc similarity index 100% rename from bin/ui/set_root_view/main.cc rename to garnet/bin/ui/set_root_view/main.cc
diff --git a/bin/ui/set_root_view/meta/set_root_view.cmx b/garnet/bin/ui/set_root_view/meta/set_root_view.cmx similarity index 100% rename from bin/ui/set_root_view/meta/set_root_view.cmx rename to garnet/bin/ui/set_root_view/meta/set_root_view.cmx
diff --git a/bin/ui/sketchy/BUILD.gn b/garnet/bin/ui/sketchy/BUILD.gn similarity index 100% rename from bin/ui/sketchy/BUILD.gn rename to garnet/bin/ui/sketchy/BUILD.gn
diff --git a/bin/ui/sketchy/README.md b/garnet/bin/ui/sketchy/README.md similarity index 100% rename from bin/ui/sketchy/README.md rename to garnet/bin/ui/sketchy/README.md
diff --git a/bin/ui/sketchy/app.cc b/garnet/bin/ui/sketchy/app.cc similarity index 100% rename from bin/ui/sketchy/app.cc rename to garnet/bin/ui/sketchy/app.cc
diff --git a/bin/ui/sketchy/app.h b/garnet/bin/ui/sketchy/app.h similarity index 100% rename from bin/ui/sketchy/app.h rename to garnet/bin/ui/sketchy/app.h
diff --git a/bin/ui/sketchy/buffer/appendable_buffer.cc b/garnet/bin/ui/sketchy/buffer/appendable_buffer.cc similarity index 100% rename from bin/ui/sketchy/buffer/appendable_buffer.cc rename to garnet/bin/ui/sketchy/buffer/appendable_buffer.cc
diff --git a/bin/ui/sketchy/buffer/appendable_buffer.h b/garnet/bin/ui/sketchy/buffer/appendable_buffer.h similarity index 100% rename from bin/ui/sketchy/buffer/appendable_buffer.h rename to garnet/bin/ui/sketchy/buffer/appendable_buffer.h
diff --git a/bin/ui/sketchy/buffer/mesh_buffer.cc b/garnet/bin/ui/sketchy/buffer/mesh_buffer.cc similarity index 100% rename from bin/ui/sketchy/buffer/mesh_buffer.cc rename to garnet/bin/ui/sketchy/buffer/mesh_buffer.cc
diff --git a/bin/ui/sketchy/buffer/mesh_buffer.h b/garnet/bin/ui/sketchy/buffer/mesh_buffer.h similarity index 100% rename from bin/ui/sketchy/buffer/mesh_buffer.h rename to garnet/bin/ui/sketchy/buffer/mesh_buffer.h
diff --git a/bin/ui/sketchy/buffer/shared_buffer.cc b/garnet/bin/ui/sketchy/buffer/shared_buffer.cc similarity index 100% rename from bin/ui/sketchy/buffer/shared_buffer.cc rename to garnet/bin/ui/sketchy/buffer/shared_buffer.cc
diff --git a/bin/ui/sketchy/buffer/shared_buffer.h b/garnet/bin/ui/sketchy/buffer/shared_buffer.h similarity index 100% rename from bin/ui/sketchy/buffer/shared_buffer.h rename to garnet/bin/ui/sketchy/buffer/shared_buffer.h
diff --git a/bin/ui/sketchy/buffer/shared_buffer_pool.cc b/garnet/bin/ui/sketchy/buffer/shared_buffer_pool.cc similarity index 100% rename from bin/ui/sketchy/buffer/shared_buffer_pool.cc rename to garnet/bin/ui/sketchy/buffer/shared_buffer_pool.cc
diff --git a/bin/ui/sketchy/buffer/shared_buffer_pool.h b/garnet/bin/ui/sketchy/buffer/shared_buffer_pool.h similarity index 100% rename from bin/ui/sketchy/buffer/shared_buffer_pool.h rename to garnet/bin/ui/sketchy/buffer/shared_buffer_pool.h
diff --git a/bin/ui/sketchy/canvas.cc b/garnet/bin/ui/sketchy/canvas.cc similarity index 100% rename from bin/ui/sketchy/canvas.cc rename to garnet/bin/ui/sketchy/canvas.cc
diff --git a/bin/ui/sketchy/canvas.h b/garnet/bin/ui/sketchy/canvas.h similarity index 100% rename from bin/ui/sketchy/canvas.h rename to garnet/bin/ui/sketchy/canvas.h
diff --git a/bin/ui/sketchy/docs/data-flow.png b/garnet/bin/ui/sketchy/docs/data-flow.png similarity index 100% rename from bin/ui/sketchy/docs/data-flow.png rename to garnet/bin/ui/sketchy/docs/data-flow.png Binary files differ
diff --git a/bin/ui/sketchy/docs/multi-buffering.png b/garnet/bin/ui/sketchy/docs/multi-buffering.png similarity index 100% rename from bin/ui/sketchy/docs/multi-buffering.png rename to garnet/bin/ui/sketchy/docs/multi-buffering.png Binary files differ
diff --git a/bin/ui/sketchy/frame.cc b/garnet/bin/ui/sketchy/frame.cc similarity index 100% rename from bin/ui/sketchy/frame.cc rename to garnet/bin/ui/sketchy/frame.cc
diff --git a/bin/ui/sketchy/frame.h b/garnet/bin/ui/sketchy/frame.h similarity index 100% rename from bin/ui/sketchy/frame.h rename to garnet/bin/ui/sketchy/frame.h
diff --git a/bin/ui/sketchy/main.cc b/garnet/bin/ui/sketchy/main.cc similarity index 100% rename from bin/ui/sketchy/main.cc rename to garnet/bin/ui/sketchy/main.cc
diff --git a/bin/ui/sketchy/meta/sketchy_service.cmx b/garnet/bin/ui/sketchy/meta/sketchy_service.cmx similarity index 100% rename from bin/ui/sketchy/meta/sketchy_service.cmx rename to garnet/bin/ui/sketchy/meta/sketchy_service.cmx
diff --git a/bin/ui/sketchy/resources/import_node.cc b/garnet/bin/ui/sketchy/resources/import_node.cc similarity index 100% rename from bin/ui/sketchy/resources/import_node.cc rename to garnet/bin/ui/sketchy/resources/import_node.cc
diff --git a/bin/ui/sketchy/resources/import_node.h b/garnet/bin/ui/sketchy/resources/import_node.h similarity index 100% rename from bin/ui/sketchy/resources/import_node.h rename to garnet/bin/ui/sketchy/resources/import_node.h
diff --git a/bin/ui/sketchy/resources/resource.cc b/garnet/bin/ui/sketchy/resources/resource.cc similarity index 100% rename from bin/ui/sketchy/resources/resource.cc rename to garnet/bin/ui/sketchy/resources/resource.cc
diff --git a/bin/ui/sketchy/resources/resource.h b/garnet/bin/ui/sketchy/resources/resource.h similarity index 100% rename from bin/ui/sketchy/resources/resource.h rename to garnet/bin/ui/sketchy/resources/resource.h
diff --git a/bin/ui/sketchy/resources/resource_map.cc b/garnet/bin/ui/sketchy/resources/resource_map.cc similarity index 100% rename from bin/ui/sketchy/resources/resource_map.cc rename to garnet/bin/ui/sketchy/resources/resource_map.cc
diff --git a/bin/ui/sketchy/resources/resource_map.h b/garnet/bin/ui/sketchy/resources/resource_map.h similarity index 100% rename from bin/ui/sketchy/resources/resource_map.h rename to garnet/bin/ui/sketchy/resources/resource_map.h
diff --git a/bin/ui/sketchy/resources/stroke.cc b/garnet/bin/ui/sketchy/resources/stroke.cc similarity index 100% rename from bin/ui/sketchy/resources/stroke.cc rename to garnet/bin/ui/sketchy/resources/stroke.cc
diff --git a/bin/ui/sketchy/resources/stroke.h b/garnet/bin/ui/sketchy/resources/stroke.h similarity index 100% rename from bin/ui/sketchy/resources/stroke.h rename to garnet/bin/ui/sketchy/resources/stroke.h
diff --git a/bin/ui/sketchy/resources/stroke_group.cc b/garnet/bin/ui/sketchy/resources/stroke_group.cc similarity index 100% rename from bin/ui/sketchy/resources/stroke_group.cc rename to garnet/bin/ui/sketchy/resources/stroke_group.cc
diff --git a/bin/ui/sketchy/resources/stroke_group.h b/garnet/bin/ui/sketchy/resources/stroke_group.h similarity index 100% rename from bin/ui/sketchy/resources/stroke_group.h rename to garnet/bin/ui/sketchy/resources/stroke_group.h
diff --git a/bin/ui/sketchy/resources/types.h b/garnet/bin/ui/sketchy/resources/types.h similarity index 100% rename from bin/ui/sketchy/resources/types.h rename to garnet/bin/ui/sketchy/resources/types.h
diff --git a/bin/ui/sketchy/stroke/cubic_bezier.cc b/garnet/bin/ui/sketchy/stroke/cubic_bezier.cc similarity index 100% rename from bin/ui/sketchy/stroke/cubic_bezier.cc rename to garnet/bin/ui/sketchy/stroke/cubic_bezier.cc
diff --git a/bin/ui/sketchy/stroke/cubic_bezier.h b/garnet/bin/ui/sketchy/stroke/cubic_bezier.h similarity index 100% rename from bin/ui/sketchy/stroke/cubic_bezier.h rename to garnet/bin/ui/sketchy/stroke/cubic_bezier.h
diff --git a/bin/ui/sketchy/stroke/divided_stroke_path.cc b/garnet/bin/ui/sketchy/stroke/divided_stroke_path.cc similarity index 100% rename from bin/ui/sketchy/stroke/divided_stroke_path.cc rename to garnet/bin/ui/sketchy/stroke/divided_stroke_path.cc
diff --git a/bin/ui/sketchy/stroke/divided_stroke_path.h b/garnet/bin/ui/sketchy/stroke/divided_stroke_path.h similarity index 100% rename from bin/ui/sketchy/stroke/divided_stroke_path.h rename to garnet/bin/ui/sketchy/stroke/divided_stroke_path.h
diff --git a/bin/ui/sketchy/stroke/stroke_fitter.cc b/garnet/bin/ui/sketchy/stroke/stroke_fitter.cc similarity index 100% rename from bin/ui/sketchy/stroke/stroke_fitter.cc rename to garnet/bin/ui/sketchy/stroke/stroke_fitter.cc
diff --git a/bin/ui/sketchy/stroke/stroke_fitter.h b/garnet/bin/ui/sketchy/stroke/stroke_fitter.h similarity index 100% rename from bin/ui/sketchy/stroke/stroke_fitter.h rename to garnet/bin/ui/sketchy/stroke/stroke_fitter.h
diff --git a/bin/ui/sketchy/stroke/stroke_manager.cc b/garnet/bin/ui/sketchy/stroke/stroke_manager.cc similarity index 100% rename from bin/ui/sketchy/stroke/stroke_manager.cc rename to garnet/bin/ui/sketchy/stroke/stroke_manager.cc
diff --git a/bin/ui/sketchy/stroke/stroke_manager.h b/garnet/bin/ui/sketchy/stroke/stroke_manager.h similarity index 100% rename from bin/ui/sketchy/stroke/stroke_manager.h rename to garnet/bin/ui/sketchy/stroke/stroke_manager.h
diff --git a/bin/ui/sketchy/stroke/stroke_path.cc b/garnet/bin/ui/sketchy/stroke/stroke_path.cc similarity index 100% rename from bin/ui/sketchy/stroke/stroke_path.cc rename to garnet/bin/ui/sketchy/stroke/stroke_path.cc
diff --git a/bin/ui/sketchy/stroke/stroke_path.h b/garnet/bin/ui/sketchy/stroke/stroke_path.h similarity index 100% rename from bin/ui/sketchy/stroke/stroke_path.h rename to garnet/bin/ui/sketchy/stroke/stroke_path.h
diff --git a/bin/ui/sketchy/stroke/stroke_tessellator.cc b/garnet/bin/ui/sketchy/stroke/stroke_tessellator.cc similarity index 100% rename from bin/ui/sketchy/stroke/stroke_tessellator.cc rename to garnet/bin/ui/sketchy/stroke/stroke_tessellator.cc
diff --git a/bin/ui/sketchy/stroke/stroke_tessellator.h b/garnet/bin/ui/sketchy/stroke/stroke_tessellator.h similarity index 100% rename from bin/ui/sketchy/stroke/stroke_tessellator.h rename to garnet/bin/ui/sketchy/stroke/stroke_tessellator.h
diff --git a/bin/ui/sketchy/util/glm_types.h b/garnet/bin/ui/sketchy/util/glm_types.h similarity index 100% rename from bin/ui/sketchy/util/glm_types.h rename to garnet/bin/ui/sketchy/util/glm_types.h
diff --git a/bin/ui/snapshot/BUILD.gn b/garnet/bin/ui/snapshot/BUILD.gn similarity index 100% rename from bin/ui/snapshot/BUILD.gn rename to garnet/bin/ui/snapshot/BUILD.gn
diff --git a/bin/ui/snapshot/README.md b/garnet/bin/ui/snapshot/README.md similarity index 100% rename from bin/ui/snapshot/README.md rename to garnet/bin/ui/snapshot/README.md
diff --git a/bin/ui/snapshot/main.cc b/garnet/bin/ui/snapshot/main.cc similarity index 100% rename from bin/ui/snapshot/main.cc rename to garnet/bin/ui/snapshot/main.cc
diff --git a/bin/ui/snapshot/meta/snapshot.cmx b/garnet/bin/ui/snapshot/meta/snapshot.cmx similarity index 100% rename from bin/ui/snapshot/meta/snapshot.cmx rename to garnet/bin/ui/snapshot/meta/snapshot.cmx
diff --git a/bin/ui/snapshot/snapshot_loader.fidl b/garnet/bin/ui/snapshot/snapshot_loader.fidl similarity index 100% rename from bin/ui/snapshot/snapshot_loader.fidl rename to garnet/bin/ui/snapshot/snapshot_loader.fidl
diff --git a/bin/ui/snapshot/view.cc b/garnet/bin/ui/snapshot/view.cc similarity index 100% rename from bin/ui/snapshot/view.cc rename to garnet/bin/ui/snapshot/view.cc
diff --git a/bin/ui/snapshot/view.h b/garnet/bin/ui/snapshot/view.h similarity index 100% rename from bin/ui/snapshot/view.h rename to garnet/bin/ui/snapshot/view.h
diff --git a/bin/ui/tests/performance/BUILD.gn b/garnet/bin/ui/tests/performance/BUILD.gn similarity index 100% rename from bin/ui/tests/performance/BUILD.gn rename to garnet/bin/ui/tests/performance/BUILD.gn
diff --git a/bin/ui/tests/performance/README.md b/garnet/bin/ui/tests/performance/README.md similarity index 100% rename from bin/ui/tests/performance/README.md rename to garnet/bin/ui/tests/performance/README.md
diff --git a/bin/ui/tests/performance/gfx_benchmarks_standalone.sh b/garnet/bin/ui/tests/performance/gfx_benchmarks_standalone.sh similarity index 100% rename from bin/ui/tests/performance/gfx_benchmarks_standalone.sh rename to garnet/bin/ui/tests/performance/gfx_benchmarks_standalone.sh
diff --git a/bin/ui/tests/performance/process_scenic_trace.go b/garnet/bin/ui/tests/performance/process_scenic_trace.go similarity index 100% rename from bin/ui/tests/performance/process_scenic_trace.go rename to garnet/bin/ui/tests/performance/process_scenic_trace.go
diff --git a/bin/ui/tests/performance/run_scenic_benchmark.sh b/garnet/bin/ui/tests/performance/run_scenic_benchmark.sh similarity index 100% rename from bin/ui/tests/performance/run_scenic_benchmark.sh rename to garnet/bin/ui/tests/performance/run_scenic_benchmark.sh
diff --git a/bin/ui/tests/performance/trace_from_host.sh b/garnet/bin/ui/tests/performance/trace_from_host.sh similarity index 100% rename from bin/ui/tests/performance/trace_from_host.sh rename to garnet/bin/ui/tests/performance/trace_from_host.sh
diff --git a/bin/ui/tests/performance/vulkan_is_supported/BUILD.gn b/garnet/bin/ui/tests/performance/vulkan_is_supported/BUILD.gn similarity index 100% rename from bin/ui/tests/performance/vulkan_is_supported/BUILD.gn rename to garnet/bin/ui/tests/performance/vulkan_is_supported/BUILD.gn
diff --git a/bin/ui/tests/performance/vulkan_is_supported/README.md b/garnet/bin/ui/tests/performance/vulkan_is_supported/README.md similarity index 100% rename from bin/ui/tests/performance/vulkan_is_supported/README.md rename to garnet/bin/ui/tests/performance/vulkan_is_supported/README.md
diff --git a/bin/ui/tests/performance/vulkan_is_supported/main.cc b/garnet/bin/ui/tests/performance/vulkan_is_supported/main.cc similarity index 100% rename from bin/ui/tests/performance/vulkan_is_supported/main.cc rename to garnet/bin/ui/tests/performance/vulkan_is_supported/main.cc
diff --git a/bin/ui/tests/performance/vulkan_is_supported/meta/vulkan_is_supported.cmx b/garnet/bin/ui/tests/performance/vulkan_is_supported/meta/vulkan_is_supported.cmx similarity index 100% rename from bin/ui/tests/performance/vulkan_is_supported/meta/vulkan_is_supported.cmx rename to garnet/bin/ui/tests/performance/vulkan_is_supported/meta/vulkan_is_supported.cmx
diff --git a/bin/ui/view_manager/BUILD.gn b/garnet/bin/ui/view_manager/BUILD.gn similarity index 100% rename from bin/ui/view_manager/BUILD.gn rename to garnet/bin/ui/view_manager/BUILD.gn
diff --git a/bin/ui/view_manager/README.md b/garnet/bin/ui/view_manager/README.md similarity index 100% rename from bin/ui/view_manager/README.md rename to garnet/bin/ui/view_manager/README.md
diff --git a/bin/ui/view_manager/internal/view_inspector.h b/garnet/bin/ui/view_manager/internal/view_inspector.h similarity index 100% rename from bin/ui/view_manager/internal/view_inspector.h rename to garnet/bin/ui/view_manager/internal/view_inspector.h
diff --git a/bin/ui/view_manager/main.cc b/garnet/bin/ui/view_manager/main.cc similarity index 100% rename from bin/ui/view_manager/main.cc rename to garnet/bin/ui/view_manager/main.cc
diff --git a/bin/ui/view_manager/meta/view_manager.cmx b/garnet/bin/ui/view_manager/meta/view_manager.cmx similarity index 100% rename from bin/ui/view_manager/meta/view_manager.cmx rename to garnet/bin/ui/view_manager/meta/view_manager.cmx
diff --git a/bin/ui/view_manager/tests/BUILD.gn b/garnet/bin/ui/view_manager/tests/BUILD.gn similarity index 100% rename from bin/ui/view_manager/tests/BUILD.gn rename to garnet/bin/ui/view_manager/tests/BUILD.gn
diff --git a/bin/ui/view_manager/tests/test_helpers.h b/garnet/bin/ui/view_manager/tests/test_helpers.h similarity index 100% rename from bin/ui/view_manager/tests/test_helpers.h rename to garnet/bin/ui/view_manager/tests/test_helpers.h
diff --git a/bin/ui/view_manager/tests/view_manager_test.cc b/garnet/bin/ui/view_manager/tests/view_manager_test.cc similarity index 100% rename from bin/ui/view_manager/tests/view_manager_test.cc rename to garnet/bin/ui/view_manager/tests/view_manager_test.cc
diff --git a/bin/ui/view_manager/view_container_state.cc b/garnet/bin/ui/view_manager/view_container_state.cc similarity index 100% rename from bin/ui/view_manager/view_container_state.cc rename to garnet/bin/ui/view_manager/view_container_state.cc
diff --git a/bin/ui/view_manager/view_container_state.h b/garnet/bin/ui/view_manager/view_container_state.h similarity index 100% rename from bin/ui/view_manager/view_container_state.h rename to garnet/bin/ui/view_manager/view_container_state.h
diff --git a/bin/ui/view_manager/view_impl.cc b/garnet/bin/ui/view_manager/view_impl.cc similarity index 100% rename from bin/ui/view_manager/view_impl.cc rename to garnet/bin/ui/view_manager/view_impl.cc
diff --git a/bin/ui/view_manager/view_impl.h b/garnet/bin/ui/view_manager/view_impl.h similarity index 100% rename from bin/ui/view_manager/view_impl.h rename to garnet/bin/ui/view_manager/view_impl.h
diff --git a/bin/ui/view_manager/view_manager_app.cc b/garnet/bin/ui/view_manager/view_manager_app.cc similarity index 100% rename from bin/ui/view_manager/view_manager_app.cc rename to garnet/bin/ui/view_manager/view_manager_app.cc
diff --git a/bin/ui/view_manager/view_manager_app.h b/garnet/bin/ui/view_manager/view_manager_app.h similarity index 100% rename from bin/ui/view_manager/view_manager_app.h rename to garnet/bin/ui/view_manager/view_manager_app.h
diff --git a/bin/ui/view_manager/view_manager_impl.cc b/garnet/bin/ui/view_manager/view_manager_impl.cc similarity index 100% rename from bin/ui/view_manager/view_manager_impl.cc rename to garnet/bin/ui/view_manager/view_manager_impl.cc
diff --git a/bin/ui/view_manager/view_manager_impl.h b/garnet/bin/ui/view_manager/view_manager_impl.h similarity index 100% rename from bin/ui/view_manager/view_manager_impl.h rename to garnet/bin/ui/view_manager/view_manager_impl.h
diff --git a/bin/ui/view_manager/view_registry.cc b/garnet/bin/ui/view_manager/view_registry.cc similarity index 100% rename from bin/ui/view_manager/view_registry.cc rename to garnet/bin/ui/view_manager/view_registry.cc
diff --git a/bin/ui/view_manager/view_registry.h b/garnet/bin/ui/view_manager/view_registry.h similarity index 100% rename from bin/ui/view_manager/view_registry.h rename to garnet/bin/ui/view_manager/view_registry.h
diff --git a/bin/ui/view_manager/view_snapshot_impl.cc b/garnet/bin/ui/view_manager/view_snapshot_impl.cc similarity index 100% rename from bin/ui/view_manager/view_snapshot_impl.cc rename to garnet/bin/ui/view_manager/view_snapshot_impl.cc
diff --git a/bin/ui/view_manager/view_snapshot_impl.h b/garnet/bin/ui/view_manager/view_snapshot_impl.h similarity index 100% rename from bin/ui/view_manager/view_snapshot_impl.h rename to garnet/bin/ui/view_manager/view_snapshot_impl.h
diff --git a/bin/ui/view_manager/view_state.cc b/garnet/bin/ui/view_manager/view_state.cc similarity index 100% rename from bin/ui/view_manager/view_state.cc rename to garnet/bin/ui/view_manager/view_state.cc
diff --git a/bin/ui/view_manager/view_state.h b/garnet/bin/ui/view_manager/view_state.h similarity index 100% rename from bin/ui/view_manager/view_state.h rename to garnet/bin/ui/view_manager/view_state.h
diff --git a/bin/ui/view_manager/view_stub.cc b/garnet/bin/ui/view_manager/view_stub.cc similarity index 100% rename from bin/ui/view_manager/view_stub.cc rename to garnet/bin/ui/view_manager/view_stub.cc
diff --git a/bin/ui/view_manager/view_stub.h b/garnet/bin/ui/view_manager/view_stub.h similarity index 100% rename from bin/ui/view_manager/view_stub.h rename to garnet/bin/ui/view_manager/view_stub.h
diff --git a/bin/ui/view_manager/view_tree_impl.cc b/garnet/bin/ui/view_manager/view_tree_impl.cc similarity index 100% rename from bin/ui/view_manager/view_tree_impl.cc rename to garnet/bin/ui/view_manager/view_tree_impl.cc
diff --git a/bin/ui/view_manager/view_tree_impl.h b/garnet/bin/ui/view_manager/view_tree_impl.h similarity index 100% rename from bin/ui/view_manager/view_tree_impl.h rename to garnet/bin/ui/view_manager/view_tree_impl.h
diff --git a/bin/ui/view_manager/view_tree_state.cc b/garnet/bin/ui/view_manager/view_tree_state.cc similarity index 100% rename from bin/ui/view_manager/view_tree_state.cc rename to garnet/bin/ui/view_manager/view_tree_state.cc
diff --git a/bin/ui/view_manager/view_tree_state.h b/garnet/bin/ui/view_manager/view_tree_state.h similarity index 100% rename from bin/ui/view_manager/view_tree_state.h rename to garnet/bin/ui/view_manager/view_tree_state.h
diff --git a/bin/uname/BUILD.gn b/garnet/bin/uname/BUILD.gn similarity index 100% rename from bin/uname/BUILD.gn rename to garnet/bin/uname/BUILD.gn
diff --git a/bin/uname/uname.c b/garnet/bin/uname/uname.c similarity index 100% rename from bin/uname/uname.c rename to garnet/bin/uname/uname.c
diff --git a/bin/vsock_service/BUILD.gn b/garnet/bin/vsock_service/BUILD.gn similarity index 100% rename from bin/vsock_service/BUILD.gn rename to garnet/bin/vsock_service/BUILD.gn
diff --git a/bin/vsock_service/meta/vsock_service.cmx b/garnet/bin/vsock_service/meta/vsock_service.cmx similarity index 100% rename from bin/vsock_service/meta/vsock_service.cmx rename to garnet/bin/vsock_service/meta/vsock_service.cmx
diff --git a/bin/vsock_service/meta/vsock_service_lib_lib_test.cmx b/garnet/bin/vsock_service/meta/vsock_service_lib_lib_test.cmx similarity index 100% rename from bin/vsock_service/meta/vsock_service_lib_lib_test.cmx rename to garnet/bin/vsock_service/meta/vsock_service_lib_lib_test.cmx
diff --git a/bin/vsock_service/src/addr.rs b/garnet/bin/vsock_service/src/addr.rs similarity index 100% rename from bin/vsock_service/src/addr.rs rename to garnet/bin/vsock_service/src/addr.rs
diff --git a/bin/vsock_service/src/lib.rs b/garnet/bin/vsock_service/src/lib.rs similarity index 100% rename from bin/vsock_service/src/lib.rs rename to garnet/bin/vsock_service/src/lib.rs
diff --git a/bin/vsock_service/src/main.rs b/garnet/bin/vsock_service/src/main.rs similarity index 100% rename from bin/vsock_service/src/main.rs rename to garnet/bin/vsock_service/src/main.rs
diff --git a/bin/vsock_service/src/port.rs b/garnet/bin/vsock_service/src/port.rs similarity index 100% rename from bin/vsock_service/src/port.rs rename to garnet/bin/vsock_service/src/port.rs
diff --git a/bin/vsock_service/src/service.rs b/garnet/bin/vsock_service/src/service.rs similarity index 100% rename from bin/vsock_service/src/service.rs rename to garnet/bin/vsock_service/src/service.rs
diff --git a/bin/vulkan_loader/BUILD.gn b/garnet/bin/vulkan_loader/BUILD.gn similarity index 100% rename from bin/vulkan_loader/BUILD.gn rename to garnet/bin/vulkan_loader/BUILD.gn
diff --git a/bin/vulkan_loader/main.cc b/garnet/bin/vulkan_loader/main.cc similarity index 100% rename from bin/vulkan_loader/main.cc rename to garnet/bin/vulkan_loader/main.cc
diff --git a/bin/vulkan_loader/meta/vulkan_loader.cmx b/garnet/bin/vulkan_loader/meta/vulkan_loader.cmx similarity index 100% rename from bin/vulkan_loader/meta/vulkan_loader.cmx rename to garnet/bin/vulkan_loader/meta/vulkan_loader.cmx
diff --git a/bin/wayland/BUILD.gn b/garnet/bin/wayland/BUILD.gn similarity index 100% rename from bin/wayland/BUILD.gn rename to garnet/bin/wayland/BUILD.gn
diff --git a/bin/wayland/bridge/BUILD.gn b/garnet/bin/wayland/bridge/BUILD.gn similarity index 100% rename from bin/wayland/bridge/BUILD.gn rename to garnet/bin/wayland/bridge/BUILD.gn
diff --git a/bin/wayland/bridge/meta/test_wayland_bridge.cmx b/garnet/bin/wayland/bridge/meta/test_wayland_bridge.cmx similarity index 100% rename from bin/wayland/bridge/meta/test_wayland_bridge.cmx rename to garnet/bin/wayland/bridge/meta/test_wayland_bridge.cmx
diff --git a/bin/wayland/bridge/src/client.rs b/garnet/bin/wayland/bridge/src/client.rs similarity index 100% rename from bin/wayland/bridge/src/client.rs rename to garnet/bin/wayland/bridge/src/client.rs
diff --git a/bin/wayland/bridge/src/compositor.rs b/garnet/bin/wayland/bridge/src/compositor.rs similarity index 100% rename from bin/wayland/bridge/src/compositor.rs rename to garnet/bin/wayland/bridge/src/compositor.rs
diff --git a/bin/wayland/bridge/src/data_device_manager.rs b/garnet/bin/wayland/bridge/src/data_device_manager.rs similarity index 100% rename from bin/wayland/bridge/src/data_device_manager.rs rename to garnet/bin/wayland/bridge/src/data_device_manager.rs
diff --git a/bin/wayland/bridge/src/display.rs b/garnet/bin/wayland/bridge/src/display.rs similarity index 100% rename from bin/wayland/bridge/src/display.rs rename to garnet/bin/wayland/bridge/src/display.rs
diff --git a/bin/wayland/bridge/src/frontend.rs b/garnet/bin/wayland/bridge/src/frontend.rs similarity index 100% rename from bin/wayland/bridge/src/frontend.rs rename to garnet/bin/wayland/bridge/src/frontend.rs
diff --git a/bin/wayland/bridge/src/main.rs b/garnet/bin/wayland/bridge/src/main.rs similarity index 100% rename from bin/wayland/bridge/src/main.rs rename to garnet/bin/wayland/bridge/src/main.rs
diff --git a/bin/wayland/bridge/src/object.rs b/garnet/bin/wayland/bridge/src/object.rs similarity index 100% rename from bin/wayland/bridge/src/object.rs rename to garnet/bin/wayland/bridge/src/object.rs
diff --git a/bin/wayland/bridge/src/output.rs b/garnet/bin/wayland/bridge/src/output.rs similarity index 100% rename from bin/wayland/bridge/src/output.rs rename to garnet/bin/wayland/bridge/src/output.rs
diff --git a/bin/wayland/bridge/src/registry.rs b/garnet/bin/wayland/bridge/src/registry.rs similarity index 100% rename from bin/wayland/bridge/src/registry.rs rename to garnet/bin/wayland/bridge/src/registry.rs
diff --git a/bin/wayland/bridge/src/seat.rs b/garnet/bin/wayland/bridge/src/seat.rs similarity index 100% rename from bin/wayland/bridge/src/seat.rs rename to garnet/bin/wayland/bridge/src/seat.rs
diff --git a/bin/wayland/bridge/src/shm.rs b/garnet/bin/wayland/bridge/src/shm.rs similarity index 100% rename from bin/wayland/bridge/src/shm.rs rename to garnet/bin/wayland/bridge/src/shm.rs
diff --git a/bin/wayland/bridge/src/subcompositor.rs b/garnet/bin/wayland/bridge/src/subcompositor.rs similarity index 100% rename from bin/wayland/bridge/src/subcompositor.rs rename to garnet/bin/wayland/bridge/src/subcompositor.rs
diff --git a/bin/wayland/bridge/src/test_protocol.rs b/garnet/bin/wayland/bridge/src/test_protocol.rs similarity index 100% rename from bin/wayland/bridge/src/test_protocol.rs rename to garnet/bin/wayland/bridge/src/test_protocol.rs
diff --git a/bin/wayland/bridge/tests/integration_test.rs b/garnet/bin/wayland/bridge/tests/integration_test.rs similarity index 100% rename from bin/wayland/bridge/tests/integration_test.rs rename to garnet/bin/wayland/bridge/tests/integration_test.rs
diff --git a/bin/wayland/core/BUILD.gn b/garnet/bin/wayland/core/BUILD.gn similarity index 100% rename from bin/wayland/core/BUILD.gn rename to garnet/bin/wayland/core/BUILD.gn
diff --git a/bin/wayland/core/src/fixed.rs b/garnet/bin/wayland/core/src/fixed.rs similarity index 100% rename from bin/wayland/core/src/fixed.rs rename to garnet/bin/wayland/core/src/fixed.rs
diff --git a/bin/wayland/core/src/lib.rs b/garnet/bin/wayland/core/src/lib.rs similarity index 100% rename from bin/wayland/core/src/lib.rs rename to garnet/bin/wayland/core/src/lib.rs
diff --git a/bin/wayland/core/src/message.rs b/garnet/bin/wayland/core/src/message.rs similarity index 100% rename from bin/wayland/core/src/message.rs rename to garnet/bin/wayland/core/src/message.rs
diff --git a/bin/wayland/fidl/BUILD.gn b/garnet/bin/wayland/fidl/BUILD.gn similarity index 100% rename from bin/wayland/fidl/BUILD.gn rename to garnet/bin/wayland/fidl/BUILD.gn
diff --git a/bin/wayland/fidl/view_producer.fidl b/garnet/bin/wayland/fidl/view_producer.fidl similarity index 100% rename from bin/wayland/fidl/view_producer.fidl rename to garnet/bin/wayland/fidl/view_producer.fidl
diff --git a/bin/wayland/meta/fuchsia_wayland_core_lib_test.cmx b/garnet/bin/wayland/meta/fuchsia_wayland_core_lib_test.cmx similarity index 100% rename from bin/wayland/meta/fuchsia_wayland_core_lib_test.cmx rename to garnet/bin/wayland/meta/fuchsia_wayland_core_lib_test.cmx
diff --git a/bin/wayland/meta/test_wayland_bridge_test_lib_test.cmx b/garnet/bin/wayland/meta/test_wayland_bridge_test_lib_test.cmx similarity index 100% rename from bin/wayland/meta/test_wayland_bridge_test_lib_test.cmx rename to garnet/bin/wayland/meta/test_wayland_bridge_test_lib_test.cmx
diff --git a/bin/wayland/meta/wayland_scanner_back_end_test_lib_test.cmx b/garnet/bin/wayland/meta/wayland_scanner_back_end_test_lib_test.cmx similarity index 100% rename from bin/wayland/meta/wayland_scanner_back_end_test_lib_test.cmx rename to garnet/bin/wayland/meta/wayland_scanner_back_end_test_lib_test.cmx
diff --git a/bin/wayland/meta/wayland_scanner_front_end_test_lib_test.cmx b/garnet/bin/wayland/meta/wayland_scanner_front_end_test_lib_test.cmx similarity index 100% rename from bin/wayland/meta/wayland_scanner_front_end_test_lib_test.cmx rename to garnet/bin/wayland/meta/wayland_scanner_front_end_test_lib_test.cmx
diff --git a/bin/wayland/protocol.gni b/garnet/bin/wayland/protocol.gni similarity index 100% rename from bin/wayland/protocol.gni rename to garnet/bin/wayland/protocol.gni
diff --git a/bin/wayland/protocols/BUILD.gn b/garnet/bin/wayland/protocols/BUILD.gn similarity index 100% rename from bin/wayland/protocols/BUILD.gn rename to garnet/bin/wayland/protocols/BUILD.gn
diff --git a/bin/wayland/scanner/BUILD.gn b/garnet/bin/wayland/scanner/BUILD.gn similarity index 100% rename from bin/wayland/scanner/BUILD.gn rename to garnet/bin/wayland/scanner/BUILD.gn
diff --git a/bin/wayland/scanner/README.md b/garnet/bin/wayland/scanner/README.md similarity index 100% rename from bin/wayland/scanner/README.md rename to garnet/bin/wayland/scanner/README.md
diff --git a/bin/wayland/scanner/src/ast.rs b/garnet/bin/wayland/scanner/src/ast.rs similarity index 100% rename from bin/wayland/scanner/src/ast.rs rename to garnet/bin/wayland/scanner/src/ast.rs
diff --git a/bin/wayland/scanner/src/codegen.rs b/garnet/bin/wayland/scanner/src/codegen.rs similarity index 100% rename from bin/wayland/scanner/src/codegen.rs rename to garnet/bin/wayland/scanner/src/codegen.rs
diff --git a/bin/wayland/scanner/src/lib.rs b/garnet/bin/wayland/scanner/src/lib.rs similarity index 100% rename from bin/wayland/scanner/src/lib.rs rename to garnet/bin/wayland/scanner/src/lib.rs
diff --git a/bin/wayland/scanner/src/main.rs b/garnet/bin/wayland/scanner/src/main.rs similarity index 100% rename from bin/wayland/scanner/src/main.rs rename to garnet/bin/wayland/scanner/src/main.rs
diff --git a/bin/wayland/scanner/src/parser.rs b/garnet/bin/wayland/scanner/src/parser.rs similarity index 100% rename from bin/wayland/scanner/src/parser.rs rename to garnet/bin/wayland/scanner/src/parser.rs
diff --git a/bin/wayland/scanner/tests/back_end_test.rs b/garnet/bin/wayland/scanner/tests/back_end_test.rs similarity index 100% rename from bin/wayland/scanner/tests/back_end_test.rs rename to garnet/bin/wayland/scanner/tests/back_end_test.rs
diff --git a/bin/wayland/scanner/tests/front_end_test.rs b/garnet/bin/wayland/scanner/tests/front_end_test.rs similarity index 100% rename from bin/wayland/scanner/tests/front_end_test.rs rename to garnet/bin/wayland/scanner/tests/front_end_test.rs
diff --git a/bin/wayland/scanner/tests/test_protocol.xml b/garnet/bin/wayland/scanner/tests/test_protocol.xml similarity index 100% rename from bin/wayland/scanner/tests/test_protocol.xml rename to garnet/bin/wayland/scanner/tests/test_protocol.xml
diff --git a/bin/wlan/rustfmt.toml b/garnet/bin/wlan/rustfmt.toml similarity index 100% rename from bin/wlan/rustfmt.toml rename to garnet/bin/wlan/rustfmt.toml
diff --git a/bin/wlan/wlan-ap-smoke-test/BUILD.gn b/garnet/bin/wlan/wlan-ap-smoke-test/BUILD.gn similarity index 100% rename from bin/wlan/wlan-ap-smoke-test/BUILD.gn rename to garnet/bin/wlan/wlan-ap-smoke-test/BUILD.gn
diff --git a/bin/wlan/wlan-ap-smoke-test/meta/wlan-ap-smoke-test.cmx b/garnet/bin/wlan/wlan-ap-smoke-test/meta/wlan-ap-smoke-test.cmx similarity index 100% rename from bin/wlan/wlan-ap-smoke-test/meta/wlan-ap-smoke-test.cmx rename to garnet/bin/wlan/wlan-ap-smoke-test/meta/wlan-ap-smoke-test.cmx
diff --git a/bin/wlan/wlan-ap-smoke-test/src/main.rs b/garnet/bin/wlan/wlan-ap-smoke-test/src/main.rs similarity index 100% rename from bin/wlan/wlan-ap-smoke-test/src/main.rs rename to garnet/bin/wlan/wlan-ap-smoke-test/src/main.rs
diff --git a/bin/wlan/wlan-ap-smoke-test/src/opts.rs b/garnet/bin/wlan/wlan-ap-smoke-test/src/opts.rs similarity index 100% rename from bin/wlan/wlan-ap-smoke-test/src/opts.rs rename to garnet/bin/wlan/wlan-ap-smoke-test/src/opts.rs
diff --git a/bin/wlan/wlan-hw-sim/BUILD.gn b/garnet/bin/wlan/wlan-hw-sim/BUILD.gn similarity index 100% rename from bin/wlan/wlan-hw-sim/BUILD.gn rename to garnet/bin/wlan/wlan-hw-sim/BUILD.gn
diff --git a/bin/wlan/wlan-hw-sim/meta/wlan-hw-sim.cmx b/garnet/bin/wlan/wlan-hw-sim/meta/wlan-hw-sim.cmx similarity index 100% rename from bin/wlan/wlan-hw-sim/meta/wlan-hw-sim.cmx rename to garnet/bin/wlan/wlan-hw-sim/meta/wlan-hw-sim.cmx
diff --git a/bin/wlan/wlan-hw-sim/meta/wlan_hw_sim_bin_test.cmx b/garnet/bin/wlan/wlan-hw-sim/meta/wlan_hw_sim_bin_test.cmx similarity index 100% rename from bin/wlan/wlan-hw-sim/meta/wlan_hw_sim_bin_test.cmx rename to garnet/bin/wlan/wlan-hw-sim/meta/wlan_hw_sim_bin_test.cmx
diff --git a/bin/wlan/wlan-hw-sim/src/ap.rs b/garnet/bin/wlan/wlan-hw-sim/src/ap.rs similarity index 100% rename from bin/wlan/wlan-hw-sim/src/ap.rs rename to garnet/bin/wlan/wlan-hw-sim/src/ap.rs
diff --git a/bin/wlan/wlan-hw-sim/src/config.rs b/garnet/bin/wlan/wlan-hw-sim/src/config.rs similarity index 100% rename from bin/wlan/wlan-hw-sim/src/config.rs rename to garnet/bin/wlan/wlan-hw-sim/src/config.rs
diff --git a/bin/wlan/wlan-hw-sim/src/eth_frames.rs b/garnet/bin/wlan/wlan-hw-sim/src/eth_frames.rs similarity index 100% rename from bin/wlan/wlan-hw-sim/src/eth_frames.rs rename to garnet/bin/wlan/wlan-hw-sim/src/eth_frames.rs
diff --git a/bin/wlan/wlan-hw-sim/src/mac_frames.rs b/garnet/bin/wlan/wlan-hw-sim/src/mac_frames.rs similarity index 100% rename from bin/wlan/wlan-hw-sim/src/mac_frames.rs rename to garnet/bin/wlan/wlan-hw-sim/src/mac_frames.rs
diff --git a/bin/wlan/wlan-hw-sim/src/main.rs b/garnet/bin/wlan/wlan-hw-sim/src/main.rs similarity index 100% rename from bin/wlan/wlan-hw-sim/src/main.rs rename to garnet/bin/wlan/wlan-hw-sim/src/main.rs
diff --git a/bin/wlan/wlan-hw-sim/src/test_utils.rs b/garnet/bin/wlan/wlan-hw-sim/src/test_utils.rs similarity index 100% rename from bin/wlan/wlan-hw-sim/src/test_utils.rs rename to garnet/bin/wlan/wlan-hw-sim/src/test_utils.rs
diff --git a/bin/wlan/wlan-smoke-test/BUILD.gn b/garnet/bin/wlan/wlan-smoke-test/BUILD.gn similarity index 100% rename from bin/wlan/wlan-smoke-test/BUILD.gn rename to garnet/bin/wlan/wlan-smoke-test/BUILD.gn
diff --git a/bin/wlan/wlan-smoke-test/meta/wlan-smoke-test.cmx b/garnet/bin/wlan/wlan-smoke-test/meta/wlan-smoke-test.cmx similarity index 100% rename from bin/wlan/wlan-smoke-test/meta/wlan-smoke-test.cmx rename to garnet/bin/wlan/wlan-smoke-test/meta/wlan-smoke-test.cmx
diff --git a/bin/wlan/wlan-smoke-test/src/main.rs b/garnet/bin/wlan/wlan-smoke-test/src/main.rs similarity index 100% rename from bin/wlan/wlan-smoke-test/src/main.rs rename to garnet/bin/wlan/wlan-smoke-test/src/main.rs
diff --git a/bin/wlan/wlan-smoke-test/src/opts.rs b/garnet/bin/wlan/wlan-smoke-test/src/opts.rs similarity index 100% rename from bin/wlan/wlan-smoke-test/src/opts.rs rename to garnet/bin/wlan/wlan-smoke-test/src/opts.rs
diff --git a/bin/wlan/wlan-stress-test/BUILD.gn b/garnet/bin/wlan/wlan-stress-test/BUILD.gn similarity index 100% rename from bin/wlan/wlan-stress-test/BUILD.gn rename to garnet/bin/wlan/wlan-stress-test/BUILD.gn
diff --git a/bin/wlan/wlan-stress-test/meta/wlan-stress-test.cmx b/garnet/bin/wlan/wlan-stress-test/meta/wlan-stress-test.cmx similarity index 100% rename from bin/wlan/wlan-stress-test/meta/wlan-stress-test.cmx rename to garnet/bin/wlan/wlan-stress-test/meta/wlan-stress-test.cmx
diff --git a/bin/wlan/wlan-stress-test/src/main.rs b/garnet/bin/wlan/wlan-stress-test/src/main.rs similarity index 100% rename from bin/wlan/wlan-stress-test/src/main.rs rename to garnet/bin/wlan/wlan-stress-test/src/main.rs
diff --git a/bin/wlan/wlan-stress-test/src/opts.rs b/garnet/bin/wlan/wlan-stress-test/src/opts.rs similarity index 100% rename from bin/wlan/wlan-stress-test/src/opts.rs rename to garnet/bin/wlan/wlan-stress-test/src/opts.rs
diff --git a/bin/wlan/wlancfg/BUILD.gn b/garnet/bin/wlan/wlancfg/BUILD.gn similarity index 100% rename from bin/wlan/wlancfg/BUILD.gn rename to garnet/bin/wlan/wlancfg/BUILD.gn
diff --git a/bin/wlan/wlancfg/MAINTAINERS b/garnet/bin/wlan/wlancfg/MAINTAINERS similarity index 100% rename from bin/wlan/wlancfg/MAINTAINERS rename to garnet/bin/wlan/wlancfg/MAINTAINERS
diff --git a/bin/wlan/wlancfg/config/ap.json b/garnet/bin/wlan/wlancfg/config/ap.json similarity index 100% rename from bin/wlan/wlancfg/config/ap.json rename to garnet/bin/wlan/wlancfg/config/ap.json
diff --git a/bin/wlan/wlancfg/config/client.json b/garnet/bin/wlan/wlancfg/config/client.json similarity index 100% rename from bin/wlan/wlancfg/config/client.json rename to garnet/bin/wlan/wlancfg/config/client.json
diff --git a/bin/wlan/wlancfg/meta/wlancfg.cmx b/garnet/bin/wlan/wlancfg/meta/wlancfg.cmx similarity index 100% rename from bin/wlan/wlancfg/meta/wlancfg.cmx rename to garnet/bin/wlan/wlancfg/meta/wlancfg.cmx
diff --git a/bin/wlan/wlancfg/src/client.rs b/garnet/bin/wlan/wlancfg/src/client.rs similarity index 100% rename from bin/wlan/wlancfg/src/client.rs rename to garnet/bin/wlan/wlancfg/src/client.rs
diff --git a/bin/wlan/wlancfg/src/config.rs b/garnet/bin/wlan/wlancfg/src/config.rs similarity index 100% rename from bin/wlan/wlancfg/src/config.rs rename to garnet/bin/wlan/wlancfg/src/config.rs
diff --git a/bin/wlan/wlancfg/src/device.rs b/garnet/bin/wlan/wlancfg/src/device.rs similarity index 100% rename from bin/wlan/wlancfg/src/device.rs rename to garnet/bin/wlan/wlancfg/src/device.rs
diff --git a/bin/wlan/wlancfg/src/known_ess_store.rs b/garnet/bin/wlan/wlancfg/src/known_ess_store.rs similarity index 100% rename from bin/wlan/wlancfg/src/known_ess_store.rs rename to garnet/bin/wlan/wlancfg/src/known_ess_store.rs
diff --git a/bin/wlan/wlancfg/src/main.rs b/garnet/bin/wlan/wlancfg/src/main.rs similarity index 100% rename from bin/wlan/wlancfg/src/main.rs rename to garnet/bin/wlan/wlancfg/src/main.rs
diff --git a/bin/wlan/wlancfg/src/shim.rs b/garnet/bin/wlan/wlancfg/src/shim.rs similarity index 100% rename from bin/wlan/wlancfg/src/shim.rs rename to garnet/bin/wlan/wlancfg/src/shim.rs
diff --git a/bin/wlan/wlancfg/src/state_machine.rs b/garnet/bin/wlan/wlancfg/src/state_machine.rs similarity index 100% rename from bin/wlan/wlancfg/src/state_machine.rs rename to garnet/bin/wlan/wlancfg/src/state_machine.rs
diff --git a/bin/wlan/wlancfg/wlancfg.config b/garnet/bin/wlan/wlancfg/wlancfg.config similarity index 100% rename from bin/wlan/wlancfg/wlancfg.config rename to garnet/bin/wlan/wlancfg/wlancfg.config
diff --git a/bin/wlan/wlanstack/BUILD.gn b/garnet/bin/wlan/wlanstack/BUILD.gn similarity index 100% rename from bin/wlan/wlanstack/BUILD.gn rename to garnet/bin/wlan/wlanstack/BUILD.gn
diff --git a/bin/wlan/wlanstack/MAINTAINERS b/garnet/bin/wlan/wlanstack/MAINTAINERS similarity index 100% rename from bin/wlan/wlanstack/MAINTAINERS rename to garnet/bin/wlan/wlanstack/MAINTAINERS
diff --git a/bin/wlan/wlanstack/meta/wlanstack2.cmx b/garnet/bin/wlan/wlanstack/meta/wlanstack2.cmx similarity index 100% rename from bin/wlan/wlanstack/meta/wlanstack2.cmx rename to garnet/bin/wlan/wlanstack/meta/wlanstack2.cmx
diff --git a/bin/wlan/wlanstack/src/device.rs b/garnet/bin/wlan/wlanstack/src/device.rs similarity index 100% rename from bin/wlan/wlanstack/src/device.rs rename to garnet/bin/wlan/wlanstack/src/device.rs
diff --git a/bin/wlan/wlanstack/src/device_watch.rs b/garnet/bin/wlan/wlanstack/src/device_watch.rs similarity index 100% rename from bin/wlan/wlanstack/src/device_watch.rs rename to garnet/bin/wlan/wlanstack/src/device_watch.rs
diff --git a/bin/wlan/wlanstack/src/fidl_util.rs b/garnet/bin/wlan/wlanstack/src/fidl_util.rs similarity index 100% rename from bin/wlan/wlanstack/src/fidl_util.rs rename to garnet/bin/wlan/wlanstack/src/fidl_util.rs
diff --git a/bin/wlan/wlanstack/src/future_util.rs b/garnet/bin/wlan/wlanstack/src/future_util.rs similarity index 100% rename from bin/wlan/wlanstack/src/future_util.rs rename to garnet/bin/wlan/wlanstack/src/future_util.rs
diff --git a/bin/wlan/wlanstack/src/logger.rs b/garnet/bin/wlan/wlanstack/src/logger.rs similarity index 100% rename from bin/wlan/wlanstack/src/logger.rs rename to garnet/bin/wlan/wlanstack/src/logger.rs
diff --git a/bin/wlan/wlanstack/src/main.rs b/garnet/bin/wlan/wlanstack/src/main.rs similarity index 100% rename from bin/wlan/wlanstack/src/main.rs rename to garnet/bin/wlan/wlanstack/src/main.rs
diff --git a/bin/wlan/wlanstack/src/mlme_query_proxy.rs b/garnet/bin/wlan/wlanstack/src/mlme_query_proxy.rs similarity index 100% rename from bin/wlan/wlanstack/src/mlme_query_proxy.rs rename to garnet/bin/wlan/wlanstack/src/mlme_query_proxy.rs
diff --git a/bin/wlan/wlanstack/src/service.rs b/garnet/bin/wlan/wlanstack/src/service.rs similarity index 100% rename from bin/wlan/wlanstack/src/service.rs rename to garnet/bin/wlan/wlanstack/src/service.rs
diff --git a/bin/wlan/wlanstack/src/station/ap.rs b/garnet/bin/wlan/wlanstack/src/station/ap.rs similarity index 100% rename from bin/wlan/wlanstack/src/station/ap.rs rename to garnet/bin/wlan/wlanstack/src/station/ap.rs
diff --git a/bin/wlan/wlanstack/src/station/client.rs b/garnet/bin/wlan/wlanstack/src/station/client.rs similarity index 100% rename from bin/wlan/wlanstack/src/station/client.rs rename to garnet/bin/wlan/wlanstack/src/station/client.rs
diff --git a/bin/wlan/wlanstack/src/station/mesh.rs b/garnet/bin/wlan/wlanstack/src/station/mesh.rs similarity index 100% rename from bin/wlan/wlanstack/src/station/mesh.rs rename to garnet/bin/wlan/wlanstack/src/station/mesh.rs
diff --git a/bin/wlan/wlanstack/src/station/mod.rs b/garnet/bin/wlan/wlanstack/src/station/mod.rs similarity index 100% rename from bin/wlan/wlanstack/src/station/mod.rs rename to garnet/bin/wlan/wlanstack/src/station/mod.rs
diff --git a/bin/wlan/wlanstack/src/stats_scheduler.rs b/garnet/bin/wlan/wlanstack/src/stats_scheduler.rs similarity index 100% rename from bin/wlan/wlanstack/src/stats_scheduler.rs rename to garnet/bin/wlan/wlanstack/src/stats_scheduler.rs
diff --git a/bin/wlan/wlanstack/src/telemetry.rs b/garnet/bin/wlan/wlanstack/src/telemetry.rs similarity index 100% rename from bin/wlan/wlanstack/src/telemetry.rs rename to garnet/bin/wlan/wlanstack/src/telemetry.rs
diff --git a/bin/wlan/wlanstack/src/watchable_map.rs b/garnet/bin/wlan/wlanstack/src/watchable_map.rs similarity index 100% rename from bin/wlan/wlanstack/src/watchable_map.rs rename to garnet/bin/wlan/wlanstack/src/watchable_map.rs
diff --git a/bin/wlan/wlanstack/src/watcher_service.rs b/garnet/bin/wlan/wlanstack/src/watcher_service.rs similarity index 100% rename from bin/wlan/wlanstack/src/watcher_service.rs rename to garnet/bin/wlan/wlanstack/src/watcher_service.rs
diff --git a/bin/wlan/wlantool/BUILD.gn b/garnet/bin/wlan/wlantool/BUILD.gn similarity index 100% rename from bin/wlan/wlantool/BUILD.gn rename to garnet/bin/wlan/wlantool/BUILD.gn
diff --git a/bin/wlan/wlantool/MAINTAINERS b/garnet/bin/wlan/wlantool/MAINTAINERS similarity index 100% rename from bin/wlan/wlantool/MAINTAINERS rename to garnet/bin/wlan/wlantool/MAINTAINERS
diff --git a/bin/wlan/wlantool/src/main.rs b/garnet/bin/wlan/wlantool/src/main.rs similarity index 100% rename from bin/wlan/wlantool/src/main.rs rename to garnet/bin/wlan/wlantool/src/main.rs
diff --git a/bin/wlan/wlantool/src/opts.rs b/garnet/bin/wlan/wlantool/src/opts.rs similarity index 100% rename from bin/wlan/wlantool/src/opts.rs rename to garnet/bin/wlan/wlantool/src/opts.rs
diff --git a/bin/xi_core/BUILD.gn b/garnet/bin/xi_core/BUILD.gn similarity index 100% rename from bin/xi_core/BUILD.gn rename to garnet/bin/xi_core/BUILD.gn
diff --git a/bin/xi_core/meta/xi_core.cmx b/garnet/bin/xi_core/meta/xi_core.cmx similarity index 100% rename from bin/xi_core/meta/xi_core.cmx rename to garnet/bin/xi_core/meta/xi_core.cmx
diff --git a/bin/xi_core/src/main.rs b/garnet/bin/xi_core/src/main.rs similarity index 100% rename from bin/xi_core/src/main.rs rename to garnet/bin/xi_core/src/main.rs
diff --git a/bin/zircon_benchmarks/BUILD.gn b/garnet/bin/zircon_benchmarks/BUILD.gn similarity index 100% rename from bin/zircon_benchmarks/BUILD.gn rename to garnet/bin/zircon_benchmarks/BUILD.gn
diff --git a/bin/zircon_benchmarks/README.md b/garnet/bin/zircon_benchmarks/README.md similarity index 100% rename from bin/zircon_benchmarks/README.md rename to garnet/bin/zircon_benchmarks/README.md
diff --git a/bin/zircon_benchmarks/channels.cc b/garnet/bin/zircon_benchmarks/channels.cc similarity index 100% rename from bin/zircon_benchmarks/channels.cc rename to garnet/bin/zircon_benchmarks/channels.cc
diff --git a/bin/zircon_benchmarks/events.cc b/garnet/bin/zircon_benchmarks/events.cc similarity index 100% rename from bin/zircon_benchmarks/events.cc rename to garnet/bin/zircon_benchmarks/events.cc
diff --git a/bin/zircon_benchmarks/fifos.cc b/garnet/bin/zircon_benchmarks/fifos.cc similarity index 100% rename from bin/zircon_benchmarks/fifos.cc rename to garnet/bin/zircon_benchmarks/fifos.cc
diff --git a/bin/zircon_benchmarks/filesystem.cc b/garnet/bin/zircon_benchmarks/filesystem.cc similarity index 100% rename from bin/zircon_benchmarks/filesystem.cc rename to garnet/bin/zircon_benchmarks/filesystem.cc
diff --git a/bin/zircon_benchmarks/handle.cc b/garnet/bin/zircon_benchmarks/handle.cc similarity index 100% rename from bin/zircon_benchmarks/handle.cc rename to garnet/bin/zircon_benchmarks/handle.cc
diff --git a/bin/zircon_benchmarks/lazy_dir.cc b/garnet/bin/zircon_benchmarks/lazy_dir.cc similarity index 100% rename from bin/zircon_benchmarks/lazy_dir.cc rename to garnet/bin/zircon_benchmarks/lazy_dir.cc
diff --git a/bin/zircon_benchmarks/mmu.cc b/garnet/bin/zircon_benchmarks/mmu.cc similarity index 100% rename from bin/zircon_benchmarks/mmu.cc rename to garnet/bin/zircon_benchmarks/mmu.cc
diff --git a/bin/zircon_benchmarks/ports.cc b/garnet/bin/zircon_benchmarks/ports.cc similarity index 100% rename from bin/zircon_benchmarks/ports.cc rename to garnet/bin/zircon_benchmarks/ports.cc
diff --git a/bin/zircon_benchmarks/prng.cc b/garnet/bin/zircon_benchmarks/prng.cc similarity index 100% rename from bin/zircon_benchmarks/prng.cc rename to garnet/bin/zircon_benchmarks/prng.cc
diff --git a/bin/zircon_benchmarks/pseudo_dir.cc b/garnet/bin/zircon_benchmarks/pseudo_dir.cc similarity index 100% rename from bin/zircon_benchmarks/pseudo_dir.cc rename to garnet/bin/zircon_benchmarks/pseudo_dir.cc
diff --git a/bin/zircon_benchmarks/pthreads.cc b/garnet/bin/zircon_benchmarks/pthreads.cc similarity index 100% rename from bin/zircon_benchmarks/pthreads.cc rename to garnet/bin/zircon_benchmarks/pthreads.cc
diff --git a/bin/zircon_benchmarks/random_memcpy.cc b/garnet/bin/zircon_benchmarks/random_memcpy.cc similarity index 100% rename from bin/zircon_benchmarks/random_memcpy.cc rename to garnet/bin/zircon_benchmarks/random_memcpy.cc
diff --git a/bin/zircon_benchmarks/round_trip_service.fidl b/garnet/bin/zircon_benchmarks/round_trip_service.fidl similarity index 100% rename from bin/zircon_benchmarks/round_trip_service.fidl rename to garnet/bin/zircon_benchmarks/round_trip_service.fidl
diff --git a/bin/zircon_benchmarks/round_trips.cc b/garnet/bin/zircon_benchmarks/round_trips.cc similarity index 100% rename from bin/zircon_benchmarks/round_trips.cc rename to garnet/bin/zircon_benchmarks/round_trips.cc
diff --git a/bin/zircon_benchmarks/round_trips.h b/garnet/bin/zircon_benchmarks/round_trips.h similarity index 100% rename from bin/zircon_benchmarks/round_trips.h rename to garnet/bin/zircon_benchmarks/round_trips.h
diff --git a/bin/zircon_benchmarks/sockets.cc b/garnet/bin/zircon_benchmarks/sockets.cc similarity index 100% rename from bin/zircon_benchmarks/sockets.cc rename to garnet/bin/zircon_benchmarks/sockets.cc
diff --git a/bin/zircon_benchmarks/test_runner.cc b/garnet/bin/zircon_benchmarks/test_runner.cc similarity index 100% rename from bin/zircon_benchmarks/test_runner.cc rename to garnet/bin/zircon_benchmarks/test_runner.cc
diff --git a/bin/zircon_benchmarks/test_runner.h b/garnet/bin/zircon_benchmarks/test_runner.h similarity index 100% rename from bin/zircon_benchmarks/test_runner.h rename to garnet/bin/zircon_benchmarks/test_runner.h
diff --git a/bin/zircon_benchmarks/threads.cc b/garnet/bin/zircon_benchmarks/threads.cc similarity index 100% rename from bin/zircon_benchmarks/threads.cc rename to garnet/bin/zircon_benchmarks/threads.cc
diff --git a/bin/zircon_benchmarks/util.cc b/garnet/bin/zircon_benchmarks/util.cc similarity index 100% rename from bin/zircon_benchmarks/util.cc rename to garnet/bin/zircon_benchmarks/util.cc
diff --git a/bin/zircon_benchmarks/util.h b/garnet/bin/zircon_benchmarks/util.h similarity index 100% rename from bin/zircon_benchmarks/util.h rename to garnet/bin/zircon_benchmarks/util.h
diff --git a/bin/zircon_benchmarks/vmo.cc b/garnet/bin/zircon_benchmarks/vmo.cc similarity index 100% rename from bin/zircon_benchmarks/vmo.cc rename to garnet/bin/zircon_benchmarks/vmo.cc
diff --git a/bin/zxdb/BUILD.gn b/garnet/bin/zxdb/BUILD.gn similarity index 100% rename from bin/zxdb/BUILD.gn rename to garnet/bin/zxdb/BUILD.gn
diff --git a/bin/zxdb/client/BUILD.gn b/garnet/bin/zxdb/client/BUILD.gn similarity index 100% rename from bin/zxdb/client/BUILD.gn rename to garnet/bin/zxdb/client/BUILD.gn
diff --git a/bin/zxdb/client/arch_info.cc b/garnet/bin/zxdb/client/arch_info.cc similarity index 100% rename from bin/zxdb/client/arch_info.cc rename to garnet/bin/zxdb/client/arch_info.cc
diff --git a/bin/zxdb/client/arch_info.h b/garnet/bin/zxdb/client/arch_info.h similarity index 100% rename from bin/zxdb/client/arch_info.h rename to garnet/bin/zxdb/client/arch_info.h
diff --git a/bin/zxdb/client/breakpoint.cc b/garnet/bin/zxdb/client/breakpoint.cc similarity index 100% rename from bin/zxdb/client/breakpoint.cc rename to garnet/bin/zxdb/client/breakpoint.cc
diff --git a/bin/zxdb/client/breakpoint.h b/garnet/bin/zxdb/client/breakpoint.h similarity index 100% rename from bin/zxdb/client/breakpoint.h rename to garnet/bin/zxdb/client/breakpoint.h
diff --git a/bin/zxdb/client/breakpoint_action.cc b/garnet/bin/zxdb/client/breakpoint_action.cc similarity index 100% rename from bin/zxdb/client/breakpoint_action.cc rename to garnet/bin/zxdb/client/breakpoint_action.cc
diff --git a/bin/zxdb/client/breakpoint_action.h b/garnet/bin/zxdb/client/breakpoint_action.h similarity index 100% rename from bin/zxdb/client/breakpoint_action.h rename to garnet/bin/zxdb/client/breakpoint_action.h
diff --git a/bin/zxdb/client/breakpoint_impl.cc b/garnet/bin/zxdb/client/breakpoint_impl.cc similarity index 100% rename from bin/zxdb/client/breakpoint_impl.cc rename to garnet/bin/zxdb/client/breakpoint_impl.cc
diff --git a/bin/zxdb/client/breakpoint_impl.h b/garnet/bin/zxdb/client/breakpoint_impl.h similarity index 100% rename from bin/zxdb/client/breakpoint_impl.h rename to garnet/bin/zxdb/client/breakpoint_impl.h
diff --git a/bin/zxdb/client/breakpoint_impl_unittest.cc b/garnet/bin/zxdb/client/breakpoint_impl_unittest.cc similarity index 100% rename from bin/zxdb/client/breakpoint_impl_unittest.cc rename to garnet/bin/zxdb/client/breakpoint_impl_unittest.cc
diff --git a/bin/zxdb/client/breakpoint_location.cc b/garnet/bin/zxdb/client/breakpoint_location.cc similarity index 100% rename from bin/zxdb/client/breakpoint_location.cc rename to garnet/bin/zxdb/client/breakpoint_location.cc
diff --git a/bin/zxdb/client/breakpoint_location.h b/garnet/bin/zxdb/client/breakpoint_location.h similarity index 100% rename from bin/zxdb/client/breakpoint_location.h rename to garnet/bin/zxdb/client/breakpoint_location.h
diff --git a/bin/zxdb/client/breakpoint_location_impl.cc b/garnet/bin/zxdb/client/breakpoint_location_impl.cc similarity index 100% rename from bin/zxdb/client/breakpoint_location_impl.cc rename to garnet/bin/zxdb/client/breakpoint_location_impl.cc
diff --git a/bin/zxdb/client/breakpoint_location_impl.h b/garnet/bin/zxdb/client/breakpoint_location_impl.h similarity index 100% rename from bin/zxdb/client/breakpoint_location_impl.h rename to garnet/bin/zxdb/client/breakpoint_location_impl.h
diff --git a/bin/zxdb/client/breakpoint_observer.h b/garnet/bin/zxdb/client/breakpoint_observer.h similarity index 100% rename from bin/zxdb/client/breakpoint_observer.h rename to garnet/bin/zxdb/client/breakpoint_observer.h
diff --git a/bin/zxdb/client/breakpoint_settings.h b/garnet/bin/zxdb/client/breakpoint_settings.h similarity index 100% rename from bin/zxdb/client/breakpoint_settings.h rename to garnet/bin/zxdb/client/breakpoint_settings.h
diff --git a/bin/zxdb/client/client_object.cc b/garnet/bin/zxdb/client/client_object.cc similarity index 100% rename from bin/zxdb/client/client_object.cc rename to garnet/bin/zxdb/client/client_object.cc
diff --git a/bin/zxdb/client/client_object.h b/garnet/bin/zxdb/client/client_object.h similarity index 100% rename from bin/zxdb/client/client_object.h rename to garnet/bin/zxdb/client/client_object.h
diff --git a/bin/zxdb/client/disassembler.cc b/garnet/bin/zxdb/client/disassembler.cc similarity index 100% rename from bin/zxdb/client/disassembler.cc rename to garnet/bin/zxdb/client/disassembler.cc
diff --git a/bin/zxdb/client/disassembler.h b/garnet/bin/zxdb/client/disassembler.h similarity index 100% rename from bin/zxdb/client/disassembler.h rename to garnet/bin/zxdb/client/disassembler.h
diff --git a/bin/zxdb/client/disassembler_unittest.cc b/garnet/bin/zxdb/client/disassembler_unittest.cc similarity index 100% rename from bin/zxdb/client/disassembler_unittest.cc rename to garnet/bin/zxdb/client/disassembler_unittest.cc
diff --git a/bin/zxdb/client/finish_physical_frame_thread_controller.cc b/garnet/bin/zxdb/client/finish_physical_frame_thread_controller.cc similarity index 100% rename from bin/zxdb/client/finish_physical_frame_thread_controller.cc rename to garnet/bin/zxdb/client/finish_physical_frame_thread_controller.cc
diff --git a/bin/zxdb/client/finish_physical_frame_thread_controller.h b/garnet/bin/zxdb/client/finish_physical_frame_thread_controller.h similarity index 100% rename from bin/zxdb/client/finish_physical_frame_thread_controller.h rename to garnet/bin/zxdb/client/finish_physical_frame_thread_controller.h
diff --git a/bin/zxdb/client/finish_physical_frame_thread_controller_unittest.cc b/garnet/bin/zxdb/client/finish_physical_frame_thread_controller_unittest.cc similarity index 100% rename from bin/zxdb/client/finish_physical_frame_thread_controller_unittest.cc rename to garnet/bin/zxdb/client/finish_physical_frame_thread_controller_unittest.cc
diff --git a/bin/zxdb/client/finish_thread_controller.cc b/garnet/bin/zxdb/client/finish_thread_controller.cc similarity index 100% rename from bin/zxdb/client/finish_thread_controller.cc rename to garnet/bin/zxdb/client/finish_thread_controller.cc
diff --git a/bin/zxdb/client/finish_thread_controller.h b/garnet/bin/zxdb/client/finish_thread_controller.h similarity index 100% rename from bin/zxdb/client/finish_thread_controller.h rename to garnet/bin/zxdb/client/finish_thread_controller.h
diff --git a/bin/zxdb/client/finish_thread_controller_unittest.cc b/garnet/bin/zxdb/client/finish_thread_controller_unittest.cc similarity index 100% rename from bin/zxdb/client/finish_thread_controller_unittest.cc rename to garnet/bin/zxdb/client/finish_thread_controller_unittest.cc
diff --git a/bin/zxdb/client/frame.cc b/garnet/bin/zxdb/client/frame.cc similarity index 100% rename from bin/zxdb/client/frame.cc rename to garnet/bin/zxdb/client/frame.cc
diff --git a/bin/zxdb/client/frame.h b/garnet/bin/zxdb/client/frame.h similarity index 100% rename from bin/zxdb/client/frame.h rename to garnet/bin/zxdb/client/frame.h
diff --git a/bin/zxdb/client/frame_fingerprint.cc b/garnet/bin/zxdb/client/frame_fingerprint.cc similarity index 100% rename from bin/zxdb/client/frame_fingerprint.cc rename to garnet/bin/zxdb/client/frame_fingerprint.cc
diff --git a/bin/zxdb/client/frame_fingerprint.h b/garnet/bin/zxdb/client/frame_fingerprint.h similarity index 100% rename from bin/zxdb/client/frame_fingerprint.h rename to garnet/bin/zxdb/client/frame_fingerprint.h
diff --git a/bin/zxdb/client/frame_fingerprint_unittest.cc b/garnet/bin/zxdb/client/frame_fingerprint_unittest.cc similarity index 100% rename from bin/zxdb/client/frame_fingerprint_unittest.cc rename to garnet/bin/zxdb/client/frame_fingerprint_unittest.cc
diff --git a/bin/zxdb/client/frame_impl.cc b/garnet/bin/zxdb/client/frame_impl.cc similarity index 100% rename from bin/zxdb/client/frame_impl.cc rename to garnet/bin/zxdb/client/frame_impl.cc
diff --git a/bin/zxdb/client/frame_impl.h b/garnet/bin/zxdb/client/frame_impl.h similarity index 100% rename from bin/zxdb/client/frame_impl.h rename to garnet/bin/zxdb/client/frame_impl.h
diff --git a/bin/zxdb/client/frame_impl_unittest.cc b/garnet/bin/zxdb/client/frame_impl_unittest.cc similarity index 100% rename from bin/zxdb/client/frame_impl_unittest.cc rename to garnet/bin/zxdb/client/frame_impl_unittest.cc
diff --git a/bin/zxdb/client/frame_symbol_data_provider.cc b/garnet/bin/zxdb/client/frame_symbol_data_provider.cc similarity index 100% rename from bin/zxdb/client/frame_symbol_data_provider.cc rename to garnet/bin/zxdb/client/frame_symbol_data_provider.cc
diff --git a/bin/zxdb/client/frame_symbol_data_provider.h b/garnet/bin/zxdb/client/frame_symbol_data_provider.h similarity index 100% rename from bin/zxdb/client/frame_symbol_data_provider.h rename to garnet/bin/zxdb/client/frame_symbol_data_provider.h
diff --git a/bin/zxdb/client/job.cc b/garnet/bin/zxdb/client/job.cc similarity index 100% rename from bin/zxdb/client/job.cc rename to garnet/bin/zxdb/client/job.cc
diff --git a/bin/zxdb/client/job.h b/garnet/bin/zxdb/client/job.h similarity index 100% rename from bin/zxdb/client/job.h rename to garnet/bin/zxdb/client/job.h
diff --git a/bin/zxdb/client/job_context.cc b/garnet/bin/zxdb/client/job_context.cc similarity index 100% rename from bin/zxdb/client/job_context.cc rename to garnet/bin/zxdb/client/job_context.cc
diff --git a/bin/zxdb/client/job_context.h b/garnet/bin/zxdb/client/job_context.h similarity index 100% rename from bin/zxdb/client/job_context.h rename to garnet/bin/zxdb/client/job_context.h
diff --git a/bin/zxdb/client/job_context_impl.cc b/garnet/bin/zxdb/client/job_context_impl.cc similarity index 100% rename from bin/zxdb/client/job_context_impl.cc rename to garnet/bin/zxdb/client/job_context_impl.cc
diff --git a/bin/zxdb/client/job_context_impl.h b/garnet/bin/zxdb/client/job_context_impl.h similarity index 100% rename from bin/zxdb/client/job_context_impl.h rename to garnet/bin/zxdb/client/job_context_impl.h
diff --git a/bin/zxdb/client/job_impl.cc b/garnet/bin/zxdb/client/job_impl.cc similarity index 100% rename from bin/zxdb/client/job_impl.cc rename to garnet/bin/zxdb/client/job_impl.cc
diff --git a/bin/zxdb/client/job_impl.h b/garnet/bin/zxdb/client/job_impl.h similarity index 100% rename from bin/zxdb/client/job_impl.h rename to garnet/bin/zxdb/client/job_impl.h
diff --git a/bin/zxdb/client/memory_dump.cc b/garnet/bin/zxdb/client/memory_dump.cc similarity index 100% rename from bin/zxdb/client/memory_dump.cc rename to garnet/bin/zxdb/client/memory_dump.cc
diff --git a/bin/zxdb/client/memory_dump.h b/garnet/bin/zxdb/client/memory_dump.h similarity index 100% rename from bin/zxdb/client/memory_dump.h rename to garnet/bin/zxdb/client/memory_dump.h
diff --git a/bin/zxdb/client/memory_dump_unittest.cc b/garnet/bin/zxdb/client/memory_dump_unittest.cc similarity index 100% rename from bin/zxdb/client/memory_dump_unittest.cc rename to garnet/bin/zxdb/client/memory_dump_unittest.cc
diff --git a/bin/zxdb/client/minidump_remote_api.cc b/garnet/bin/zxdb/client/minidump_remote_api.cc similarity index 100% rename from bin/zxdb/client/minidump_remote_api.cc rename to garnet/bin/zxdb/client/minidump_remote_api.cc
diff --git a/bin/zxdb/client/minidump_remote_api.h b/garnet/bin/zxdb/client/minidump_remote_api.h similarity index 100% rename from bin/zxdb/client/minidump_remote_api.h rename to garnet/bin/zxdb/client/minidump_remote_api.h
diff --git a/bin/zxdb/client/minidump_unittest.cc b/garnet/bin/zxdb/client/minidump_unittest.cc similarity index 100% rename from bin/zxdb/client/minidump_unittest.cc rename to garnet/bin/zxdb/client/minidump_unittest.cc
diff --git a/bin/zxdb/client/mock_frame.cc b/garnet/bin/zxdb/client/mock_frame.cc similarity index 100% rename from bin/zxdb/client/mock_frame.cc rename to garnet/bin/zxdb/client/mock_frame.cc
diff --git a/bin/zxdb/client/mock_frame.h b/garnet/bin/zxdb/client/mock_frame.h similarity index 100% rename from bin/zxdb/client/mock_frame.h rename to garnet/bin/zxdb/client/mock_frame.h
diff --git a/bin/zxdb/client/mock_process.cc b/garnet/bin/zxdb/client/mock_process.cc similarity index 100% rename from bin/zxdb/client/mock_process.cc rename to garnet/bin/zxdb/client/mock_process.cc
diff --git a/bin/zxdb/client/mock_process.h b/garnet/bin/zxdb/client/mock_process.h similarity index 100% rename from bin/zxdb/client/mock_process.h rename to garnet/bin/zxdb/client/mock_process.h
diff --git a/bin/zxdb/client/mock_remote_api.cc b/garnet/bin/zxdb/client/mock_remote_api.cc similarity index 100% rename from bin/zxdb/client/mock_remote_api.cc rename to garnet/bin/zxdb/client/mock_remote_api.cc
diff --git a/bin/zxdb/client/mock_remote_api.h b/garnet/bin/zxdb/client/mock_remote_api.h similarity index 100% rename from bin/zxdb/client/mock_remote_api.h rename to garnet/bin/zxdb/client/mock_remote_api.h
diff --git a/bin/zxdb/client/process.cc b/garnet/bin/zxdb/client/process.cc similarity index 100% rename from bin/zxdb/client/process.cc rename to garnet/bin/zxdb/client/process.cc
diff --git a/bin/zxdb/client/process.h b/garnet/bin/zxdb/client/process.h similarity index 100% rename from bin/zxdb/client/process.h rename to garnet/bin/zxdb/client/process.h
diff --git a/bin/zxdb/client/process_impl.cc b/garnet/bin/zxdb/client/process_impl.cc similarity index 100% rename from bin/zxdb/client/process_impl.cc rename to garnet/bin/zxdb/client/process_impl.cc
diff --git a/bin/zxdb/client/process_impl.h b/garnet/bin/zxdb/client/process_impl.h similarity index 100% rename from bin/zxdb/client/process_impl.h rename to garnet/bin/zxdb/client/process_impl.h
diff --git a/bin/zxdb/client/process_impl_unittest.cc b/garnet/bin/zxdb/client/process_impl_unittest.cc similarity index 100% rename from bin/zxdb/client/process_impl_unittest.cc rename to garnet/bin/zxdb/client/process_impl_unittest.cc
diff --git a/bin/zxdb/client/process_observer.h b/garnet/bin/zxdb/client/process_observer.h similarity index 100% rename from bin/zxdb/client/process_observer.h rename to garnet/bin/zxdb/client/process_observer.h
diff --git a/bin/zxdb/client/register.cc b/garnet/bin/zxdb/client/register.cc similarity index 100% rename from bin/zxdb/client/register.cc rename to garnet/bin/zxdb/client/register.cc
diff --git a/bin/zxdb/client/register.h b/garnet/bin/zxdb/client/register.h similarity index 100% rename from bin/zxdb/client/register.h rename to garnet/bin/zxdb/client/register.h
diff --git a/bin/zxdb/client/register_dwarf.cc b/garnet/bin/zxdb/client/register_dwarf.cc similarity index 100% rename from bin/zxdb/client/register_dwarf.cc rename to garnet/bin/zxdb/client/register_dwarf.cc
diff --git a/bin/zxdb/client/register_dwarf.h b/garnet/bin/zxdb/client/register_dwarf.h similarity index 100% rename from bin/zxdb/client/register_dwarf.h rename to garnet/bin/zxdb/client/register_dwarf.h
diff --git a/bin/zxdb/client/register_unittest.cc b/garnet/bin/zxdb/client/register_unittest.cc similarity index 100% rename from bin/zxdb/client/register_unittest.cc rename to garnet/bin/zxdb/client/register_unittest.cc
diff --git a/bin/zxdb/client/remote_api.cc b/garnet/bin/zxdb/client/remote_api.cc similarity index 100% rename from bin/zxdb/client/remote_api.cc rename to garnet/bin/zxdb/client/remote_api.cc
diff --git a/bin/zxdb/client/remote_api.h b/garnet/bin/zxdb/client/remote_api.h similarity index 100% rename from bin/zxdb/client/remote_api.h rename to garnet/bin/zxdb/client/remote_api.h
diff --git a/bin/zxdb/client/remote_api_impl.cc b/garnet/bin/zxdb/client/remote_api_impl.cc similarity index 100% rename from bin/zxdb/client/remote_api_impl.cc rename to garnet/bin/zxdb/client/remote_api_impl.cc
diff --git a/bin/zxdb/client/remote_api_impl.h b/garnet/bin/zxdb/client/remote_api_impl.h similarity index 100% rename from bin/zxdb/client/remote_api_impl.h rename to garnet/bin/zxdb/client/remote_api_impl.h
diff --git a/bin/zxdb/client/remote_api_test.cc b/garnet/bin/zxdb/client/remote_api_test.cc similarity index 100% rename from bin/zxdb/client/remote_api_test.cc rename to garnet/bin/zxdb/client/remote_api_test.cc
diff --git a/bin/zxdb/client/remote_api_test.h b/garnet/bin/zxdb/client/remote_api_test.h similarity index 100% rename from bin/zxdb/client/remote_api_test.h rename to garnet/bin/zxdb/client/remote_api_test.h
diff --git a/bin/zxdb/client/session.cc b/garnet/bin/zxdb/client/session.cc similarity index 100% rename from bin/zxdb/client/session.cc rename to garnet/bin/zxdb/client/session.cc
diff --git a/bin/zxdb/client/session.h b/garnet/bin/zxdb/client/session.h similarity index 100% rename from bin/zxdb/client/session.h rename to garnet/bin/zxdb/client/session.h
diff --git a/bin/zxdb/client/session_unittest.cc b/garnet/bin/zxdb/client/session_unittest.cc similarity index 100% rename from bin/zxdb/client/session_unittest.cc rename to garnet/bin/zxdb/client/session_unittest.cc
diff --git a/bin/zxdb/client/setting_schema.cc b/garnet/bin/zxdb/client/setting_schema.cc similarity index 100% rename from bin/zxdb/client/setting_schema.cc rename to garnet/bin/zxdb/client/setting_schema.cc
diff --git a/bin/zxdb/client/setting_schema.h b/garnet/bin/zxdb/client/setting_schema.h similarity index 100% rename from bin/zxdb/client/setting_schema.h rename to garnet/bin/zxdb/client/setting_schema.h
diff --git a/bin/zxdb/client/setting_schema_definition.cc b/garnet/bin/zxdb/client/setting_schema_definition.cc similarity index 100% rename from bin/zxdb/client/setting_schema_definition.cc rename to garnet/bin/zxdb/client/setting_schema_definition.cc
diff --git a/bin/zxdb/client/setting_schema_definition.h b/garnet/bin/zxdb/client/setting_schema_definition.h similarity index 100% rename from bin/zxdb/client/setting_schema_definition.h rename to garnet/bin/zxdb/client/setting_schema_definition.h
diff --git a/bin/zxdb/client/setting_schema_unittest.cc b/garnet/bin/zxdb/client/setting_schema_unittest.cc similarity index 100% rename from bin/zxdb/client/setting_schema_unittest.cc rename to garnet/bin/zxdb/client/setting_schema_unittest.cc
diff --git a/bin/zxdb/client/setting_store.cc b/garnet/bin/zxdb/client/setting_store.cc similarity index 100% rename from bin/zxdb/client/setting_store.cc rename to garnet/bin/zxdb/client/setting_store.cc
diff --git a/bin/zxdb/client/setting_store.h b/garnet/bin/zxdb/client/setting_store.h similarity index 100% rename from bin/zxdb/client/setting_store.h rename to garnet/bin/zxdb/client/setting_store.h
diff --git a/bin/zxdb/client/setting_store_observer.h b/garnet/bin/zxdb/client/setting_store_observer.h similarity index 100% rename from bin/zxdb/client/setting_store_observer.h rename to garnet/bin/zxdb/client/setting_store_observer.h
diff --git a/bin/zxdb/client/setting_store_unittest.cc b/garnet/bin/zxdb/client/setting_store_unittest.cc similarity index 100% rename from bin/zxdb/client/setting_store_unittest.cc rename to garnet/bin/zxdb/client/setting_store_unittest.cc
diff --git a/bin/zxdb/client/setting_value.cc b/garnet/bin/zxdb/client/setting_value.cc similarity index 100% rename from bin/zxdb/client/setting_value.cc rename to garnet/bin/zxdb/client/setting_value.cc
diff --git a/bin/zxdb/client/setting_value.h b/garnet/bin/zxdb/client/setting_value.h similarity index 100% rename from bin/zxdb/client/setting_value.h rename to garnet/bin/zxdb/client/setting_value.h
diff --git a/bin/zxdb/client/setting_value_unittest.cc b/garnet/bin/zxdb/client/setting_value_unittest.cc similarity index 100% rename from bin/zxdb/client/setting_value_unittest.cc rename to garnet/bin/zxdb/client/setting_value_unittest.cc
diff --git a/bin/zxdb/client/stack.cc b/garnet/bin/zxdb/client/stack.cc similarity index 100% rename from bin/zxdb/client/stack.cc rename to garnet/bin/zxdb/client/stack.cc
diff --git a/bin/zxdb/client/stack.h b/garnet/bin/zxdb/client/stack.h similarity index 100% rename from bin/zxdb/client/stack.h rename to garnet/bin/zxdb/client/stack.h
diff --git a/bin/zxdb/client/stack_unittest.cc b/garnet/bin/zxdb/client/stack_unittest.cc similarity index 100% rename from bin/zxdb/client/stack_unittest.cc rename to garnet/bin/zxdb/client/stack_unittest.cc
diff --git a/bin/zxdb/client/step_mode.h b/garnet/bin/zxdb/client/step_mode.h similarity index 100% rename from bin/zxdb/client/step_mode.h rename to garnet/bin/zxdb/client/step_mode.h
diff --git a/bin/zxdb/client/step_over_thread_controller.cc b/garnet/bin/zxdb/client/step_over_thread_controller.cc similarity index 100% rename from bin/zxdb/client/step_over_thread_controller.cc rename to garnet/bin/zxdb/client/step_over_thread_controller.cc
diff --git a/bin/zxdb/client/step_over_thread_controller.h b/garnet/bin/zxdb/client/step_over_thread_controller.h similarity index 100% rename from bin/zxdb/client/step_over_thread_controller.h rename to garnet/bin/zxdb/client/step_over_thread_controller.h
diff --git a/bin/zxdb/client/step_over_thread_controller_unittest.cc b/garnet/bin/zxdb/client/step_over_thread_controller_unittest.cc similarity index 100% rename from bin/zxdb/client/step_over_thread_controller_unittest.cc rename to garnet/bin/zxdb/client/step_over_thread_controller_unittest.cc
diff --git a/bin/zxdb/client/step_thread_controller.cc b/garnet/bin/zxdb/client/step_thread_controller.cc similarity index 100% rename from bin/zxdb/client/step_thread_controller.cc rename to garnet/bin/zxdb/client/step_thread_controller.cc
diff --git a/bin/zxdb/client/step_thread_controller.h b/garnet/bin/zxdb/client/step_thread_controller.h similarity index 100% rename from bin/zxdb/client/step_thread_controller.h rename to garnet/bin/zxdb/client/step_thread_controller.h
diff --git a/bin/zxdb/client/step_thread_controller_unittest.cc b/garnet/bin/zxdb/client/step_thread_controller_unittest.cc similarity index 100% rename from bin/zxdb/client/step_thread_controller_unittest.cc rename to garnet/bin/zxdb/client/step_thread_controller_unittest.cc
diff --git a/bin/zxdb/client/string_util_unittest.cc b/garnet/bin/zxdb/client/string_util_unittest.cc similarity index 100% rename from bin/zxdb/client/string_util_unittest.cc rename to garnet/bin/zxdb/client/string_util_unittest.cc
diff --git a/bin/zxdb/client/system.cc b/garnet/bin/zxdb/client/system.cc similarity index 100% rename from bin/zxdb/client/system.cc rename to garnet/bin/zxdb/client/system.cc
diff --git a/bin/zxdb/client/system.h b/garnet/bin/zxdb/client/system.h similarity index 100% rename from bin/zxdb/client/system.h rename to garnet/bin/zxdb/client/system.h
diff --git a/bin/zxdb/client/system_impl.cc b/garnet/bin/zxdb/client/system_impl.cc similarity index 100% rename from bin/zxdb/client/system_impl.cc rename to garnet/bin/zxdb/client/system_impl.cc
diff --git a/bin/zxdb/client/system_impl.h b/garnet/bin/zxdb/client/system_impl.h similarity index 100% rename from bin/zxdb/client/system_impl.h rename to garnet/bin/zxdb/client/system_impl.h
diff --git a/bin/zxdb/client/system_observer.h b/garnet/bin/zxdb/client/system_observer.h similarity index 100% rename from bin/zxdb/client/system_observer.h rename to garnet/bin/zxdb/client/system_observer.h
diff --git a/bin/zxdb/client/target.cc b/garnet/bin/zxdb/client/target.cc similarity index 100% rename from bin/zxdb/client/target.cc rename to garnet/bin/zxdb/client/target.cc
diff --git a/bin/zxdb/client/target.h b/garnet/bin/zxdb/client/target.h similarity index 100% rename from bin/zxdb/client/target.h rename to garnet/bin/zxdb/client/target.h
diff --git a/bin/zxdb/client/target_impl.cc b/garnet/bin/zxdb/client/target_impl.cc similarity index 100% rename from bin/zxdb/client/target_impl.cc rename to garnet/bin/zxdb/client/target_impl.cc
diff --git a/bin/zxdb/client/target_impl.h b/garnet/bin/zxdb/client/target_impl.h similarity index 100% rename from bin/zxdb/client/target_impl.h rename to garnet/bin/zxdb/client/target_impl.h
diff --git a/bin/zxdb/client/target_impl_unittest.cc b/garnet/bin/zxdb/client/target_impl_unittest.cc similarity index 100% rename from bin/zxdb/client/target_impl_unittest.cc rename to garnet/bin/zxdb/client/target_impl_unittest.cc
diff --git a/bin/zxdb/client/target_observer.h b/garnet/bin/zxdb/client/target_observer.h similarity index 100% rename from bin/zxdb/client/target_observer.h rename to garnet/bin/zxdb/client/target_observer.h
diff --git a/bin/zxdb/client/test_example_minidump.dmp b/garnet/bin/zxdb/client/test_example_minidump.dmp similarity index 100% rename from bin/zxdb/client/test_example_minidump.dmp rename to garnet/bin/zxdb/client/test_example_minidump.dmp Binary files differ
diff --git a/bin/zxdb/client/test_example_minidump_with_aspace.dmp b/garnet/bin/zxdb/client/test_example_minidump_with_aspace.dmp similarity index 100% rename from bin/zxdb/client/test_example_minidump_with_aspace.dmp rename to garnet/bin/zxdb/client/test_example_minidump_with_aspace.dmp Binary files differ
diff --git a/bin/zxdb/client/thread.cc b/garnet/bin/zxdb/client/thread.cc similarity index 100% rename from bin/zxdb/client/thread.cc rename to garnet/bin/zxdb/client/thread.cc
diff --git a/bin/zxdb/client/thread.h b/garnet/bin/zxdb/client/thread.h similarity index 100% rename from bin/zxdb/client/thread.h rename to garnet/bin/zxdb/client/thread.h
diff --git a/bin/zxdb/client/thread_controller.cc b/garnet/bin/zxdb/client/thread_controller.cc similarity index 100% rename from bin/zxdb/client/thread_controller.cc rename to garnet/bin/zxdb/client/thread_controller.cc
diff --git a/bin/zxdb/client/thread_controller.h b/garnet/bin/zxdb/client/thread_controller.h similarity index 100% rename from bin/zxdb/client/thread_controller.h rename to garnet/bin/zxdb/client/thread_controller.h
diff --git a/bin/zxdb/client/thread_controller_test.cc b/garnet/bin/zxdb/client/thread_controller_test.cc similarity index 100% rename from bin/zxdb/client/thread_controller_test.cc rename to garnet/bin/zxdb/client/thread_controller_test.cc
diff --git a/bin/zxdb/client/thread_controller_test.h b/garnet/bin/zxdb/client/thread_controller_test.h similarity index 100% rename from bin/zxdb/client/thread_controller_test.h rename to garnet/bin/zxdb/client/thread_controller_test.h
diff --git a/bin/zxdb/client/thread_impl.cc b/garnet/bin/zxdb/client/thread_impl.cc similarity index 100% rename from bin/zxdb/client/thread_impl.cc rename to garnet/bin/zxdb/client/thread_impl.cc
diff --git a/bin/zxdb/client/thread_impl.h b/garnet/bin/zxdb/client/thread_impl.h similarity index 100% rename from bin/zxdb/client/thread_impl.h rename to garnet/bin/zxdb/client/thread_impl.h
diff --git a/bin/zxdb/client/thread_impl_test_support.cc b/garnet/bin/zxdb/client/thread_impl_test_support.cc similarity index 100% rename from bin/zxdb/client/thread_impl_test_support.cc rename to garnet/bin/zxdb/client/thread_impl_test_support.cc
diff --git a/bin/zxdb/client/thread_impl_test_support.h b/garnet/bin/zxdb/client/thread_impl_test_support.h similarity index 100% rename from bin/zxdb/client/thread_impl_test_support.h rename to garnet/bin/zxdb/client/thread_impl_test_support.h
diff --git a/bin/zxdb/client/thread_impl_unittest.cc b/garnet/bin/zxdb/client/thread_impl_unittest.cc similarity index 100% rename from bin/zxdb/client/thread_impl_unittest.cc rename to garnet/bin/zxdb/client/thread_impl_unittest.cc
diff --git a/bin/zxdb/client/thread_observer.h b/garnet/bin/zxdb/client/thread_observer.h similarity index 100% rename from bin/zxdb/client/thread_observer.h rename to garnet/bin/zxdb/client/thread_observer.h
diff --git a/bin/zxdb/client/until_thread_controller.cc b/garnet/bin/zxdb/client/until_thread_controller.cc similarity index 100% rename from bin/zxdb/client/until_thread_controller.cc rename to garnet/bin/zxdb/client/until_thread_controller.cc
diff --git a/bin/zxdb/client/until_thread_controller.h b/garnet/bin/zxdb/client/until_thread_controller.h similarity index 100% rename from bin/zxdb/client/until_thread_controller.h rename to garnet/bin/zxdb/client/until_thread_controller.h
diff --git a/bin/zxdb/common/BUILD.gn b/garnet/bin/zxdb/common/BUILD.gn similarity index 100% rename from bin/zxdb/common/BUILD.gn rename to garnet/bin/zxdb/common/BUILD.gn
diff --git a/bin/zxdb/common/address_range.cc b/garnet/bin/zxdb/common/address_range.cc similarity index 100% rename from bin/zxdb/common/address_range.cc rename to garnet/bin/zxdb/common/address_range.cc
diff --git a/bin/zxdb/common/address_range.h b/garnet/bin/zxdb/common/address_range.h similarity index 100% rename from bin/zxdb/common/address_range.h rename to garnet/bin/zxdb/common/address_range.h
diff --git a/bin/zxdb/common/address_ranges.cc b/garnet/bin/zxdb/common/address_ranges.cc similarity index 100% rename from bin/zxdb/common/address_ranges.cc rename to garnet/bin/zxdb/common/address_ranges.cc
diff --git a/bin/zxdb/common/address_ranges.h b/garnet/bin/zxdb/common/address_ranges.h similarity index 100% rename from bin/zxdb/common/address_ranges.h rename to garnet/bin/zxdb/common/address_ranges.h
diff --git a/bin/zxdb/common/address_ranges_unittest.cc b/garnet/bin/zxdb/common/address_ranges_unittest.cc similarity index 100% rename from bin/zxdb/common/address_ranges_unittest.cc rename to garnet/bin/zxdb/common/address_ranges_unittest.cc
diff --git a/bin/zxdb/common/command_line_parser.cc b/garnet/bin/zxdb/common/command_line_parser.cc similarity index 100% rename from bin/zxdb/common/command_line_parser.cc rename to garnet/bin/zxdb/common/command_line_parser.cc
diff --git a/bin/zxdb/common/command_line_parser.h b/garnet/bin/zxdb/common/command_line_parser.h similarity index 100% rename from bin/zxdb/common/command_line_parser.h rename to garnet/bin/zxdb/common/command_line_parser.h
diff --git a/bin/zxdb/common/command_line_parser_unittest.cc b/garnet/bin/zxdb/common/command_line_parser_unittest.cc similarity index 100% rename from bin/zxdb/common/command_line_parser_unittest.cc rename to garnet/bin/zxdb/common/command_line_parser_unittest.cc
diff --git a/bin/zxdb/common/err.cc b/garnet/bin/zxdb/common/err.cc similarity index 100% rename from bin/zxdb/common/err.cc rename to garnet/bin/zxdb/common/err.cc
diff --git a/bin/zxdb/common/err.h b/garnet/bin/zxdb/common/err.h similarity index 100% rename from bin/zxdb/common/err.h rename to garnet/bin/zxdb/common/err.h
diff --git a/bin/zxdb/common/file_util.cc b/garnet/bin/zxdb/common/file_util.cc similarity index 100% rename from bin/zxdb/common/file_util.cc rename to garnet/bin/zxdb/common/file_util.cc
diff --git a/bin/zxdb/common/file_util.h b/garnet/bin/zxdb/common/file_util.h similarity index 100% rename from bin/zxdb/common/file_util.h rename to garnet/bin/zxdb/common/file_util.h
diff --git a/bin/zxdb/common/file_util_unittest.cc b/garnet/bin/zxdb/common/file_util_unittest.cc similarity index 100% rename from bin/zxdb/common/file_util_unittest.cc rename to garnet/bin/zxdb/common/file_util_unittest.cc
diff --git a/bin/zxdb/common/host_util.cc b/garnet/bin/zxdb/common/host_util.cc similarity index 100% rename from bin/zxdb/common/host_util.cc rename to garnet/bin/zxdb/common/host_util.cc
diff --git a/bin/zxdb/common/host_util.h b/garnet/bin/zxdb/common/host_util.h similarity index 100% rename from bin/zxdb/common/host_util.h rename to garnet/bin/zxdb/common/host_util.h
diff --git a/bin/zxdb/common/regex.cc b/garnet/bin/zxdb/common/regex.cc similarity index 100% rename from bin/zxdb/common/regex.cc rename to garnet/bin/zxdb/common/regex.cc
diff --git a/bin/zxdb/common/regex.h b/garnet/bin/zxdb/common/regex.h similarity index 100% rename from bin/zxdb/common/regex.h rename to garnet/bin/zxdb/common/regex.h
diff --git a/bin/zxdb/common/regex_unittest.cc b/garnet/bin/zxdb/common/regex_unittest.cc similarity index 100% rename from bin/zxdb/common/regex_unittest.cc rename to garnet/bin/zxdb/common/regex_unittest.cc
diff --git a/bin/zxdb/common/string_util.cc b/garnet/bin/zxdb/common/string_util.cc similarity index 100% rename from bin/zxdb/common/string_util.cc rename to garnet/bin/zxdb/common/string_util.cc
diff --git a/bin/zxdb/common/string_util.h b/garnet/bin/zxdb/common/string_util.h similarity index 100% rename from bin/zxdb/common/string_util.h rename to garnet/bin/zxdb/common/string_util.h
diff --git a/bin/zxdb/common/test_with_loop.h b/garnet/bin/zxdb/common/test_with_loop.h similarity index 100% rename from bin/zxdb/common/test_with_loop.h rename to garnet/bin/zxdb/common/test_with_loop.h
diff --git a/bin/zxdb/console/BUILD.gn b/garnet/bin/zxdb/console/BUILD.gn similarity index 100% rename from bin/zxdb/console/BUILD.gn rename to garnet/bin/zxdb/console/BUILD.gn
diff --git a/bin/zxdb/console/actions.cc b/garnet/bin/zxdb/console/actions.cc similarity index 100% rename from bin/zxdb/console/actions.cc rename to garnet/bin/zxdb/console/actions.cc
diff --git a/bin/zxdb/console/actions.h b/garnet/bin/zxdb/console/actions.h similarity index 100% rename from bin/zxdb/console/actions.h rename to garnet/bin/zxdb/console/actions.h
diff --git a/bin/zxdb/console/actions_unittest.cc b/garnet/bin/zxdb/console/actions_unittest.cc similarity index 100% rename from bin/zxdb/console/actions_unittest.cc rename to garnet/bin/zxdb/console/actions_unittest.cc
diff --git a/bin/zxdb/console/analyze_memory.cc b/garnet/bin/zxdb/console/analyze_memory.cc similarity index 100% rename from bin/zxdb/console/analyze_memory.cc rename to garnet/bin/zxdb/console/analyze_memory.cc
diff --git a/bin/zxdb/console/analyze_memory.h b/garnet/bin/zxdb/console/analyze_memory.h similarity index 100% rename from bin/zxdb/console/analyze_memory.h rename to garnet/bin/zxdb/console/analyze_memory.h
diff --git a/bin/zxdb/console/analyze_memory_unittest.cc b/garnet/bin/zxdb/console/analyze_memory_unittest.cc similarity index 100% rename from bin/zxdb/console/analyze_memory_unittest.cc rename to garnet/bin/zxdb/console/analyze_memory_unittest.cc
diff --git a/bin/zxdb/console/command.cc b/garnet/bin/zxdb/console/command.cc similarity index 100% rename from bin/zxdb/console/command.cc rename to garnet/bin/zxdb/console/command.cc
diff --git a/bin/zxdb/console/command.h b/garnet/bin/zxdb/console/command.h similarity index 100% rename from bin/zxdb/console/command.h rename to garnet/bin/zxdb/console/command.h
diff --git a/bin/zxdb/console/command_group.h b/garnet/bin/zxdb/console/command_group.h similarity index 100% rename from bin/zxdb/console/command_group.h rename to garnet/bin/zxdb/console/command_group.h
diff --git a/bin/zxdb/console/command_line_options.cc b/garnet/bin/zxdb/console/command_line_options.cc similarity index 100% rename from bin/zxdb/console/command_line_options.cc rename to garnet/bin/zxdb/console/command_line_options.cc
diff --git a/bin/zxdb/console/command_line_options.h b/garnet/bin/zxdb/console/command_line_options.h similarity index 100% rename from bin/zxdb/console/command_line_options.h rename to garnet/bin/zxdb/console/command_line_options.h
diff --git a/bin/zxdb/console/command_parser.cc b/garnet/bin/zxdb/console/command_parser.cc similarity index 100% rename from bin/zxdb/console/command_parser.cc rename to garnet/bin/zxdb/console/command_parser.cc
diff --git a/bin/zxdb/console/command_parser.h b/garnet/bin/zxdb/console/command_parser.h similarity index 100% rename from bin/zxdb/console/command_parser.h rename to garnet/bin/zxdb/console/command_parser.h
diff --git a/bin/zxdb/console/command_parser_unittest.cc b/garnet/bin/zxdb/console/command_parser_unittest.cc similarity index 100% rename from bin/zxdb/console/command_parser_unittest.cc rename to garnet/bin/zxdb/console/command_parser_unittest.cc
diff --git a/bin/zxdb/console/command_utils.cc b/garnet/bin/zxdb/console/command_utils.cc similarity index 100% rename from bin/zxdb/console/command_utils.cc rename to garnet/bin/zxdb/console/command_utils.cc
diff --git a/bin/zxdb/console/command_utils.h b/garnet/bin/zxdb/console/command_utils.h similarity index 100% rename from bin/zxdb/console/command_utils.h rename to garnet/bin/zxdb/console/command_utils.h
diff --git a/bin/zxdb/console/command_utils_unittest.cc b/garnet/bin/zxdb/console/command_utils_unittest.cc similarity index 100% rename from bin/zxdb/console/command_utils_unittest.cc rename to garnet/bin/zxdb/console/command_utils_unittest.cc
diff --git a/bin/zxdb/console/console.cc b/garnet/bin/zxdb/console/console.cc similarity index 100% rename from bin/zxdb/console/console.cc rename to garnet/bin/zxdb/console/console.cc
diff --git a/bin/zxdb/console/console.h b/garnet/bin/zxdb/console/console.h similarity index 100% rename from bin/zxdb/console/console.h rename to garnet/bin/zxdb/console/console.h
diff --git a/bin/zxdb/console/console_context.cc b/garnet/bin/zxdb/console/console_context.cc similarity index 100% rename from bin/zxdb/console/console_context.cc rename to garnet/bin/zxdb/console/console_context.cc
diff --git a/bin/zxdb/console/console_context.h b/garnet/bin/zxdb/console/console_context.h similarity index 100% rename from bin/zxdb/console/console_context.h rename to garnet/bin/zxdb/console/console_context.h
diff --git a/bin/zxdb/console/console_main.cc b/garnet/bin/zxdb/console/console_main.cc similarity index 100% rename from bin/zxdb/console/console_main.cc rename to garnet/bin/zxdb/console/console_main.cc
diff --git a/bin/zxdb/console/console_main.h b/garnet/bin/zxdb/console/console_main.h similarity index 100% rename from bin/zxdb/console/console_main.h rename to garnet/bin/zxdb/console/console_main.h
diff --git a/bin/zxdb/console/format_context.cc b/garnet/bin/zxdb/console/format_context.cc similarity index 100% rename from bin/zxdb/console/format_context.cc rename to garnet/bin/zxdb/console/format_context.cc
diff --git a/bin/zxdb/console/format_context.h b/garnet/bin/zxdb/console/format_context.h similarity index 100% rename from bin/zxdb/console/format_context.h rename to garnet/bin/zxdb/console/format_context.h
diff --git a/bin/zxdb/console/format_context_unittest.cc b/garnet/bin/zxdb/console/format_context_unittest.cc similarity index 100% rename from bin/zxdb/console/format_context_unittest.cc rename to garnet/bin/zxdb/console/format_context_unittest.cc
diff --git a/bin/zxdb/console/format_frame.cc b/garnet/bin/zxdb/console/format_frame.cc similarity index 100% rename from bin/zxdb/console/format_frame.cc rename to garnet/bin/zxdb/console/format_frame.cc
diff --git a/bin/zxdb/console/format_frame.h b/garnet/bin/zxdb/console/format_frame.h similarity index 100% rename from bin/zxdb/console/format_frame.h rename to garnet/bin/zxdb/console/format_frame.h
diff --git a/bin/zxdb/console/format_frame_unittest.cc b/garnet/bin/zxdb/console/format_frame_unittest.cc similarity index 100% rename from bin/zxdb/console/format_frame_unittest.cc rename to garnet/bin/zxdb/console/format_frame_unittest.cc
diff --git a/bin/zxdb/console/format_memory.cc b/garnet/bin/zxdb/console/format_memory.cc similarity index 100% rename from bin/zxdb/console/format_memory.cc rename to garnet/bin/zxdb/console/format_memory.cc
diff --git a/bin/zxdb/console/format_memory.h b/garnet/bin/zxdb/console/format_memory.h similarity index 100% rename from bin/zxdb/console/format_memory.h rename to garnet/bin/zxdb/console/format_memory.h
diff --git a/bin/zxdb/console/format_memory_unittest.cc b/garnet/bin/zxdb/console/format_memory_unittest.cc similarity index 100% rename from bin/zxdb/console/format_memory_unittest.cc rename to garnet/bin/zxdb/console/format_memory_unittest.cc
diff --git a/bin/zxdb/console/format_register.cc b/garnet/bin/zxdb/console/format_register.cc similarity index 100% rename from bin/zxdb/console/format_register.cc rename to garnet/bin/zxdb/console/format_register.cc
diff --git a/bin/zxdb/console/format_register.h b/garnet/bin/zxdb/console/format_register.h similarity index 100% rename from bin/zxdb/console/format_register.h rename to garnet/bin/zxdb/console/format_register.h
diff --git a/bin/zxdb/console/format_register_arm64.cc b/garnet/bin/zxdb/console/format_register_arm64.cc similarity index 100% rename from bin/zxdb/console/format_register_arm64.cc rename to garnet/bin/zxdb/console/format_register_arm64.cc
diff --git a/bin/zxdb/console/format_register_arm64.h b/garnet/bin/zxdb/console/format_register_arm64.h similarity index 100% rename from bin/zxdb/console/format_register_arm64.h rename to garnet/bin/zxdb/console/format_register_arm64.h
diff --git a/bin/zxdb/console/format_register_unittest.cc b/garnet/bin/zxdb/console/format_register_unittest.cc similarity index 100% rename from bin/zxdb/console/format_register_unittest.cc rename to garnet/bin/zxdb/console/format_register_unittest.cc
diff --git a/bin/zxdb/console/format_register_x64.cc b/garnet/bin/zxdb/console/format_register_x64.cc similarity index 100% rename from bin/zxdb/console/format_register_x64.cc rename to garnet/bin/zxdb/console/format_register_x64.cc
diff --git a/bin/zxdb/console/format_register_x64.h b/garnet/bin/zxdb/console/format_register_x64.h similarity index 100% rename from bin/zxdb/console/format_register_x64.h rename to garnet/bin/zxdb/console/format_register_x64.h
diff --git a/bin/zxdb/console/format_settings.cc b/garnet/bin/zxdb/console/format_settings.cc similarity index 100% rename from bin/zxdb/console/format_settings.cc rename to garnet/bin/zxdb/console/format_settings.cc
diff --git a/bin/zxdb/console/format_settings.h b/garnet/bin/zxdb/console/format_settings.h similarity index 100% rename from bin/zxdb/console/format_settings.h rename to garnet/bin/zxdb/console/format_settings.h
diff --git a/bin/zxdb/console/format_settings_unittest.cc b/garnet/bin/zxdb/console/format_settings_unittest.cc similarity index 100% rename from bin/zxdb/console/format_settings_unittest.cc rename to garnet/bin/zxdb/console/format_settings_unittest.cc
diff --git a/bin/zxdb/console/format_table.cc b/garnet/bin/zxdb/console/format_table.cc similarity index 100% rename from bin/zxdb/console/format_table.cc rename to garnet/bin/zxdb/console/format_table.cc
diff --git a/bin/zxdb/console/format_table.h b/garnet/bin/zxdb/console/format_table.h similarity index 100% rename from bin/zxdb/console/format_table.h rename to garnet/bin/zxdb/console/format_table.h
diff --git a/bin/zxdb/console/format_table_unittest.cc b/garnet/bin/zxdb/console/format_table_unittest.cc similarity index 100% rename from bin/zxdb/console/format_table_unittest.cc rename to garnet/bin/zxdb/console/format_table_unittest.cc
diff --git a/bin/zxdb/console/format_value.cc b/garnet/bin/zxdb/console/format_value.cc similarity index 100% rename from bin/zxdb/console/format_value.cc rename to garnet/bin/zxdb/console/format_value.cc
diff --git a/bin/zxdb/console/format_value.h b/garnet/bin/zxdb/console/format_value.h similarity index 100% rename from bin/zxdb/console/format_value.h rename to garnet/bin/zxdb/console/format_value.h
diff --git a/bin/zxdb/console/format_value_process_context_impl.cc b/garnet/bin/zxdb/console/format_value_process_context_impl.cc similarity index 100% rename from bin/zxdb/console/format_value_process_context_impl.cc rename to garnet/bin/zxdb/console/format_value_process_context_impl.cc
diff --git a/bin/zxdb/console/format_value_process_context_impl.h b/garnet/bin/zxdb/console/format_value_process_context_impl.h similarity index 100% rename from bin/zxdb/console/format_value_process_context_impl.h rename to garnet/bin/zxdb/console/format_value_process_context_impl.h
diff --git a/bin/zxdb/console/format_value_unittest.cc b/garnet/bin/zxdb/console/format_value_unittest.cc similarity index 100% rename from bin/zxdb/console/format_value_unittest.cc rename to garnet/bin/zxdb/console/format_value_unittest.cc
diff --git a/bin/zxdb/console/input_location_parser.cc b/garnet/bin/zxdb/console/input_location_parser.cc similarity index 100% rename from bin/zxdb/console/input_location_parser.cc rename to garnet/bin/zxdb/console/input_location_parser.cc
diff --git a/bin/zxdb/console/input_location_parser.h b/garnet/bin/zxdb/console/input_location_parser.h similarity index 100% rename from bin/zxdb/console/input_location_parser.h rename to garnet/bin/zxdb/console/input_location_parser.h
diff --git a/bin/zxdb/console/input_location_parser_unittest.cc b/garnet/bin/zxdb/console/input_location_parser_unittest.cc similarity index 100% rename from bin/zxdb/console/input_location_parser_unittest.cc rename to garnet/bin/zxdb/console/input_location_parser_unittest.cc
diff --git a/bin/zxdb/console/line_input.cc b/garnet/bin/zxdb/console/line_input.cc similarity index 100% rename from bin/zxdb/console/line_input.cc rename to garnet/bin/zxdb/console/line_input.cc
diff --git a/bin/zxdb/console/line_input.h b/garnet/bin/zxdb/console/line_input.h similarity index 100% rename from bin/zxdb/console/line_input.h rename to garnet/bin/zxdb/console/line_input.h
diff --git a/bin/zxdb/console/line_input_unittest.cc b/garnet/bin/zxdb/console/line_input_unittest.cc similarity index 100% rename from bin/zxdb/console/line_input_unittest.cc rename to garnet/bin/zxdb/console/line_input_unittest.cc
diff --git a/bin/zxdb/console/mock_format_value_process_context.cc b/garnet/bin/zxdb/console/mock_format_value_process_context.cc similarity index 100% rename from bin/zxdb/console/mock_format_value_process_context.cc rename to garnet/bin/zxdb/console/mock_format_value_process_context.cc
diff --git a/bin/zxdb/console/mock_format_value_process_context.h b/garnet/bin/zxdb/console/mock_format_value_process_context.h similarity index 100% rename from bin/zxdb/console/mock_format_value_process_context.h rename to garnet/bin/zxdb/console/mock_format_value_process_context.h
diff --git a/bin/zxdb/console/nouns.cc b/garnet/bin/zxdb/console/nouns.cc similarity index 100% rename from bin/zxdb/console/nouns.cc rename to garnet/bin/zxdb/console/nouns.cc
diff --git a/bin/zxdb/console/nouns.h b/garnet/bin/zxdb/console/nouns.h similarity index 100% rename from bin/zxdb/console/nouns.h rename to garnet/bin/zxdb/console/nouns.h
diff --git a/bin/zxdb/console/output_buffer.cc b/garnet/bin/zxdb/console/output_buffer.cc similarity index 100% rename from bin/zxdb/console/output_buffer.cc rename to garnet/bin/zxdb/console/output_buffer.cc
diff --git a/bin/zxdb/console/output_buffer.h b/garnet/bin/zxdb/console/output_buffer.h similarity index 100% rename from bin/zxdb/console/output_buffer.h rename to garnet/bin/zxdb/console/output_buffer.h
diff --git a/bin/zxdb/console/source_util.cc b/garnet/bin/zxdb/console/source_util.cc similarity index 100% rename from bin/zxdb/console/source_util.cc rename to garnet/bin/zxdb/console/source_util.cc
diff --git a/bin/zxdb/console/source_util.h b/garnet/bin/zxdb/console/source_util.h similarity index 100% rename from bin/zxdb/console/source_util.h rename to garnet/bin/zxdb/console/source_util.h
diff --git a/bin/zxdb/console/source_util_unittest.cc b/garnet/bin/zxdb/console/source_util_unittest.cc similarity index 100% rename from bin/zxdb/console/source_util_unittest.cc rename to garnet/bin/zxdb/console/source_util_unittest.cc
diff --git a/bin/zxdb/console/string_formatters.cc b/garnet/bin/zxdb/console/string_formatters.cc similarity index 100% rename from bin/zxdb/console/string_formatters.cc rename to garnet/bin/zxdb/console/string_formatters.cc
diff --git a/bin/zxdb/console/string_formatters.h b/garnet/bin/zxdb/console/string_formatters.h similarity index 100% rename from bin/zxdb/console/string_formatters.h rename to garnet/bin/zxdb/console/string_formatters.h
diff --git a/bin/zxdb/console/string_formatters_unittest.cc b/garnet/bin/zxdb/console/string_formatters_unittest.cc similarity index 100% rename from bin/zxdb/console/string_formatters_unittest.cc rename to garnet/bin/zxdb/console/string_formatters_unittest.cc
diff --git a/bin/zxdb/console/string_util.cc b/garnet/bin/zxdb/console/string_util.cc similarity index 100% rename from bin/zxdb/console/string_util.cc rename to garnet/bin/zxdb/console/string_util.cc
diff --git a/bin/zxdb/console/string_util.h b/garnet/bin/zxdb/console/string_util.h similarity index 100% rename from bin/zxdb/console/string_util.h rename to garnet/bin/zxdb/console/string_util.h
diff --git a/bin/zxdb/console/string_util_unittest.cc b/garnet/bin/zxdb/console/string_util_unittest.cc similarity index 100% rename from bin/zxdb/console/string_util_unittest.cc rename to garnet/bin/zxdb/console/string_util_unittest.cc
diff --git a/bin/zxdb/console/switch_record.h b/garnet/bin/zxdb/console/switch_record.h similarity index 100% rename from bin/zxdb/console/switch_record.h rename to garnet/bin/zxdb/console/switch_record.h
diff --git a/bin/zxdb/console/verbs.cc b/garnet/bin/zxdb/console/verbs.cc similarity index 100% rename from bin/zxdb/console/verbs.cc rename to garnet/bin/zxdb/console/verbs.cc
diff --git a/bin/zxdb/console/verbs.h b/garnet/bin/zxdb/console/verbs.h similarity index 100% rename from bin/zxdb/console/verbs.h rename to garnet/bin/zxdb/console/verbs.h
diff --git a/bin/zxdb/console/verbs_breakpoint.cc b/garnet/bin/zxdb/console/verbs_breakpoint.cc similarity index 100% rename from bin/zxdb/console/verbs_breakpoint.cc rename to garnet/bin/zxdb/console/verbs_breakpoint.cc
diff --git a/bin/zxdb/console/verbs_control.cc b/garnet/bin/zxdb/console/verbs_control.cc similarity index 100% rename from bin/zxdb/console/verbs_control.cc rename to garnet/bin/zxdb/console/verbs_control.cc
diff --git a/bin/zxdb/console/verbs_memory.cc b/garnet/bin/zxdb/console/verbs_memory.cc similarity index 100% rename from bin/zxdb/console/verbs_memory.cc rename to garnet/bin/zxdb/console/verbs_memory.cc
diff --git a/bin/zxdb/console/verbs_process.cc b/garnet/bin/zxdb/console/verbs_process.cc similarity index 100% rename from bin/zxdb/console/verbs_process.cc rename to garnet/bin/zxdb/console/verbs_process.cc
diff --git a/bin/zxdb/console/verbs_shared.cc b/garnet/bin/zxdb/console/verbs_shared.cc similarity index 100% rename from bin/zxdb/console/verbs_shared.cc rename to garnet/bin/zxdb/console/verbs_shared.cc
diff --git a/bin/zxdb/console/verbs_symbol.cc b/garnet/bin/zxdb/console/verbs_symbol.cc similarity index 100% rename from bin/zxdb/console/verbs_symbol.cc rename to garnet/bin/zxdb/console/verbs_symbol.cc
diff --git a/bin/zxdb/console/verbs_system.cc b/garnet/bin/zxdb/console/verbs_system.cc similarity index 100% rename from bin/zxdb/console/verbs_system.cc rename to garnet/bin/zxdb/console/verbs_system.cc
diff --git a/bin/zxdb/console/verbs_thread.cc b/garnet/bin/zxdb/console/verbs_thread.cc similarity index 100% rename from bin/zxdb/console/verbs_thread.cc rename to garnet/bin/zxdb/console/verbs_thread.cc
diff --git a/bin/zxdb/expr/BUILD.gn b/garnet/bin/zxdb/expr/BUILD.gn similarity index 100% rename from bin/zxdb/expr/BUILD.gn rename to garnet/bin/zxdb/expr/BUILD.gn
diff --git a/bin/zxdb/expr/README.md b/garnet/bin/zxdb/expr/README.md similarity index 100% rename from bin/zxdb/expr/README.md rename to garnet/bin/zxdb/expr/README.md
diff --git a/bin/zxdb/expr/cast.cc b/garnet/bin/zxdb/expr/cast.cc similarity index 100% rename from bin/zxdb/expr/cast.cc rename to garnet/bin/zxdb/expr/cast.cc
diff --git a/bin/zxdb/expr/cast.h b/garnet/bin/zxdb/expr/cast.h similarity index 100% rename from bin/zxdb/expr/cast.h rename to garnet/bin/zxdb/expr/cast.h
diff --git a/bin/zxdb/expr/cast_unittest.cc b/garnet/bin/zxdb/expr/cast_unittest.cc similarity index 100% rename from bin/zxdb/expr/cast_unittest.cc rename to garnet/bin/zxdb/expr/cast_unittest.cc
diff --git a/bin/zxdb/expr/eval_operators.cc b/garnet/bin/zxdb/expr/eval_operators.cc similarity index 100% rename from bin/zxdb/expr/eval_operators.cc rename to garnet/bin/zxdb/expr/eval_operators.cc
diff --git a/bin/zxdb/expr/eval_operators.h b/garnet/bin/zxdb/expr/eval_operators.h similarity index 100% rename from bin/zxdb/expr/eval_operators.h rename to garnet/bin/zxdb/expr/eval_operators.h
diff --git a/bin/zxdb/expr/eval_operators_unittest.cc b/garnet/bin/zxdb/expr/eval_operators_unittest.cc similarity index 100% rename from bin/zxdb/expr/eval_operators_unittest.cc rename to garnet/bin/zxdb/expr/eval_operators_unittest.cc
diff --git a/bin/zxdb/expr/expr.cc b/garnet/bin/zxdb/expr/expr.cc similarity index 100% rename from bin/zxdb/expr/expr.cc rename to garnet/bin/zxdb/expr/expr.cc
diff --git a/bin/zxdb/expr/expr.h b/garnet/bin/zxdb/expr/expr.h similarity index 100% rename from bin/zxdb/expr/expr.h rename to garnet/bin/zxdb/expr/expr.h
diff --git a/bin/zxdb/expr/expr_eval_context.h b/garnet/bin/zxdb/expr/expr_eval_context.h similarity index 100% rename from bin/zxdb/expr/expr_eval_context.h rename to garnet/bin/zxdb/expr/expr_eval_context.h
diff --git a/bin/zxdb/expr/expr_node.cc b/garnet/bin/zxdb/expr/expr_node.cc similarity index 100% rename from bin/zxdb/expr/expr_node.cc rename to garnet/bin/zxdb/expr/expr_node.cc
diff --git a/bin/zxdb/expr/expr_node.h b/garnet/bin/zxdb/expr/expr_node.h similarity index 100% rename from bin/zxdb/expr/expr_node.h rename to garnet/bin/zxdb/expr/expr_node.h
diff --git a/bin/zxdb/expr/expr_node_unittest.cc b/garnet/bin/zxdb/expr/expr_node_unittest.cc similarity index 100% rename from bin/zxdb/expr/expr_node_unittest.cc rename to garnet/bin/zxdb/expr/expr_node_unittest.cc
diff --git a/bin/zxdb/expr/expr_parser.cc b/garnet/bin/zxdb/expr/expr_parser.cc similarity index 100% rename from bin/zxdb/expr/expr_parser.cc rename to garnet/bin/zxdb/expr/expr_parser.cc
diff --git a/bin/zxdb/expr/expr_parser.h b/garnet/bin/zxdb/expr/expr_parser.h similarity index 100% rename from bin/zxdb/expr/expr_parser.h rename to garnet/bin/zxdb/expr/expr_parser.h
diff --git a/bin/zxdb/expr/expr_parser_unittest.cc b/garnet/bin/zxdb/expr/expr_parser_unittest.cc similarity index 100% rename from bin/zxdb/expr/expr_parser_unittest.cc rename to garnet/bin/zxdb/expr/expr_parser_unittest.cc
diff --git a/bin/zxdb/expr/expr_token.h b/garnet/bin/zxdb/expr/expr_token.h similarity index 100% rename from bin/zxdb/expr/expr_token.h rename to garnet/bin/zxdb/expr/expr_token.h
diff --git a/bin/zxdb/expr/expr_tokenizer.cc b/garnet/bin/zxdb/expr/expr_tokenizer.cc similarity index 100% rename from bin/zxdb/expr/expr_tokenizer.cc rename to garnet/bin/zxdb/expr/expr_tokenizer.cc
diff --git a/bin/zxdb/expr/expr_tokenizer.h b/garnet/bin/zxdb/expr/expr_tokenizer.h similarity index 100% rename from bin/zxdb/expr/expr_tokenizer.h rename to garnet/bin/zxdb/expr/expr_tokenizer.h
diff --git a/bin/zxdb/expr/expr_tokenizer_unittest.cc b/garnet/bin/zxdb/expr/expr_tokenizer_unittest.cc similarity index 100% rename from bin/zxdb/expr/expr_tokenizer_unittest.cc rename to garnet/bin/zxdb/expr/expr_tokenizer_unittest.cc
diff --git a/bin/zxdb/expr/expr_value.cc b/garnet/bin/zxdb/expr/expr_value.cc similarity index 100% rename from bin/zxdb/expr/expr_value.cc rename to garnet/bin/zxdb/expr/expr_value.cc
diff --git a/bin/zxdb/expr/expr_value.h b/garnet/bin/zxdb/expr/expr_value.h similarity index 100% rename from bin/zxdb/expr/expr_value.h rename to garnet/bin/zxdb/expr/expr_value.h
diff --git a/bin/zxdb/expr/expr_value_source.h b/garnet/bin/zxdb/expr/expr_value_source.h similarity index 100% rename from bin/zxdb/expr/expr_value_source.h rename to garnet/bin/zxdb/expr/expr_value_source.h
diff --git a/bin/zxdb/expr/find_variable.cc b/garnet/bin/zxdb/expr/find_variable.cc similarity index 100% rename from bin/zxdb/expr/find_variable.cc rename to garnet/bin/zxdb/expr/find_variable.cc
diff --git a/bin/zxdb/expr/find_variable.h b/garnet/bin/zxdb/expr/find_variable.h similarity index 100% rename from bin/zxdb/expr/find_variable.h rename to garnet/bin/zxdb/expr/find_variable.h
diff --git a/bin/zxdb/expr/find_variable_unittest.cc b/garnet/bin/zxdb/expr/find_variable_unittest.cc similarity index 100% rename from bin/zxdb/expr/find_variable_unittest.cc rename to garnet/bin/zxdb/expr/find_variable_unittest.cc
diff --git a/bin/zxdb/expr/format_expr_value_options.h b/garnet/bin/zxdb/expr/format_expr_value_options.h similarity index 100% rename from bin/zxdb/expr/format_expr_value_options.h rename to garnet/bin/zxdb/expr/format_expr_value_options.h
diff --git a/bin/zxdb/expr/found_member.cc b/garnet/bin/zxdb/expr/found_member.cc similarity index 100% rename from bin/zxdb/expr/found_member.cc rename to garnet/bin/zxdb/expr/found_member.cc
diff --git a/bin/zxdb/expr/found_member.h b/garnet/bin/zxdb/expr/found_member.h similarity index 100% rename from bin/zxdb/expr/found_member.h rename to garnet/bin/zxdb/expr/found_member.h
diff --git a/bin/zxdb/expr/found_variable.cc b/garnet/bin/zxdb/expr/found_variable.cc similarity index 100% rename from bin/zxdb/expr/found_variable.cc rename to garnet/bin/zxdb/expr/found_variable.cc
diff --git a/bin/zxdb/expr/found_variable.h b/garnet/bin/zxdb/expr/found_variable.h similarity index 100% rename from bin/zxdb/expr/found_variable.h rename to garnet/bin/zxdb/expr/found_variable.h
diff --git a/bin/zxdb/expr/identifier.cc b/garnet/bin/zxdb/expr/identifier.cc similarity index 100% rename from bin/zxdb/expr/identifier.cc rename to garnet/bin/zxdb/expr/identifier.cc
diff --git a/bin/zxdb/expr/identifier.h b/garnet/bin/zxdb/expr/identifier.h similarity index 100% rename from bin/zxdb/expr/identifier.h rename to garnet/bin/zxdb/expr/identifier.h
diff --git a/bin/zxdb/expr/identifier_unittest.cc b/garnet/bin/zxdb/expr/identifier_unittest.cc similarity index 100% rename from bin/zxdb/expr/identifier_unittest.cc rename to garnet/bin/zxdb/expr/identifier_unittest.cc
diff --git a/bin/zxdb/expr/index_walker.cc b/garnet/bin/zxdb/expr/index_walker.cc similarity index 100% rename from bin/zxdb/expr/index_walker.cc rename to garnet/bin/zxdb/expr/index_walker.cc
diff --git a/bin/zxdb/expr/index_walker.h b/garnet/bin/zxdb/expr/index_walker.h similarity index 100% rename from bin/zxdb/expr/index_walker.h rename to garnet/bin/zxdb/expr/index_walker.h
diff --git a/bin/zxdb/expr/index_walker_unittest.cc b/garnet/bin/zxdb/expr/index_walker_unittest.cc similarity index 100% rename from bin/zxdb/expr/index_walker_unittest.cc rename to garnet/bin/zxdb/expr/index_walker_unittest.cc
diff --git a/bin/zxdb/expr/mock_expr_eval_context.cc b/garnet/bin/zxdb/expr/mock_expr_eval_context.cc similarity index 100% rename from bin/zxdb/expr/mock_expr_eval_context.cc rename to garnet/bin/zxdb/expr/mock_expr_eval_context.cc
diff --git a/bin/zxdb/expr/mock_expr_eval_context.h b/garnet/bin/zxdb/expr/mock_expr_eval_context.h similarity index 100% rename from bin/zxdb/expr/mock_expr_eval_context.h rename to garnet/bin/zxdb/expr/mock_expr_eval_context.h
diff --git a/bin/zxdb/expr/mock_expr_node.cc b/garnet/bin/zxdb/expr/mock_expr_node.cc similarity index 100% rename from bin/zxdb/expr/mock_expr_node.cc rename to garnet/bin/zxdb/expr/mock_expr_node.cc
diff --git a/bin/zxdb/expr/mock_expr_node.h b/garnet/bin/zxdb/expr/mock_expr_node.h similarity index 100% rename from bin/zxdb/expr/mock_expr_node.h rename to garnet/bin/zxdb/expr/mock_expr_node.h
diff --git a/bin/zxdb/expr/resolve_array.cc b/garnet/bin/zxdb/expr/resolve_array.cc similarity index 100% rename from bin/zxdb/expr/resolve_array.cc rename to garnet/bin/zxdb/expr/resolve_array.cc
diff --git a/bin/zxdb/expr/resolve_array.h b/garnet/bin/zxdb/expr/resolve_array.h similarity index 100% rename from bin/zxdb/expr/resolve_array.h rename to garnet/bin/zxdb/expr/resolve_array.h
diff --git a/bin/zxdb/expr/resolve_array_unittest.cc b/garnet/bin/zxdb/expr/resolve_array_unittest.cc similarity index 100% rename from bin/zxdb/expr/resolve_array_unittest.cc rename to garnet/bin/zxdb/expr/resolve_array_unittest.cc
diff --git a/bin/zxdb/expr/resolve_collection.cc b/garnet/bin/zxdb/expr/resolve_collection.cc similarity index 100% rename from bin/zxdb/expr/resolve_collection.cc rename to garnet/bin/zxdb/expr/resolve_collection.cc
diff --git a/bin/zxdb/expr/resolve_collection.h b/garnet/bin/zxdb/expr/resolve_collection.h similarity index 100% rename from bin/zxdb/expr/resolve_collection.h rename to garnet/bin/zxdb/expr/resolve_collection.h
diff --git a/bin/zxdb/expr/resolve_collection_unittest.cc b/garnet/bin/zxdb/expr/resolve_collection_unittest.cc similarity index 100% rename from bin/zxdb/expr/resolve_collection_unittest.cc rename to garnet/bin/zxdb/expr/resolve_collection_unittest.cc
diff --git a/bin/zxdb/expr/resolve_ptr_ref.cc b/garnet/bin/zxdb/expr/resolve_ptr_ref.cc similarity index 100% rename from bin/zxdb/expr/resolve_ptr_ref.cc rename to garnet/bin/zxdb/expr/resolve_ptr_ref.cc
diff --git a/bin/zxdb/expr/resolve_ptr_ref.h b/garnet/bin/zxdb/expr/resolve_ptr_ref.h similarity index 100% rename from bin/zxdb/expr/resolve_ptr_ref.h rename to garnet/bin/zxdb/expr/resolve_ptr_ref.h
diff --git a/bin/zxdb/expr/resolve_ptr_ref_unittest.cc b/garnet/bin/zxdb/expr/resolve_ptr_ref_unittest.cc similarity index 100% rename from bin/zxdb/expr/resolve_ptr_ref_unittest.cc rename to garnet/bin/zxdb/expr/resolve_ptr_ref_unittest.cc
diff --git a/bin/zxdb/expr/symbol_eval_context.cc b/garnet/bin/zxdb/expr/symbol_eval_context.cc similarity index 100% rename from bin/zxdb/expr/symbol_eval_context.cc rename to garnet/bin/zxdb/expr/symbol_eval_context.cc
diff --git a/bin/zxdb/expr/symbol_eval_context.h b/garnet/bin/zxdb/expr/symbol_eval_context.h similarity index 100% rename from bin/zxdb/expr/symbol_eval_context.h rename to garnet/bin/zxdb/expr/symbol_eval_context.h
diff --git a/bin/zxdb/expr/symbol_eval_context_unittest.cc b/garnet/bin/zxdb/expr/symbol_eval_context_unittest.cc similarity index 100% rename from bin/zxdb/expr/symbol_eval_context_unittest.cc rename to garnet/bin/zxdb/expr/symbol_eval_context_unittest.cc
diff --git a/bin/zxdb/expr/symbol_variable_resolver.cc b/garnet/bin/zxdb/expr/symbol_variable_resolver.cc similarity index 100% rename from bin/zxdb/expr/symbol_variable_resolver.cc rename to garnet/bin/zxdb/expr/symbol_variable_resolver.cc
diff --git a/bin/zxdb/expr/symbol_variable_resolver.h b/garnet/bin/zxdb/expr/symbol_variable_resolver.h similarity index 100% rename from bin/zxdb/expr/symbol_variable_resolver.h rename to garnet/bin/zxdb/expr/symbol_variable_resolver.h
diff --git a/bin/zxdb/expr/symbol_variable_resolver_unittest.cc b/garnet/bin/zxdb/expr/symbol_variable_resolver_unittest.cc similarity index 100% rename from bin/zxdb/expr/symbol_variable_resolver_unittest.cc rename to garnet/bin/zxdb/expr/symbol_variable_resolver_unittest.cc
diff --git a/bin/zxdb/expr/template_type_extractor.cc b/garnet/bin/zxdb/expr/template_type_extractor.cc similarity index 100% rename from bin/zxdb/expr/template_type_extractor.cc rename to garnet/bin/zxdb/expr/template_type_extractor.cc
diff --git a/bin/zxdb/expr/template_type_extractor.h b/garnet/bin/zxdb/expr/template_type_extractor.h similarity index 100% rename from bin/zxdb/expr/template_type_extractor.h rename to garnet/bin/zxdb/expr/template_type_extractor.h
diff --git a/bin/zxdb/expr/template_type_extractor_unittest.cc b/garnet/bin/zxdb/expr/template_type_extractor_unittest.cc similarity index 100% rename from bin/zxdb/expr/template_type_extractor_unittest.cc rename to garnet/bin/zxdb/expr/template_type_extractor_unittest.cc
diff --git a/bin/zxdb/main_host.cc b/garnet/bin/zxdb/main_host.cc similarity index 100% rename from bin/zxdb/main_host.cc rename to garnet/bin/zxdb/main_host.cc
diff --git a/bin/zxdb/main_target.cc b/garnet/bin/zxdb/main_target.cc similarity index 100% rename from bin/zxdb/main_target.cc rename to garnet/bin/zxdb/main_target.cc
diff --git a/bin/zxdb/symbols/BUILD.gn b/garnet/bin/zxdb/symbols/BUILD.gn similarity index 100% rename from bin/zxdb/symbols/BUILD.gn rename to garnet/bin/zxdb/symbols/BUILD.gn
diff --git a/bin/zxdb/symbols/arch.cc b/garnet/bin/zxdb/symbols/arch.cc similarity index 100% rename from bin/zxdb/symbols/arch.cc rename to garnet/bin/zxdb/symbols/arch.cc
diff --git a/bin/zxdb/symbols/arch.h b/garnet/bin/zxdb/symbols/arch.h similarity index 100% rename from bin/zxdb/symbols/arch.h rename to garnet/bin/zxdb/symbols/arch.h
diff --git a/bin/zxdb/symbols/array_type.cc b/garnet/bin/zxdb/symbols/array_type.cc similarity index 100% rename from bin/zxdb/symbols/array_type.cc rename to garnet/bin/zxdb/symbols/array_type.cc
diff --git a/bin/zxdb/symbols/array_type.h b/garnet/bin/zxdb/symbols/array_type.h similarity index 100% rename from bin/zxdb/symbols/array_type.h rename to garnet/bin/zxdb/symbols/array_type.h
diff --git a/bin/zxdb/symbols/base_type.cc b/garnet/bin/zxdb/symbols/base_type.cc similarity index 100% rename from bin/zxdb/symbols/base_type.cc rename to garnet/bin/zxdb/symbols/base_type.cc
diff --git a/bin/zxdb/symbols/base_type.h b/garnet/bin/zxdb/symbols/base_type.h similarity index 100% rename from bin/zxdb/symbols/base_type.h rename to garnet/bin/zxdb/symbols/base_type.h
diff --git a/bin/zxdb/symbols/build_id_index.cc b/garnet/bin/zxdb/symbols/build_id_index.cc similarity index 100% rename from bin/zxdb/symbols/build_id_index.cc rename to garnet/bin/zxdb/symbols/build_id_index.cc
diff --git a/bin/zxdb/symbols/build_id_index.h b/garnet/bin/zxdb/symbols/build_id_index.h similarity index 100% rename from bin/zxdb/symbols/build_id_index.h rename to garnet/bin/zxdb/symbols/build_id_index.h
diff --git a/bin/zxdb/symbols/build_id_index_unittest.cc b/garnet/bin/zxdb/symbols/build_id_index_unittest.cc similarity index 100% rename from bin/zxdb/symbols/build_id_index_unittest.cc rename to garnet/bin/zxdb/symbols/build_id_index_unittest.cc
diff --git a/bin/zxdb/symbols/code_block.cc b/garnet/bin/zxdb/symbols/code_block.cc similarity index 100% rename from bin/zxdb/symbols/code_block.cc rename to garnet/bin/zxdb/symbols/code_block.cc
diff --git a/bin/zxdb/symbols/code_block.h b/garnet/bin/zxdb/symbols/code_block.h similarity index 100% rename from bin/zxdb/symbols/code_block.h rename to garnet/bin/zxdb/symbols/code_block.h
diff --git a/bin/zxdb/symbols/code_block_unittest.cc b/garnet/bin/zxdb/symbols/code_block_unittest.cc similarity index 100% rename from bin/zxdb/symbols/code_block_unittest.cc rename to garnet/bin/zxdb/symbols/code_block_unittest.cc
diff --git a/bin/zxdb/symbols/collection.cc b/garnet/bin/zxdb/symbols/collection.cc similarity index 100% rename from bin/zxdb/symbols/collection.cc rename to garnet/bin/zxdb/symbols/collection.cc
diff --git a/bin/zxdb/symbols/collection.h b/garnet/bin/zxdb/symbols/collection.h similarity index 100% rename from bin/zxdb/symbols/collection.h rename to garnet/bin/zxdb/symbols/collection.h
diff --git a/bin/zxdb/symbols/data_member.cc b/garnet/bin/zxdb/symbols/data_member.cc similarity index 100% rename from bin/zxdb/symbols/data_member.cc rename to garnet/bin/zxdb/symbols/data_member.cc
diff --git a/bin/zxdb/symbols/data_member.h b/garnet/bin/zxdb/symbols/data_member.h similarity index 100% rename from bin/zxdb/symbols/data_member.h rename to garnet/bin/zxdb/symbols/data_member.h
diff --git a/bin/zxdb/symbols/dwarf_die_decoder.cc b/garnet/bin/zxdb/symbols/dwarf_die_decoder.cc similarity index 100% rename from bin/zxdb/symbols/dwarf_die_decoder.cc rename to garnet/bin/zxdb/symbols/dwarf_die_decoder.cc
diff --git a/bin/zxdb/symbols/dwarf_die_decoder.h b/garnet/bin/zxdb/symbols/dwarf_die_decoder.h similarity index 100% rename from bin/zxdb/symbols/dwarf_die_decoder.h rename to garnet/bin/zxdb/symbols/dwarf_die_decoder.h
diff --git a/bin/zxdb/symbols/dwarf_expr_eval.cc b/garnet/bin/zxdb/symbols/dwarf_expr_eval.cc similarity index 100% rename from bin/zxdb/symbols/dwarf_expr_eval.cc rename to garnet/bin/zxdb/symbols/dwarf_expr_eval.cc
diff --git a/bin/zxdb/symbols/dwarf_expr_eval.h b/garnet/bin/zxdb/symbols/dwarf_expr_eval.h similarity index 100% rename from bin/zxdb/symbols/dwarf_expr_eval.h rename to garnet/bin/zxdb/symbols/dwarf_expr_eval.h
diff --git a/bin/zxdb/symbols/dwarf_expr_eval_unittest.cc b/garnet/bin/zxdb/symbols/dwarf_expr_eval_unittest.cc similarity index 100% rename from bin/zxdb/symbols/dwarf_expr_eval_unittest.cc rename to garnet/bin/zxdb/symbols/dwarf_expr_eval_unittest.cc
diff --git a/bin/zxdb/symbols/dwarf_symbol_factory.cc b/garnet/bin/zxdb/symbols/dwarf_symbol_factory.cc similarity index 100% rename from bin/zxdb/symbols/dwarf_symbol_factory.cc rename to garnet/bin/zxdb/symbols/dwarf_symbol_factory.cc
diff --git a/bin/zxdb/symbols/dwarf_symbol_factory.h b/garnet/bin/zxdb/symbols/dwarf_symbol_factory.h similarity index 100% rename from bin/zxdb/symbols/dwarf_symbol_factory.h rename to garnet/bin/zxdb/symbols/dwarf_symbol_factory.h
diff --git a/bin/zxdb/symbols/dwarf_symbol_factory_unittest.cc b/garnet/bin/zxdb/symbols/dwarf_symbol_factory_unittest.cc similarity index 100% rename from bin/zxdb/symbols/dwarf_symbol_factory_unittest.cc rename to garnet/bin/zxdb/symbols/dwarf_symbol_factory_unittest.cc
diff --git a/bin/zxdb/symbols/dwarf_test_util.cc b/garnet/bin/zxdb/symbols/dwarf_test_util.cc similarity index 100% rename from bin/zxdb/symbols/dwarf_test_util.cc rename to garnet/bin/zxdb/symbols/dwarf_test_util.cc
diff --git a/bin/zxdb/symbols/dwarf_test_util.h b/garnet/bin/zxdb/symbols/dwarf_test_util.h similarity index 100% rename from bin/zxdb/symbols/dwarf_test_util.h rename to garnet/bin/zxdb/symbols/dwarf_test_util.h
diff --git a/bin/zxdb/symbols/enumeration.cc b/garnet/bin/zxdb/symbols/enumeration.cc similarity index 100% rename from bin/zxdb/symbols/enumeration.cc rename to garnet/bin/zxdb/symbols/enumeration.cc
diff --git a/bin/zxdb/symbols/enumeration.h b/garnet/bin/zxdb/symbols/enumeration.h similarity index 100% rename from bin/zxdb/symbols/enumeration.h rename to garnet/bin/zxdb/symbols/enumeration.h
diff --git a/bin/zxdb/symbols/file_line.cc b/garnet/bin/zxdb/symbols/file_line.cc similarity index 100% rename from bin/zxdb/symbols/file_line.cc rename to garnet/bin/zxdb/symbols/file_line.cc
diff --git a/bin/zxdb/symbols/file_line.h b/garnet/bin/zxdb/symbols/file_line.h similarity index 100% rename from bin/zxdb/symbols/file_line.h rename to garnet/bin/zxdb/symbols/file_line.h
diff --git a/bin/zxdb/symbols/find_line.cc b/garnet/bin/zxdb/symbols/find_line.cc similarity index 100% rename from bin/zxdb/symbols/find_line.cc rename to garnet/bin/zxdb/symbols/find_line.cc
diff --git a/bin/zxdb/symbols/find_line.h b/garnet/bin/zxdb/symbols/find_line.h similarity index 100% rename from bin/zxdb/symbols/find_line.h rename to garnet/bin/zxdb/symbols/find_line.h
diff --git a/bin/zxdb/symbols/find_line_unittest.cc b/garnet/bin/zxdb/symbols/find_line_unittest.cc similarity index 100% rename from bin/zxdb/symbols/find_line_unittest.cc rename to garnet/bin/zxdb/symbols/find_line_unittest.cc
diff --git a/bin/zxdb/symbols/function.cc b/garnet/bin/zxdb/symbols/function.cc similarity index 100% rename from bin/zxdb/symbols/function.cc rename to garnet/bin/zxdb/symbols/function.cc
diff --git a/bin/zxdb/symbols/function.h b/garnet/bin/zxdb/symbols/function.h similarity index 100% rename from bin/zxdb/symbols/function.h rename to garnet/bin/zxdb/symbols/function.h
diff --git a/bin/zxdb/symbols/function_type.cc b/garnet/bin/zxdb/symbols/function_type.cc similarity index 100% rename from bin/zxdb/symbols/function_type.cc rename to garnet/bin/zxdb/symbols/function_type.cc
diff --git a/bin/zxdb/symbols/function_type.h b/garnet/bin/zxdb/symbols/function_type.h similarity index 100% rename from bin/zxdb/symbols/function_type.h rename to garnet/bin/zxdb/symbols/function_type.h
diff --git a/bin/zxdb/symbols/function_type_unittest.cc b/garnet/bin/zxdb/symbols/function_type_unittest.cc similarity index 100% rename from bin/zxdb/symbols/function_type_unittest.cc rename to garnet/bin/zxdb/symbols/function_type_unittest.cc
diff --git a/bin/zxdb/symbols/inherited_from.cc b/garnet/bin/zxdb/symbols/inherited_from.cc similarity index 100% rename from bin/zxdb/symbols/inherited_from.cc rename to garnet/bin/zxdb/symbols/inherited_from.cc
diff --git a/bin/zxdb/symbols/inherited_from.h b/garnet/bin/zxdb/symbols/inherited_from.h similarity index 100% rename from bin/zxdb/symbols/inherited_from.h rename to garnet/bin/zxdb/symbols/inherited_from.h
diff --git a/bin/zxdb/symbols/input_location.h b/garnet/bin/zxdb/symbols/input_location.h similarity index 100% rename from bin/zxdb/symbols/input_location.h rename to garnet/bin/zxdb/symbols/input_location.h
diff --git a/bin/zxdb/symbols/lazy_symbol.cc b/garnet/bin/zxdb/symbols/lazy_symbol.cc similarity index 100% rename from bin/zxdb/symbols/lazy_symbol.cc rename to garnet/bin/zxdb/symbols/lazy_symbol.cc
diff --git a/bin/zxdb/symbols/lazy_symbol.h b/garnet/bin/zxdb/symbols/lazy_symbol.h similarity index 100% rename from bin/zxdb/symbols/lazy_symbol.h rename to garnet/bin/zxdb/symbols/lazy_symbol.h
diff --git a/bin/zxdb/symbols/line_details.cc b/garnet/bin/zxdb/symbols/line_details.cc similarity index 100% rename from bin/zxdb/symbols/line_details.cc rename to garnet/bin/zxdb/symbols/line_details.cc
diff --git a/bin/zxdb/symbols/line_details.h b/garnet/bin/zxdb/symbols/line_details.h similarity index 100% rename from bin/zxdb/symbols/line_details.h rename to garnet/bin/zxdb/symbols/line_details.h
diff --git a/bin/zxdb/symbols/line_table.h b/garnet/bin/zxdb/symbols/line_table.h similarity index 100% rename from bin/zxdb/symbols/line_table.h rename to garnet/bin/zxdb/symbols/line_table.h
diff --git a/bin/zxdb/symbols/line_table_impl.cc b/garnet/bin/zxdb/symbols/line_table_impl.cc similarity index 100% rename from bin/zxdb/symbols/line_table_impl.cc rename to garnet/bin/zxdb/symbols/line_table_impl.cc
diff --git a/bin/zxdb/symbols/line_table_impl.h b/garnet/bin/zxdb/symbols/line_table_impl.h similarity index 100% rename from bin/zxdb/symbols/line_table_impl.h rename to garnet/bin/zxdb/symbols/line_table_impl.h
diff --git a/bin/zxdb/symbols/loaded_module_symbols.cc b/garnet/bin/zxdb/symbols/loaded_module_symbols.cc similarity index 100% rename from bin/zxdb/symbols/loaded_module_symbols.cc rename to garnet/bin/zxdb/symbols/loaded_module_symbols.cc
diff --git a/bin/zxdb/symbols/loaded_module_symbols.h b/garnet/bin/zxdb/symbols/loaded_module_symbols.h similarity index 100% rename from bin/zxdb/symbols/loaded_module_symbols.h rename to garnet/bin/zxdb/symbols/loaded_module_symbols.h
diff --git a/bin/zxdb/symbols/location.cc b/garnet/bin/zxdb/symbols/location.cc similarity index 100% rename from bin/zxdb/symbols/location.cc rename to garnet/bin/zxdb/symbols/location.cc
diff --git a/bin/zxdb/symbols/location.h b/garnet/bin/zxdb/symbols/location.h similarity index 100% rename from bin/zxdb/symbols/location.h rename to garnet/bin/zxdb/symbols/location.h
diff --git a/bin/zxdb/symbols/member_ptr.cc b/garnet/bin/zxdb/symbols/member_ptr.cc similarity index 100% rename from bin/zxdb/symbols/member_ptr.cc rename to garnet/bin/zxdb/symbols/member_ptr.cc
diff --git a/bin/zxdb/symbols/member_ptr.h b/garnet/bin/zxdb/symbols/member_ptr.h similarity index 100% rename from bin/zxdb/symbols/member_ptr.h rename to garnet/bin/zxdb/symbols/member_ptr.h
diff --git a/bin/zxdb/symbols/member_ptr_unittest.cc b/garnet/bin/zxdb/symbols/member_ptr_unittest.cc similarity index 100% rename from bin/zxdb/symbols/member_ptr_unittest.cc rename to garnet/bin/zxdb/symbols/member_ptr_unittest.cc
diff --git a/bin/zxdb/symbols/mock_line_table.cc b/garnet/bin/zxdb/symbols/mock_line_table.cc similarity index 100% rename from bin/zxdb/symbols/mock_line_table.cc rename to garnet/bin/zxdb/symbols/mock_line_table.cc
diff --git a/bin/zxdb/symbols/mock_line_table.h b/garnet/bin/zxdb/symbols/mock_line_table.h similarity index 100% rename from bin/zxdb/symbols/mock_line_table.h rename to garnet/bin/zxdb/symbols/mock_line_table.h
diff --git a/bin/zxdb/symbols/mock_module_symbols.cc b/garnet/bin/zxdb/symbols/mock_module_symbols.cc similarity index 100% rename from bin/zxdb/symbols/mock_module_symbols.cc rename to garnet/bin/zxdb/symbols/mock_module_symbols.cc
diff --git a/bin/zxdb/symbols/mock_module_symbols.h b/garnet/bin/zxdb/symbols/mock_module_symbols.h similarity index 100% rename from bin/zxdb/symbols/mock_module_symbols.h rename to garnet/bin/zxdb/symbols/mock_module_symbols.h
diff --git a/bin/zxdb/symbols/mock_symbol_data_provider.cc b/garnet/bin/zxdb/symbols/mock_symbol_data_provider.cc similarity index 100% rename from bin/zxdb/symbols/mock_symbol_data_provider.cc rename to garnet/bin/zxdb/symbols/mock_symbol_data_provider.cc
diff --git a/bin/zxdb/symbols/mock_symbol_data_provider.h b/garnet/bin/zxdb/symbols/mock_symbol_data_provider.h similarity index 100% rename from bin/zxdb/symbols/mock_symbol_data_provider.h rename to garnet/bin/zxdb/symbols/mock_symbol_data_provider.h
diff --git a/bin/zxdb/symbols/mock_symbol_data_provider_unittest.cc b/garnet/bin/zxdb/symbols/mock_symbol_data_provider_unittest.cc similarity index 100% rename from bin/zxdb/symbols/mock_symbol_data_provider_unittest.cc rename to garnet/bin/zxdb/symbols/mock_symbol_data_provider_unittest.cc
diff --git a/bin/zxdb/symbols/modified_type.cc b/garnet/bin/zxdb/symbols/modified_type.cc similarity index 100% rename from bin/zxdb/symbols/modified_type.cc rename to garnet/bin/zxdb/symbols/modified_type.cc
diff --git a/bin/zxdb/symbols/modified_type.h b/garnet/bin/zxdb/symbols/modified_type.h similarity index 100% rename from bin/zxdb/symbols/modified_type.h rename to garnet/bin/zxdb/symbols/modified_type.h
diff --git a/bin/zxdb/symbols/modified_type_unittest.cc b/garnet/bin/zxdb/symbols/modified_type_unittest.cc similarity index 100% rename from bin/zxdb/symbols/modified_type_unittest.cc rename to garnet/bin/zxdb/symbols/modified_type_unittest.cc
diff --git a/bin/zxdb/symbols/module_symbol_index.cc b/garnet/bin/zxdb/symbols/module_symbol_index.cc similarity index 100% rename from bin/zxdb/symbols/module_symbol_index.cc rename to garnet/bin/zxdb/symbols/module_symbol_index.cc
diff --git a/bin/zxdb/symbols/module_symbol_index.h b/garnet/bin/zxdb/symbols/module_symbol_index.h similarity index 100% rename from bin/zxdb/symbols/module_symbol_index.h rename to garnet/bin/zxdb/symbols/module_symbol_index.h
diff --git a/bin/zxdb/symbols/module_symbol_index_node.cc b/garnet/bin/zxdb/symbols/module_symbol_index_node.cc similarity index 100% rename from bin/zxdb/symbols/module_symbol_index_node.cc rename to garnet/bin/zxdb/symbols/module_symbol_index_node.cc
diff --git a/bin/zxdb/symbols/module_symbol_index_node.h b/garnet/bin/zxdb/symbols/module_symbol_index_node.h similarity index 100% rename from bin/zxdb/symbols/module_symbol_index_node.h rename to garnet/bin/zxdb/symbols/module_symbol_index_node.h
diff --git a/bin/zxdb/symbols/module_symbol_index_node_unittest.cc b/garnet/bin/zxdb/symbols/module_symbol_index_node_unittest.cc similarity index 100% rename from bin/zxdb/symbols/module_symbol_index_node_unittest.cc rename to garnet/bin/zxdb/symbols/module_symbol_index_node_unittest.cc
diff --git a/bin/zxdb/symbols/module_symbol_index_unittest.cc b/garnet/bin/zxdb/symbols/module_symbol_index_unittest.cc similarity index 100% rename from bin/zxdb/symbols/module_symbol_index_unittest.cc rename to garnet/bin/zxdb/symbols/module_symbol_index_unittest.cc
diff --git a/bin/zxdb/symbols/module_symbol_status.h b/garnet/bin/zxdb/symbols/module_symbol_status.h similarity index 100% rename from bin/zxdb/symbols/module_symbol_status.h rename to garnet/bin/zxdb/symbols/module_symbol_status.h
diff --git a/bin/zxdb/symbols/module_symbols.cc b/garnet/bin/zxdb/symbols/module_symbols.cc similarity index 100% rename from bin/zxdb/symbols/module_symbols.cc rename to garnet/bin/zxdb/symbols/module_symbols.cc
diff --git a/bin/zxdb/symbols/module_symbols.h b/garnet/bin/zxdb/symbols/module_symbols.h similarity index 100% rename from bin/zxdb/symbols/module_symbols.h rename to garnet/bin/zxdb/symbols/module_symbols.h
diff --git a/bin/zxdb/symbols/module_symbols_impl.cc b/garnet/bin/zxdb/symbols/module_symbols_impl.cc similarity index 100% rename from bin/zxdb/symbols/module_symbols_impl.cc rename to garnet/bin/zxdb/symbols/module_symbols_impl.cc
diff --git a/bin/zxdb/symbols/module_symbols_impl.h b/garnet/bin/zxdb/symbols/module_symbols_impl.h similarity index 100% rename from bin/zxdb/symbols/module_symbols_impl.h rename to garnet/bin/zxdb/symbols/module_symbols_impl.h
diff --git a/bin/zxdb/symbols/module_symbols_impl_unittest.cc b/garnet/bin/zxdb/symbols/module_symbols_impl_unittest.cc similarity index 100% rename from bin/zxdb/symbols/module_symbols_impl_unittest.cc rename to garnet/bin/zxdb/symbols/module_symbols_impl_unittest.cc
diff --git a/bin/zxdb/symbols/namespace.cc b/garnet/bin/zxdb/symbols/namespace.cc similarity index 100% rename from bin/zxdb/symbols/namespace.cc rename to garnet/bin/zxdb/symbols/namespace.cc
diff --git a/bin/zxdb/symbols/namespace.h b/garnet/bin/zxdb/symbols/namespace.h similarity index 100% rename from bin/zxdb/symbols/namespace.h rename to garnet/bin/zxdb/symbols/namespace.h
diff --git a/bin/zxdb/symbols/process_symbols.cc b/garnet/bin/zxdb/symbols/process_symbols.cc similarity index 100% rename from bin/zxdb/symbols/process_symbols.cc rename to garnet/bin/zxdb/symbols/process_symbols.cc
diff --git a/bin/zxdb/symbols/process_symbols.h b/garnet/bin/zxdb/symbols/process_symbols.h similarity index 100% rename from bin/zxdb/symbols/process_symbols.h rename to garnet/bin/zxdb/symbols/process_symbols.h
diff --git a/bin/zxdb/symbols/process_symbols_test_setup.cc b/garnet/bin/zxdb/symbols/process_symbols_test_setup.cc similarity index 100% rename from bin/zxdb/symbols/process_symbols_test_setup.cc rename to garnet/bin/zxdb/symbols/process_symbols_test_setup.cc
diff --git a/bin/zxdb/symbols/process_symbols_test_setup.h b/garnet/bin/zxdb/symbols/process_symbols_test_setup.h similarity index 100% rename from bin/zxdb/symbols/process_symbols_test_setup.h rename to garnet/bin/zxdb/symbols/process_symbols_test_setup.h
diff --git a/bin/zxdb/symbols/process_symbols_unittest.cc b/garnet/bin/zxdb/symbols/process_symbols_unittest.cc similarity index 100% rename from bin/zxdb/symbols/process_symbols_unittest.cc rename to garnet/bin/zxdb/symbols/process_symbols_unittest.cc
diff --git a/bin/zxdb/symbols/resolve_options.h b/garnet/bin/zxdb/symbols/resolve_options.h similarity index 100% rename from bin/zxdb/symbols/resolve_options.h rename to garnet/bin/zxdb/symbols/resolve_options.h
diff --git a/bin/zxdb/symbols/symbol.cc b/garnet/bin/zxdb/symbols/symbol.cc similarity index 100% rename from bin/zxdb/symbols/symbol.cc rename to garnet/bin/zxdb/symbols/symbol.cc
diff --git a/bin/zxdb/symbols/symbol.h b/garnet/bin/zxdb/symbols/symbol.h similarity index 100% rename from bin/zxdb/symbols/symbol.h rename to garnet/bin/zxdb/symbols/symbol.h
diff --git a/bin/zxdb/symbols/symbol_context.h b/garnet/bin/zxdb/symbols/symbol_context.h similarity index 100% rename from bin/zxdb/symbols/symbol_context.h rename to garnet/bin/zxdb/symbols/symbol_context.h
diff --git a/bin/zxdb/symbols/symbol_data_provider.h b/garnet/bin/zxdb/symbols/symbol_data_provider.h similarity index 100% rename from bin/zxdb/symbols/symbol_data_provider.h rename to garnet/bin/zxdb/symbols/symbol_data_provider.h
diff --git a/bin/zxdb/symbols/symbol_factory.h b/garnet/bin/zxdb/symbols/symbol_factory.h similarity index 100% rename from bin/zxdb/symbols/symbol_factory.h rename to garnet/bin/zxdb/symbols/symbol_factory.h
diff --git a/bin/zxdb/symbols/symbol_utils.cc b/garnet/bin/zxdb/symbols/symbol_utils.cc similarity index 100% rename from bin/zxdb/symbols/symbol_utils.cc rename to garnet/bin/zxdb/symbols/symbol_utils.cc
diff --git a/bin/zxdb/symbols/symbol_utils.h b/garnet/bin/zxdb/symbols/symbol_utils.h similarity index 100% rename from bin/zxdb/symbols/symbol_utils.h rename to garnet/bin/zxdb/symbols/symbol_utils.h
diff --git a/bin/zxdb/symbols/symbol_utils_unittest.cc b/garnet/bin/zxdb/symbols/symbol_utils_unittest.cc similarity index 100% rename from bin/zxdb/symbols/symbol_utils_unittest.cc rename to garnet/bin/zxdb/symbols/symbol_utils_unittest.cc
diff --git a/bin/zxdb/symbols/system_symbols.cc b/garnet/bin/zxdb/symbols/system_symbols.cc similarity index 100% rename from bin/zxdb/symbols/system_symbols.cc rename to garnet/bin/zxdb/symbols/system_symbols.cc
diff --git a/bin/zxdb/symbols/system_symbols.h b/garnet/bin/zxdb/symbols/system_symbols.h similarity index 100% rename from bin/zxdb/symbols/system_symbols.h rename to garnet/bin/zxdb/symbols/system_symbols.h
diff --git a/bin/zxdb/symbols/target_symbols.cc b/garnet/bin/zxdb/symbols/target_symbols.cc similarity index 100% rename from bin/zxdb/symbols/target_symbols.cc rename to garnet/bin/zxdb/symbols/target_symbols.cc
diff --git a/bin/zxdb/symbols/target_symbols.h b/garnet/bin/zxdb/symbols/target_symbols.h similarity index 100% rename from bin/zxdb/symbols/target_symbols.h rename to garnet/bin/zxdb/symbols/target_symbols.h
diff --git a/bin/zxdb/symbols/test_data/BUILD.gn b/garnet/bin/zxdb/symbols/test_data/BUILD.gn similarity index 100% rename from bin/zxdb/symbols/test_data/BUILD.gn rename to garnet/bin/zxdb/symbols/test_data/BUILD.gn
diff --git a/bin/zxdb/symbols/test_data/libsymbol_test_so.targetso b/garnet/bin/zxdb/symbols/test_data/libsymbol_test_so.targetso similarity index 100% rename from bin/zxdb/symbols/test_data/libsymbol_test_so.targetso rename to garnet/bin/zxdb/symbols/test_data/libsymbol_test_so.targetso Binary files differ
diff --git a/bin/zxdb/symbols/test_data/line_lookup_symbol_test.cc b/garnet/bin/zxdb/symbols/test_data/line_lookup_symbol_test.cc similarity index 100% rename from bin/zxdb/symbols/test_data/line_lookup_symbol_test.cc rename to garnet/bin/zxdb/symbols/test_data/line_lookup_symbol_test.cc
diff --git a/bin/zxdb/symbols/test_data/type_test.cc b/garnet/bin/zxdb/symbols/test_data/type_test.cc similarity index 100% rename from bin/zxdb/symbols/test_data/type_test.cc rename to garnet/bin/zxdb/symbols/test_data/type_test.cc
diff --git a/bin/zxdb/symbols/test_data/zxdb_symbol_test.cc b/garnet/bin/zxdb/symbols/test_data/zxdb_symbol_test.cc similarity index 100% rename from bin/zxdb/symbols/test_data/zxdb_symbol_test.cc rename to garnet/bin/zxdb/symbols/test_data/zxdb_symbol_test.cc
diff --git a/bin/zxdb/symbols/test_data/zxdb_symbol_test.h b/garnet/bin/zxdb/symbols/test_data/zxdb_symbol_test.h similarity index 100% rename from bin/zxdb/symbols/test_data/zxdb_symbol_test.h rename to garnet/bin/zxdb/symbols/test_data/zxdb_symbol_test.h
diff --git a/bin/zxdb/symbols/test_data/zxdb_symbol_test2.cc b/garnet/bin/zxdb/symbols/test_data/zxdb_symbol_test2.cc similarity index 100% rename from bin/zxdb/symbols/test_data/zxdb_symbol_test2.cc rename to garnet/bin/zxdb/symbols/test_data/zxdb_symbol_test2.cc
diff --git a/bin/zxdb/symbols/test_symbol_module.cc b/garnet/bin/zxdb/symbols/test_symbol_module.cc similarity index 100% rename from bin/zxdb/symbols/test_symbol_module.cc rename to garnet/bin/zxdb/symbols/test_symbol_module.cc
diff --git a/bin/zxdb/symbols/test_symbol_module.h b/garnet/bin/zxdb/symbols/test_symbol_module.h similarity index 100% rename from bin/zxdb/symbols/test_symbol_module.h rename to garnet/bin/zxdb/symbols/test_symbol_module.h
diff --git a/bin/zxdb/symbols/type.cc b/garnet/bin/zxdb/symbols/type.cc similarity index 100% rename from bin/zxdb/symbols/type.cc rename to garnet/bin/zxdb/symbols/type.cc
diff --git a/bin/zxdb/symbols/type.h b/garnet/bin/zxdb/symbols/type.h similarity index 100% rename from bin/zxdb/symbols/type.h rename to garnet/bin/zxdb/symbols/type.h
diff --git a/bin/zxdb/symbols/type_test_support.cc b/garnet/bin/zxdb/symbols/type_test_support.cc similarity index 100% rename from bin/zxdb/symbols/type_test_support.cc rename to garnet/bin/zxdb/symbols/type_test_support.cc
diff --git a/bin/zxdb/symbols/type_test_support.h b/garnet/bin/zxdb/symbols/type_test_support.h similarity index 100% rename from bin/zxdb/symbols/type_test_support.h rename to garnet/bin/zxdb/symbols/type_test_support.h
diff --git a/bin/zxdb/symbols/type_utils.cc b/garnet/bin/zxdb/symbols/type_utils.cc similarity index 100% rename from bin/zxdb/symbols/type_utils.cc rename to garnet/bin/zxdb/symbols/type_utils.cc
diff --git a/bin/zxdb/symbols/type_utils.h b/garnet/bin/zxdb/symbols/type_utils.h similarity index 100% rename from bin/zxdb/symbols/type_utils.h rename to garnet/bin/zxdb/symbols/type_utils.h
diff --git a/bin/zxdb/symbols/type_utils_unittest.cc b/garnet/bin/zxdb/symbols/type_utils_unittest.cc similarity index 100% rename from bin/zxdb/symbols/type_utils_unittest.cc rename to garnet/bin/zxdb/symbols/type_utils_unittest.cc
diff --git a/bin/zxdb/symbols/value.cc b/garnet/bin/zxdb/symbols/value.cc similarity index 100% rename from bin/zxdb/symbols/value.cc rename to garnet/bin/zxdb/symbols/value.cc
diff --git a/bin/zxdb/symbols/value.h b/garnet/bin/zxdb/symbols/value.h similarity index 100% rename from bin/zxdb/symbols/value.h rename to garnet/bin/zxdb/symbols/value.h
diff --git a/bin/zxdb/symbols/variable.cc b/garnet/bin/zxdb/symbols/variable.cc similarity index 100% rename from bin/zxdb/symbols/variable.cc rename to garnet/bin/zxdb/symbols/variable.cc
diff --git a/bin/zxdb/symbols/variable.h b/garnet/bin/zxdb/symbols/variable.h similarity index 100% rename from bin/zxdb/symbols/variable.h rename to garnet/bin/zxdb/symbols/variable.h
diff --git a/bin/zxdb/symbols/variable_location.cc b/garnet/bin/zxdb/symbols/variable_location.cc similarity index 100% rename from bin/zxdb/symbols/variable_location.cc rename to garnet/bin/zxdb/symbols/variable_location.cc
diff --git a/bin/zxdb/symbols/variable_location.h b/garnet/bin/zxdb/symbols/variable_location.h similarity index 100% rename from bin/zxdb/symbols/variable_location.h rename to garnet/bin/zxdb/symbols/variable_location.h
diff --git a/bin/zxdb/symbols/variable_location_unittest.cc b/garnet/bin/zxdb/symbols/variable_location_unittest.cc similarity index 100% rename from bin/zxdb/symbols/variable_location_unittest.cc rename to garnet/bin/zxdb/symbols/variable_location_unittest.cc
diff --git a/bin/zxdb/symbols/variable_test_support.cc b/garnet/bin/zxdb/symbols/variable_test_support.cc similarity index 100% rename from bin/zxdb/symbols/variable_test_support.cc rename to garnet/bin/zxdb/symbols/variable_test_support.cc
diff --git a/bin/zxdb/symbols/variable_test_support.h b/garnet/bin/zxdb/symbols/variable_test_support.h similarity index 100% rename from bin/zxdb/symbols/variable_test_support.h rename to garnet/bin/zxdb/symbols/variable_test_support.h
diff --git a/bin/zxdb/symbols/visit_scopes.cc b/garnet/bin/zxdb/symbols/visit_scopes.cc similarity index 100% rename from bin/zxdb/symbols/visit_scopes.cc rename to garnet/bin/zxdb/symbols/visit_scopes.cc
diff --git a/bin/zxdb/symbols/visit_scopes.h b/garnet/bin/zxdb/symbols/visit_scopes.h similarity index 100% rename from bin/zxdb/symbols/visit_scopes.h rename to garnet/bin/zxdb/symbols/visit_scopes.h
diff --git a/bin/zxdb/symbols/visit_scopes_unittest.cc b/garnet/bin/zxdb/symbols/visit_scopes_unittest.cc similarity index 100% rename from bin/zxdb/symbols/visit_scopes_unittest.cc rename to garnet/bin/zxdb/symbols/visit_scopes_unittest.cc
diff --git a/boards/arm64.gni b/garnet/boards/arm64.gni similarity index 100% rename from boards/arm64.gni rename to garnet/boards/arm64.gni
diff --git a/boards/frank.gni b/garnet/boards/frank.gni similarity index 100% rename from boards/frank.gni rename to garnet/boards/frank.gni
diff --git a/boards/mt8167s_ref.gni b/garnet/boards/mt8167s_ref.gni similarity index 100% rename from boards/mt8167s_ref.gni rename to garnet/boards/mt8167s_ref.gni
diff --git a/boards/toulouse.gni b/garnet/boards/toulouse.gni similarity index 100% rename from boards/toulouse.gni rename to garnet/boards/toulouse.gni
diff --git a/boards/x64.gni b/garnet/boards/x64.gni similarity index 100% rename from boards/x64.gni rename to garnet/boards/x64.gni
diff --git a/build/pkgfs.gni b/garnet/build/pkgfs.gni similarity index 100% rename from build/pkgfs.gni rename to garnet/build/pkgfs.gni
diff --git a/docs/MAINTAINERS b/garnet/docs/MAINTAINERS similarity index 100% rename from docs/MAINTAINERS rename to garnet/docs/MAINTAINERS
diff --git a/docs/bluetooth_architecture.md b/garnet/docs/bluetooth_architecture.md similarity index 100% rename from docs/bluetooth_architecture.md rename to garnet/docs/bluetooth_architecture.md
diff --git a/docs/bluetooth_source_layout.md b/garnet/docs/bluetooth_source_layout.md similarity index 100% rename from docs/bluetooth_source_layout.md rename to garnet/docs/bluetooth_source_layout.md
diff --git a/docs/catapult.md b/garnet/docs/catapult.md similarity index 100% rename from docs/catapult.md rename to garnet/docs/catapult.md
diff --git a/docs/debugger.md b/garnet/docs/debugger.md similarity index 100% rename from docs/debugger.md rename to garnet/docs/debugger.md
diff --git a/docs/debugger_usage.md b/garnet/docs/debugger_usage.md similarity index 100% rename from docs/debugger_usage.md rename to garnet/docs/debugger_usage.md
diff --git a/docs/gen/build_arguments.md b/garnet/docs/gen/build_arguments.md similarity index 100% rename from docs/gen/build_arguments.md rename to garnet/docs/gen/build_arguments.md
diff --git a/docs/inspect.md b/garnet/docs/inspect.md similarity index 100% rename from docs/inspect.md rename to garnet/docs/inspect.md
diff --git a/docs/iquery.md b/garnet/docs/iquery.md similarity index 100% rename from docs/iquery.md rename to garnet/docs/iquery.md
diff --git a/docs/repository_structure.md b/garnet/docs/repository_structure.md similarity index 100% rename from docs/repository_structure.md rename to garnet/docs/repository_structure.md
diff --git a/docs/standalone_build.md b/garnet/docs/standalone_build.md similarity index 100% rename from docs/standalone_build.md rename to garnet/docs/standalone_build.md
diff --git a/docs/tracing_usage_guide.md b/garnet/docs/tracing_usage_guide.md similarity index 100% rename from docs/tracing_usage_guide.md rename to garnet/docs/tracing_usage_guide.md
diff --git a/docs/ui/README.md b/garnet/docs/ui/README.md similarity index 100% rename from docs/ui/README.md rename to garnet/docs/ui/README.md
diff --git a/docs/ui/input.md b/garnet/docs/ui/input.md similarity index 100% rename from docs/ui/input.md rename to garnet/docs/ui/input.md
diff --git a/docs/ui/scenic.md b/garnet/docs/ui/scenic.md similarity index 100% rename from docs/ui/scenic.md rename to garnet/docs/ui/scenic.md
diff --git a/docs/ui/scenic_resource_graph.png b/garnet/docs/ui/scenic_resource_graph.png similarity index 100% rename from docs/ui/scenic_resource_graph.png rename to garnet/docs/ui/scenic_resource_graph.png Binary files differ
diff --git a/docs/ui/scenic_within_fuchsia_diagram.png b/garnet/docs/ui/scenic_within_fuchsia_diagram.png similarity index 100% rename from docs/ui/scenic_within_fuchsia_diagram.png rename to garnet/docs/ui/scenic_within_fuchsia_diagram.png Binary files differ
diff --git a/docs/ui/units_and_metrics.md b/garnet/docs/ui/units_and_metrics.md similarity index 100% rename from docs/ui/units_and_metrics.md rename to garnet/docs/ui/units_and_metrics.md
diff --git a/drivers/bluetooth/MAINTAINERS b/garnet/drivers/bluetooth/MAINTAINERS similarity index 100% rename from drivers/bluetooth/MAINTAINERS rename to garnet/drivers/bluetooth/MAINTAINERS
diff --git a/drivers/bluetooth/hci/BUILD.gn b/garnet/drivers/bluetooth/hci/BUILD.gn similarity index 100% rename from drivers/bluetooth/hci/BUILD.gn rename to garnet/drivers/bluetooth/hci/BUILD.gn
diff --git a/drivers/bluetooth/hci/atheros/.gitignore b/garnet/drivers/bluetooth/hci/atheros/.gitignore similarity index 100% rename from drivers/bluetooth/hci/atheros/.gitignore rename to garnet/drivers/bluetooth/hci/atheros/.gitignore
diff --git a/drivers/bluetooth/hci/atheros/BUILD.gn b/garnet/drivers/bluetooth/hci/atheros/BUILD.gn similarity index 100% rename from drivers/bluetooth/hci/atheros/BUILD.gn rename to garnet/drivers/bluetooth/hci/atheros/BUILD.gn
diff --git a/drivers/bluetooth/hci/atheros/binding.c b/garnet/drivers/bluetooth/hci/atheros/binding.c similarity index 100% rename from drivers/bluetooth/hci/atheros/binding.c rename to garnet/drivers/bluetooth/hci/atheros/binding.c
diff --git a/drivers/bluetooth/hci/atheros/device.cpp b/garnet/drivers/bluetooth/hci/atheros/device.cpp similarity index 100% rename from drivers/bluetooth/hci/atheros/device.cpp rename to garnet/drivers/bluetooth/hci/atheros/device.cpp
diff --git a/drivers/bluetooth/hci/atheros/device.h b/garnet/drivers/bluetooth/hci/atheros/device.h similarity index 100% rename from drivers/bluetooth/hci/atheros/device.h rename to garnet/drivers/bluetooth/hci/atheros/device.h
diff --git a/drivers/bluetooth/hci/atheros/driver.cpp b/garnet/drivers/bluetooth/hci/atheros/driver.cpp similarity index 100% rename from drivers/bluetooth/hci/atheros/driver.cpp rename to garnet/drivers/bluetooth/hci/atheros/driver.cpp
diff --git a/drivers/bluetooth/hci/atheros/logging.h b/garnet/drivers/bluetooth/hci/atheros/logging.h similarity index 100% rename from drivers/bluetooth/hci/atheros/logging.h rename to garnet/drivers/bluetooth/hci/atheros/logging.h
diff --git a/drivers/bluetooth/hci/fake/BUILD.gn b/garnet/drivers/bluetooth/hci/fake/BUILD.gn similarity index 100% rename from drivers/bluetooth/hci/fake/BUILD.gn rename to garnet/drivers/bluetooth/hci/fake/BUILD.gn
diff --git a/drivers/bluetooth/hci/fake/binding.c b/garnet/drivers/bluetooth/hci/fake/binding.c similarity index 100% rename from drivers/bluetooth/hci/fake/binding.c rename to garnet/drivers/bluetooth/hci/fake/binding.c
diff --git a/drivers/bluetooth/hci/fake/driver.cpp b/garnet/drivers/bluetooth/hci/fake/driver.cpp similarity index 100% rename from drivers/bluetooth/hci/fake/driver.cpp rename to garnet/drivers/bluetooth/hci/fake/driver.cpp
diff --git a/drivers/bluetooth/hci/fake/fake-device.cpp b/garnet/drivers/bluetooth/hci/fake/fake-device.cpp similarity index 100% rename from drivers/bluetooth/hci/fake/fake-device.cpp rename to garnet/drivers/bluetooth/hci/fake/fake-device.cpp
diff --git a/drivers/bluetooth/hci/fake/fake-device.h b/garnet/drivers/bluetooth/hci/fake/fake-device.h similarity index 100% rename from drivers/bluetooth/hci/fake/fake-device.h rename to garnet/drivers/bluetooth/hci/fake/fake-device.h
diff --git a/drivers/bluetooth/hci/intel/.gitignore b/garnet/drivers/bluetooth/hci/intel/.gitignore similarity index 100% rename from drivers/bluetooth/hci/intel/.gitignore rename to garnet/drivers/bluetooth/hci/intel/.gitignore
diff --git a/drivers/bluetooth/hci/intel/BUILD.gn b/garnet/drivers/bluetooth/hci/intel/BUILD.gn similarity index 100% rename from drivers/bluetooth/hci/intel/BUILD.gn rename to garnet/drivers/bluetooth/hci/intel/BUILD.gn
diff --git a/drivers/bluetooth/hci/intel/binding.c b/garnet/drivers/bluetooth/hci/intel/binding.c similarity index 100% rename from drivers/bluetooth/hci/intel/binding.c rename to garnet/drivers/bluetooth/hci/intel/binding.c
diff --git a/drivers/bluetooth/hci/intel/device.cc b/garnet/drivers/bluetooth/hci/intel/device.cc similarity index 100% rename from drivers/bluetooth/hci/intel/device.cc rename to garnet/drivers/bluetooth/hci/intel/device.cc
diff --git a/drivers/bluetooth/hci/intel/device.h b/garnet/drivers/bluetooth/hci/intel/device.h similarity index 100% rename from drivers/bluetooth/hci/intel/device.h rename to garnet/drivers/bluetooth/hci/intel/device.h
diff --git a/drivers/bluetooth/hci/intel/driver.cc b/garnet/drivers/bluetooth/hci/intel/driver.cc similarity index 100% rename from drivers/bluetooth/hci/intel/driver.cc rename to garnet/drivers/bluetooth/hci/intel/driver.cc
diff --git a/drivers/bluetooth/hci/intel/firmware_loader.cc b/garnet/drivers/bluetooth/hci/intel/firmware_loader.cc similarity index 100% rename from drivers/bluetooth/hci/intel/firmware_loader.cc rename to garnet/drivers/bluetooth/hci/intel/firmware_loader.cc
diff --git a/drivers/bluetooth/hci/intel/firmware_loader.h b/garnet/drivers/bluetooth/hci/intel/firmware_loader.h similarity index 100% rename from drivers/bluetooth/hci/intel/firmware_loader.h rename to garnet/drivers/bluetooth/hci/intel/firmware_loader.h
diff --git a/drivers/bluetooth/hci/intel/logging.h b/garnet/drivers/bluetooth/hci/intel/logging.h similarity index 100% rename from drivers/bluetooth/hci/intel/logging.h rename to garnet/drivers/bluetooth/hci/intel/logging.h
diff --git a/drivers/bluetooth/hci/intel/vendor_hci.cc b/garnet/drivers/bluetooth/hci/intel/vendor_hci.cc similarity index 100% rename from drivers/bluetooth/hci/intel/vendor_hci.cc rename to garnet/drivers/bluetooth/hci/intel/vendor_hci.cc
diff --git a/drivers/bluetooth/hci/intel/vendor_hci.h b/garnet/drivers/bluetooth/hci/intel/vendor_hci.h similarity index 100% rename from drivers/bluetooth/hci/intel/vendor_hci.h rename to garnet/drivers/bluetooth/hci/intel/vendor_hci.h
diff --git a/drivers/bluetooth/hci/passthrough/BUILD.gn b/garnet/drivers/bluetooth/hci/passthrough/BUILD.gn similarity index 100% rename from drivers/bluetooth/hci/passthrough/BUILD.gn rename to garnet/drivers/bluetooth/hci/passthrough/BUILD.gn
diff --git a/drivers/bluetooth/hci/passthrough/passthrough.c b/garnet/drivers/bluetooth/hci/passthrough/passthrough.c similarity index 100% rename from drivers/bluetooth/hci/passthrough/passthrough.c rename to garnet/drivers/bluetooth/hci/passthrough/passthrough.c
diff --git a/drivers/bluetooth/host/BUILD.gn b/garnet/drivers/bluetooth/host/BUILD.gn similarity index 100% rename from drivers/bluetooth/host/BUILD.gn rename to garnet/drivers/bluetooth/host/BUILD.gn
diff --git a/drivers/bluetooth/host/binding.c b/garnet/drivers/bluetooth/host/binding.c similarity index 100% rename from drivers/bluetooth/host/binding.c rename to garnet/drivers/bluetooth/host/binding.c
diff --git a/drivers/bluetooth/host/driver.cc b/garnet/drivers/bluetooth/host/driver.cc similarity index 100% rename from drivers/bluetooth/host/driver.cc rename to garnet/drivers/bluetooth/host/driver.cc
diff --git a/drivers/bluetooth/host/fidl/gatt_client_server.cc b/garnet/drivers/bluetooth/host/fidl/gatt_client_server.cc similarity index 100% rename from drivers/bluetooth/host/fidl/gatt_client_server.cc rename to garnet/drivers/bluetooth/host/fidl/gatt_client_server.cc
diff --git a/drivers/bluetooth/host/fidl/gatt_client_server.h b/garnet/drivers/bluetooth/host/fidl/gatt_client_server.h similarity index 100% rename from drivers/bluetooth/host/fidl/gatt_client_server.h rename to garnet/drivers/bluetooth/host/fidl/gatt_client_server.h
diff --git a/drivers/bluetooth/host/fidl/gatt_remote_service_server.cc b/garnet/drivers/bluetooth/host/fidl/gatt_remote_service_server.cc similarity index 100% rename from drivers/bluetooth/host/fidl/gatt_remote_service_server.cc rename to garnet/drivers/bluetooth/host/fidl/gatt_remote_service_server.cc
diff --git a/drivers/bluetooth/host/fidl/gatt_remote_service_server.h b/garnet/drivers/bluetooth/host/fidl/gatt_remote_service_server.h similarity index 100% rename from drivers/bluetooth/host/fidl/gatt_remote_service_server.h rename to garnet/drivers/bluetooth/host/fidl/gatt_remote_service_server.h
diff --git a/drivers/bluetooth/host/fidl/gatt_server_server.cc b/garnet/drivers/bluetooth/host/fidl/gatt_server_server.cc similarity index 100% rename from drivers/bluetooth/host/fidl/gatt_server_server.cc rename to garnet/drivers/bluetooth/host/fidl/gatt_server_server.cc
diff --git a/drivers/bluetooth/host/fidl/gatt_server_server.h b/garnet/drivers/bluetooth/host/fidl/gatt_server_server.h similarity index 100% rename from drivers/bluetooth/host/fidl/gatt_server_server.h rename to garnet/drivers/bluetooth/host/fidl/gatt_server_server.h
diff --git a/drivers/bluetooth/host/fidl/helpers.cc b/garnet/drivers/bluetooth/host/fidl/helpers.cc similarity index 100% rename from drivers/bluetooth/host/fidl/helpers.cc rename to garnet/drivers/bluetooth/host/fidl/helpers.cc
diff --git a/drivers/bluetooth/host/fidl/helpers.h b/garnet/drivers/bluetooth/host/fidl/helpers.h similarity index 100% rename from drivers/bluetooth/host/fidl/helpers.h rename to garnet/drivers/bluetooth/host/fidl/helpers.h
diff --git a/drivers/bluetooth/host/fidl/host_server.cc b/garnet/drivers/bluetooth/host/fidl/host_server.cc similarity index 100% rename from drivers/bluetooth/host/fidl/host_server.cc rename to garnet/drivers/bluetooth/host/fidl/host_server.cc
diff --git a/drivers/bluetooth/host/fidl/host_server.h b/garnet/drivers/bluetooth/host/fidl/host_server.h similarity index 100% rename from drivers/bluetooth/host/fidl/host_server.h rename to garnet/drivers/bluetooth/host/fidl/host_server.h
diff --git a/drivers/bluetooth/host/fidl/low_energy_central_server.cc b/garnet/drivers/bluetooth/host/fidl/low_energy_central_server.cc similarity index 100% rename from drivers/bluetooth/host/fidl/low_energy_central_server.cc rename to garnet/drivers/bluetooth/host/fidl/low_energy_central_server.cc
diff --git a/drivers/bluetooth/host/fidl/low_energy_central_server.h b/garnet/drivers/bluetooth/host/fidl/low_energy_central_server.h similarity index 100% rename from drivers/bluetooth/host/fidl/low_energy_central_server.h rename to garnet/drivers/bluetooth/host/fidl/low_energy_central_server.h
diff --git a/drivers/bluetooth/host/fidl/low_energy_peripheral_server.cc b/garnet/drivers/bluetooth/host/fidl/low_energy_peripheral_server.cc similarity index 100% rename from drivers/bluetooth/host/fidl/low_energy_peripheral_server.cc rename to garnet/drivers/bluetooth/host/fidl/low_energy_peripheral_server.cc
diff --git a/drivers/bluetooth/host/fidl/low_energy_peripheral_server.h b/garnet/drivers/bluetooth/host/fidl/low_energy_peripheral_server.h similarity index 100% rename from drivers/bluetooth/host/fidl/low_energy_peripheral_server.h rename to garnet/drivers/bluetooth/host/fidl/low_energy_peripheral_server.h
diff --git a/drivers/bluetooth/host/fidl/profile_server.cc b/garnet/drivers/bluetooth/host/fidl/profile_server.cc similarity index 100% rename from drivers/bluetooth/host/fidl/profile_server.cc rename to garnet/drivers/bluetooth/host/fidl/profile_server.cc
diff --git a/drivers/bluetooth/host/fidl/profile_server.h b/garnet/drivers/bluetooth/host/fidl/profile_server.h similarity index 100% rename from drivers/bluetooth/host/fidl/profile_server.h rename to garnet/drivers/bluetooth/host/fidl/profile_server.h
diff --git a/drivers/bluetooth/host/fidl/server_base.h b/garnet/drivers/bluetooth/host/fidl/server_base.h similarity index 100% rename from drivers/bluetooth/host/fidl/server_base.h rename to garnet/drivers/bluetooth/host/fidl/server_base.h
diff --git a/drivers/bluetooth/host/gatt_host.cc b/garnet/drivers/bluetooth/host/gatt_host.cc similarity index 100% rename from drivers/bluetooth/host/gatt_host.cc rename to garnet/drivers/bluetooth/host/gatt_host.cc
diff --git a/drivers/bluetooth/host/gatt_host.h b/garnet/drivers/bluetooth/host/gatt_host.h similarity index 100% rename from drivers/bluetooth/host/gatt_host.h rename to garnet/drivers/bluetooth/host/gatt_host.h
diff --git a/drivers/bluetooth/host/gatt_remote_service_device.cc b/garnet/drivers/bluetooth/host/gatt_remote_service_device.cc similarity index 100% rename from drivers/bluetooth/host/gatt_remote_service_device.cc rename to garnet/drivers/bluetooth/host/gatt_remote_service_device.cc
diff --git a/drivers/bluetooth/host/gatt_remote_service_device.h b/garnet/drivers/bluetooth/host/gatt_remote_service_device.h similarity index 100% rename from drivers/bluetooth/host/gatt_remote_service_device.h rename to garnet/drivers/bluetooth/host/gatt_remote_service_device.h
diff --git a/drivers/bluetooth/host/host.cc b/garnet/drivers/bluetooth/host/host.cc similarity index 100% rename from drivers/bluetooth/host/host.cc rename to garnet/drivers/bluetooth/host/host.cc
diff --git a/drivers/bluetooth/host/host.h b/garnet/drivers/bluetooth/host/host.h similarity index 100% rename from drivers/bluetooth/host/host.h rename to garnet/drivers/bluetooth/host/host.h
diff --git a/drivers/bluetooth/host/host_device.cc b/garnet/drivers/bluetooth/host/host_device.cc similarity index 100% rename from drivers/bluetooth/host/host_device.cc rename to garnet/drivers/bluetooth/host/host_device.cc
diff --git a/drivers/bluetooth/host/host_device.h b/garnet/drivers/bluetooth/host/host_device.h similarity index 100% rename from drivers/bluetooth/host/host_device.h rename to garnet/drivers/bluetooth/host/host_device.h
diff --git a/drivers/bluetooth/lib/BUILD.gn b/garnet/drivers/bluetooth/lib/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/BUILD.gn rename to garnet/drivers/bluetooth/lib/BUILD.gn
diff --git a/drivers/bluetooth/lib/README.md b/garnet/drivers/bluetooth/lib/README.md similarity index 100% rename from drivers/bluetooth/lib/README.md rename to garnet/drivers/bluetooth/lib/README.md
diff --git a/drivers/bluetooth/lib/att/BUILD.gn b/garnet/drivers/bluetooth/lib/att/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/att/BUILD.gn rename to garnet/drivers/bluetooth/lib/att/BUILD.gn
diff --git a/drivers/bluetooth/lib/att/att.h b/garnet/drivers/bluetooth/lib/att/att.h similarity index 100% rename from drivers/bluetooth/lib/att/att.h rename to garnet/drivers/bluetooth/lib/att/att.h
diff --git a/drivers/bluetooth/lib/att/attribute.cc b/garnet/drivers/bluetooth/lib/att/attribute.cc similarity index 100% rename from drivers/bluetooth/lib/att/attribute.cc rename to garnet/drivers/bluetooth/lib/att/attribute.cc
diff --git a/drivers/bluetooth/lib/att/attribute.h b/garnet/drivers/bluetooth/lib/att/attribute.h similarity index 100% rename from drivers/bluetooth/lib/att/attribute.h rename to garnet/drivers/bluetooth/lib/att/attribute.h
diff --git a/drivers/bluetooth/lib/att/attribute_unittest.cc b/garnet/drivers/bluetooth/lib/att/attribute_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/att/attribute_unittest.cc rename to garnet/drivers/bluetooth/lib/att/attribute_unittest.cc
diff --git a/drivers/bluetooth/lib/att/bearer.cc b/garnet/drivers/bluetooth/lib/att/bearer.cc similarity index 100% rename from drivers/bluetooth/lib/att/bearer.cc rename to garnet/drivers/bluetooth/lib/att/bearer.cc
diff --git a/drivers/bluetooth/lib/att/bearer.h b/garnet/drivers/bluetooth/lib/att/bearer.h similarity index 100% rename from drivers/bluetooth/lib/att/bearer.h rename to garnet/drivers/bluetooth/lib/att/bearer.h
diff --git a/drivers/bluetooth/lib/att/bearer_unittest.cc b/garnet/drivers/bluetooth/lib/att/bearer_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/att/bearer_unittest.cc rename to garnet/drivers/bluetooth/lib/att/bearer_unittest.cc
diff --git a/drivers/bluetooth/lib/att/database.cc b/garnet/drivers/bluetooth/lib/att/database.cc similarity index 100% rename from drivers/bluetooth/lib/att/database.cc rename to garnet/drivers/bluetooth/lib/att/database.cc
diff --git a/drivers/bluetooth/lib/att/database.h b/garnet/drivers/bluetooth/lib/att/database.h similarity index 100% rename from drivers/bluetooth/lib/att/database.h rename to garnet/drivers/bluetooth/lib/att/database.h
diff --git a/drivers/bluetooth/lib/att/database_unittest.cc b/garnet/drivers/bluetooth/lib/att/database_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/att/database_unittest.cc rename to garnet/drivers/bluetooth/lib/att/database_unittest.cc
diff --git a/drivers/bluetooth/lib/att/packet.cc b/garnet/drivers/bluetooth/lib/att/packet.cc similarity index 100% rename from drivers/bluetooth/lib/att/packet.cc rename to garnet/drivers/bluetooth/lib/att/packet.cc
diff --git a/drivers/bluetooth/lib/att/packet.h b/garnet/drivers/bluetooth/lib/att/packet.h similarity index 100% rename from drivers/bluetooth/lib/att/packet.h rename to garnet/drivers/bluetooth/lib/att/packet.h
diff --git a/drivers/bluetooth/lib/att/status.cc b/garnet/drivers/bluetooth/lib/att/status.cc similarity index 100% rename from drivers/bluetooth/lib/att/status.cc rename to garnet/drivers/bluetooth/lib/att/status.cc
diff --git a/drivers/bluetooth/lib/att/status.h b/garnet/drivers/bluetooth/lib/att/status.h similarity index 100% rename from drivers/bluetooth/lib/att/status.h rename to garnet/drivers/bluetooth/lib/att/status.h
diff --git a/drivers/bluetooth/lib/common/BUILD.gn b/garnet/drivers/bluetooth/lib/common/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/common/BUILD.gn rename to garnet/drivers/bluetooth/lib/common/BUILD.gn
diff --git a/drivers/bluetooth/lib/common/byte_buffer.cc b/garnet/drivers/bluetooth/lib/common/byte_buffer.cc similarity index 100% rename from drivers/bluetooth/lib/common/byte_buffer.cc rename to garnet/drivers/bluetooth/lib/common/byte_buffer.cc
diff --git a/drivers/bluetooth/lib/common/byte_buffer.h b/garnet/drivers/bluetooth/lib/common/byte_buffer.h similarity index 100% rename from drivers/bluetooth/lib/common/byte_buffer.h rename to garnet/drivers/bluetooth/lib/common/byte_buffer.h
diff --git a/drivers/bluetooth/lib/common/byte_buffer_unittest.cc b/garnet/drivers/bluetooth/lib/common/byte_buffer_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/byte_buffer_unittest.cc rename to garnet/drivers/bluetooth/lib/common/byte_buffer_unittest.cc
diff --git a/drivers/bluetooth/lib/common/device_address.cc b/garnet/drivers/bluetooth/lib/common/device_address.cc similarity index 100% rename from drivers/bluetooth/lib/common/device_address.cc rename to garnet/drivers/bluetooth/lib/common/device_address.cc
diff --git a/drivers/bluetooth/lib/common/device_address.h b/garnet/drivers/bluetooth/lib/common/device_address.h similarity index 100% rename from drivers/bluetooth/lib/common/device_address.h rename to garnet/drivers/bluetooth/lib/common/device_address.h
diff --git a/drivers/bluetooth/lib/common/device_address_unittest.cc b/garnet/drivers/bluetooth/lib/common/device_address_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/device_address_unittest.cc rename to garnet/drivers/bluetooth/lib/common/device_address_unittest.cc
diff --git a/drivers/bluetooth/lib/common/device_class.cc b/garnet/drivers/bluetooth/lib/common/device_class.cc similarity index 100% rename from drivers/bluetooth/lib/common/device_class.cc rename to garnet/drivers/bluetooth/lib/common/device_class.cc
diff --git a/drivers/bluetooth/lib/common/device_class.h b/garnet/drivers/bluetooth/lib/common/device_class.h similarity index 100% rename from drivers/bluetooth/lib/common/device_class.h rename to garnet/drivers/bluetooth/lib/common/device_class.h
diff --git a/drivers/bluetooth/lib/common/device_class_unittest.cc b/garnet/drivers/bluetooth/lib/common/device_class_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/device_class_unittest.cc rename to garnet/drivers/bluetooth/lib/common/device_class_unittest.cc
diff --git a/drivers/bluetooth/lib/common/linked_list.h b/garnet/drivers/bluetooth/lib/common/linked_list.h similarity index 100% rename from drivers/bluetooth/lib/common/linked_list.h rename to garnet/drivers/bluetooth/lib/common/linked_list.h
diff --git a/drivers/bluetooth/lib/common/log.cc b/garnet/drivers/bluetooth/lib/common/log.cc similarity index 100% rename from drivers/bluetooth/lib/common/log.cc rename to garnet/drivers/bluetooth/lib/common/log.cc
diff --git a/drivers/bluetooth/lib/common/log.h b/garnet/drivers/bluetooth/lib/common/log.h similarity index 100% rename from drivers/bluetooth/lib/common/log.h rename to garnet/drivers/bluetooth/lib/common/log.h
diff --git a/drivers/bluetooth/lib/common/manufacturer_names.cc b/garnet/drivers/bluetooth/lib/common/manufacturer_names.cc similarity index 100% rename from drivers/bluetooth/lib/common/manufacturer_names.cc rename to garnet/drivers/bluetooth/lib/common/manufacturer_names.cc
diff --git a/drivers/bluetooth/lib/common/manufacturer_names.h b/garnet/drivers/bluetooth/lib/common/manufacturer_names.h similarity index 100% rename from drivers/bluetooth/lib/common/manufacturer_names.h rename to garnet/drivers/bluetooth/lib/common/manufacturer_names.h
diff --git a/drivers/bluetooth/lib/common/manufacturer_names_unittest.cc b/garnet/drivers/bluetooth/lib/common/manufacturer_names_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/manufacturer_names_unittest.cc rename to garnet/drivers/bluetooth/lib/common/manufacturer_names_unittest.cc
diff --git a/drivers/bluetooth/lib/common/packet_view.h b/garnet/drivers/bluetooth/lib/common/packet_view.h similarity index 100% rename from drivers/bluetooth/lib/common/packet_view.h rename to garnet/drivers/bluetooth/lib/common/packet_view.h
diff --git a/drivers/bluetooth/lib/common/packet_view_unittest.cc b/garnet/drivers/bluetooth/lib/common/packet_view_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/packet_view_unittest.cc rename to garnet/drivers/bluetooth/lib/common/packet_view_unittest.cc
diff --git a/drivers/bluetooth/lib/common/run_or_post.cc b/garnet/drivers/bluetooth/lib/common/run_or_post.cc similarity index 100% rename from drivers/bluetooth/lib/common/run_or_post.cc rename to garnet/drivers/bluetooth/lib/common/run_or_post.cc
diff --git a/drivers/bluetooth/lib/common/run_or_post.h b/garnet/drivers/bluetooth/lib/common/run_or_post.h similarity index 100% rename from drivers/bluetooth/lib/common/run_or_post.h rename to garnet/drivers/bluetooth/lib/common/run_or_post.h
diff --git a/drivers/bluetooth/lib/common/run_or_post_unittest.cc b/garnet/drivers/bluetooth/lib/common/run_or_post_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/run_or_post_unittest.cc rename to garnet/drivers/bluetooth/lib/common/run_or_post_unittest.cc
diff --git a/drivers/bluetooth/lib/common/run_task_sync.cc b/garnet/drivers/bluetooth/lib/common/run_task_sync.cc similarity index 100% rename from drivers/bluetooth/lib/common/run_task_sync.cc rename to garnet/drivers/bluetooth/lib/common/run_task_sync.cc
diff --git a/drivers/bluetooth/lib/common/run_task_sync.h b/garnet/drivers/bluetooth/lib/common/run_task_sync.h similarity index 100% rename from drivers/bluetooth/lib/common/run_task_sync.h rename to garnet/drivers/bluetooth/lib/common/run_task_sync.h
diff --git a/drivers/bluetooth/lib/common/run_task_sync_unittest.cc b/garnet/drivers/bluetooth/lib/common/run_task_sync_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/run_task_sync_unittest.cc rename to garnet/drivers/bluetooth/lib/common/run_task_sync_unittest.cc
diff --git a/drivers/bluetooth/lib/common/slab_allocator.cc b/garnet/drivers/bluetooth/lib/common/slab_allocator.cc similarity index 100% rename from drivers/bluetooth/lib/common/slab_allocator.cc rename to garnet/drivers/bluetooth/lib/common/slab_allocator.cc
diff --git a/drivers/bluetooth/lib/common/slab_allocator.h b/garnet/drivers/bluetooth/lib/common/slab_allocator.h similarity index 100% rename from drivers/bluetooth/lib/common/slab_allocator.h rename to garnet/drivers/bluetooth/lib/common/slab_allocator.h
diff --git a/drivers/bluetooth/lib/common/slab_allocator_traits.h b/garnet/drivers/bluetooth/lib/common/slab_allocator_traits.h similarity index 100% rename from drivers/bluetooth/lib/common/slab_allocator_traits.h rename to garnet/drivers/bluetooth/lib/common/slab_allocator_traits.h
diff --git a/drivers/bluetooth/lib/common/slab_allocator_traits_unittest.cc b/garnet/drivers/bluetooth/lib/common/slab_allocator_traits_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/slab_allocator_traits_unittest.cc rename to garnet/drivers/bluetooth/lib/common/slab_allocator_traits_unittest.cc
diff --git a/drivers/bluetooth/lib/common/slab_allocator_unittest.cc b/garnet/drivers/bluetooth/lib/common/slab_allocator_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/slab_allocator_unittest.cc rename to garnet/drivers/bluetooth/lib/common/slab_allocator_unittest.cc
diff --git a/drivers/bluetooth/lib/common/slab_buffer.h b/garnet/drivers/bluetooth/lib/common/slab_buffer.h similarity index 100% rename from drivers/bluetooth/lib/common/slab_buffer.h rename to garnet/drivers/bluetooth/lib/common/slab_buffer.h
diff --git a/drivers/bluetooth/lib/common/status.cc b/garnet/drivers/bluetooth/lib/common/status.cc similarity index 100% rename from drivers/bluetooth/lib/common/status.cc rename to garnet/drivers/bluetooth/lib/common/status.cc
diff --git a/drivers/bluetooth/lib/common/status.h b/garnet/drivers/bluetooth/lib/common/status.h similarity index 100% rename from drivers/bluetooth/lib/common/status.h rename to garnet/drivers/bluetooth/lib/common/status.h
diff --git a/drivers/bluetooth/lib/common/status_unittest.cc b/garnet/drivers/bluetooth/lib/common/status_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/status_unittest.cc rename to garnet/drivers/bluetooth/lib/common/status_unittest.cc
diff --git a/drivers/bluetooth/lib/common/task_domain.h b/garnet/drivers/bluetooth/lib/common/task_domain.h similarity index 100% rename from drivers/bluetooth/lib/common/task_domain.h rename to garnet/drivers/bluetooth/lib/common/task_domain.h
diff --git a/drivers/bluetooth/lib/common/task_domain_unittest.cc b/garnet/drivers/bluetooth/lib/common/task_domain_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/task_domain_unittest.cc rename to garnet/drivers/bluetooth/lib/common/task_domain_unittest.cc
diff --git a/drivers/bluetooth/lib/common/test_helpers.h b/garnet/drivers/bluetooth/lib/common/test_helpers.h similarity index 100% rename from drivers/bluetooth/lib/common/test_helpers.h rename to garnet/drivers/bluetooth/lib/common/test_helpers.h
diff --git a/drivers/bluetooth/lib/common/uint128.cc b/garnet/drivers/bluetooth/lib/common/uint128.cc similarity index 100% rename from drivers/bluetooth/lib/common/uint128.cc rename to garnet/drivers/bluetooth/lib/common/uint128.cc
diff --git a/drivers/bluetooth/lib/common/uint128.h b/garnet/drivers/bluetooth/lib/common/uint128.h similarity index 100% rename from drivers/bluetooth/lib/common/uint128.h rename to garnet/drivers/bluetooth/lib/common/uint128.h
diff --git a/drivers/bluetooth/lib/common/uuid.cc b/garnet/drivers/bluetooth/lib/common/uuid.cc similarity index 100% rename from drivers/bluetooth/lib/common/uuid.cc rename to garnet/drivers/bluetooth/lib/common/uuid.cc
diff --git a/drivers/bluetooth/lib/common/uuid.h b/garnet/drivers/bluetooth/lib/common/uuid.h similarity index 100% rename from drivers/bluetooth/lib/common/uuid.h rename to garnet/drivers/bluetooth/lib/common/uuid.h
diff --git a/drivers/bluetooth/lib/common/uuid_unittest.cc b/garnet/drivers/bluetooth/lib/common/uuid_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/common/uuid_unittest.cc rename to garnet/drivers/bluetooth/lib/common/uuid_unittest.cc
diff --git a/drivers/bluetooth/lib/data/BUILD.gn b/garnet/drivers/bluetooth/lib/data/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/data/BUILD.gn rename to garnet/drivers/bluetooth/lib/data/BUILD.gn
diff --git a/drivers/bluetooth/lib/data/domain.cc b/garnet/drivers/bluetooth/lib/data/domain.cc similarity index 100% rename from drivers/bluetooth/lib/data/domain.cc rename to garnet/drivers/bluetooth/lib/data/domain.cc
diff --git a/drivers/bluetooth/lib/data/domain.h b/garnet/drivers/bluetooth/lib/data/domain.h similarity index 100% rename from drivers/bluetooth/lib/data/domain.h rename to garnet/drivers/bluetooth/lib/data/domain.h
diff --git a/drivers/bluetooth/lib/data/domain_unittest.cc b/garnet/drivers/bluetooth/lib/data/domain_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/data/domain_unittest.cc rename to garnet/drivers/bluetooth/lib/data/domain_unittest.cc
diff --git a/drivers/bluetooth/lib/data/fake_domain.cc b/garnet/drivers/bluetooth/lib/data/fake_domain.cc similarity index 100% rename from drivers/bluetooth/lib/data/fake_domain.cc rename to garnet/drivers/bluetooth/lib/data/fake_domain.cc
diff --git a/drivers/bluetooth/lib/data/fake_domain.h b/garnet/drivers/bluetooth/lib/data/fake_domain.h similarity index 100% rename from drivers/bluetooth/lib/data/fake_domain.h rename to garnet/drivers/bluetooth/lib/data/fake_domain.h
diff --git a/drivers/bluetooth/lib/data/l2cap_socket_channel_relay.cc b/garnet/drivers/bluetooth/lib/data/l2cap_socket_channel_relay.cc similarity index 100% rename from drivers/bluetooth/lib/data/l2cap_socket_channel_relay.cc rename to garnet/drivers/bluetooth/lib/data/l2cap_socket_channel_relay.cc
diff --git a/drivers/bluetooth/lib/data/l2cap_socket_factory.cc b/garnet/drivers/bluetooth/lib/data/l2cap_socket_factory.cc similarity index 100% rename from drivers/bluetooth/lib/data/l2cap_socket_factory.cc rename to garnet/drivers/bluetooth/lib/data/l2cap_socket_factory.cc
diff --git a/drivers/bluetooth/lib/data/rfcomm_socket_channel_relay.cc b/garnet/drivers/bluetooth/lib/data/rfcomm_socket_channel_relay.cc similarity index 100% rename from drivers/bluetooth/lib/data/rfcomm_socket_channel_relay.cc rename to garnet/drivers/bluetooth/lib/data/rfcomm_socket_channel_relay.cc
diff --git a/drivers/bluetooth/lib/data/rfcomm_socket_factory.cc b/garnet/drivers/bluetooth/lib/data/rfcomm_socket_factory.cc similarity index 100% rename from drivers/bluetooth/lib/data/rfcomm_socket_factory.cc rename to garnet/drivers/bluetooth/lib/data/rfcomm_socket_factory.cc
diff --git a/drivers/bluetooth/lib/data/socket_channel_relay.cc b/garnet/drivers/bluetooth/lib/data/socket_channel_relay.cc similarity index 100% rename from drivers/bluetooth/lib/data/socket_channel_relay.cc rename to garnet/drivers/bluetooth/lib/data/socket_channel_relay.cc
diff --git a/drivers/bluetooth/lib/data/socket_channel_relay.h b/garnet/drivers/bluetooth/lib/data/socket_channel_relay.h similarity index 100% rename from drivers/bluetooth/lib/data/socket_channel_relay.h rename to garnet/drivers/bluetooth/lib/data/socket_channel_relay.h
diff --git a/drivers/bluetooth/lib/data/socket_channel_relay_unittest.cc b/garnet/drivers/bluetooth/lib/data/socket_channel_relay_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/data/socket_channel_relay_unittest.cc rename to garnet/drivers/bluetooth/lib/data/socket_channel_relay_unittest.cc
diff --git a/drivers/bluetooth/lib/data/socket_factory.cc b/garnet/drivers/bluetooth/lib/data/socket_factory.cc similarity index 100% rename from drivers/bluetooth/lib/data/socket_factory.cc rename to garnet/drivers/bluetooth/lib/data/socket_factory.cc
diff --git a/drivers/bluetooth/lib/data/socket_factory.h b/garnet/drivers/bluetooth/lib/data/socket_factory.h similarity index 100% rename from drivers/bluetooth/lib/data/socket_factory.h rename to garnet/drivers/bluetooth/lib/data/socket_factory.h
diff --git a/drivers/bluetooth/lib/data/socket_factory_unittest.cc b/garnet/drivers/bluetooth/lib/data/socket_factory_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/data/socket_factory_unittest.cc rename to garnet/drivers/bluetooth/lib/data/socket_factory_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/BUILD.gn b/garnet/drivers/bluetooth/lib/gap/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/gap/BUILD.gn rename to garnet/drivers/bluetooth/lib/gap/BUILD.gn
diff --git a/drivers/bluetooth/lib/gap/README.md b/garnet/drivers/bluetooth/lib/gap/README.md similarity index 100% rename from drivers/bluetooth/lib/gap/README.md rename to garnet/drivers/bluetooth/lib/gap/README.md
diff --git a/drivers/bluetooth/lib/gap/adapter.cc b/garnet/drivers/bluetooth/lib/gap/adapter.cc similarity index 100% rename from drivers/bluetooth/lib/gap/adapter.cc rename to garnet/drivers/bluetooth/lib/gap/adapter.cc
diff --git a/drivers/bluetooth/lib/gap/adapter.h b/garnet/drivers/bluetooth/lib/gap/adapter.h similarity index 100% rename from drivers/bluetooth/lib/gap/adapter.h rename to garnet/drivers/bluetooth/lib/gap/adapter.h
diff --git a/drivers/bluetooth/lib/gap/adapter_state.cc b/garnet/drivers/bluetooth/lib/gap/adapter_state.cc similarity index 100% rename from drivers/bluetooth/lib/gap/adapter_state.cc rename to garnet/drivers/bluetooth/lib/gap/adapter_state.cc
diff --git a/drivers/bluetooth/lib/gap/adapter_state.h b/garnet/drivers/bluetooth/lib/gap/adapter_state.h similarity index 100% rename from drivers/bluetooth/lib/gap/adapter_state.h rename to garnet/drivers/bluetooth/lib/gap/adapter_state.h
diff --git a/drivers/bluetooth/lib/gap/adapter_unittest.cc b/garnet/drivers/bluetooth/lib/gap/adapter_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/adapter_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/adapter_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/advertising_data.cc b/garnet/drivers/bluetooth/lib/gap/advertising_data.cc similarity index 100% rename from drivers/bluetooth/lib/gap/advertising_data.cc rename to garnet/drivers/bluetooth/lib/gap/advertising_data.cc
diff --git a/drivers/bluetooth/lib/gap/advertising_data.h b/garnet/drivers/bluetooth/lib/gap/advertising_data.h similarity index 100% rename from drivers/bluetooth/lib/gap/advertising_data.h rename to garnet/drivers/bluetooth/lib/gap/advertising_data.h
diff --git a/drivers/bluetooth/lib/gap/advertising_data_unittest.cc b/garnet/drivers/bluetooth/lib/gap/advertising_data_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/advertising_data_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/advertising_data_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/bredr_connection_manager.cc b/garnet/drivers/bluetooth/lib/gap/bredr_connection_manager.cc similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_connection_manager.cc rename to garnet/drivers/bluetooth/lib/gap/bredr_connection_manager.cc
diff --git a/drivers/bluetooth/lib/gap/bredr_connection_manager.h b/garnet/drivers/bluetooth/lib/gap/bredr_connection_manager.h similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_connection_manager.h rename to garnet/drivers/bluetooth/lib/gap/bredr_connection_manager.h
diff --git a/drivers/bluetooth/lib/gap/bredr_connection_manager_unittest.cc b/garnet/drivers/bluetooth/lib/gap/bredr_connection_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_connection_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/bredr_connection_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/bredr_discovery_manager.cc b/garnet/drivers/bluetooth/lib/gap/bredr_discovery_manager.cc similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_discovery_manager.cc rename to garnet/drivers/bluetooth/lib/gap/bredr_discovery_manager.cc
diff --git a/drivers/bluetooth/lib/gap/bredr_discovery_manager.h b/garnet/drivers/bluetooth/lib/gap/bredr_discovery_manager.h similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_discovery_manager.h rename to garnet/drivers/bluetooth/lib/gap/bredr_discovery_manager.h
diff --git a/drivers/bluetooth/lib/gap/bredr_discovery_manager_unittest.cc b/garnet/drivers/bluetooth/lib/gap/bredr_discovery_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_discovery_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/bredr_discovery_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/bredr_interrogator.cc b/garnet/drivers/bluetooth/lib/gap/bredr_interrogator.cc similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_interrogator.cc rename to garnet/drivers/bluetooth/lib/gap/bredr_interrogator.cc
diff --git a/drivers/bluetooth/lib/gap/bredr_interrogator.h b/garnet/drivers/bluetooth/lib/gap/bredr_interrogator.h similarity index 100% rename from drivers/bluetooth/lib/gap/bredr_interrogator.h rename to garnet/drivers/bluetooth/lib/gap/bredr_interrogator.h
diff --git a/drivers/bluetooth/lib/gap/discovery_filter.cc b/garnet/drivers/bluetooth/lib/gap/discovery_filter.cc similarity index 100% rename from drivers/bluetooth/lib/gap/discovery_filter.cc rename to garnet/drivers/bluetooth/lib/gap/discovery_filter.cc
diff --git a/drivers/bluetooth/lib/gap/discovery_filter.h b/garnet/drivers/bluetooth/lib/gap/discovery_filter.h similarity index 100% rename from drivers/bluetooth/lib/gap/discovery_filter.h rename to garnet/drivers/bluetooth/lib/gap/discovery_filter.h
diff --git a/drivers/bluetooth/lib/gap/discovery_filter_unittest.cc b/garnet/drivers/bluetooth/lib/gap/discovery_filter_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/discovery_filter_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/discovery_filter_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/gap.h b/garnet/drivers/bluetooth/lib/gap/gap.h similarity index 100% rename from drivers/bluetooth/lib/gap/gap.h rename to garnet/drivers/bluetooth/lib/gap/gap.h
diff --git a/drivers/bluetooth/lib/gap/identity_resolving_list.cc b/garnet/drivers/bluetooth/lib/gap/identity_resolving_list.cc similarity index 100% rename from drivers/bluetooth/lib/gap/identity_resolving_list.cc rename to garnet/drivers/bluetooth/lib/gap/identity_resolving_list.cc
diff --git a/drivers/bluetooth/lib/gap/identity_resolving_list.h b/garnet/drivers/bluetooth/lib/gap/identity_resolving_list.h similarity index 100% rename from drivers/bluetooth/lib/gap/identity_resolving_list.h rename to garnet/drivers/bluetooth/lib/gap/identity_resolving_list.h
diff --git a/drivers/bluetooth/lib/gap/identity_resolving_list_unittest.cc b/garnet/drivers/bluetooth/lib/gap/identity_resolving_list_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/identity_resolving_list_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/identity_resolving_list_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_advertising_manager.cc b/garnet/drivers/bluetooth/lib/gap/low_energy_advertising_manager.cc similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_advertising_manager.cc rename to garnet/drivers/bluetooth/lib/gap/low_energy_advertising_manager.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_advertising_manager.h b/garnet/drivers/bluetooth/lib/gap/low_energy_advertising_manager.h similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_advertising_manager.h rename to garnet/drivers/bluetooth/lib/gap/low_energy_advertising_manager.h
diff --git a/drivers/bluetooth/lib/gap/low_energy_advertising_manager_unittest.cc b/garnet/drivers/bluetooth/lib/gap/low_energy_advertising_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_advertising_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/low_energy_advertising_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_connection_manager.cc b/garnet/drivers/bluetooth/lib/gap/low_energy_connection_manager.cc similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_connection_manager.cc rename to garnet/drivers/bluetooth/lib/gap/low_energy_connection_manager.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_connection_manager.h b/garnet/drivers/bluetooth/lib/gap/low_energy_connection_manager.h similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_connection_manager.h rename to garnet/drivers/bluetooth/lib/gap/low_energy_connection_manager.h
diff --git a/drivers/bluetooth/lib/gap/low_energy_connection_manager_unittest.cc b/garnet/drivers/bluetooth/lib/gap/low_energy_connection_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_connection_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/low_energy_connection_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_discovery_manager.cc b/garnet/drivers/bluetooth/lib/gap/low_energy_discovery_manager.cc similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_discovery_manager.cc rename to garnet/drivers/bluetooth/lib/gap/low_energy_discovery_manager.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_discovery_manager.h b/garnet/drivers/bluetooth/lib/gap/low_energy_discovery_manager.h similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_discovery_manager.h rename to garnet/drivers/bluetooth/lib/gap/low_energy_discovery_manager.h
diff --git a/drivers/bluetooth/lib/gap/low_energy_discovery_manager_unittest.cc b/garnet/drivers/bluetooth/lib/gap/low_energy_discovery_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_discovery_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/low_energy_discovery_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_state.cc b/garnet/drivers/bluetooth/lib/gap/low_energy_state.cc similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_state.cc rename to garnet/drivers/bluetooth/lib/gap/low_energy_state.cc
diff --git a/drivers/bluetooth/lib/gap/low_energy_state.h b/garnet/drivers/bluetooth/lib/gap/low_energy_state.h similarity index 100% rename from drivers/bluetooth/lib/gap/low_energy_state.h rename to garnet/drivers/bluetooth/lib/gap/low_energy_state.h
diff --git a/drivers/bluetooth/lib/gap/pairing_delegate.h b/garnet/drivers/bluetooth/lib/gap/pairing_delegate.h similarity index 100% rename from drivers/bluetooth/lib/gap/pairing_delegate.h rename to garnet/drivers/bluetooth/lib/gap/pairing_delegate.h
diff --git a/drivers/bluetooth/lib/gap/random_address_generator.cc b/garnet/drivers/bluetooth/lib/gap/random_address_generator.cc similarity index 100% rename from drivers/bluetooth/lib/gap/random_address_generator.cc rename to garnet/drivers/bluetooth/lib/gap/random_address_generator.cc
diff --git a/drivers/bluetooth/lib/gap/random_address_generator.h b/garnet/drivers/bluetooth/lib/gap/random_address_generator.h similarity index 100% rename from drivers/bluetooth/lib/gap/random_address_generator.h rename to garnet/drivers/bluetooth/lib/gap/random_address_generator.h
diff --git a/drivers/bluetooth/lib/gap/random_address_generator_unittest.cc b/garnet/drivers/bluetooth/lib/gap/random_address_generator_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/random_address_generator_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/random_address_generator_unittest.cc
diff --git a/drivers/bluetooth/lib/gap/remote_device.cc b/garnet/drivers/bluetooth/lib/gap/remote_device.cc similarity index 100% rename from drivers/bluetooth/lib/gap/remote_device.cc rename to garnet/drivers/bluetooth/lib/gap/remote_device.cc
diff --git a/drivers/bluetooth/lib/gap/remote_device.h b/garnet/drivers/bluetooth/lib/gap/remote_device.h similarity index 100% rename from drivers/bluetooth/lib/gap/remote_device.h rename to garnet/drivers/bluetooth/lib/gap/remote_device.h
diff --git a/drivers/bluetooth/lib/gap/remote_device_cache.cc b/garnet/drivers/bluetooth/lib/gap/remote_device_cache.cc similarity index 100% rename from drivers/bluetooth/lib/gap/remote_device_cache.cc rename to garnet/drivers/bluetooth/lib/gap/remote_device_cache.cc
diff --git a/drivers/bluetooth/lib/gap/remote_device_cache.h b/garnet/drivers/bluetooth/lib/gap/remote_device_cache.h similarity index 100% rename from drivers/bluetooth/lib/gap/remote_device_cache.h rename to garnet/drivers/bluetooth/lib/gap/remote_device_cache.h
diff --git a/drivers/bluetooth/lib/gap/remote_device_cache_unittest.cc b/garnet/drivers/bluetooth/lib/gap/remote_device_cache_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gap/remote_device_cache_unittest.cc rename to garnet/drivers/bluetooth/lib/gap/remote_device_cache_unittest.cc
diff --git a/drivers/bluetooth/lib/gatt/BUILD.gn b/garnet/drivers/bluetooth/lib/gatt/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/gatt/BUILD.gn rename to garnet/drivers/bluetooth/lib/gatt/BUILD.gn
diff --git a/drivers/bluetooth/lib/gatt/client.cc b/garnet/drivers/bluetooth/lib/gatt/client.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/client.cc rename to garnet/drivers/bluetooth/lib/gatt/client.cc
diff --git a/drivers/bluetooth/lib/gatt/client.h b/garnet/drivers/bluetooth/lib/gatt/client.h similarity index 100% rename from drivers/bluetooth/lib/gatt/client.h rename to garnet/drivers/bluetooth/lib/gatt/client.h
diff --git a/drivers/bluetooth/lib/gatt/client_unittest.cc b/garnet/drivers/bluetooth/lib/gatt/client_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/client_unittest.cc rename to garnet/drivers/bluetooth/lib/gatt/client_unittest.cc
diff --git a/drivers/bluetooth/lib/gatt/connection.cc b/garnet/drivers/bluetooth/lib/gatt/connection.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/connection.cc rename to garnet/drivers/bluetooth/lib/gatt/connection.cc
diff --git a/drivers/bluetooth/lib/gatt/connection.h b/garnet/drivers/bluetooth/lib/gatt/connection.h similarity index 100% rename from drivers/bluetooth/lib/gatt/connection.h rename to garnet/drivers/bluetooth/lib/gatt/connection.h
diff --git a/drivers/bluetooth/lib/gatt/fake_client.cc b/garnet/drivers/bluetooth/lib/gatt/fake_client.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/fake_client.cc rename to garnet/drivers/bluetooth/lib/gatt/fake_client.cc
diff --git a/drivers/bluetooth/lib/gatt/fake_client.h b/garnet/drivers/bluetooth/lib/gatt/fake_client.h similarity index 100% rename from drivers/bluetooth/lib/gatt/fake_client.h rename to garnet/drivers/bluetooth/lib/gatt/fake_client.h
diff --git a/drivers/bluetooth/lib/gatt/fake_layer.cc b/garnet/drivers/bluetooth/lib/gatt/fake_layer.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/fake_layer.cc rename to garnet/drivers/bluetooth/lib/gatt/fake_layer.cc
diff --git a/drivers/bluetooth/lib/gatt/fake_layer.h b/garnet/drivers/bluetooth/lib/gatt/fake_layer.h similarity index 100% rename from drivers/bluetooth/lib/gatt/fake_layer.h rename to garnet/drivers/bluetooth/lib/gatt/fake_layer.h
diff --git a/drivers/bluetooth/lib/gatt/gatt.cc b/garnet/drivers/bluetooth/lib/gatt/gatt.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/gatt.cc rename to garnet/drivers/bluetooth/lib/gatt/gatt.cc
diff --git a/drivers/bluetooth/lib/gatt/gatt.h b/garnet/drivers/bluetooth/lib/gatt/gatt.h similarity index 100% rename from drivers/bluetooth/lib/gatt/gatt.h rename to garnet/drivers/bluetooth/lib/gatt/gatt.h
diff --git a/drivers/bluetooth/lib/gatt/gatt_defs.cc b/garnet/drivers/bluetooth/lib/gatt/gatt_defs.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/gatt_defs.cc rename to garnet/drivers/bluetooth/lib/gatt/gatt_defs.cc
diff --git a/drivers/bluetooth/lib/gatt/gatt_defs.h b/garnet/drivers/bluetooth/lib/gatt/gatt_defs.h similarity index 100% rename from drivers/bluetooth/lib/gatt/gatt_defs.h rename to garnet/drivers/bluetooth/lib/gatt/gatt_defs.h
diff --git a/drivers/bluetooth/lib/gatt/generic_attribute_service.cc b/garnet/drivers/bluetooth/lib/gatt/generic_attribute_service.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/generic_attribute_service.cc rename to garnet/drivers/bluetooth/lib/gatt/generic_attribute_service.cc
diff --git a/drivers/bluetooth/lib/gatt/generic_attribute_service.h b/garnet/drivers/bluetooth/lib/gatt/generic_attribute_service.h similarity index 100% rename from drivers/bluetooth/lib/gatt/generic_attribute_service.h rename to garnet/drivers/bluetooth/lib/gatt/generic_attribute_service.h
diff --git a/drivers/bluetooth/lib/gatt/generic_attribute_service_unittest.cc b/garnet/drivers/bluetooth/lib/gatt/generic_attribute_service_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/generic_attribute_service_unittest.cc rename to garnet/drivers/bluetooth/lib/gatt/generic_attribute_service_unittest.cc
diff --git a/drivers/bluetooth/lib/gatt/local_service_manager.cc b/garnet/drivers/bluetooth/lib/gatt/local_service_manager.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/local_service_manager.cc rename to garnet/drivers/bluetooth/lib/gatt/local_service_manager.cc
diff --git a/drivers/bluetooth/lib/gatt/local_service_manager.h b/garnet/drivers/bluetooth/lib/gatt/local_service_manager.h similarity index 100% rename from drivers/bluetooth/lib/gatt/local_service_manager.h rename to garnet/drivers/bluetooth/lib/gatt/local_service_manager.h
diff --git a/drivers/bluetooth/lib/gatt/local_service_manager_unittest.cc b/garnet/drivers/bluetooth/lib/gatt/local_service_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/local_service_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/gatt/local_service_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/gatt/remote_characteristic.cc b/garnet/drivers/bluetooth/lib/gatt/remote_characteristic.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/remote_characteristic.cc rename to garnet/drivers/bluetooth/lib/gatt/remote_characteristic.cc
diff --git a/drivers/bluetooth/lib/gatt/remote_characteristic.h b/garnet/drivers/bluetooth/lib/gatt/remote_characteristic.h similarity index 100% rename from drivers/bluetooth/lib/gatt/remote_characteristic.h rename to garnet/drivers/bluetooth/lib/gatt/remote_characteristic.h
diff --git a/drivers/bluetooth/lib/gatt/remote_service.cc b/garnet/drivers/bluetooth/lib/gatt/remote_service.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/remote_service.cc rename to garnet/drivers/bluetooth/lib/gatt/remote_service.cc
diff --git a/drivers/bluetooth/lib/gatt/remote_service.h b/garnet/drivers/bluetooth/lib/gatt/remote_service.h similarity index 100% rename from drivers/bluetooth/lib/gatt/remote_service.h rename to garnet/drivers/bluetooth/lib/gatt/remote_service.h
diff --git a/drivers/bluetooth/lib/gatt/remote_service_manager.cc b/garnet/drivers/bluetooth/lib/gatt/remote_service_manager.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/remote_service_manager.cc rename to garnet/drivers/bluetooth/lib/gatt/remote_service_manager.cc
diff --git a/drivers/bluetooth/lib/gatt/remote_service_manager.h b/garnet/drivers/bluetooth/lib/gatt/remote_service_manager.h similarity index 100% rename from drivers/bluetooth/lib/gatt/remote_service_manager.h rename to garnet/drivers/bluetooth/lib/gatt/remote_service_manager.h
diff --git a/drivers/bluetooth/lib/gatt/remote_service_manager_unittest.cc b/garnet/drivers/bluetooth/lib/gatt/remote_service_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/remote_service_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/gatt/remote_service_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/gatt/server.cc b/garnet/drivers/bluetooth/lib/gatt/server.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/server.cc rename to garnet/drivers/bluetooth/lib/gatt/server.cc
diff --git a/drivers/bluetooth/lib/gatt/server.h b/garnet/drivers/bluetooth/lib/gatt/server.h similarity index 100% rename from drivers/bluetooth/lib/gatt/server.h rename to garnet/drivers/bluetooth/lib/gatt/server.h
diff --git a/drivers/bluetooth/lib/gatt/server_unittest.cc b/garnet/drivers/bluetooth/lib/gatt/server_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/server_unittest.cc rename to garnet/drivers/bluetooth/lib/gatt/server_unittest.cc
diff --git a/drivers/bluetooth/lib/gatt/types.cc b/garnet/drivers/bluetooth/lib/gatt/types.cc similarity index 100% rename from drivers/bluetooth/lib/gatt/types.cc rename to garnet/drivers/bluetooth/lib/gatt/types.cc
diff --git a/drivers/bluetooth/lib/gatt/types.h b/garnet/drivers/bluetooth/lib/gatt/types.h similarity index 100% rename from drivers/bluetooth/lib/gatt/types.h rename to garnet/drivers/bluetooth/lib/gatt/types.h
diff --git a/drivers/bluetooth/lib/hci/BUILD.gn b/garnet/drivers/bluetooth/lib/hci/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/hci/BUILD.gn rename to garnet/drivers/bluetooth/lib/hci/BUILD.gn
diff --git a/drivers/bluetooth/lib/hci/README.md b/garnet/drivers/bluetooth/lib/hci/README.md similarity index 100% rename from drivers/bluetooth/lib/hci/README.md rename to garnet/drivers/bluetooth/lib/hci/README.md
diff --git a/drivers/bluetooth/lib/hci/acl_data_channel.cc b/garnet/drivers/bluetooth/lib/hci/acl_data_channel.cc similarity index 100% rename from drivers/bluetooth/lib/hci/acl_data_channel.cc rename to garnet/drivers/bluetooth/lib/hci/acl_data_channel.cc
diff --git a/drivers/bluetooth/lib/hci/acl_data_channel.h b/garnet/drivers/bluetooth/lib/hci/acl_data_channel.h similarity index 100% rename from drivers/bluetooth/lib/hci/acl_data_channel.h rename to garnet/drivers/bluetooth/lib/hci/acl_data_channel.h
diff --git a/drivers/bluetooth/lib/hci/acl_data_channel_unittest.cc b/garnet/drivers/bluetooth/lib/hci/acl_data_channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/acl_data_channel_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/acl_data_channel_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/acl_data_packet.cc b/garnet/drivers/bluetooth/lib/hci/acl_data_packet.cc similarity index 100% rename from drivers/bluetooth/lib/hci/acl_data_packet.cc rename to garnet/drivers/bluetooth/lib/hci/acl_data_packet.cc
diff --git a/drivers/bluetooth/lib/hci/acl_data_packet.h b/garnet/drivers/bluetooth/lib/hci/acl_data_packet.h similarity index 100% rename from drivers/bluetooth/lib/hci/acl_data_packet.h rename to garnet/drivers/bluetooth/lib/hci/acl_data_packet.h
diff --git a/drivers/bluetooth/lib/hci/advertising_report_parser.cc b/garnet/drivers/bluetooth/lib/hci/advertising_report_parser.cc similarity index 100% rename from drivers/bluetooth/lib/hci/advertising_report_parser.cc rename to garnet/drivers/bluetooth/lib/hci/advertising_report_parser.cc
diff --git a/drivers/bluetooth/lib/hci/advertising_report_parser.h b/garnet/drivers/bluetooth/lib/hci/advertising_report_parser.h similarity index 100% rename from drivers/bluetooth/lib/hci/advertising_report_parser.h rename to garnet/drivers/bluetooth/lib/hci/advertising_report_parser.h
diff --git a/drivers/bluetooth/lib/hci/advertising_report_parser_unittest.cc b/garnet/drivers/bluetooth/lib/hci/advertising_report_parser_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/advertising_report_parser_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/advertising_report_parser_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/command_channel.cc b/garnet/drivers/bluetooth/lib/hci/command_channel.cc similarity index 100% rename from drivers/bluetooth/lib/hci/command_channel.cc rename to garnet/drivers/bluetooth/lib/hci/command_channel.cc
diff --git a/drivers/bluetooth/lib/hci/command_channel.h b/garnet/drivers/bluetooth/lib/hci/command_channel.h similarity index 100% rename from drivers/bluetooth/lib/hci/command_channel.h rename to garnet/drivers/bluetooth/lib/hci/command_channel.h
diff --git a/drivers/bluetooth/lib/hci/command_channel_unittest.cc b/garnet/drivers/bluetooth/lib/hci/command_channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/command_channel_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/command_channel_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/connection.cc b/garnet/drivers/bluetooth/lib/hci/connection.cc similarity index 100% rename from drivers/bluetooth/lib/hci/connection.cc rename to garnet/drivers/bluetooth/lib/hci/connection.cc
diff --git a/drivers/bluetooth/lib/hci/connection.h b/garnet/drivers/bluetooth/lib/hci/connection.h similarity index 100% rename from drivers/bluetooth/lib/hci/connection.h rename to garnet/drivers/bluetooth/lib/hci/connection.h
diff --git a/drivers/bluetooth/lib/hci/connection_parameters.cc b/garnet/drivers/bluetooth/lib/hci/connection_parameters.cc similarity index 100% rename from drivers/bluetooth/lib/hci/connection_parameters.cc rename to garnet/drivers/bluetooth/lib/hci/connection_parameters.cc
diff --git a/drivers/bluetooth/lib/hci/connection_parameters.h b/garnet/drivers/bluetooth/lib/hci/connection_parameters.h similarity index 100% rename from drivers/bluetooth/lib/hci/connection_parameters.h rename to garnet/drivers/bluetooth/lib/hci/connection_parameters.h
diff --git a/drivers/bluetooth/lib/hci/connection_unittest.cc b/garnet/drivers/bluetooth/lib/hci/connection_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/connection_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/connection_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/control_packets.cc b/garnet/drivers/bluetooth/lib/hci/control_packets.cc similarity index 100% rename from drivers/bluetooth/lib/hci/control_packets.cc rename to garnet/drivers/bluetooth/lib/hci/control_packets.cc
diff --git a/drivers/bluetooth/lib/hci/control_packets.h b/garnet/drivers/bluetooth/lib/hci/control_packets.h similarity index 100% rename from drivers/bluetooth/lib/hci/control_packets.h rename to garnet/drivers/bluetooth/lib/hci/control_packets.h
diff --git a/drivers/bluetooth/lib/hci/defaults.h b/garnet/drivers/bluetooth/lib/hci/defaults.h similarity index 100% rename from drivers/bluetooth/lib/hci/defaults.h rename to garnet/drivers/bluetooth/lib/hci/defaults.h
diff --git a/drivers/bluetooth/lib/hci/device_wrapper.cc b/garnet/drivers/bluetooth/lib/hci/device_wrapper.cc similarity index 100% rename from drivers/bluetooth/lib/hci/device_wrapper.cc rename to garnet/drivers/bluetooth/lib/hci/device_wrapper.cc
diff --git a/drivers/bluetooth/lib/hci/device_wrapper.h b/garnet/drivers/bluetooth/lib/hci/device_wrapper.h similarity index 100% rename from drivers/bluetooth/lib/hci/device_wrapper.h rename to garnet/drivers/bluetooth/lib/hci/device_wrapper.h
diff --git a/drivers/bluetooth/lib/hci/fake_connection.cc b/garnet/drivers/bluetooth/lib/hci/fake_connection.cc similarity index 100% rename from drivers/bluetooth/lib/hci/fake_connection.cc rename to garnet/drivers/bluetooth/lib/hci/fake_connection.cc
diff --git a/drivers/bluetooth/lib/hci/fake_connection.h b/garnet/drivers/bluetooth/lib/hci/fake_connection.h similarity index 100% rename from drivers/bluetooth/lib/hci/fake_connection.h rename to garnet/drivers/bluetooth/lib/hci/fake_connection.h
diff --git a/drivers/bluetooth/lib/hci/hci.h b/garnet/drivers/bluetooth/lib/hci/hci.h similarity index 100% rename from drivers/bluetooth/lib/hci/hci.h rename to garnet/drivers/bluetooth/lib/hci/hci.h
diff --git a/drivers/bluetooth/lib/hci/hci_constants.h b/garnet/drivers/bluetooth/lib/hci/hci_constants.h similarity index 100% rename from drivers/bluetooth/lib/hci/hci_constants.h rename to garnet/drivers/bluetooth/lib/hci/hci_constants.h
diff --git a/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.cc b/garnet/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.cc similarity index 100% rename from drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.cc rename to garnet/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.cc
diff --git a/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.h b/garnet/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.h similarity index 100% rename from drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.h rename to garnet/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser.h
diff --git a/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser_unittest.cc b/garnet/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/legacy_low_energy_advertiser_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/legacy_low_energy_advertiser_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/legacy_low_energy_scanner.cc b/garnet/drivers/bluetooth/lib/hci/legacy_low_energy_scanner.cc similarity index 100% rename from drivers/bluetooth/lib/hci/legacy_low_energy_scanner.cc rename to garnet/drivers/bluetooth/lib/hci/legacy_low_energy_scanner.cc
diff --git a/drivers/bluetooth/lib/hci/legacy_low_energy_scanner.h b/garnet/drivers/bluetooth/lib/hci/legacy_low_energy_scanner.h similarity index 100% rename from drivers/bluetooth/lib/hci/legacy_low_energy_scanner.h rename to garnet/drivers/bluetooth/lib/hci/legacy_low_energy_scanner.h
diff --git a/drivers/bluetooth/lib/hci/legacy_low_energy_scanner_unittest.cc b/garnet/drivers/bluetooth/lib/hci/legacy_low_energy_scanner_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/legacy_low_energy_scanner_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/legacy_low_energy_scanner_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/link_key.cc b/garnet/drivers/bluetooth/lib/hci/link_key.cc similarity index 100% rename from drivers/bluetooth/lib/hci/link_key.cc rename to garnet/drivers/bluetooth/lib/hci/link_key.cc
diff --git a/drivers/bluetooth/lib/hci/link_key.h b/garnet/drivers/bluetooth/lib/hci/link_key.h similarity index 100% rename from drivers/bluetooth/lib/hci/link_key.h rename to garnet/drivers/bluetooth/lib/hci/link_key.h
diff --git a/drivers/bluetooth/lib/hci/lmp_feature_set.h b/garnet/drivers/bluetooth/lib/hci/lmp_feature_set.h similarity index 100% rename from drivers/bluetooth/lib/hci/lmp_feature_set.h rename to garnet/drivers/bluetooth/lib/hci/lmp_feature_set.h
diff --git a/drivers/bluetooth/lib/hci/low_energy_advertiser.h b/garnet/drivers/bluetooth/lib/hci/low_energy_advertiser.h similarity index 100% rename from drivers/bluetooth/lib/hci/low_energy_advertiser.h rename to garnet/drivers/bluetooth/lib/hci/low_energy_advertiser.h
diff --git a/drivers/bluetooth/lib/hci/low_energy_connector.cc b/garnet/drivers/bluetooth/lib/hci/low_energy_connector.cc similarity index 100% rename from drivers/bluetooth/lib/hci/low_energy_connector.cc rename to garnet/drivers/bluetooth/lib/hci/low_energy_connector.cc
diff --git a/drivers/bluetooth/lib/hci/low_energy_connector.h b/garnet/drivers/bluetooth/lib/hci/low_energy_connector.h similarity index 100% rename from drivers/bluetooth/lib/hci/low_energy_connector.h rename to garnet/drivers/bluetooth/lib/hci/low_energy_connector.h
diff --git a/drivers/bluetooth/lib/hci/low_energy_connector_unittest.cc b/garnet/drivers/bluetooth/lib/hci/low_energy_connector_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/low_energy_connector_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/low_energy_connector_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/low_energy_scanner.cc b/garnet/drivers/bluetooth/lib/hci/low_energy_scanner.cc similarity index 100% rename from drivers/bluetooth/lib/hci/low_energy_scanner.cc rename to garnet/drivers/bluetooth/lib/hci/low_energy_scanner.cc
diff --git a/drivers/bluetooth/lib/hci/low_energy_scanner.h b/garnet/drivers/bluetooth/lib/hci/low_energy_scanner.h similarity index 100% rename from drivers/bluetooth/lib/hci/low_energy_scanner.h rename to garnet/drivers/bluetooth/lib/hci/low_energy_scanner.h
diff --git a/drivers/bluetooth/lib/hci/packet.h b/garnet/drivers/bluetooth/lib/hci/packet.h similarity index 100% rename from drivers/bluetooth/lib/hci/packet.h rename to garnet/drivers/bluetooth/lib/hci/packet.h
diff --git a/drivers/bluetooth/lib/hci/packet_unittest.cc b/garnet/drivers/bluetooth/lib/hci/packet_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/packet_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/packet_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/sequential_command_runner.cc b/garnet/drivers/bluetooth/lib/hci/sequential_command_runner.cc similarity index 100% rename from drivers/bluetooth/lib/hci/sequential_command_runner.cc rename to garnet/drivers/bluetooth/lib/hci/sequential_command_runner.cc
diff --git a/drivers/bluetooth/lib/hci/sequential_command_runner.h b/garnet/drivers/bluetooth/lib/hci/sequential_command_runner.h similarity index 100% rename from drivers/bluetooth/lib/hci/sequential_command_runner.h rename to garnet/drivers/bluetooth/lib/hci/sequential_command_runner.h
diff --git a/drivers/bluetooth/lib/hci/sequential_command_runner_unittest.cc b/garnet/drivers/bluetooth/lib/hci/sequential_command_runner_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/sequential_command_runner_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/sequential_command_runner_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/slab_allocators.h b/garnet/drivers/bluetooth/lib/hci/slab_allocators.h similarity index 100% rename from drivers/bluetooth/lib/hci/slab_allocators.h rename to garnet/drivers/bluetooth/lib/hci/slab_allocators.h
diff --git a/drivers/bluetooth/lib/hci/slab_allocators_unittest.cc b/garnet/drivers/bluetooth/lib/hci/slab_allocators_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/slab_allocators_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/slab_allocators_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/status.cc b/garnet/drivers/bluetooth/lib/hci/status.cc similarity index 100% rename from drivers/bluetooth/lib/hci/status.cc rename to garnet/drivers/bluetooth/lib/hci/status.cc
diff --git a/drivers/bluetooth/lib/hci/status.h b/garnet/drivers/bluetooth/lib/hci/status.h similarity index 100% rename from drivers/bluetooth/lib/hci/status.h rename to garnet/drivers/bluetooth/lib/hci/status.h
diff --git a/drivers/bluetooth/lib/hci/status_unittest.cc b/garnet/drivers/bluetooth/lib/hci/status_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/status_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/status_unittest.cc
diff --git a/drivers/bluetooth/lib/hci/transport.cc b/garnet/drivers/bluetooth/lib/hci/transport.cc similarity index 100% rename from drivers/bluetooth/lib/hci/transport.cc rename to garnet/drivers/bluetooth/lib/hci/transport.cc
diff --git a/drivers/bluetooth/lib/hci/transport.h b/garnet/drivers/bluetooth/lib/hci/transport.h similarity index 100% rename from drivers/bluetooth/lib/hci/transport.h rename to garnet/drivers/bluetooth/lib/hci/transport.h
diff --git a/drivers/bluetooth/lib/hci/util.cc b/garnet/drivers/bluetooth/lib/hci/util.cc similarity index 100% rename from drivers/bluetooth/lib/hci/util.cc rename to garnet/drivers/bluetooth/lib/hci/util.cc
diff --git a/drivers/bluetooth/lib/hci/util.h b/garnet/drivers/bluetooth/lib/hci/util.h similarity index 100% rename from drivers/bluetooth/lib/hci/util.h rename to garnet/drivers/bluetooth/lib/hci/util.h
diff --git a/drivers/bluetooth/lib/hci/util_unittest.cc b/garnet/drivers/bluetooth/lib/hci/util_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/hci/util_unittest.cc rename to garnet/drivers/bluetooth/lib/hci/util_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/BUILD.gn b/garnet/drivers/bluetooth/lib/l2cap/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/l2cap/BUILD.gn rename to garnet/drivers/bluetooth/lib/l2cap/BUILD.gn
diff --git a/drivers/bluetooth/lib/l2cap/bredr_command_handler.cc b/garnet/drivers/bluetooth/lib/l2cap/bredr_command_handler.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_command_handler.cc rename to garnet/drivers/bluetooth/lib/l2cap/bredr_command_handler.cc
diff --git a/drivers/bluetooth/lib/l2cap/bredr_command_handler.h b/garnet/drivers/bluetooth/lib/l2cap/bredr_command_handler.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_command_handler.h rename to garnet/drivers/bluetooth/lib/l2cap/bredr_command_handler.h
diff --git a/drivers/bluetooth/lib/l2cap/bredr_command_handler_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/bredr_command_handler_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_command_handler_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/bredr_command_handler_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.h b/garnet/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_dynamic_channel_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/bredr_dynamic_channel_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/bredr_signaling_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/bredr_signaling_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_signaling_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/bredr_signaling_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/bredr_signaling_channel.h b/garnet/drivers/bluetooth/lib/l2cap/bredr_signaling_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_signaling_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/bredr_signaling_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/bredr_signaling_channel_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/bredr_signaling_channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/bredr_signaling_channel_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/bredr_signaling_channel_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/channel.cc b/garnet/drivers/bluetooth/lib/l2cap/channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/channel.h b/garnet/drivers/bluetooth/lib/l2cap/channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/channel.h rename to garnet/drivers/bluetooth/lib/l2cap/channel.h
diff --git a/drivers/bluetooth/lib/l2cap/channel_manager.cc b/garnet/drivers/bluetooth/lib/l2cap/channel_manager.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/channel_manager.cc rename to garnet/drivers/bluetooth/lib/l2cap/channel_manager.cc
diff --git a/drivers/bluetooth/lib/l2cap/channel_manager.h b/garnet/drivers/bluetooth/lib/l2cap/channel_manager.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/channel_manager.h rename to garnet/drivers/bluetooth/lib/l2cap/channel_manager.h
diff --git a/drivers/bluetooth/lib/l2cap/channel_manager_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/channel_manager_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/channel_manager_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/channel_manager_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/channel_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/channel_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/channel_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/dynamic_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/dynamic_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/dynamic_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/dynamic_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/dynamic_channel.h b/garnet/drivers/bluetooth/lib/l2cap/dynamic_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/dynamic_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/dynamic_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/dynamic_channel_registry.cc b/garnet/drivers/bluetooth/lib/l2cap/dynamic_channel_registry.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/dynamic_channel_registry.cc rename to garnet/drivers/bluetooth/lib/l2cap/dynamic_channel_registry.cc
diff --git a/drivers/bluetooth/lib/l2cap/dynamic_channel_registry.h b/garnet/drivers/bluetooth/lib/l2cap/dynamic_channel_registry.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/dynamic_channel_registry.h rename to garnet/drivers/bluetooth/lib/l2cap/dynamic_channel_registry.h
diff --git a/drivers/bluetooth/lib/l2cap/dynamic_channel_registry_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/dynamic_channel_registry_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/dynamic_channel_registry_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/dynamic_channel_registry_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/fake_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/fake_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/fake_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/fake_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/fake_channel.h b/garnet/drivers/bluetooth/lib/l2cap/fake_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/fake_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/fake_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/fake_channel_test.cc b/garnet/drivers/bluetooth/lib/l2cap/fake_channel_test.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/fake_channel_test.cc rename to garnet/drivers/bluetooth/lib/l2cap/fake_channel_test.cc
diff --git a/drivers/bluetooth/lib/l2cap/fake_channel_test.h b/garnet/drivers/bluetooth/lib/l2cap/fake_channel_test.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/fake_channel_test.h rename to garnet/drivers/bluetooth/lib/l2cap/fake_channel_test.h
diff --git a/drivers/bluetooth/lib/l2cap/fake_signaling_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/fake_signaling_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/fake_signaling_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/fake_signaling_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/fake_signaling_channel.h b/garnet/drivers/bluetooth/lib/l2cap/fake_signaling_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/fake_signaling_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/fake_signaling_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/fragmenter.cc b/garnet/drivers/bluetooth/lib/l2cap/fragmenter.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/fragmenter.cc rename to garnet/drivers/bluetooth/lib/l2cap/fragmenter.cc
diff --git a/drivers/bluetooth/lib/l2cap/fragmenter.h b/garnet/drivers/bluetooth/lib/l2cap/fragmenter.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/fragmenter.h rename to garnet/drivers/bluetooth/lib/l2cap/fragmenter.h
diff --git a/drivers/bluetooth/lib/l2cap/fragmenter_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/fragmenter_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/fragmenter_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/fragmenter_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/l2cap.h b/garnet/drivers/bluetooth/lib/l2cap/l2cap.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/l2cap.h rename to garnet/drivers/bluetooth/lib/l2cap/l2cap.h
diff --git a/drivers/bluetooth/lib/l2cap/le_signaling_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/le_signaling_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/le_signaling_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/le_signaling_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/le_signaling_channel.h b/garnet/drivers/bluetooth/lib/l2cap/le_signaling_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/le_signaling_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/le_signaling_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/le_signaling_channel_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/le_signaling_channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/le_signaling_channel_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/le_signaling_channel_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/logical_link.cc b/garnet/drivers/bluetooth/lib/l2cap/logical_link.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/logical_link.cc rename to garnet/drivers/bluetooth/lib/l2cap/logical_link.cc
diff --git a/drivers/bluetooth/lib/l2cap/logical_link.h b/garnet/drivers/bluetooth/lib/l2cap/logical_link.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/logical_link.h rename to garnet/drivers/bluetooth/lib/l2cap/logical_link.h
diff --git a/drivers/bluetooth/lib/l2cap/pdu.cc b/garnet/drivers/bluetooth/lib/l2cap/pdu.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/pdu.cc rename to garnet/drivers/bluetooth/lib/l2cap/pdu.cc
diff --git a/drivers/bluetooth/lib/l2cap/pdu.h b/garnet/drivers/bluetooth/lib/l2cap/pdu.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/pdu.h rename to garnet/drivers/bluetooth/lib/l2cap/pdu.h
diff --git a/drivers/bluetooth/lib/l2cap/pdu_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/pdu_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/pdu_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/pdu_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/recombiner.cc b/garnet/drivers/bluetooth/lib/l2cap/recombiner.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/recombiner.cc rename to garnet/drivers/bluetooth/lib/l2cap/recombiner.cc
diff --git a/drivers/bluetooth/lib/l2cap/recombiner.h b/garnet/drivers/bluetooth/lib/l2cap/recombiner.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/recombiner.h rename to garnet/drivers/bluetooth/lib/l2cap/recombiner.h
diff --git a/drivers/bluetooth/lib/l2cap/recombiner_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/recombiner_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/recombiner_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/recombiner_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/scoped_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/scoped_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/scoped_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/scoped_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/scoped_channel.h b/garnet/drivers/bluetooth/lib/l2cap/scoped_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/scoped_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/scoped_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/scoped_channel_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/scoped_channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/scoped_channel_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/scoped_channel_unittest.cc
diff --git a/drivers/bluetooth/lib/l2cap/sdu.h b/garnet/drivers/bluetooth/lib/l2cap/sdu.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/sdu.h rename to garnet/drivers/bluetooth/lib/l2cap/sdu.h
diff --git a/drivers/bluetooth/lib/l2cap/signaling_channel.cc b/garnet/drivers/bluetooth/lib/l2cap/signaling_channel.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/signaling_channel.cc rename to garnet/drivers/bluetooth/lib/l2cap/signaling_channel.cc
diff --git a/drivers/bluetooth/lib/l2cap/signaling_channel.h b/garnet/drivers/bluetooth/lib/l2cap/signaling_channel.h similarity index 100% rename from drivers/bluetooth/lib/l2cap/signaling_channel.h rename to garnet/drivers/bluetooth/lib/l2cap/signaling_channel.h
diff --git a/drivers/bluetooth/lib/l2cap/signaling_channel_unittest.cc b/garnet/drivers/bluetooth/lib/l2cap/signaling_channel_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/l2cap/signaling_channel_unittest.cc rename to garnet/drivers/bluetooth/lib/l2cap/signaling_channel_unittest.cc
diff --git a/drivers/bluetooth/lib/rfcomm/BUILD.gn b/garnet/drivers/bluetooth/lib/rfcomm/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/rfcomm/BUILD.gn rename to garnet/drivers/bluetooth/lib/rfcomm/BUILD.gn
diff --git a/drivers/bluetooth/lib/rfcomm/channel.cc b/garnet/drivers/bluetooth/lib/rfcomm/channel.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/channel.cc rename to garnet/drivers/bluetooth/lib/rfcomm/channel.cc
diff --git a/drivers/bluetooth/lib/rfcomm/channel.h b/garnet/drivers/bluetooth/lib/rfcomm/channel.h similarity index 100% rename from drivers/bluetooth/lib/rfcomm/channel.h rename to garnet/drivers/bluetooth/lib/rfcomm/channel.h
diff --git a/drivers/bluetooth/lib/rfcomm/channel_manager.cc b/garnet/drivers/bluetooth/lib/rfcomm/channel_manager.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/channel_manager.cc rename to garnet/drivers/bluetooth/lib/rfcomm/channel_manager.cc
diff --git a/drivers/bluetooth/lib/rfcomm/channel_manager.h b/garnet/drivers/bluetooth/lib/rfcomm/channel_manager.h similarity index 100% rename from drivers/bluetooth/lib/rfcomm/channel_manager.h rename to garnet/drivers/bluetooth/lib/rfcomm/channel_manager.h
diff --git a/drivers/bluetooth/lib/rfcomm/frames.cc b/garnet/drivers/bluetooth/lib/rfcomm/frames.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/frames.cc rename to garnet/drivers/bluetooth/lib/rfcomm/frames.cc
diff --git a/drivers/bluetooth/lib/rfcomm/frames.h b/garnet/drivers/bluetooth/lib/rfcomm/frames.h similarity index 100% rename from drivers/bluetooth/lib/rfcomm/frames.h rename to garnet/drivers/bluetooth/lib/rfcomm/frames.h
diff --git a/drivers/bluetooth/lib/rfcomm/frames_unittest.cc b/garnet/drivers/bluetooth/lib/rfcomm/frames_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/frames_unittest.cc rename to garnet/drivers/bluetooth/lib/rfcomm/frames_unittest.cc
diff --git a/drivers/bluetooth/lib/rfcomm/mux_commands.cc b/garnet/drivers/bluetooth/lib/rfcomm/mux_commands.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/mux_commands.cc rename to garnet/drivers/bluetooth/lib/rfcomm/mux_commands.cc
diff --git a/drivers/bluetooth/lib/rfcomm/mux_commands.h b/garnet/drivers/bluetooth/lib/rfcomm/mux_commands.h similarity index 100% rename from drivers/bluetooth/lib/rfcomm/mux_commands.h rename to garnet/drivers/bluetooth/lib/rfcomm/mux_commands.h
diff --git a/drivers/bluetooth/lib/rfcomm/mux_commands_unittest.cc b/garnet/drivers/bluetooth/lib/rfcomm/mux_commands_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/mux_commands_unittest.cc rename to garnet/drivers/bluetooth/lib/rfcomm/mux_commands_unittest.cc
diff --git a/drivers/bluetooth/lib/rfcomm/rfcomm.h b/garnet/drivers/bluetooth/lib/rfcomm/rfcomm.h similarity index 100% rename from drivers/bluetooth/lib/rfcomm/rfcomm.h rename to garnet/drivers/bluetooth/lib/rfcomm/rfcomm.h
diff --git a/drivers/bluetooth/lib/rfcomm/rfcomm_unittest.cc b/garnet/drivers/bluetooth/lib/rfcomm/rfcomm_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/rfcomm_unittest.cc rename to garnet/drivers/bluetooth/lib/rfcomm/rfcomm_unittest.cc
diff --git a/drivers/bluetooth/lib/rfcomm/session.cc b/garnet/drivers/bluetooth/lib/rfcomm/session.cc similarity index 100% rename from drivers/bluetooth/lib/rfcomm/session.cc rename to garnet/drivers/bluetooth/lib/rfcomm/session.cc
diff --git a/drivers/bluetooth/lib/rfcomm/session.h b/garnet/drivers/bluetooth/lib/rfcomm/session.h similarity index 100% rename from drivers/bluetooth/lib/rfcomm/session.h rename to garnet/drivers/bluetooth/lib/rfcomm/session.h
diff --git a/drivers/bluetooth/lib/sdp/BUILD.gn b/garnet/drivers/bluetooth/lib/sdp/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/sdp/BUILD.gn rename to garnet/drivers/bluetooth/lib/sdp/BUILD.gn
diff --git a/drivers/bluetooth/lib/sdp/data_element.cc b/garnet/drivers/bluetooth/lib/sdp/data_element.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/data_element.cc rename to garnet/drivers/bluetooth/lib/sdp/data_element.cc
diff --git a/drivers/bluetooth/lib/sdp/data_element.h b/garnet/drivers/bluetooth/lib/sdp/data_element.h similarity index 100% rename from drivers/bluetooth/lib/sdp/data_element.h rename to garnet/drivers/bluetooth/lib/sdp/data_element.h
diff --git a/drivers/bluetooth/lib/sdp/data_element_unittest.cc b/garnet/drivers/bluetooth/lib/sdp/data_element_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/data_element_unittest.cc rename to garnet/drivers/bluetooth/lib/sdp/data_element_unittest.cc
diff --git a/drivers/bluetooth/lib/sdp/pdu.cc b/garnet/drivers/bluetooth/lib/sdp/pdu.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/pdu.cc rename to garnet/drivers/bluetooth/lib/sdp/pdu.cc
diff --git a/drivers/bluetooth/lib/sdp/pdu.h b/garnet/drivers/bluetooth/lib/sdp/pdu.h similarity index 100% rename from drivers/bluetooth/lib/sdp/pdu.h rename to garnet/drivers/bluetooth/lib/sdp/pdu.h
diff --git a/drivers/bluetooth/lib/sdp/pdu_unittest.cc b/garnet/drivers/bluetooth/lib/sdp/pdu_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/pdu_unittest.cc rename to garnet/drivers/bluetooth/lib/sdp/pdu_unittest.cc
diff --git a/drivers/bluetooth/lib/sdp/sdp.h b/garnet/drivers/bluetooth/lib/sdp/sdp.h similarity index 100% rename from drivers/bluetooth/lib/sdp/sdp.h rename to garnet/drivers/bluetooth/lib/sdp/sdp.h
diff --git a/drivers/bluetooth/lib/sdp/server.cc b/garnet/drivers/bluetooth/lib/sdp/server.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/server.cc rename to garnet/drivers/bluetooth/lib/sdp/server.cc
diff --git a/drivers/bluetooth/lib/sdp/server.h b/garnet/drivers/bluetooth/lib/sdp/server.h similarity index 100% rename from drivers/bluetooth/lib/sdp/server.h rename to garnet/drivers/bluetooth/lib/sdp/server.h
diff --git a/drivers/bluetooth/lib/sdp/server_unittest.cc b/garnet/drivers/bluetooth/lib/sdp/server_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/server_unittest.cc rename to garnet/drivers/bluetooth/lib/sdp/server_unittest.cc
diff --git a/drivers/bluetooth/lib/sdp/service_record.cc b/garnet/drivers/bluetooth/lib/sdp/service_record.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/service_record.cc rename to garnet/drivers/bluetooth/lib/sdp/service_record.cc
diff --git a/drivers/bluetooth/lib/sdp/service_record.h b/garnet/drivers/bluetooth/lib/sdp/service_record.h similarity index 100% rename from drivers/bluetooth/lib/sdp/service_record.h rename to garnet/drivers/bluetooth/lib/sdp/service_record.h
diff --git a/drivers/bluetooth/lib/sdp/service_record_unittest.cc b/garnet/drivers/bluetooth/lib/sdp/service_record_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/service_record_unittest.cc rename to garnet/drivers/bluetooth/lib/sdp/service_record_unittest.cc
diff --git a/drivers/bluetooth/lib/sdp/status.cc b/garnet/drivers/bluetooth/lib/sdp/status.cc similarity index 100% rename from drivers/bluetooth/lib/sdp/status.cc rename to garnet/drivers/bluetooth/lib/sdp/status.cc
diff --git a/drivers/bluetooth/lib/sdp/status.h b/garnet/drivers/bluetooth/lib/sdp/status.h similarity index 100% rename from drivers/bluetooth/lib/sdp/status.h rename to garnet/drivers/bluetooth/lib/sdp/status.h
diff --git a/drivers/bluetooth/lib/sm/BUILD.gn b/garnet/drivers/bluetooth/lib/sm/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/sm/BUILD.gn rename to garnet/drivers/bluetooth/lib/sm/BUILD.gn
diff --git a/drivers/bluetooth/lib/sm/bearer.cc b/garnet/drivers/bluetooth/lib/sm/bearer.cc similarity index 100% rename from drivers/bluetooth/lib/sm/bearer.cc rename to garnet/drivers/bluetooth/lib/sm/bearer.cc
diff --git a/drivers/bluetooth/lib/sm/bearer.h b/garnet/drivers/bluetooth/lib/sm/bearer.h similarity index 100% rename from drivers/bluetooth/lib/sm/bearer.h rename to garnet/drivers/bluetooth/lib/sm/bearer.h
diff --git a/drivers/bluetooth/lib/sm/bearer_unittest.cc b/garnet/drivers/bluetooth/lib/sm/bearer_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sm/bearer_unittest.cc rename to garnet/drivers/bluetooth/lib/sm/bearer_unittest.cc
diff --git a/drivers/bluetooth/lib/sm/packet.cc b/garnet/drivers/bluetooth/lib/sm/packet.cc similarity index 100% rename from drivers/bluetooth/lib/sm/packet.cc rename to garnet/drivers/bluetooth/lib/sm/packet.cc
diff --git a/drivers/bluetooth/lib/sm/packet.h b/garnet/drivers/bluetooth/lib/sm/packet.h similarity index 100% rename from drivers/bluetooth/lib/sm/packet.h rename to garnet/drivers/bluetooth/lib/sm/packet.h
diff --git a/drivers/bluetooth/lib/sm/pairing_state.cc b/garnet/drivers/bluetooth/lib/sm/pairing_state.cc similarity index 100% rename from drivers/bluetooth/lib/sm/pairing_state.cc rename to garnet/drivers/bluetooth/lib/sm/pairing_state.cc
diff --git a/drivers/bluetooth/lib/sm/pairing_state.h b/garnet/drivers/bluetooth/lib/sm/pairing_state.h similarity index 100% rename from drivers/bluetooth/lib/sm/pairing_state.h rename to garnet/drivers/bluetooth/lib/sm/pairing_state.h
diff --git a/drivers/bluetooth/lib/sm/pairing_state_unittest.cc b/garnet/drivers/bluetooth/lib/sm/pairing_state_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sm/pairing_state_unittest.cc rename to garnet/drivers/bluetooth/lib/sm/pairing_state_unittest.cc
diff --git a/drivers/bluetooth/lib/sm/smp.h b/garnet/drivers/bluetooth/lib/sm/smp.h similarity index 100% rename from drivers/bluetooth/lib/sm/smp.h rename to garnet/drivers/bluetooth/lib/sm/smp.h
diff --git a/drivers/bluetooth/lib/sm/status.cc b/garnet/drivers/bluetooth/lib/sm/status.cc similarity index 100% rename from drivers/bluetooth/lib/sm/status.cc rename to garnet/drivers/bluetooth/lib/sm/status.cc
diff --git a/drivers/bluetooth/lib/sm/status.h b/garnet/drivers/bluetooth/lib/sm/status.h similarity index 100% rename from drivers/bluetooth/lib/sm/status.h rename to garnet/drivers/bluetooth/lib/sm/status.h
diff --git a/drivers/bluetooth/lib/sm/types.cc b/garnet/drivers/bluetooth/lib/sm/types.cc similarity index 100% rename from drivers/bluetooth/lib/sm/types.cc rename to garnet/drivers/bluetooth/lib/sm/types.cc
diff --git a/drivers/bluetooth/lib/sm/types.h b/garnet/drivers/bluetooth/lib/sm/types.h similarity index 100% rename from drivers/bluetooth/lib/sm/types.h rename to garnet/drivers/bluetooth/lib/sm/types.h
diff --git a/drivers/bluetooth/lib/sm/types_unittest.cc b/garnet/drivers/bluetooth/lib/sm/types_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sm/types_unittest.cc rename to garnet/drivers/bluetooth/lib/sm/types_unittest.cc
diff --git a/drivers/bluetooth/lib/sm/util.cc b/garnet/drivers/bluetooth/lib/sm/util.cc similarity index 100% rename from drivers/bluetooth/lib/sm/util.cc rename to garnet/drivers/bluetooth/lib/sm/util.cc
diff --git a/drivers/bluetooth/lib/sm/util.h b/garnet/drivers/bluetooth/lib/sm/util.h similarity index 100% rename from drivers/bluetooth/lib/sm/util.h rename to garnet/drivers/bluetooth/lib/sm/util.h
diff --git a/drivers/bluetooth/lib/sm/util_unittest.cc b/garnet/drivers/bluetooth/lib/sm/util_unittest.cc similarity index 100% rename from drivers/bluetooth/lib/sm/util_unittest.cc rename to garnet/drivers/bluetooth/lib/sm/util_unittest.cc
diff --git a/drivers/bluetooth/lib/testing/BUILD.gn b/garnet/drivers/bluetooth/lib/testing/BUILD.gn similarity index 100% rename from drivers/bluetooth/lib/testing/BUILD.gn rename to garnet/drivers/bluetooth/lib/testing/BUILD.gn
diff --git a/drivers/bluetooth/lib/testing/fake_controller.cc b/garnet/drivers/bluetooth/lib/testing/fake_controller.cc similarity index 100% rename from drivers/bluetooth/lib/testing/fake_controller.cc rename to garnet/drivers/bluetooth/lib/testing/fake_controller.cc
diff --git a/drivers/bluetooth/lib/testing/fake_controller.h b/garnet/drivers/bluetooth/lib/testing/fake_controller.h similarity index 100% rename from drivers/bluetooth/lib/testing/fake_controller.h rename to garnet/drivers/bluetooth/lib/testing/fake_controller.h
diff --git a/drivers/bluetooth/lib/testing/fake_controller_base.cc b/garnet/drivers/bluetooth/lib/testing/fake_controller_base.cc similarity index 100% rename from drivers/bluetooth/lib/testing/fake_controller_base.cc rename to garnet/drivers/bluetooth/lib/testing/fake_controller_base.cc
diff --git a/drivers/bluetooth/lib/testing/fake_controller_base.h b/garnet/drivers/bluetooth/lib/testing/fake_controller_base.h similarity index 100% rename from drivers/bluetooth/lib/testing/fake_controller_base.h rename to garnet/drivers/bluetooth/lib/testing/fake_controller_base.h
diff --git a/drivers/bluetooth/lib/testing/fake_controller_test.h b/garnet/drivers/bluetooth/lib/testing/fake_controller_test.h similarity index 100% rename from drivers/bluetooth/lib/testing/fake_controller_test.h rename to garnet/drivers/bluetooth/lib/testing/fake_controller_test.h
diff --git a/drivers/bluetooth/lib/testing/fake_device.cc b/garnet/drivers/bluetooth/lib/testing/fake_device.cc similarity index 100% rename from drivers/bluetooth/lib/testing/fake_device.cc rename to garnet/drivers/bluetooth/lib/testing/fake_device.cc
diff --git a/drivers/bluetooth/lib/testing/fake_device.h b/garnet/drivers/bluetooth/lib/testing/fake_device.h similarity index 100% rename from drivers/bluetooth/lib/testing/fake_device.h rename to garnet/drivers/bluetooth/lib/testing/fake_device.h
diff --git a/drivers/bluetooth/lib/testing/fake_gatt_server.cc b/garnet/drivers/bluetooth/lib/testing/fake_gatt_server.cc similarity index 100% rename from drivers/bluetooth/lib/testing/fake_gatt_server.cc rename to garnet/drivers/bluetooth/lib/testing/fake_gatt_server.cc
diff --git a/drivers/bluetooth/lib/testing/fake_gatt_server.h b/garnet/drivers/bluetooth/lib/testing/fake_gatt_server.h similarity index 100% rename from drivers/bluetooth/lib/testing/fake_gatt_server.h rename to garnet/drivers/bluetooth/lib/testing/fake_gatt_server.h
diff --git a/drivers/bluetooth/lib/testing/run_all_unittests.cc b/garnet/drivers/bluetooth/lib/testing/run_all_unittests.cc similarity index 100% rename from drivers/bluetooth/lib/testing/run_all_unittests.cc rename to garnet/drivers/bluetooth/lib/testing/run_all_unittests.cc
diff --git a/drivers/bluetooth/lib/testing/test_controller.cc b/garnet/drivers/bluetooth/lib/testing/test_controller.cc similarity index 100% rename from drivers/bluetooth/lib/testing/test_controller.cc rename to garnet/drivers/bluetooth/lib/testing/test_controller.cc
diff --git a/drivers/bluetooth/lib/testing/test_controller.h b/garnet/drivers/bluetooth/lib/testing/test_controller.h similarity index 100% rename from drivers/bluetooth/lib/testing/test_controller.h rename to garnet/drivers/bluetooth/lib/testing/test_controller.h
diff --git a/drivers/bluetooth/profiles/gatt/hid/BUILD.gn b/garnet/drivers/bluetooth/profiles/gatt/hid/BUILD.gn similarity index 100% rename from drivers/bluetooth/profiles/gatt/hid/BUILD.gn rename to garnet/drivers/bluetooth/profiles/gatt/hid/BUILD.gn
diff --git a/drivers/bluetooth/profiles/gatt/hid/binding.c b/garnet/drivers/bluetooth/profiles/gatt/hid/binding.c similarity index 100% rename from drivers/bluetooth/profiles/gatt/hid/binding.c rename to garnet/drivers/bluetooth/profiles/gatt/hid/binding.c
diff --git a/drivers/bluetooth/profiles/gatt/hid/boot_descriptors.h b/garnet/drivers/bluetooth/profiles/gatt/hid/boot_descriptors.h similarity index 100% rename from drivers/bluetooth/profiles/gatt/hid/boot_descriptors.h rename to garnet/drivers/bluetooth/profiles/gatt/hid/boot_descriptors.h
diff --git a/drivers/bluetooth/profiles/gatt/hid/hog.c b/garnet/drivers/bluetooth/profiles/gatt/hid/hog.c similarity index 100% rename from drivers/bluetooth/profiles/gatt/hid/hog.c rename to garnet/drivers/bluetooth/profiles/gatt/hid/hog.c
diff --git a/drivers/bluetooth/profiles/gatt/hid/hog.h b/garnet/drivers/bluetooth/profiles/gatt/hid/hog.h similarity index 100% rename from drivers/bluetooth/profiles/gatt/hid/hog.h rename to garnet/drivers/bluetooth/profiles/gatt/hid/hog.h
diff --git a/drivers/gpu/.clang-format b/garnet/drivers/gpu/.clang-format similarity index 100% rename from drivers/gpu/.clang-format rename to garnet/drivers/gpu/.clang-format
diff --git a/drivers/gpu/MAINTAINERS b/garnet/drivers/gpu/MAINTAINERS similarity index 100% rename from drivers/gpu/MAINTAINERS rename to garnet/drivers/gpu/MAINTAINERS
diff --git a/drivers/gpu/msd-arm-mali/BUILD.gn b/garnet/drivers/gpu/msd-arm-mali/BUILD.gn similarity index 100% rename from drivers/gpu/msd-arm-mali/BUILD.gn rename to garnet/drivers/gpu/msd-arm-mali/BUILD.gn
diff --git a/drivers/gpu/msd-arm-mali/include/BUILD.gn b/garnet/drivers/gpu/msd-arm-mali/include/BUILD.gn similarity index 100% rename from drivers/gpu/msd-arm-mali/include/BUILD.gn rename to garnet/drivers/gpu/msd-arm-mali/include/BUILD.gn
diff --git a/drivers/gpu/msd-arm-mali/include/magma_arm_mali_types.h b/garnet/drivers/gpu/msd-arm-mali/include/magma_arm_mali_types.h similarity index 100% rename from drivers/gpu/msd-arm-mali/include/magma_arm_mali_types.h rename to garnet/drivers/gpu/msd-arm-mali/include/magma_arm_mali_types.h
diff --git a/drivers/gpu/msd-arm-mali/include/magma_vendor_queries.h b/garnet/drivers/gpu/msd-arm-mali/include/magma_vendor_queries.h similarity index 100% rename from drivers/gpu/msd-arm-mali/include/magma_vendor_queries.h rename to garnet/drivers/gpu/msd-arm-mali/include/magma_vendor_queries.h
diff --git a/drivers/gpu/msd-arm-mali/src/BUILD.gn b/garnet/drivers/gpu/msd-arm-mali/src/BUILD.gn similarity index 100% rename from drivers/gpu/msd-arm-mali/src/BUILD.gn rename to garnet/drivers/gpu/msd-arm-mali/src/BUILD.gn
diff --git a/drivers/gpu/msd-arm-mali/src/address_manager.cc b/garnet/drivers/gpu/msd-arm-mali/src/address_manager.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/address_manager.cc rename to garnet/drivers/gpu/msd-arm-mali/src/address_manager.cc
diff --git a/drivers/gpu/msd-arm-mali/src/address_manager.h b/garnet/drivers/gpu/msd-arm-mali/src/address_manager.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/address_manager.h rename to garnet/drivers/gpu/msd-arm-mali/src/address_manager.h
diff --git a/drivers/gpu/msd-arm-mali/src/address_space.cc b/garnet/drivers/gpu/msd-arm-mali/src/address_space.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/address_space.cc rename to garnet/drivers/gpu/msd-arm-mali/src/address_space.cc
diff --git a/drivers/gpu/msd-arm-mali/src/address_space.h b/garnet/drivers/gpu/msd-arm-mali/src/address_space.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/address_space.h rename to garnet/drivers/gpu/msd-arm-mali/src/address_space.h
diff --git a/drivers/gpu/msd-arm-mali/src/device_request.h b/garnet/drivers/gpu/msd-arm-mali/src/device_request.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/device_request.h rename to garnet/drivers/gpu/msd-arm-mali/src/device_request.h
diff --git a/drivers/gpu/msd-arm-mali/src/entry_stubs.cc b/garnet/drivers/gpu/msd-arm-mali/src/entry_stubs.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/entry_stubs.cc rename to garnet/drivers/gpu/msd-arm-mali/src/entry_stubs.cc
diff --git a/drivers/gpu/msd-arm-mali/src/gpu_features.h b/garnet/drivers/gpu/msd-arm-mali/src/gpu_features.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/gpu_features.h rename to garnet/drivers/gpu/msd-arm-mali/src/gpu_features.h
diff --git a/drivers/gpu/msd-arm-mali/src/gpu_mapping.cc b/garnet/drivers/gpu/msd-arm-mali/src/gpu_mapping.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/gpu_mapping.cc rename to garnet/drivers/gpu/msd-arm-mali/src/gpu_mapping.cc
diff --git a/drivers/gpu/msd-arm-mali/src/gpu_mapping.h b/garnet/drivers/gpu/msd-arm-mali/src/gpu_mapping.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/gpu_mapping.h rename to garnet/drivers/gpu/msd-arm-mali/src/gpu_mapping.h
diff --git a/drivers/gpu/msd-arm-mali/src/job_scheduler.cc b/garnet/drivers/gpu/msd-arm-mali/src/job_scheduler.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/job_scheduler.cc rename to garnet/drivers/gpu/msd-arm-mali/src/job_scheduler.cc
diff --git a/drivers/gpu/msd-arm-mali/src/job_scheduler.h b/garnet/drivers/gpu/msd-arm-mali/src/job_scheduler.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/job_scheduler.h rename to garnet/drivers/gpu/msd-arm-mali/src/job_scheduler.h
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_atom.cc b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_atom.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_atom.cc rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_atom.cc
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_atom.h b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_atom.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_atom.h rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_atom.h
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_buffer.cc b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_buffer.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_buffer.cc rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_buffer.cc
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_buffer.h b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_buffer.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_buffer.h rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_buffer.h
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_connection.cc b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_connection.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_connection.cc rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_connection.cc
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_connection.h b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_connection.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_connection.h rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_connection.h
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_context.h b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_context.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_context.h rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_context.h
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_device.cc b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_device.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_device.cc rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_device.cc
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_device.h b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_device.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_device.h rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_device.h
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_driver.cc b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_driver.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_driver.cc rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_driver.cc
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_driver.h b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_driver.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_driver.h rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_driver.h
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.cc b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.cc rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.cc
diff --git a/drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.h b/garnet/drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.h rename to garnet/drivers/gpu/msd-arm-mali/src/msd_arm_semaphore.h
diff --git a/drivers/gpu/msd-arm-mali/src/performance_counters.cc b/garnet/drivers/gpu/msd-arm-mali/src/performance_counters.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/performance_counters.cc rename to garnet/drivers/gpu/msd-arm-mali/src/performance_counters.cc
diff --git a/drivers/gpu/msd-arm-mali/src/performance_counters.h b/garnet/drivers/gpu/msd-arm-mali/src/performance_counters.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/performance_counters.h rename to garnet/drivers/gpu/msd-arm-mali/src/performance_counters.h
diff --git a/drivers/gpu/msd-arm-mali/src/power_manager.cc b/garnet/drivers/gpu/msd-arm-mali/src/power_manager.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/src/power_manager.cc rename to garnet/drivers/gpu/msd-arm-mali/src/power_manager.cc
diff --git a/drivers/gpu/msd-arm-mali/src/power_manager.h b/garnet/drivers/gpu/msd-arm-mali/src/power_manager.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/power_manager.h rename to garnet/drivers/gpu/msd-arm-mali/src/power_manager.h
diff --git a/drivers/gpu/msd-arm-mali/src/registers.h b/garnet/drivers/gpu/msd-arm-mali/src/registers.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/registers.h rename to garnet/drivers/gpu/msd-arm-mali/src/registers.h
diff --git a/drivers/gpu/msd-arm-mali/src/types.h b/garnet/drivers/gpu/msd-arm-mali/src/types.h similarity index 100% rename from drivers/gpu/msd-arm-mali/src/types.h rename to garnet/drivers/gpu/msd-arm-mali/src/types.h
diff --git a/drivers/gpu/msd-arm-mali/tests/BUILD.gn b/garnet/drivers/gpu/msd-arm-mali/tests/BUILD.gn similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/BUILD.gn rename to garnet/drivers/gpu/msd-arm-mali/tests/BUILD.gn
diff --git a/drivers/gpu/msd-arm-mali/tests/integration/BUILD.gn b/garnet/drivers/gpu/msd-arm-mali/tests/integration/BUILD.gn similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/integration/BUILD.gn rename to garnet/drivers/gpu/msd-arm-mali/tests/integration/BUILD.gn
diff --git a/drivers/gpu/msd-arm-mali/tests/integration/main.cc b/garnet/drivers/gpu/msd-arm-mali/tests/integration/main.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/integration/main.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/integration/main.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/integration/test_fault_recovery.cc b/garnet/drivers/gpu/msd-arm-mali/tests/integration/test_fault_recovery.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/integration/test_fault_recovery.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/integration/test_fault_recovery.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/integration/test_shutdown.cc b/garnet/drivers/gpu/msd-arm-mali/tests/integration/test_shutdown.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/integration/test_shutdown.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/integration/test_shutdown.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/BUILD.gn b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/BUILD.gn similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/BUILD.gn rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/BUILD.gn
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/main.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/main.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/main.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/main.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_manager.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_manager.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_manager.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_manager.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_space.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_space.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_space.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_address_space.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_buffer.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_buffer.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_buffer.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_buffer.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_command_buffer.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_command_buffer.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_command_buffer.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_command_buffer.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_connection.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_connection.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_connection.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_connection.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_device.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_device.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_device.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_device.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_job_scheduler.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_job_scheduler.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_job_scheduler.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_job_scheduler.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_performance_counters.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_performance_counters.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_performance_counters.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_performance_counters.cc
diff --git a/drivers/gpu/msd-arm-mali/tests/unit_tests/test_power_manager.cc b/garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_power_manager.cc similarity index 100% rename from drivers/gpu/msd-arm-mali/tests/unit_tests/test_power_manager.cc rename to garnet/drivers/gpu/msd-arm-mali/tests/unit_tests/test_power_manager.cc
diff --git a/drivers/gpu/msd-intel-gen/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/BUILD.gn similarity index 100% rename from drivers/gpu/msd-intel-gen/BUILD.gn rename to garnet/drivers/gpu/msd-intel-gen/BUILD.gn
diff --git a/drivers/gpu/msd-intel-gen/README.md b/garnet/drivers/gpu/msd-intel-gen/README.md similarity index 100% rename from drivers/gpu/msd-intel-gen/README.md rename to garnet/drivers/gpu/msd-intel-gen/README.md
diff --git a/drivers/gpu/msd-intel-gen/glossary.md b/garnet/drivers/gpu/msd-intel-gen/glossary.md similarity index 100% rename from drivers/gpu/msd-intel-gen/glossary.md rename to garnet/drivers/gpu/msd-intel-gen/glossary.md
diff --git a/drivers/gpu/msd-intel-gen/include/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/include/BUILD.gn similarity index 100% rename from drivers/gpu/msd-intel-gen/include/BUILD.gn rename to garnet/drivers/gpu/msd-intel-gen/include/BUILD.gn
diff --git a/drivers/gpu/msd-intel-gen/include/msd_intel_gen_query.h b/garnet/drivers/gpu/msd-intel-gen/include/msd_intel_gen_query.h similarity index 100% rename from drivers/gpu/msd-intel-gen/include/msd_intel_gen_query.h rename to garnet/drivers/gpu/msd-intel-gen/include/msd_intel_gen_query.h
diff --git a/drivers/gpu/msd-intel-gen/src/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn similarity index 100% rename from drivers/gpu/msd-intel-gen/src/BUILD.gn rename to garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn
diff --git a/drivers/gpu/msd-intel-gen/src/address_space.cc b/garnet/drivers/gpu/msd-intel-gen/src/address_space.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/address_space.cc rename to garnet/drivers/gpu/msd-intel-gen/src/address_space.cc
diff --git a/drivers/gpu/msd-intel-gen/src/address_space.h b/garnet/drivers/gpu/msd-intel-gen/src/address_space.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/address_space.h rename to garnet/drivers/gpu/msd-intel-gen/src/address_space.h
diff --git a/drivers/gpu/msd-intel-gen/src/cache_config.cc b/garnet/drivers/gpu/msd-intel-gen/src/cache_config.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/cache_config.cc rename to garnet/drivers/gpu/msd-intel-gen/src/cache_config.cc
diff --git a/drivers/gpu/msd-intel-gen/src/cache_config.h b/garnet/drivers/gpu/msd-intel-gen/src/cache_config.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/cache_config.h rename to garnet/drivers/gpu/msd-intel-gen/src/cache_config.h
diff --git a/drivers/gpu/msd-intel-gen/src/command_buffer.cc b/garnet/drivers/gpu/msd-intel-gen/src/command_buffer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/command_buffer.cc rename to garnet/drivers/gpu/msd-intel-gen/src/command_buffer.cc
diff --git a/drivers/gpu/msd-intel-gen/src/command_buffer.h b/garnet/drivers/gpu/msd-intel-gen/src/command_buffer.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/command_buffer.h rename to garnet/drivers/gpu/msd-intel-gen/src/command_buffer.h
diff --git a/drivers/gpu/msd-intel-gen/src/device_id.h b/garnet/drivers/gpu/msd-intel-gen/src/device_id.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/device_id.h rename to garnet/drivers/gpu/msd-intel-gen/src/device_id.h
diff --git a/drivers/gpu/msd-intel-gen/src/device_request.h b/garnet/drivers/gpu/msd-intel-gen/src/device_request.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/device_request.h rename to garnet/drivers/gpu/msd-intel-gen/src/device_request.h
diff --git a/drivers/gpu/msd-intel-gen/src/driver_entry.cc b/garnet/drivers/gpu/msd-intel-gen/src/driver_entry.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/driver_entry.cc rename to garnet/drivers/gpu/msd-intel-gen/src/driver_entry.cc
diff --git a/drivers/gpu/msd-intel-gen/src/engine_command_streamer.cc b/garnet/drivers/gpu/msd-intel-gen/src/engine_command_streamer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/engine_command_streamer.cc rename to garnet/drivers/gpu/msd-intel-gen/src/engine_command_streamer.cc
diff --git a/drivers/gpu/msd-intel-gen/src/engine_command_streamer.h b/garnet/drivers/gpu/msd-intel-gen/src/engine_command_streamer.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/engine_command_streamer.h rename to garnet/drivers/gpu/msd-intel-gen/src/engine_command_streamer.h
diff --git a/drivers/gpu/msd-intel-gen/src/forcewake.h b/garnet/drivers/gpu/msd-intel-gen/src/forcewake.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/forcewake.h rename to garnet/drivers/gpu/msd-intel-gen/src/forcewake.h
diff --git a/drivers/gpu/msd-intel-gen/src/global_context.cc b/garnet/drivers/gpu/msd-intel-gen/src/global_context.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/global_context.cc rename to garnet/drivers/gpu/msd-intel-gen/src/global_context.cc
diff --git a/drivers/gpu/msd-intel-gen/src/global_context.h b/garnet/drivers/gpu/msd-intel-gen/src/global_context.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/global_context.h rename to garnet/drivers/gpu/msd-intel-gen/src/global_context.h
diff --git a/drivers/gpu/msd-intel-gen/src/gpu_mapping.cc b/garnet/drivers/gpu/msd-intel-gen/src/gpu_mapping.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/gpu_mapping.cc rename to garnet/drivers/gpu/msd-intel-gen/src/gpu_mapping.cc
diff --git a/drivers/gpu/msd-intel-gen/src/gpu_mapping.h b/garnet/drivers/gpu/msd-intel-gen/src/gpu_mapping.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/gpu_mapping.h rename to garnet/drivers/gpu/msd-intel-gen/src/gpu_mapping.h
diff --git a/drivers/gpu/msd-intel-gen/src/gpu_progress.h b/garnet/drivers/gpu/msd-intel-gen/src/gpu_progress.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/gpu_progress.h rename to garnet/drivers/gpu/msd-intel-gen/src/gpu_progress.h
diff --git a/drivers/gpu/msd-intel-gen/src/gtt.h b/garnet/drivers/gpu/msd-intel-gen/src/gtt.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/gtt.h rename to garnet/drivers/gpu/msd-intel-gen/src/gtt.h
diff --git a/drivers/gpu/msd-intel-gen/src/gtt_shim.cc b/garnet/drivers/gpu/msd-intel-gen/src/gtt_shim.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/gtt_shim.cc rename to garnet/drivers/gpu/msd-intel-gen/src/gtt_shim.cc
diff --git a/drivers/gpu/msd-intel-gen/src/hardware_status_page.h b/garnet/drivers/gpu/msd-intel-gen/src/hardware_status_page.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/hardware_status_page.h rename to garnet/drivers/gpu/msd-intel-gen/src/hardware_status_page.h
diff --git a/drivers/gpu/msd-intel-gen/src/instructions.h b/garnet/drivers/gpu/msd-intel-gen/src/instructions.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/instructions.h rename to garnet/drivers/gpu/msd-intel-gen/src/instructions.h
diff --git a/drivers/gpu/msd-intel-gen/src/interrupt_manager.h b/garnet/drivers/gpu/msd-intel-gen/src/interrupt_manager.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/interrupt_manager.h rename to garnet/drivers/gpu/msd-intel-gen/src/interrupt_manager.h
diff --git a/drivers/gpu/msd-intel-gen/src/interrupt_manager_shim.cc b/garnet/drivers/gpu/msd-intel-gen/src/interrupt_manager_shim.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/interrupt_manager_shim.cc rename to garnet/drivers/gpu/msd-intel-gen/src/interrupt_manager_shim.cc
diff --git a/drivers/gpu/msd-intel-gen/src/mapped_batch.h b/garnet/drivers/gpu/msd-intel-gen/src/mapped_batch.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/mapped_batch.h rename to garnet/drivers/gpu/msd-intel-gen/src/mapped_batch.h
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_buffer.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_buffer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_buffer.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_buffer.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_buffer.h b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_buffer.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_buffer.h rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_buffer.h
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_connection.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_connection.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_connection.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_connection.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_connection.h b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_connection.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_connection.h rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_connection.h
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_context.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_context.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_context.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_context.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_context.h b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_context.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_context.h rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_context.h
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_device.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_device.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_device.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_device.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_device.h b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_device.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_device.h rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_device.h
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_device_dump.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_device_dump.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_device_dump.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_device_dump.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_driver.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_driver.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_driver.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_driver.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_driver.h b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_driver.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_driver.h rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_driver.h
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_pci_device.h b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_pci_device.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_pci_device.h rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_pci_device.h
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_pci_device_shim.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_pci_device_shim.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_pci_device_shim.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_pci_device_shim.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.cc b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.cc rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.cc
diff --git a/drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.h b/garnet/drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.h rename to garnet/drivers/gpu/msd-intel-gen/src/msd_intel_semaphore.h
diff --git a/drivers/gpu/msd-intel-gen/src/pagetable.h b/garnet/drivers/gpu/msd-intel-gen/src/pagetable.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/pagetable.h rename to garnet/drivers/gpu/msd-intel-gen/src/pagetable.h
diff --git a/drivers/gpu/msd-intel-gen/src/ppgtt.cc b/garnet/drivers/gpu/msd-intel-gen/src/ppgtt.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/ppgtt.cc rename to garnet/drivers/gpu/msd-intel-gen/src/ppgtt.cc
diff --git a/drivers/gpu/msd-intel-gen/src/ppgtt.h b/garnet/drivers/gpu/msd-intel-gen/src/ppgtt.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/ppgtt.h rename to garnet/drivers/gpu/msd-intel-gen/src/ppgtt.h
diff --git a/drivers/gpu/msd-intel-gen/src/registers.h b/garnet/drivers/gpu/msd-intel-gen/src/registers.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/registers.h rename to garnet/drivers/gpu/msd-intel-gen/src/registers.h
diff --git a/drivers/gpu/msd-intel-gen/src/render_init_batch.cc b/garnet/drivers/gpu/msd-intel-gen/src/render_init_batch.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/render_init_batch.cc rename to garnet/drivers/gpu/msd-intel-gen/src/render_init_batch.cc
diff --git a/drivers/gpu/msd-intel-gen/src/render_init_batch.h b/garnet/drivers/gpu/msd-intel-gen/src/render_init_batch.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/render_init_batch.h rename to garnet/drivers/gpu/msd-intel-gen/src/render_init_batch.h
diff --git a/drivers/gpu/msd-intel-gen/src/render_init_batch_gen9.cc b/garnet/drivers/gpu/msd-intel-gen/src/render_init_batch_gen9.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/render_init_batch_gen9.cc rename to garnet/drivers/gpu/msd-intel-gen/src/render_init_batch_gen9.cc
diff --git a/drivers/gpu/msd-intel-gen/src/ringbuffer.cc b/garnet/drivers/gpu/msd-intel-gen/src/ringbuffer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/ringbuffer.cc rename to garnet/drivers/gpu/msd-intel-gen/src/ringbuffer.cc
diff --git a/drivers/gpu/msd-intel-gen/src/ringbuffer.h b/garnet/drivers/gpu/msd-intel-gen/src/ringbuffer.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/ringbuffer.h rename to garnet/drivers/gpu/msd-intel-gen/src/ringbuffer.h
diff --git a/drivers/gpu/msd-intel-gen/src/scheduler.cc b/garnet/drivers/gpu/msd-intel-gen/src/scheduler.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/src/scheduler.cc rename to garnet/drivers/gpu/msd-intel-gen/src/scheduler.cc
diff --git a/drivers/gpu/msd-intel-gen/src/scheduler.h b/garnet/drivers/gpu/msd-intel-gen/src/scheduler.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/scheduler.h rename to garnet/drivers/gpu/msd-intel-gen/src/scheduler.h
diff --git a/drivers/gpu/msd-intel-gen/src/sequencer.h b/garnet/drivers/gpu/msd-intel-gen/src/sequencer.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/sequencer.h rename to garnet/drivers/gpu/msd-intel-gen/src/sequencer.h
diff --git a/drivers/gpu/msd-intel-gen/src/types.h b/garnet/drivers/gpu/msd-intel-gen/src/types.h similarity index 100% rename from drivers/gpu/msd-intel-gen/src/types.h rename to garnet/drivers/gpu/msd-intel-gen/src/types.h
diff --git a/drivers/gpu/msd-intel-gen/tests/integration/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/tests/integration/BUILD.gn similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/integration/BUILD.gn rename to garnet/drivers/gpu/msd-intel-gen/tests/integration/BUILD.gn
diff --git a/drivers/gpu/msd-intel-gen/tests/integration/main.cc b/garnet/drivers/gpu/msd-intel-gen/tests/integration/main.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/integration/main.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/integration/main.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/integration/test_hang_recovery.cc b/garnet/drivers/gpu/msd-intel-gen/tests/integration/test_hang_recovery.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/integration/test_hang_recovery.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/integration/test_hang_recovery.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/integration/test_shutdown.cc b/garnet/drivers/gpu/msd-intel-gen/tests/integration/test_shutdown.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/integration/test_shutdown.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/integration/test_shutdown.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/mock/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/tests/mock/BUILD.gn similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/mock/BUILD.gn rename to garnet/drivers/gpu/msd-intel-gen/tests/mock/BUILD.gn
diff --git a/drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.cc b/garnet/drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.h b/garnet/drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.h similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.h rename to garnet/drivers/gpu/msd-intel-gen/tests/mock/mock_address_space.h
diff --git a/drivers/gpu/msd-intel-gen/tests/mock/mock_mapped_batch.h b/garnet/drivers/gpu/msd-intel-gen/tests/mock/mock_mapped_batch.h similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/mock/mock_mapped_batch.h rename to garnet/drivers/gpu/msd-intel-gen/tests/mock/mock_mapped_batch.h
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/BUILD.gn similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/BUILD.gn rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/BUILD.gn
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/main.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/main.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/main.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/main.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/register_tracer.h b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/register_tracer.h similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/register_tracer.h rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/register_tracer.h
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_buffer.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_buffer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_buffer.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_buffer.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_cache_config.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_cache_config.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_cache_config.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_cache_config.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.h b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.h similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.h rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_command_buffer.h
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_connection.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_connection.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_connection.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_connection.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_context.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_context.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_context.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_context.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_device.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_device.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_device.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_device.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_engine_command_streamer.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_engine_command_streamer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_engine_command_streamer.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_engine_command_streamer.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_exec.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_exec.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_exec.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_exec.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_forcewake.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_forcewake.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_forcewake.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_forcewake.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_hardware_status_page.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_hardware_status_page.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_hardware_status_page.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_hardware_status_page.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_instructions.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_instructions.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_instructions.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_instructions.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_ppgtt.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_ppgtt.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_ppgtt.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_ppgtt.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_progress.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_progress.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_progress.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_progress.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_render_init_batch.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_render_init_batch.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_render_init_batch.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_render_init_batch.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_ringbuffer.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_ringbuffer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_ringbuffer.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_ringbuffer.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_scheduler.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_scheduler.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_scheduler.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_scheduler.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_semaphore.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_semaphore.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_semaphore.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_semaphore.cc
diff --git a/drivers/gpu/msd-intel-gen/tests/unit_tests/test_sequencer.cc b/garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_sequencer.cc similarity index 100% rename from drivers/gpu/msd-intel-gen/tests/unit_tests/test_sequencer.cc rename to garnet/drivers/gpu/msd-intel-gen/tests/unit_tests/test_sequencer.cc
diff --git a/drivers/gpu/msd-vsl-gc/BUILD.gn b/garnet/drivers/gpu/msd-vsl-gc/BUILD.gn similarity index 100% rename from drivers/gpu/msd-vsl-gc/BUILD.gn rename to garnet/drivers/gpu/msd-vsl-gc/BUILD.gn
diff --git a/drivers/gpu/msd-vsl-gc/src/BUILD.gn b/garnet/drivers/gpu/msd-vsl-gc/src/BUILD.gn similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/BUILD.gn rename to garnet/drivers/gpu/msd-vsl-gc/src/BUILD.gn
diff --git a/drivers/gpu/msd-vsl-gc/src/address_space.cc b/garnet/drivers/gpu/msd-vsl-gc/src/address_space.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/address_space.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/address_space.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/address_space.h b/garnet/drivers/gpu/msd-vsl-gc/src/address_space.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/address_space.h rename to garnet/drivers/gpu/msd-vsl-gc/src/address_space.h
diff --git a/drivers/gpu/msd-vsl-gc/src/address_space_base.cc b/garnet/drivers/gpu/msd-vsl-gc/src/address_space_base.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/address_space_base.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/address_space_base.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/address_space_base.h b/garnet/drivers/gpu/msd-vsl-gc/src/address_space_base.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/address_space_base.h rename to garnet/drivers/gpu/msd-vsl-gc/src/address_space_base.h
diff --git a/drivers/gpu/msd-vsl-gc/src/gpu_features.h b/garnet/drivers/gpu/msd-vsl-gc/src/gpu_features.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/gpu_features.h rename to garnet/drivers/gpu/msd-vsl-gc/src/gpu_features.h
diff --git a/drivers/gpu/msd-vsl-gc/src/gpu_mapping.cc b/garnet/drivers/gpu/msd-vsl-gc/src/gpu_mapping.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/gpu_mapping.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/gpu_mapping.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/gpu_mapping.h b/garnet/drivers/gpu/msd-vsl-gc/src/gpu_mapping.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/gpu_mapping.h rename to garnet/drivers/gpu/msd-vsl-gc/src/gpu_mapping.h
diff --git a/drivers/gpu/msd-vsl-gc/src/macros.h b/garnet/drivers/gpu/msd-vsl-gc/src/macros.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/macros.h rename to garnet/drivers/gpu/msd-vsl-gc/src/macros.h
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.cc b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.h b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.h rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_buffer.h
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.cc b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.h b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.h rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_connection.h
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_context.cc b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_context.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_context.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_context.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_context.h b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_context.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_context.h rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_context.h
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_device.cc b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_device.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_device.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_device.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_device.h b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_device.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_device.h rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_device.h
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.cc b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.h b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.h rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_driver.h
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.cc b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.h b/garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.h rename to garnet/drivers/gpu/msd-vsl-gc/src/msd_vsl_semaphore.h
diff --git a/drivers/gpu/msd-vsl-gc/src/page_table_arrays.cc b/garnet/drivers/gpu/msd-vsl-gc/src/page_table_arrays.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/page_table_arrays.cc rename to garnet/drivers/gpu/msd-vsl-gc/src/page_table_arrays.cc
diff --git a/drivers/gpu/msd-vsl-gc/src/page_table_arrays.h b/garnet/drivers/gpu/msd-vsl-gc/src/page_table_arrays.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/page_table_arrays.h rename to garnet/drivers/gpu/msd-vsl-gc/src/page_table_arrays.h
diff --git a/drivers/gpu/msd-vsl-gc/src/page_table_slot_allocator.h b/garnet/drivers/gpu/msd-vsl-gc/src/page_table_slot_allocator.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/page_table_slot_allocator.h rename to garnet/drivers/gpu/msd-vsl-gc/src/page_table_slot_allocator.h
diff --git a/drivers/gpu/msd-vsl-gc/src/registers.h b/garnet/drivers/gpu/msd-vsl-gc/src/registers.h similarity index 100% rename from drivers/gpu/msd-vsl-gc/src/registers.h rename to garnet/drivers/gpu/msd-vsl-gc/src/registers.h
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/BUILD.gn b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/BUILD.gn similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/BUILD.gn rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/BUILD.gn
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/main.cc b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/main.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/main.cc rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/main.cc
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space.cc b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space.cc rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space.cc
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space_base.cc b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space_base.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space_base.cc rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_address_space_base.cc
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_connection.cc b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_connection.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/test_connection.cc rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_connection.cc
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_device.cc b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_device.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/test_device.cc rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_device.cc
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_memory_write.cc b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_memory_write.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/test_memory_write.cc rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_memory_write.cc
diff --git a/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_page_table_slot_allocator.cc b/garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_page_table_slot_allocator.cc similarity index 100% rename from drivers/gpu/msd-vsl-gc/tests/unit_tests/test_page_table_slot_allocator.cc rename to garnet/drivers/gpu/msd-vsl-gc/tests/unit_tests/test_page_table_slot_allocator.cc
diff --git a/drivers/telephony/MAINTAINERS b/garnet/drivers/telephony/MAINTAINERS similarity index 100% rename from drivers/telephony/MAINTAINERS rename to garnet/drivers/telephony/MAINTAINERS
diff --git a/drivers/telephony/qmi-fake-transport/BUILD.gn b/garnet/drivers/telephony/qmi-fake-transport/BUILD.gn similarity index 100% rename from drivers/telephony/qmi-fake-transport/BUILD.gn rename to garnet/drivers/telephony/qmi-fake-transport/BUILD.gn
diff --git a/drivers/telephony/qmi-fake-transport/binding.c b/garnet/drivers/telephony/qmi-fake-transport/binding.c similarity index 100% rename from drivers/telephony/qmi-fake-transport/binding.c rename to garnet/drivers/telephony/qmi-fake-transport/binding.c
diff --git a/drivers/telephony/qmi-fake-transport/driver.cpp b/garnet/drivers/telephony/qmi-fake-transport/driver.cpp similarity index 100% rename from drivers/telephony/qmi-fake-transport/driver.cpp rename to garnet/drivers/telephony/qmi-fake-transport/driver.cpp
diff --git a/drivers/telephony/qmi-fake-transport/fake-device.cpp b/garnet/drivers/telephony/qmi-fake-transport/fake-device.cpp similarity index 100% rename from drivers/telephony/qmi-fake-transport/fake-device.cpp rename to garnet/drivers/telephony/qmi-fake-transport/fake-device.cpp
diff --git a/drivers/telephony/qmi-fake-transport/fake-device.h b/garnet/drivers/telephony/qmi-fake-transport/fake-device.h similarity index 100% rename from drivers/telephony/qmi-fake-transport/fake-device.h rename to garnet/drivers/telephony/qmi-fake-transport/fake-device.h
diff --git a/drivers/telephony/qmi-usb-transport/BUILD.gn b/garnet/drivers/telephony/qmi-usb-transport/BUILD.gn similarity index 100% rename from drivers/telephony/qmi-usb-transport/BUILD.gn rename to garnet/drivers/telephony/qmi-usb-transport/BUILD.gn
diff --git a/drivers/telephony/qmi-usb-transport/qmi-usb-transport.c b/garnet/drivers/telephony/qmi-usb-transport/qmi-usb-transport.c similarity index 100% rename from drivers/telephony/qmi-usb-transport/qmi-usb-transport.c rename to garnet/drivers/telephony/qmi-usb-transport/qmi-usb-transport.c
diff --git a/drivers/telephony/qmi-usb-transport/qmi-usb-transport.h b/garnet/drivers/telephony/qmi-usb-transport/qmi-usb-transport.h similarity index 100% rename from drivers/telephony/qmi-usb-transport/qmi-usb-transport.h rename to garnet/drivers/telephony/qmi-usb-transport/qmi-usb-transport.h
diff --git a/drivers/usb_video/BUILD.gn b/garnet/drivers/usb_video/BUILD.gn similarity index 100% rename from drivers/usb_video/BUILD.gn rename to garnet/drivers/usb_video/BUILD.gn
diff --git a/drivers/usb_video/binding.c b/garnet/drivers/usb_video/binding.c similarity index 100% rename from drivers/usb_video/binding.c rename to garnet/drivers/usb_video/binding.c
diff --git a/drivers/usb_video/camera_control_impl.cpp b/garnet/drivers/usb_video/camera_control_impl.cpp similarity index 100% rename from drivers/usb_video/camera_control_impl.cpp rename to garnet/drivers/usb_video/camera_control_impl.cpp
diff --git a/drivers/usb_video/camera_control_impl.h b/garnet/drivers/usb_video/camera_control_impl.h similarity index 100% rename from drivers/usb_video/camera_control_impl.h rename to garnet/drivers/usb_video/camera_control_impl.h
diff --git a/drivers/usb_video/usb-video-camera.h b/garnet/drivers/usb_video/usb-video-camera.h similarity index 100% rename from drivers/usb_video/usb-video-camera.h rename to garnet/drivers/usb_video/usb-video-camera.h
diff --git a/drivers/usb_video/usb-video-stream.cpp b/garnet/drivers/usb_video/usb-video-stream.cpp similarity index 100% rename from drivers/usb_video/usb-video-stream.cpp rename to garnet/drivers/usb_video/usb-video-stream.cpp
diff --git a/drivers/usb_video/usb-video-stream.h b/garnet/drivers/usb_video/usb-video-stream.h similarity index 100% rename from drivers/usb_video/usb-video-stream.h rename to garnet/drivers/usb_video/usb-video-stream.h
diff --git a/drivers/usb_video/usb-video.cpp b/garnet/drivers/usb_video/usb-video.cpp similarity index 100% rename from drivers/usb_video/usb-video.cpp rename to garnet/drivers/usb_video/usb-video.cpp
diff --git a/drivers/usb_video/usb-video.h b/garnet/drivers/usb_video/usb-video.h similarity index 100% rename from drivers/usb_video/usb-video.h rename to garnet/drivers/usb_video/usb-video.h
diff --git a/drivers/usb_video/uvc_format.cpp b/garnet/drivers/usb_video/uvc_format.cpp similarity index 100% rename from drivers/usb_video/uvc_format.cpp rename to garnet/drivers/usb_video/uvc_format.cpp
diff --git a/drivers/usb_video/uvc_format.h b/garnet/drivers/usb_video/uvc_format.h similarity index 100% rename from drivers/usb_video/uvc_format.h rename to garnet/drivers/usb_video/uvc_format.h
diff --git a/drivers/usb_video/video-util.c b/garnet/drivers/usb_video/video-util.c similarity index 100% rename from drivers/usb_video/video-util.c rename to garnet/drivers/usb_video/video-util.c
diff --git a/drivers/usb_video/video-util.h b/garnet/drivers/usb_video/video-util.h similarity index 100% rename from drivers/usb_video/video-util.h rename to garnet/drivers/usb_video/video-util.h
diff --git a/drivers/video/amlogic-decoder/.gitignore b/garnet/drivers/video/amlogic-decoder/.gitignore similarity index 100% rename from drivers/video/amlogic-decoder/.gitignore rename to garnet/drivers/video/amlogic-decoder/.gitignore
diff --git a/drivers/video/amlogic-decoder/BUILD.gn b/garnet/drivers/video/amlogic-decoder/BUILD.gn similarity index 100% rename from drivers/video/amlogic-decoder/BUILD.gn rename to garnet/drivers/video/amlogic-decoder/BUILD.gn
diff --git a/drivers/video/amlogic-decoder/amlogic-video.cc b/garnet/drivers/video/amlogic-decoder/amlogic-video.cc similarity index 100% rename from drivers/video/amlogic-decoder/amlogic-video.cc rename to garnet/drivers/video/amlogic-decoder/amlogic-video.cc
diff --git a/drivers/video/amlogic-decoder/amlogic-video.h b/garnet/drivers/video/amlogic-decoder/amlogic-video.h similarity index 100% rename from drivers/video/amlogic-decoder/amlogic-video.h rename to garnet/drivers/video/amlogic-decoder/amlogic-video.h
diff --git a/drivers/video/amlogic-decoder/binding.c b/garnet/drivers/video/amlogic-decoder/binding.c similarity index 100% rename from drivers/video/amlogic-decoder/binding.c rename to garnet/drivers/video/amlogic-decoder/binding.c
diff --git a/drivers/video/amlogic-decoder/codec_adapter_h264.cc b/garnet/drivers/video/amlogic-decoder/codec_adapter_h264.cc similarity index 100% rename from drivers/video/amlogic-decoder/codec_adapter_h264.cc rename to garnet/drivers/video/amlogic-decoder/codec_adapter_h264.cc
diff --git a/drivers/video/amlogic-decoder/codec_adapter_h264.h b/garnet/drivers/video/amlogic-decoder/codec_adapter_h264.h similarity index 100% rename from drivers/video/amlogic-decoder/codec_adapter_h264.h rename to garnet/drivers/video/amlogic-decoder/codec_adapter_h264.h
diff --git a/drivers/video/amlogic-decoder/codec_adapter_mpeg2.cc b/garnet/drivers/video/amlogic-decoder/codec_adapter_mpeg2.cc similarity index 100% rename from drivers/video/amlogic-decoder/codec_adapter_mpeg2.cc rename to garnet/drivers/video/amlogic-decoder/codec_adapter_mpeg2.cc
diff --git a/drivers/video/amlogic-decoder/codec_adapter_mpeg2.h b/garnet/drivers/video/amlogic-decoder/codec_adapter_mpeg2.h similarity index 100% rename from drivers/video/amlogic-decoder/codec_adapter_mpeg2.h rename to garnet/drivers/video/amlogic-decoder/codec_adapter_mpeg2.h
diff --git a/drivers/video/amlogic-decoder/codec_adapter_vp9.cc b/garnet/drivers/video/amlogic-decoder/codec_adapter_vp9.cc similarity index 100% rename from drivers/video/amlogic-decoder/codec_adapter_vp9.cc rename to garnet/drivers/video/amlogic-decoder/codec_adapter_vp9.cc
diff --git a/drivers/video/amlogic-decoder/codec_adapter_vp9.h b/garnet/drivers/video/amlogic-decoder/codec_adapter_vp9.h similarity index 100% rename from drivers/video/amlogic-decoder/codec_adapter_vp9.h rename to garnet/drivers/video/amlogic-decoder/codec_adapter_vp9.h
diff --git a/drivers/video/amlogic-decoder/decoder_core.h b/garnet/drivers/video/amlogic-decoder/decoder_core.h similarity index 100% rename from drivers/video/amlogic-decoder/decoder_core.h rename to garnet/drivers/video/amlogic-decoder/decoder_core.h
diff --git a/drivers/video/amlogic-decoder/decoder_instance.h b/garnet/drivers/video/amlogic-decoder/decoder_instance.h similarity index 100% rename from drivers/video/amlogic-decoder/decoder_instance.h rename to garnet/drivers/video/amlogic-decoder/decoder_instance.h
diff --git a/drivers/video/amlogic-decoder/device_ctx.cc b/garnet/drivers/video/amlogic-decoder/device_ctx.cc similarity index 100% rename from drivers/video/amlogic-decoder/device_ctx.cc rename to garnet/drivers/video/amlogic-decoder/device_ctx.cc
diff --git a/drivers/video/amlogic-decoder/device_ctx.h b/garnet/drivers/video/amlogic-decoder/device_ctx.h similarity index 100% rename from drivers/video/amlogic-decoder/device_ctx.h rename to garnet/drivers/video/amlogic-decoder/device_ctx.h
diff --git a/drivers/video/amlogic-decoder/device_fidl.cc b/garnet/drivers/video/amlogic-decoder/device_fidl.cc similarity index 100% rename from drivers/video/amlogic-decoder/device_fidl.cc rename to garnet/drivers/video/amlogic-decoder/device_fidl.cc
diff --git a/drivers/video/amlogic-decoder/device_fidl.h b/garnet/drivers/video/amlogic-decoder/device_fidl.h similarity index 100% rename from drivers/video/amlogic-decoder/device_fidl.h rename to garnet/drivers/video/amlogic-decoder/device_fidl.h
diff --git a/drivers/video/amlogic-decoder/driver_ctx.cc b/garnet/drivers/video/amlogic-decoder/driver_ctx.cc similarity index 100% rename from drivers/video/amlogic-decoder/driver_ctx.cc rename to garnet/drivers/video/amlogic-decoder/driver_ctx.cc
diff --git a/drivers/video/amlogic-decoder/driver_ctx.h b/garnet/drivers/video/amlogic-decoder/driver_ctx.h similarity index 100% rename from drivers/video/amlogic-decoder/driver_ctx.h rename to garnet/drivers/video/amlogic-decoder/driver_ctx.h
diff --git a/drivers/video/amlogic-decoder/firmware_blob.cc b/garnet/drivers/video/amlogic-decoder/firmware_blob.cc similarity index 100% rename from drivers/video/amlogic-decoder/firmware_blob.cc rename to garnet/drivers/video/amlogic-decoder/firmware_blob.cc
diff --git a/drivers/video/amlogic-decoder/firmware_blob.h b/garnet/drivers/video/amlogic-decoder/firmware_blob.h similarity index 100% rename from drivers/video/amlogic-decoder/firmware_blob.h rename to garnet/drivers/video/amlogic-decoder/firmware_blob.h
diff --git a/drivers/video/amlogic-decoder/h264_decoder.cc b/garnet/drivers/video/amlogic-decoder/h264_decoder.cc similarity index 100% rename from drivers/video/amlogic-decoder/h264_decoder.cc rename to garnet/drivers/video/amlogic-decoder/h264_decoder.cc
diff --git a/drivers/video/amlogic-decoder/h264_decoder.h b/garnet/drivers/video/amlogic-decoder/h264_decoder.h similarity index 100% rename from drivers/video/amlogic-decoder/h264_decoder.h rename to garnet/drivers/video/amlogic-decoder/h264_decoder.h
diff --git a/drivers/video/amlogic-decoder/hevcdec.cc b/garnet/drivers/video/amlogic-decoder/hevcdec.cc similarity index 100% rename from drivers/video/amlogic-decoder/hevcdec.cc rename to garnet/drivers/video/amlogic-decoder/hevcdec.cc
diff --git a/drivers/video/amlogic-decoder/hevcdec.h b/garnet/drivers/video/amlogic-decoder/hevcdec.h similarity index 100% rename from drivers/video/amlogic-decoder/hevcdec.h rename to garnet/drivers/video/amlogic-decoder/hevcdec.h
diff --git a/drivers/video/amlogic-decoder/local_codec_factory.cc b/garnet/drivers/video/amlogic-decoder/local_codec_factory.cc similarity index 100% rename from drivers/video/amlogic-decoder/local_codec_factory.cc rename to garnet/drivers/video/amlogic-decoder/local_codec_factory.cc
diff --git a/drivers/video/amlogic-decoder/local_codec_factory.h b/garnet/drivers/video/amlogic-decoder/local_codec_factory.h similarity index 100% rename from drivers/video/amlogic-decoder/local_codec_factory.h rename to garnet/drivers/video/amlogic-decoder/local_codec_factory.h
diff --git a/drivers/video/amlogic-decoder/macros.h b/garnet/drivers/video/amlogic-decoder/macros.h similarity index 100% rename from drivers/video/amlogic-decoder/macros.h rename to garnet/drivers/video/amlogic-decoder/macros.h
diff --git a/drivers/video/amlogic-decoder/memory_barriers.h b/garnet/drivers/video/amlogic-decoder/memory_barriers.h similarity index 100% rename from drivers/video/amlogic-decoder/memory_barriers.h rename to garnet/drivers/video/amlogic-decoder/memory_barriers.h
diff --git a/drivers/video/amlogic-decoder/mpeg12_decoder.cc b/garnet/drivers/video/amlogic-decoder/mpeg12_decoder.cc similarity index 100% rename from drivers/video/amlogic-decoder/mpeg12_decoder.cc rename to garnet/drivers/video/amlogic-decoder/mpeg12_decoder.cc
diff --git a/drivers/video/amlogic-decoder/mpeg12_decoder.h b/garnet/drivers/video/amlogic-decoder/mpeg12_decoder.h similarity index 100% rename from drivers/video/amlogic-decoder/mpeg12_decoder.h rename to garnet/drivers/video/amlogic-decoder/mpeg12_decoder.h
diff --git a/drivers/video/amlogic-decoder/pts_manager.cc b/garnet/drivers/video/amlogic-decoder/pts_manager.cc similarity index 100% rename from drivers/video/amlogic-decoder/pts_manager.cc rename to garnet/drivers/video/amlogic-decoder/pts_manager.cc
diff --git a/drivers/video/amlogic-decoder/pts_manager.h b/garnet/drivers/video/amlogic-decoder/pts_manager.h similarity index 100% rename from drivers/video/amlogic-decoder/pts_manager.h rename to garnet/drivers/video/amlogic-decoder/pts_manager.h
diff --git a/drivers/video/amlogic-decoder/registers.h b/garnet/drivers/video/amlogic-decoder/registers.h similarity index 100% rename from drivers/video/amlogic-decoder/registers.h rename to garnet/drivers/video/amlogic-decoder/registers.h
diff --git a/drivers/video/amlogic-decoder/stream_buffer.h b/garnet/drivers/video/amlogic-decoder/stream_buffer.h similarity index 100% rename from drivers/video/amlogic-decoder/stream_buffer.h rename to garnet/drivers/video/amlogic-decoder/stream_buffer.h
diff --git a/drivers/video/amlogic-decoder/tests/integration/test_h264.cc b/garnet/drivers/video/amlogic-decoder/tests/integration/test_h264.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/integration/test_h264.cc rename to garnet/drivers/video/amlogic-decoder/tests/integration/test_h264.cc
diff --git a/drivers/video/amlogic-decoder/tests/integration/test_mpeg2.cc b/garnet/drivers/video/amlogic-decoder/tests/integration/test_mpeg2.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/integration/test_mpeg2.cc rename to garnet/drivers/video/amlogic-decoder/tests/integration/test_mpeg2.cc
diff --git a/drivers/video/amlogic-decoder/tests/integration/test_vp9.cc b/garnet/drivers/video/amlogic-decoder/tests/integration/test_vp9.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/integration/test_vp9.cc rename to garnet/drivers/video/amlogic-decoder/tests/integration/test_vp9.cc
diff --git a/drivers/video/amlogic-decoder/tests/manual/test_amlogic_codec_factory.cc b/garnet/drivers/video/amlogic-decoder/tests/manual/test_amlogic_codec_factory.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/manual/test_amlogic_codec_factory.cc rename to garnet/drivers/video/amlogic-decoder/tests/manual/test_amlogic_codec_factory.cc
diff --git a/drivers/video/amlogic-decoder/tests/test_support.cc b/garnet/drivers/video/amlogic-decoder/tests/test_support.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/test_support.cc rename to garnet/drivers/video/amlogic-decoder/tests/test_support.cc
diff --git a/drivers/video/amlogic-decoder/tests/test_support.h b/garnet/drivers/video/amlogic-decoder/tests/test_support.h similarity index 100% rename from drivers/video/amlogic-decoder/tests/test_support.h rename to garnet/drivers/video/amlogic-decoder/tests/test_support.h
diff --git a/drivers/video/amlogic-decoder/tests/test_support_disabled.cc b/garnet/drivers/video/amlogic-decoder/tests/test_support_disabled.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/test_support_disabled.cc rename to garnet/drivers/video/amlogic-decoder/tests/test_support_disabled.cc
diff --git a/drivers/video/amlogic-decoder/tests/unit_tests/test_binding.cc b/garnet/drivers/video/amlogic-decoder/tests/unit_tests/test_binding.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/unit_tests/test_binding.cc rename to garnet/drivers/video/amlogic-decoder/tests/unit_tests/test_binding.cc
diff --git a/drivers/video/amlogic-decoder/tests/unit_tests/test_vp9.cc b/garnet/drivers/video/amlogic-decoder/tests/unit_tests/test_vp9.cc similarity index 100% rename from drivers/video/amlogic-decoder/tests/unit_tests/test_vp9.cc rename to garnet/drivers/video/amlogic-decoder/tests/unit_tests/test_vp9.cc
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/BUILD.gn b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/BUILD.gn similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/BUILD.gn rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/BUILD.gn
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/LICENSE b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/LICENSE similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/LICENSE rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/LICENSE
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/PATENTS b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/PATENTS similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/PATENTS rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/PATENTS
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/README.fuchsia b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/README.fuchsia similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/README.fuchsia rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/README.fuchsia
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_enums.h b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_enums.h similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_enums.h rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_enums.h
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.c b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.c similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.c rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.c
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.h b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.h similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.h rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_loopfilter.h
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_seg_common.h b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_seg_common.h similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_seg_common.h rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vp9/common/vp9_seg_common.h
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vpx/vpx_integer.h b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx/vpx_integer.h similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vpx/vpx_integer.h rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx/vpx_integer.h
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vpx_config.h b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx_config.h similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vpx_config.h rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx_config.h
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vpx_dsp/vpx_dsp_common.h b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx_dsp/vpx_dsp_common.h similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vpx_dsp/vpx_dsp_common.h rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx_dsp/vpx_dsp_common.h
diff --git a/drivers/video/amlogic-decoder/third_party/libvpx/vpx_ports/mem.h b/garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx_ports/mem.h similarity index 100% rename from drivers/video/amlogic-decoder/third_party/libvpx/vpx_ports/mem.h rename to garnet/drivers/video/amlogic-decoder/third_party/libvpx/vpx_ports/mem.h
diff --git a/drivers/video/amlogic-decoder/vdec1.cc b/garnet/drivers/video/amlogic-decoder/vdec1.cc similarity index 100% rename from drivers/video/amlogic-decoder/vdec1.cc rename to garnet/drivers/video/amlogic-decoder/vdec1.cc
diff --git a/drivers/video/amlogic-decoder/vdec1.h b/garnet/drivers/video/amlogic-decoder/vdec1.h similarity index 100% rename from drivers/video/amlogic-decoder/vdec1.h rename to garnet/drivers/video/amlogic-decoder/vdec1.h
diff --git a/drivers/video/amlogic-decoder/video_decoder.h b/garnet/drivers/video/amlogic-decoder/video_decoder.h similarity index 100% rename from drivers/video/amlogic-decoder/video_decoder.h rename to garnet/drivers/video/amlogic-decoder/video_decoder.h
diff --git a/drivers/video/amlogic-decoder/video_frame.cc b/garnet/drivers/video/amlogic-decoder/video_frame.cc similarity index 100% rename from drivers/video/amlogic-decoder/video_frame.cc rename to garnet/drivers/video/amlogic-decoder/video_frame.cc
diff --git a/drivers/video/amlogic-decoder/video_frame.h b/garnet/drivers/video/amlogic-decoder/video_frame.h similarity index 100% rename from drivers/video/amlogic-decoder/video_frame.h rename to garnet/drivers/video/amlogic-decoder/video_frame.h
diff --git a/drivers/video/amlogic-decoder/vp9_decoder.cc b/garnet/drivers/video/amlogic-decoder/vp9_decoder.cc similarity index 100% rename from drivers/video/amlogic-decoder/vp9_decoder.cc rename to garnet/drivers/video/amlogic-decoder/vp9_decoder.cc
diff --git a/drivers/video/amlogic-decoder/vp9_decoder.h b/garnet/drivers/video/amlogic-decoder/vp9_decoder.h similarity index 100% rename from drivers/video/amlogic-decoder/vp9_decoder.h rename to garnet/drivers/video/amlogic-decoder/vp9_decoder.h
diff --git a/drivers/video/amlogic-decoder/vp9_utils.cc b/garnet/drivers/video/amlogic-decoder/vp9_utils.cc similarity index 100% rename from drivers/video/amlogic-decoder/vp9_utils.cc rename to garnet/drivers/video/amlogic-decoder/vp9_utils.cc
diff --git a/drivers/video/amlogic-decoder/vp9_utils.h b/garnet/drivers/video/amlogic-decoder/vp9_utils.h similarity index 100% rename from drivers/video/amlogic-decoder/vp9_utils.h rename to garnet/drivers/video/amlogic-decoder/vp9_utils.h
diff --git a/drivers/wlan/.clang-format b/garnet/drivers/wlan/.clang-format similarity index 100% rename from drivers/wlan/.clang-format rename to garnet/drivers/wlan/.clang-format
diff --git a/drivers/wlan/MAINTAINERS b/garnet/drivers/wlan/MAINTAINERS similarity index 100% rename from drivers/wlan/MAINTAINERS rename to garnet/drivers/wlan/MAINTAINERS
diff --git a/drivers/wlan/README.md b/garnet/drivers/wlan/README.md similarity index 100% rename from drivers/wlan/README.md rename to garnet/drivers/wlan/README.md
diff --git a/drivers/wlan/lib/BUILD.gn b/garnet/drivers/wlan/lib/BUILD.gn similarity index 100% rename from drivers/wlan/lib/BUILD.gn rename to garnet/drivers/wlan/lib/BUILD.gn
diff --git a/drivers/wlan/lib/include/wlan/async/dispatcher.h b/garnet/drivers/wlan/lib/include/wlan/async/dispatcher.h similarity index 100% rename from drivers/wlan/lib/include/wlan/async/dispatcher.h rename to garnet/drivers/wlan/lib/include/wlan/async/dispatcher.h
diff --git a/drivers/wlan/lib/include/wlan/wlanmac-ifc-proxy.h b/garnet/drivers/wlan/lib/include/wlan/wlanmac-ifc-proxy.h similarity index 100% rename from drivers/wlan/lib/include/wlan/wlanmac-ifc-proxy.h rename to garnet/drivers/wlan/lib/include/wlan/wlanmac-ifc-proxy.h
diff --git a/drivers/wlan/mediatek/ralink/.gitignore b/garnet/drivers/wlan/mediatek/ralink/.gitignore similarity index 100% rename from drivers/wlan/mediatek/ralink/.gitignore rename to garnet/drivers/wlan/mediatek/ralink/.gitignore
diff --git a/drivers/wlan/mediatek/ralink/BUILD.gn b/garnet/drivers/wlan/mediatek/ralink/BUILD.gn similarity index 100% rename from drivers/wlan/mediatek/ralink/BUILD.gn rename to garnet/drivers/wlan/mediatek/ralink/BUILD.gn
diff --git a/drivers/wlan/mediatek/ralink/binding.c b/garnet/drivers/wlan/mediatek/ralink/binding.c similarity index 100% rename from drivers/wlan/mediatek/ralink/binding.c rename to garnet/drivers/wlan/mediatek/ralink/binding.c
diff --git a/drivers/wlan/mediatek/ralink/device.cpp b/garnet/drivers/wlan/mediatek/ralink/device.cpp similarity index 100% rename from drivers/wlan/mediatek/ralink/device.cpp rename to garnet/drivers/wlan/mediatek/ralink/device.cpp
diff --git a/drivers/wlan/mediatek/ralink/device.h b/garnet/drivers/wlan/mediatek/ralink/device.h similarity index 100% rename from drivers/wlan/mediatek/ralink/device.h rename to garnet/drivers/wlan/mediatek/ralink/device.h
diff --git a/drivers/wlan/mediatek/ralink/driver.cpp b/garnet/drivers/wlan/mediatek/ralink/driver.cpp similarity index 100% rename from drivers/wlan/mediatek/ralink/driver.cpp rename to garnet/drivers/wlan/mediatek/ralink/driver.cpp
diff --git a/drivers/wlan/mediatek/ralink/driver.h b/garnet/drivers/wlan/mediatek/ralink/driver.h similarity index 100% rename from drivers/wlan/mediatek/ralink/driver.h rename to garnet/drivers/wlan/mediatek/ralink/driver.h
diff --git a/drivers/wlan/mediatek/ralink/ralink.h b/garnet/drivers/wlan/mediatek/ralink/ralink.h similarity index 100% rename from drivers/wlan/mediatek/ralink/ralink.h rename to garnet/drivers/wlan/mediatek/ralink/ralink.h
diff --git a/drivers/wlan/mediatek/ralink/register.h b/garnet/drivers/wlan/mediatek/ralink/register.h similarity index 100% rename from drivers/wlan/mediatek/ralink/register.h rename to garnet/drivers/wlan/mediatek/ralink/register.h
diff --git a/drivers/wlan/realtek/rtl88xx/BUILD.gn b/garnet/drivers/wlan/realtek/rtl88xx/BUILD.gn similarity index 100% rename from drivers/wlan/realtek/rtl88xx/BUILD.gn rename to garnet/drivers/wlan/realtek/rtl88xx/BUILD.gn
diff --git a/drivers/wlan/realtek/rtl88xx/binding.c b/garnet/drivers/wlan/realtek/rtl88xx/binding.c similarity index 100% rename from drivers/wlan/realtek/rtl88xx/binding.c rename to garnet/drivers/wlan/realtek/rtl88xx/binding.c
diff --git a/drivers/wlan/realtek/rtl88xx/bus.cc b/garnet/drivers/wlan/realtek/rtl88xx/bus.cc similarity index 100% rename from drivers/wlan/realtek/rtl88xx/bus.cc rename to garnet/drivers/wlan/realtek/rtl88xx/bus.cc
diff --git a/drivers/wlan/realtek/rtl88xx/bus.h b/garnet/drivers/wlan/realtek/rtl88xx/bus.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/bus.h rename to garnet/drivers/wlan/realtek/rtl88xx/bus.h
diff --git a/drivers/wlan/realtek/rtl88xx/bus_util.h b/garnet/drivers/wlan/realtek/rtl88xx/bus_util.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/bus_util.h rename to garnet/drivers/wlan/realtek/rtl88xx/bus_util.h
diff --git a/drivers/wlan/realtek/rtl88xx/device.cc b/garnet/drivers/wlan/realtek/rtl88xx/device.cc similarity index 100% rename from drivers/wlan/realtek/rtl88xx/device.cc rename to garnet/drivers/wlan/realtek/rtl88xx/device.cc
diff --git a/drivers/wlan/realtek/rtl88xx/device.h b/garnet/drivers/wlan/realtek/rtl88xx/device.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/device.h rename to garnet/drivers/wlan/realtek/rtl88xx/device.h
diff --git a/drivers/wlan/realtek/rtl88xx/register.h b/garnet/drivers/wlan/realtek/rtl88xx/register.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/register.h rename to garnet/drivers/wlan/realtek/rtl88xx/register.h
diff --git a/drivers/wlan/realtek/rtl88xx/rtl8821c_device.cc b/garnet/drivers/wlan/realtek/rtl88xx/rtl8821c_device.cc similarity index 100% rename from drivers/wlan/realtek/rtl88xx/rtl8821c_device.cc rename to garnet/drivers/wlan/realtek/rtl88xx/rtl8821c_device.cc
diff --git a/drivers/wlan/realtek/rtl88xx/rtl8821c_device.h b/garnet/drivers/wlan/realtek/rtl88xx/rtl8821c_device.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/rtl8821c_device.h rename to garnet/drivers/wlan/realtek/rtl88xx/rtl8821c_device.h
diff --git a/drivers/wlan/realtek/rtl88xx/rtl88xx_registers.h b/garnet/drivers/wlan/realtek/rtl88xx/rtl88xx_registers.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/rtl88xx_registers.h rename to garnet/drivers/wlan/realtek/rtl88xx/rtl88xx_registers.h
diff --git a/drivers/wlan/realtek/rtl88xx/usb_bus.cc b/garnet/drivers/wlan/realtek/rtl88xx/usb_bus.cc similarity index 100% rename from drivers/wlan/realtek/rtl88xx/usb_bus.cc rename to garnet/drivers/wlan/realtek/rtl88xx/usb_bus.cc
diff --git a/drivers/wlan/realtek/rtl88xx/usb_bus.h b/garnet/drivers/wlan/realtek/rtl88xx/usb_bus.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/usb_bus.h rename to garnet/drivers/wlan/realtek/rtl88xx/usb_bus.h
diff --git a/drivers/wlan/realtek/rtl88xx/wlan_mac.cc b/garnet/drivers/wlan/realtek/rtl88xx/wlan_mac.cc similarity index 100% rename from drivers/wlan/realtek/rtl88xx/wlan_mac.cc rename to garnet/drivers/wlan/realtek/rtl88xx/wlan_mac.cc
diff --git a/drivers/wlan/realtek/rtl88xx/wlan_mac.h b/garnet/drivers/wlan/realtek/rtl88xx/wlan_mac.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/wlan_mac.h rename to garnet/drivers/wlan/realtek/rtl88xx/wlan_mac.h
diff --git a/drivers/wlan/realtek/rtl88xx/wlan_phy.cc b/garnet/drivers/wlan/realtek/rtl88xx/wlan_phy.cc similarity index 100% rename from drivers/wlan/realtek/rtl88xx/wlan_phy.cc rename to garnet/drivers/wlan/realtek/rtl88xx/wlan_phy.cc
diff --git a/drivers/wlan/realtek/rtl88xx/wlan_phy.h b/garnet/drivers/wlan/realtek/rtl88xx/wlan_phy.h similarity index 100% rename from drivers/wlan/realtek/rtl88xx/wlan_phy.h rename to garnet/drivers/wlan/realtek/rtl88xx/wlan_phy.h
diff --git a/drivers/wlan/testing/BUILD.gn b/garnet/drivers/wlan/testing/BUILD.gn similarity index 100% rename from drivers/wlan/testing/BUILD.gn rename to garnet/drivers/wlan/testing/BUILD.gn
diff --git a/drivers/wlan/testing/binding.c b/garnet/drivers/wlan/testing/binding.c similarity index 100% rename from drivers/wlan/testing/binding.c rename to garnet/drivers/wlan/testing/binding.c
diff --git a/drivers/wlan/testing/driver.cpp b/garnet/drivers/wlan/testing/driver.cpp similarity index 100% rename from drivers/wlan/testing/driver.cpp rename to garnet/drivers/wlan/testing/driver.cpp
diff --git a/drivers/wlan/testing/driver.h b/garnet/drivers/wlan/testing/driver.h similarity index 100% rename from drivers/wlan/testing/driver.h rename to garnet/drivers/wlan/testing/driver.h
diff --git a/drivers/wlan/testing/iface-device.cpp b/garnet/drivers/wlan/testing/iface-device.cpp similarity index 100% rename from drivers/wlan/testing/iface-device.cpp rename to garnet/drivers/wlan/testing/iface-device.cpp
diff --git a/drivers/wlan/testing/iface-device.h b/garnet/drivers/wlan/testing/iface-device.h similarity index 100% rename from drivers/wlan/testing/iface-device.h rename to garnet/drivers/wlan/testing/iface-device.h
diff --git a/drivers/wlan/testing/phy-device.cpp b/garnet/drivers/wlan/testing/phy-device.cpp similarity index 100% rename from drivers/wlan/testing/phy-device.cpp rename to garnet/drivers/wlan/testing/phy-device.cpp
diff --git a/drivers/wlan/testing/phy-device.h b/garnet/drivers/wlan/testing/phy-device.h similarity index 100% rename from drivers/wlan/testing/phy-device.h rename to garnet/drivers/wlan/testing/phy-device.h
diff --git a/drivers/wlan/testing/util/BUILD.gn b/garnet/drivers/wlan/testing/util/BUILD.gn similarity index 100% rename from drivers/wlan/testing/util/BUILD.gn rename to garnet/drivers/wlan/testing/util/BUILD.gn
diff --git a/drivers/wlan/testing/util/src/main.rs b/garnet/drivers/wlan/testing/util/src/main.rs similarity index 100% rename from drivers/wlan/testing/util/src/main.rs rename to garnet/drivers/wlan/testing/util/src/main.rs
diff --git a/drivers/wlan/testing/util/src/sys.rs b/garnet/drivers/wlan/testing/util/src/sys.rs similarity index 100% rename from drivers/wlan/testing/util/src/sys.rs rename to garnet/drivers/wlan/testing/util/src/sys.rs
diff --git a/drivers/wlan/third_party/atheros/LICENSE b/garnet/drivers/wlan/third_party/atheros/LICENSE similarity index 100% rename from drivers/wlan/third_party/atheros/LICENSE rename to garnet/drivers/wlan/third_party/atheros/LICENSE
diff --git a/drivers/wlan/third_party/atheros/README.fuchsia b/garnet/drivers/wlan/third_party/atheros/README.fuchsia similarity index 100% rename from drivers/wlan/third_party/atheros/README.fuchsia rename to garnet/drivers/wlan/third_party/atheros/README.fuchsia
diff --git a/drivers/wlan/third_party/atheros/ath.h b/garnet/drivers/wlan/third_party/atheros/ath.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath.h rename to garnet/drivers/wlan/third_party/atheros/ath.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/.gitignore b/garnet/drivers/wlan/third_party/atheros/ath10k/.gitignore similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/.gitignore rename to garnet/drivers/wlan/third_party/atheros/ath10k/.gitignore
diff --git a/drivers/wlan/third_party/atheros/ath10k/BUILD.gn b/garnet/drivers/wlan/third_party/atheros/ath10k/BUILD.gn similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/BUILD.gn rename to garnet/drivers/wlan/third_party/atheros/ath10k/BUILD.gn
diff --git a/drivers/wlan/third_party/atheros/ath10k/ahb.c b/garnet/drivers/wlan/third_party/atheros/ath10k/ahb.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/ahb.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/ahb.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/ahb.h b/garnet/drivers/wlan/third_party/atheros/ath10k/ahb.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/ahb.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/ahb.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/bitarr.c b/garnet/drivers/wlan/third_party/atheros/ath10k/bitarr.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/bitarr.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/bitarr.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/bitarr.h b/garnet/drivers/wlan/third_party/atheros/ath10k/bitarr.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/bitarr.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/bitarr.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/bitarr_tests.cc b/garnet/drivers/wlan/third_party/atheros/ath10k/bitarr_tests.cc similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/bitarr_tests.cc rename to garnet/drivers/wlan/third_party/atheros/ath10k/bitarr_tests.cc
diff --git a/drivers/wlan/third_party/atheros/ath10k/bmi.c b/garnet/drivers/wlan/third_party/atheros/ath10k/bmi.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/bmi.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/bmi.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/bmi.h b/garnet/drivers/wlan/third_party/atheros/ath10k/bmi.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/bmi.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/bmi.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/ce.c b/garnet/drivers/wlan/third_party/atheros/ath10k/ce.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/ce.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/ce.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/ce.h b/garnet/drivers/wlan/third_party/atheros/ath10k/ce.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/ce.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/ce.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/core.c b/garnet/drivers/wlan/third_party/atheros/ath10k/core.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/core.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/core.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/core.h b/garnet/drivers/wlan/third_party/atheros/ath10k/core.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/core.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/core.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/debug.c b/garnet/drivers/wlan/third_party/atheros/ath10k/debug.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/debug.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/debug.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/debug.h b/garnet/drivers/wlan/third_party/atheros/ath10k/debug.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/debug.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/debug.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/debugfs_sta.c b/garnet/drivers/wlan/third_party/atheros/ath10k/debugfs_sta.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/debugfs_sta.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/debugfs_sta.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/hif.h b/garnet/drivers/wlan/third_party/atheros/ath10k/hif.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/hif.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/hif.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/htc.c b/garnet/drivers/wlan/third_party/atheros/ath10k/htc.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/htc.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/htc.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/htc.h b/garnet/drivers/wlan/third_party/atheros/ath10k/htc.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/htc.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/htc.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/htt.c b/garnet/drivers/wlan/third_party/atheros/ath10k/htt.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/htt.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/htt.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/htt.h b/garnet/drivers/wlan/third_party/atheros/ath10k/htt.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/htt.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/htt.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/htt_rx.c b/garnet/drivers/wlan/third_party/atheros/ath10k/htt_rx.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/htt_rx.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/htt_rx.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/htt_tx.c b/garnet/drivers/wlan/third_party/atheros/ath10k/htt_tx.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/htt_tx.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/htt_tx.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/hw.c b/garnet/drivers/wlan/third_party/atheros/ath10k/hw.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/hw.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/hw.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/hw.h b/garnet/drivers/wlan/third_party/atheros/ath10k/hw.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/hw.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/hw.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/ieee80211.h b/garnet/drivers/wlan/third_party/atheros/ath10k/ieee80211.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/ieee80211.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/ieee80211.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/mac.c b/garnet/drivers/wlan/third_party/atheros/ath10k/mac.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/mac.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/mac.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/mac.h b/garnet/drivers/wlan/third_party/atheros/ath10k/mac.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/mac.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/mac.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/macros.h b/garnet/drivers/wlan/third_party/atheros/ath10k/macros.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/macros.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/macros.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/msg_buf.c b/garnet/drivers/wlan/third_party/atheros/ath10k/msg_buf.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/msg_buf.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/msg_buf.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/msg_buf.h b/garnet/drivers/wlan/third_party/atheros/ath10k/msg_buf.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/msg_buf.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/msg_buf.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/p2p.c b/garnet/drivers/wlan/third_party/atheros/ath10k/p2p.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/p2p.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/p2p.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/p2p.h b/garnet/drivers/wlan/third_party/atheros/ath10k/p2p.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/p2p.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/p2p.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/pci.c b/garnet/drivers/wlan/third_party/atheros/ath10k/pci.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/pci.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/pci.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/pci.h b/garnet/drivers/wlan/third_party/atheros/ath10k/pci.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/pci.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/pci.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/rx_desc.h b/garnet/drivers/wlan/third_party/atheros/ath10k/rx_desc.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/rx_desc.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/rx_desc.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/sdio.c b/garnet/drivers/wlan/third_party/atheros/ath10k/sdio.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/sdio.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/sdio.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/sdio.h b/garnet/drivers/wlan/third_party/atheros/ath10k/sdio.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/sdio.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/sdio.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/sparse_array.c b/garnet/drivers/wlan/third_party/atheros/ath10k/sparse_array.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/sparse_array.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/sparse_array.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/sparse_array.h b/garnet/drivers/wlan/third_party/atheros/ath10k/sparse_array.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/sparse_array.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/sparse_array.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/sparse_array_tests.cc b/garnet/drivers/wlan/third_party/atheros/ath10k/sparse_array_tests.cc similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/sparse_array_tests.cc rename to garnet/drivers/wlan/third_party/atheros/ath10k/sparse_array_tests.cc
diff --git a/drivers/wlan/third_party/atheros/ath10k/spectral.c b/garnet/drivers/wlan/third_party/atheros/ath10k/spectral.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/spectral.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/spectral.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/spectral.h b/garnet/drivers/wlan/third_party/atheros/ath10k/spectral.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/spectral.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/spectral.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/swap.c b/garnet/drivers/wlan/third_party/atheros/ath10k/swap.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/swap.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/swap.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/swap.h b/garnet/drivers/wlan/third_party/atheros/ath10k/swap.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/swap.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/swap.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/targaddrs.h b/garnet/drivers/wlan/third_party/atheros/ath10k/targaddrs.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/targaddrs.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/targaddrs.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/testmode.c b/garnet/drivers/wlan/third_party/atheros/ath10k/testmode.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/testmode.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/testmode.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/testmode.h b/garnet/drivers/wlan/third_party/atheros/ath10k/testmode.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/testmode.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/testmode.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/testmode_i.h b/garnet/drivers/wlan/third_party/atheros/ath10k/testmode_i.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/testmode_i.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/testmode_i.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/thermal.c b/garnet/drivers/wlan/third_party/atheros/ath10k/thermal.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/thermal.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/thermal.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/thermal.h b/garnet/drivers/wlan/third_party/atheros/ath10k/thermal.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/thermal.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/thermal.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/trace.c b/garnet/drivers/wlan/third_party/atheros/ath10k/trace.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/trace.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/trace.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/trace.h b/garnet/drivers/wlan/third_party/atheros/ath10k/trace.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/trace.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/trace.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/txrx.c b/garnet/drivers/wlan/third_party/atheros/ath10k/txrx.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/txrx.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/txrx.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/txrx.h b/garnet/drivers/wlan/third_party/atheros/ath10k/txrx.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/txrx.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/txrx.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/utils.c b/garnet/drivers/wlan/third_party/atheros/ath10k/utils.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/utils.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/utils.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/utils.h b/garnet/drivers/wlan/third_party/atheros/ath10k/utils.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/utils.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/utils.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/wmi-ops.h b/garnet/drivers/wlan/third_party/atheros/ath10k/wmi-ops.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/wmi-ops.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/wmi-ops.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/wmi-tlv.c b/garnet/drivers/wlan/third_party/atheros/ath10k/wmi-tlv.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/wmi-tlv.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/wmi-tlv.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/wmi-tlv.h b/garnet/drivers/wlan/third_party/atheros/ath10k/wmi-tlv.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/wmi-tlv.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/wmi-tlv.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/wmi.c b/garnet/drivers/wlan/third_party/atheros/ath10k/wmi.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/wmi.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/wmi.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/wmi.h b/garnet/drivers/wlan/third_party/atheros/ath10k/wmi.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/wmi.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/wmi.h
diff --git a/drivers/wlan/third_party/atheros/ath10k/wow.c b/garnet/drivers/wlan/third_party/atheros/ath10k/wow.c similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/wow.c rename to garnet/drivers/wlan/third_party/atheros/ath10k/wow.c
diff --git a/drivers/wlan/third_party/atheros/ath10k/wow.h b/garnet/drivers/wlan/third_party/atheros/ath10k/wow.h similarity index 100% rename from drivers/wlan/third_party/atheros/ath10k/wow.h rename to garnet/drivers/wlan/third_party/atheros/ath10k/wow.h
diff --git a/drivers/wlan/third_party/atheros/debug.c b/garnet/drivers/wlan/third_party/atheros/debug.c similarity index 100% rename from drivers/wlan/third_party/atheros/debug.c rename to garnet/drivers/wlan/third_party/atheros/debug.c
diff --git a/drivers/wlan/third_party/atheros/dfs_pattern_detector.c b/garnet/drivers/wlan/third_party/atheros/dfs_pattern_detector.c similarity index 100% rename from drivers/wlan/third_party/atheros/dfs_pattern_detector.c rename to garnet/drivers/wlan/third_party/atheros/dfs_pattern_detector.c
diff --git a/drivers/wlan/third_party/atheros/dfs_pattern_detector.h b/garnet/drivers/wlan/third_party/atheros/dfs_pattern_detector.h similarity index 100% rename from drivers/wlan/third_party/atheros/dfs_pattern_detector.h rename to garnet/drivers/wlan/third_party/atheros/dfs_pattern_detector.h
diff --git a/drivers/wlan/third_party/atheros/dfs_pri_detector.c b/garnet/drivers/wlan/third_party/atheros/dfs_pri_detector.c similarity index 100% rename from drivers/wlan/third_party/atheros/dfs_pri_detector.c rename to garnet/drivers/wlan/third_party/atheros/dfs_pri_detector.c
diff --git a/drivers/wlan/third_party/atheros/dfs_pri_detector.h b/garnet/drivers/wlan/third_party/atheros/dfs_pri_detector.h similarity index 100% rename from drivers/wlan/third_party/atheros/dfs_pri_detector.h rename to garnet/drivers/wlan/third_party/atheros/dfs_pri_detector.h
diff --git a/drivers/wlan/third_party/atheros/hw.c b/garnet/drivers/wlan/third_party/atheros/hw.c similarity index 100% rename from drivers/wlan/third_party/atheros/hw.c rename to garnet/drivers/wlan/third_party/atheros/hw.c
diff --git a/drivers/wlan/third_party/atheros/key.c b/garnet/drivers/wlan/third_party/atheros/key.c similarity index 100% rename from drivers/wlan/third_party/atheros/key.c rename to garnet/drivers/wlan/third_party/atheros/key.c
diff --git a/drivers/wlan/third_party/atheros/main.c b/garnet/drivers/wlan/third_party/atheros/main.c similarity index 100% rename from drivers/wlan/third_party/atheros/main.c rename to garnet/drivers/wlan/third_party/atheros/main.c
diff --git a/drivers/wlan/third_party/atheros/reg.h b/garnet/drivers/wlan/third_party/atheros/reg.h similarity index 100% rename from drivers/wlan/third_party/atheros/reg.h rename to garnet/drivers/wlan/third_party/atheros/reg.h
diff --git a/drivers/wlan/third_party/atheros/regd.c b/garnet/drivers/wlan/third_party/atheros/regd.c similarity index 100% rename from drivers/wlan/third_party/atheros/regd.c rename to garnet/drivers/wlan/third_party/atheros/regd.c
diff --git a/drivers/wlan/third_party/atheros/regd.h b/garnet/drivers/wlan/third_party/atheros/regd.h similarity index 100% rename from drivers/wlan/third_party/atheros/regd.h rename to garnet/drivers/wlan/third_party/atheros/regd.h
diff --git a/drivers/wlan/third_party/atheros/regd_common.h b/garnet/drivers/wlan/third_party/atheros/regd_common.h similarity index 100% rename from drivers/wlan/third_party/atheros/regd_common.h rename to garnet/drivers/wlan/third_party/atheros/regd_common.h
diff --git a/drivers/wlan/third_party/atheros/spectral_common.h b/garnet/drivers/wlan/third_party/atheros/spectral_common.h similarity index 100% rename from drivers/wlan/third_party/atheros/spectral_common.h rename to garnet/drivers/wlan/third_party/atheros/spectral_common.h
diff --git a/drivers/wlan/third_party/atheros/trace.c b/garnet/drivers/wlan/third_party/atheros/trace.c similarity index 100% rename from drivers/wlan/third_party/atheros/trace.c rename to garnet/drivers/wlan/third_party/atheros/trace.c
diff --git a/drivers/wlan/third_party/atheros/trace.h b/garnet/drivers/wlan/third_party/atheros/trace.h similarity index 100% rename from drivers/wlan/third_party/atheros/trace.h rename to garnet/drivers/wlan/third_party/atheros/trace.h
diff --git a/drivers/wlan/third_party/broadcom/LICENSE b/garnet/drivers/wlan/third_party/broadcom/LICENSE similarity index 100% rename from drivers/wlan/third_party/broadcom/LICENSE rename to garnet/drivers/wlan/third_party/broadcom/LICENSE
diff --git a/drivers/wlan/third_party/broadcom/Makefile b/garnet/drivers/wlan/third_party/broadcom/Makefile similarity index 100% rename from drivers/wlan/third_party/broadcom/Makefile rename to garnet/drivers/wlan/third_party/broadcom/Makefile
diff --git a/drivers/wlan/third_party/broadcom/README.fuchsia b/garnet/drivers/wlan/third_party/broadcom/README.fuchsia similarity index 100% rename from drivers/wlan/third_party/broadcom/README.fuchsia rename to garnet/drivers/wlan/third_party/broadcom/README.fuchsia
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/.gitignore b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/.gitignore similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/.gitignore rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/.gitignore
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/BUILD.gn b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/BUILD.gn similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/BUILD.gn rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/BUILD.gn
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/bcdc.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/bcdc.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/bcdc.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/bcdc.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/bcdc.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/bcdc.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/bcdc.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/bcdc.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/bcmsdh.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/bcmsdh.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/bcmsdh.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/bcmsdh.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/binding.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/binding.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/binding.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/binding.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/brcm_hw_ids.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcm_hw_ids.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/brcm_hw_ids.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcm_hw_ids.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_d11.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_d11.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/brcmu_d11.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_d11.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_utils.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_utils.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/brcmu_utils.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_utils.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_wifi.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_wifi.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/brcmu_wifi.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/brcmu_wifi.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/btcoex.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/btcoex.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/btcoex.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/btcoex.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/btcoex.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/btcoex.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/btcoex.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/btcoex.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/bus.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/bus.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/bus.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/bus.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/cfg80211.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/chip.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/chip.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/chip.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/chip.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/chip.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/chip.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/chip.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/chip.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/chipcommon.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/chipcommon.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/chipcommon.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/chipcommon.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/common.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/common.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/common.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/common.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/common.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/common.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/common.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/common.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/commonring.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/commonring.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/commonring.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/commonring.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/commonring.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/commonring.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/commonring.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/commonring.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/core.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/core.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/core.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/core.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/core.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/core.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/core.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/core.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/d11.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/d11.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/d11.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/d11.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/debug.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/debug.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/debug.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/debug.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/debug.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/debug.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/debug.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/debug.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/defs.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/defs.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/defs.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/defs.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/device.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/device.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/device.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/device.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/device.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/device.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/device.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/device.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/feature.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/feature.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/feature.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/feature.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/feature.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/feature.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/feature.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/feature.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/firmware.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/firmware.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/firmware.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/firmware.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/firmware.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/firmware.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/firmware.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/firmware.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/flowring.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/flowring.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/flowring.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/flowring.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/flowring.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/flowring.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/flowring.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/flowring.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/fweh.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/fweh.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/fweh.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/fweh.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/fweh.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/fweh.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/fweh.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/fweh.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/fwil.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwil.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/fwil.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwil.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/fwil.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwil.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/fwil.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwil.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/fwil_types.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwil_types.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/fwil_types.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwil_types.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/fwsignal.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/linuxisms.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/msgbuf.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/netbuf.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/netbuf.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/netbuf.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/netbuf.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/netbuf.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/netbuf.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/netbuf.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/netbuf.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/of.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/of.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/of.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/of.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/of.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/of.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/of.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/of.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/p2p.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/p2p.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/p2p.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/p2p.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/p2p.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/p2p.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/p2p.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/p2p.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/pcie.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/pcie.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/pcie.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/pcie.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/pcie.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/pcie.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/pcie.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/pcie.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/pno.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/pno.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/pno.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/pno.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/pno.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/pno.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/pno.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/pno.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/proto.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/proto.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/proto.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/proto.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/proto.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/proto.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/proto.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/proto.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/sdio.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/sdio.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/sdio.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/sdio.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/sdio.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/sdio.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/sdio.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/sdio.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/soc.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/soc.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/soc.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/soc.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/test/BUILD.gn b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/test/BUILD.gn similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/test/BUILD.gn rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/test/BUILD.gn
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/test/netbuf_test.cc b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/test/netbuf_test.cc similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/test/netbuf_test.cc rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/test/netbuf_test.cc
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/test/workqueue_test.cc b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/test/workqueue_test.cc similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/test/workqueue_test.cc rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/test/workqueue_test.cc
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/usb.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/usb.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/usb.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/usb.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/usb.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/usb.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/usb.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/usb.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/utils.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/utils.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/utils.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/utils.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/vendor.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/vendor.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/vendor.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/vendor.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/vendor.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/vendor.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/vendor.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/vendor.h
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/workqueue.c b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/workqueue.c similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/workqueue.c rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/workqueue.c
diff --git a/drivers/wlan/third_party/broadcom/brcmfmac/workqueue.h b/garnet/drivers/wlan/third_party/broadcom/brcmfmac/workqueue.h similarity index 100% rename from drivers/wlan/third_party/broadcom/brcmfmac/workqueue.h rename to garnet/drivers/wlan/third_party/broadcom/brcmfmac/workqueue.h
diff --git a/drivers/wlan/wlan/BUILD.gn b/garnet/drivers/wlan/wlan/BUILD.gn similarity index 100% rename from drivers/wlan/wlan/BUILD.gn rename to garnet/drivers/wlan/wlan/BUILD.gn
diff --git a/drivers/wlan/wlan/binding.c b/garnet/drivers/wlan/wlan/binding.c similarity index 100% rename from drivers/wlan/wlan/binding.c rename to garnet/drivers/wlan/wlan/binding.c
diff --git a/drivers/wlan/wlan/device.cpp b/garnet/drivers/wlan/wlan/device.cpp similarity index 100% rename from drivers/wlan/wlan/device.cpp rename to garnet/drivers/wlan/wlan/device.cpp
diff --git a/drivers/wlan/wlan/device.h b/garnet/drivers/wlan/wlan/device.h similarity index 100% rename from drivers/wlan/wlan/device.h rename to garnet/drivers/wlan/wlan/device.h
diff --git a/drivers/wlan/wlan/driver.cpp b/garnet/drivers/wlan/wlan/driver.cpp similarity index 100% rename from drivers/wlan/wlan/driver.cpp rename to garnet/drivers/wlan/wlan/driver.cpp
diff --git a/drivers/wlan/wlan/minstrel.cpp b/garnet/drivers/wlan/wlan/minstrel.cpp similarity index 100% rename from drivers/wlan/wlan/minstrel.cpp rename to garnet/drivers/wlan/wlan/minstrel.cpp
diff --git a/drivers/wlan/wlan/minstrel.h b/garnet/drivers/wlan/wlan/minstrel.h similarity index 100% rename from drivers/wlan/wlan/minstrel.h rename to garnet/drivers/wlan/wlan/minstrel.h
diff --git a/drivers/wlan/wlan/probe_sequence.cpp b/garnet/drivers/wlan/wlan/probe_sequence.cpp similarity index 100% rename from drivers/wlan/wlan/probe_sequence.cpp rename to garnet/drivers/wlan/wlan/probe_sequence.cpp
diff --git a/drivers/wlan/wlan/probe_sequence.h b/garnet/drivers/wlan/wlan/probe_sequence.h similarity index 100% rename from drivers/wlan/wlan/probe_sequence.h rename to garnet/drivers/wlan/wlan/probe_sequence.h
diff --git a/drivers/wlan/wlan/proxy_helpers.h b/garnet/drivers/wlan/wlan/proxy_helpers.h similarity index 100% rename from drivers/wlan/wlan/proxy_helpers.h rename to garnet/drivers/wlan/wlan/proxy_helpers.h
diff --git a/drivers/wlan/wlan/tests/minstrel_unittest.cpp b/garnet/drivers/wlan/wlan/tests/minstrel_unittest.cpp similarity index 100% rename from drivers/wlan/wlan/tests/minstrel_unittest.cpp rename to garnet/drivers/wlan/wlan/tests/minstrel_unittest.cpp
diff --git a/drivers/wlan/wlan/tests/probe_sequence_unittest.cpp b/garnet/drivers/wlan/wlan/tests/probe_sequence_unittest.cpp similarity index 100% rename from drivers/wlan/wlan/tests/probe_sequence_unittest.cpp rename to garnet/drivers/wlan/wlan/tests/probe_sequence_unittest.cpp
diff --git a/drivers/wlan/wlanif/BUILD.gn b/garnet/drivers/wlan/wlanif/BUILD.gn similarity index 100% rename from drivers/wlan/wlanif/BUILD.gn rename to garnet/drivers/wlan/wlanif/BUILD.gn
diff --git a/drivers/wlan/wlanif/binding.c b/garnet/drivers/wlan/wlanif/binding.c similarity index 100% rename from drivers/wlan/wlanif/binding.c rename to garnet/drivers/wlan/wlanif/binding.c
diff --git a/drivers/wlan/wlanif/convert.cpp b/garnet/drivers/wlan/wlanif/convert.cpp similarity index 100% rename from drivers/wlan/wlanif/convert.cpp rename to garnet/drivers/wlan/wlanif/convert.cpp
diff --git a/drivers/wlan/wlanif/convert.h b/garnet/drivers/wlan/wlanif/convert.h similarity index 100% rename from drivers/wlan/wlanif/convert.h rename to garnet/drivers/wlan/wlanif/convert.h
diff --git a/drivers/wlan/wlanif/device.cpp b/garnet/drivers/wlan/wlanif/device.cpp similarity index 100% rename from drivers/wlan/wlanif/device.cpp rename to garnet/drivers/wlan/wlanif/device.cpp
diff --git a/drivers/wlan/wlanif/device.h b/garnet/drivers/wlan/wlanif/device.h similarity index 100% rename from drivers/wlan/wlanif/device.h rename to garnet/drivers/wlan/wlanif/device.h
diff --git a/drivers/wlan/wlanif/driver.cpp b/garnet/drivers/wlan/wlanif/driver.cpp similarity index 100% rename from drivers/wlan/wlanif/driver.cpp rename to garnet/drivers/wlan/wlanif/driver.cpp
diff --git a/drivers/wlan/wlanif/driver.h b/garnet/drivers/wlan/wlanif/driver.h similarity index 100% rename from drivers/wlan/wlanif/driver.h rename to garnet/drivers/wlan/wlanif/driver.h
diff --git a/drivers/wlan/wlanif/test/BUILD.gn b/garnet/drivers/wlan/wlanif/test/BUILD.gn similarity index 100% rename from drivers/wlan/wlanif/test/BUILD.gn rename to garnet/drivers/wlan/wlanif/test/BUILD.gn
diff --git a/drivers/wlan/wlanif/test/binding.c b/garnet/drivers/wlan/wlanif/test/binding.c similarity index 100% rename from drivers/wlan/wlanif/test/binding.c rename to garnet/drivers/wlan/wlanif/test/binding.c
diff --git a/drivers/wlan/wlanphy/BUILD.gn b/garnet/drivers/wlan/wlanphy/BUILD.gn similarity index 100% rename from drivers/wlan/wlanphy/BUILD.gn rename to garnet/drivers/wlan/wlanphy/BUILD.gn
diff --git a/drivers/wlan/wlanphy/binding.c b/garnet/drivers/wlan/wlanphy/binding.c similarity index 100% rename from drivers/wlan/wlanphy/binding.c rename to garnet/drivers/wlan/wlanphy/binding.c
diff --git a/drivers/wlan/wlanphy/device.cpp b/garnet/drivers/wlan/wlanphy/device.cpp similarity index 100% rename from drivers/wlan/wlanphy/device.cpp rename to garnet/drivers/wlan/wlanphy/device.cpp
diff --git a/drivers/wlan/wlanphy/device.h b/garnet/drivers/wlan/wlanphy/device.h similarity index 100% rename from drivers/wlan/wlanphy/device.h rename to garnet/drivers/wlan/wlanphy/device.h
diff --git a/drivers/wlan/wlanphy/driver.cpp b/garnet/drivers/wlan/wlanphy/driver.cpp similarity index 100% rename from drivers/wlan/wlanphy/driver.cpp rename to garnet/drivers/wlan/wlanphy/driver.cpp
diff --git a/drivers/wlan/wlanphy/driver.h b/garnet/drivers/wlan/wlanphy/driver.h similarity index 100% rename from drivers/wlan/wlanphy/driver.h rename to garnet/drivers/wlan/wlanphy/driver.h
diff --git a/drivers/wlan/wlantap/BUILD.gn b/garnet/drivers/wlan/wlantap/BUILD.gn similarity index 100% rename from drivers/wlan/wlantap/BUILD.gn rename to garnet/drivers/wlan/wlantap/BUILD.gn
diff --git a/drivers/wlan/wlantap/binding.c b/garnet/drivers/wlan/wlantap/binding.c similarity index 100% rename from drivers/wlan/wlantap/binding.c rename to garnet/drivers/wlan/wlantap/binding.c
diff --git a/drivers/wlan/wlantap/utils.cpp b/garnet/drivers/wlan/wlantap/utils.cpp similarity index 100% rename from drivers/wlan/wlantap/utils.cpp rename to garnet/drivers/wlan/wlantap/utils.cpp
diff --git a/drivers/wlan/wlantap/utils.h b/garnet/drivers/wlan/wlantap/utils.h similarity index 100% rename from drivers/wlan/wlantap/utils.h rename to garnet/drivers/wlan/wlantap/utils.h
diff --git a/drivers/wlan/wlantap/wlantap-ctl.cpp b/garnet/drivers/wlan/wlantap/wlantap-ctl.cpp similarity index 100% rename from drivers/wlan/wlantap/wlantap-ctl.cpp rename to garnet/drivers/wlan/wlantap/wlantap-ctl.cpp
diff --git a/drivers/wlan/wlantap/wlantap-mac.cpp b/garnet/drivers/wlan/wlantap/wlantap-mac.cpp similarity index 100% rename from drivers/wlan/wlantap/wlantap-mac.cpp rename to garnet/drivers/wlan/wlantap/wlantap-mac.cpp
diff --git a/drivers/wlan/wlantap/wlantap-mac.h b/garnet/drivers/wlan/wlantap/wlantap-mac.h similarity index 100% rename from drivers/wlan/wlantap/wlantap-mac.h rename to garnet/drivers/wlan/wlantap/wlantap-mac.h
diff --git a/drivers/wlan/wlantap/wlantap-phy.cpp b/garnet/drivers/wlan/wlantap/wlantap-phy.cpp similarity index 100% rename from drivers/wlan/wlantap/wlantap-phy.cpp rename to garnet/drivers/wlan/wlantap/wlantap-phy.cpp
diff --git a/drivers/wlan/wlantap/wlantap-phy.h b/garnet/drivers/wlan/wlantap/wlantap-phy.h similarity index 100% rename from drivers/wlan/wlantap/wlantap-phy.h rename to garnet/drivers/wlan/wlantap/wlantap-phy.h
diff --git a/examples/benchmark/BUILD.gn b/garnet/examples/benchmark/BUILD.gn similarity index 100% rename from examples/benchmark/BUILD.gn rename to garnet/examples/benchmark/BUILD.gn
diff --git a/examples/benchmark/benchmark_example.tspec b/garnet/examples/benchmark/benchmark_example.tspec similarity index 100% rename from examples/benchmark/benchmark_example.tspec rename to garnet/examples/benchmark/benchmark_example.tspec
diff --git a/examples/benchmark/main.cc b/garnet/examples/benchmark/main.cc similarity index 100% rename from examples/benchmark/main.cc rename to garnet/examples/benchmark/main.cc
diff --git a/examples/benchmark/meta/benchmark.cmx b/garnet/examples/benchmark/meta/benchmark.cmx similarity index 100% rename from examples/benchmark/meta/benchmark.cmx rename to garnet/examples/benchmark/meta/benchmark.cmx
diff --git a/examples/bluetooth/BUILD.gn b/garnet/examples/bluetooth/BUILD.gn similarity index 100% rename from examples/bluetooth/BUILD.gn rename to garnet/examples/bluetooth/BUILD.gn
diff --git a/examples/bluetooth/MAINTAINERS b/garnet/examples/bluetooth/MAINTAINERS similarity index 100% rename from examples/bluetooth/MAINTAINERS rename to garnet/examples/bluetooth/MAINTAINERS
diff --git a/examples/bluetooth/bt-le-battery-service/BUILD.gn b/garnet/examples/bluetooth/bt-le-battery-service/BUILD.gn similarity index 100% rename from examples/bluetooth/bt-le-battery-service/BUILD.gn rename to garnet/examples/bluetooth/bt-le-battery-service/BUILD.gn
diff --git a/examples/bluetooth/bt-le-battery-service/README.md b/garnet/examples/bluetooth/bt-le-battery-service/README.md similarity index 100% rename from examples/bluetooth/bt-le-battery-service/README.md rename to garnet/examples/bluetooth/bt-le-battery-service/README.md
diff --git a/examples/bluetooth/bt-le-battery-service/src/main.rs b/garnet/examples/bluetooth/bt-le-battery-service/src/main.rs similarity index 100% rename from examples/bluetooth/bt-le-battery-service/src/main.rs rename to garnet/examples/bluetooth/bt-le-battery-service/src/main.rs
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/BUILD.gn b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/BUILD.gn similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/BUILD.gn rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/BUILD.gn
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/app.cc b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/app.cc similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/app.cc rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/app.cc
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/app.h b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/app.h similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/app.h rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/app.h
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/main.cc b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/main.cc similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/main.cc rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/main.cc
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/service.cc b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/service.cc similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/service.cc rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/service.cc
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/service.h b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/service.h similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/service.h rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/service.h
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.cc b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.cc similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.cc rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.cc
diff --git a/examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.h b/garnet/examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.h similarity index 100% rename from examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.h rename to garnet/examples/bluetooth/bt-le-heart-rate-peripheral/system_load_heart_model.h
diff --git a/examples/bluetooth/bt_beacon_reader/BUILD.gn b/garnet/examples/bluetooth/bt_beacon_reader/BUILD.gn similarity index 100% rename from examples/bluetooth/bt_beacon_reader/BUILD.gn rename to garnet/examples/bluetooth/bt_beacon_reader/BUILD.gn
diff --git a/examples/bluetooth/bt_beacon_reader/app.cc b/garnet/examples/bluetooth/bt_beacon_reader/app.cc similarity index 100% rename from examples/bluetooth/bt_beacon_reader/app.cc rename to garnet/examples/bluetooth/bt_beacon_reader/app.cc
diff --git a/examples/bluetooth/bt_beacon_reader/app.h b/garnet/examples/bluetooth/bt_beacon_reader/app.h similarity index 100% rename from examples/bluetooth/bt_beacon_reader/app.h rename to garnet/examples/bluetooth/bt_beacon_reader/app.h
diff --git a/examples/bluetooth/bt_beacon_reader/beacons.cc b/garnet/examples/bluetooth/bt_beacon_reader/beacons.cc similarity index 100% rename from examples/bluetooth/bt_beacon_reader/beacons.cc rename to garnet/examples/bluetooth/bt_beacon_reader/beacons.cc
diff --git a/examples/bluetooth/bt_beacon_reader/beacons.h b/garnet/examples/bluetooth/bt_beacon_reader/beacons.h similarity index 100% rename from examples/bluetooth/bt_beacon_reader/beacons.h rename to garnet/examples/bluetooth/bt_beacon_reader/beacons.h
diff --git a/examples/bluetooth/bt_beacon_reader/main.cc b/garnet/examples/bluetooth/bt_beacon_reader/main.cc similarity index 100% rename from examples/bluetooth/bt_beacon_reader/main.cc rename to garnet/examples/bluetooth/bt_beacon_reader/main.cc
diff --git a/examples/camera/camera_client/BUILD.gn b/garnet/examples/camera/camera_client/BUILD.gn similarity index 100% rename from examples/camera/camera_client/BUILD.gn rename to garnet/examples/camera/camera_client/BUILD.gn
diff --git a/examples/camera/camera_client/camera_client.cc b/garnet/examples/camera/camera_client/camera_client.cc similarity index 100% rename from examples/camera/camera_client/camera_client.cc rename to garnet/examples/camera/camera_client/camera_client.cc
diff --git a/examples/camera/camera_client/camera_client.h b/garnet/examples/camera/camera_client/camera_client.h similarity index 100% rename from examples/camera/camera_client/camera_client.h rename to garnet/examples/camera/camera_client/camera_client.h
diff --git a/examples/camera/camera_client/main.cc b/garnet/examples/camera/camera_client/main.cc similarity index 100% rename from examples/camera/camera_client/main.cc rename to garnet/examples/camera/camera_client/main.cc
diff --git a/examples/camera/camera_client/meta/example_camera_client.cmx b/garnet/examples/camera/camera_client/meta/example_camera_client.cmx similarity index 100% rename from examples/camera/camera_client/meta/example_camera_client.cmx rename to garnet/examples/camera/camera_client/meta/example_camera_client.cmx
diff --git a/examples/components/BUILD.gn b/garnet/examples/components/BUILD.gn similarity index 100% rename from examples/components/BUILD.gn rename to garnet/examples/components/BUILD.gn
diff --git a/examples/components/hello_world.cc b/garnet/examples/components/hello_world.cc similarity index 100% rename from examples/components/hello_world.cc rename to garnet/examples/components/hello_world.cc
diff --git a/examples/components/hello_world2.cc b/garnet/examples/components/hello_world2.cc similarity index 100% rename from examples/components/hello_world2.cc rename to garnet/examples/components/hello_world2.cc
diff --git a/examples/components/hello_world_test.cc b/garnet/examples/components/hello_world_test.cc similarity index 100% rename from examples/components/hello_world_test.cc rename to garnet/examples/components/hello_world_test.cc
diff --git a/examples/components/meta/hello_world.cmx b/garnet/examples/components/meta/hello_world.cmx similarity index 100% rename from examples/components/meta/hello_world.cmx rename to garnet/examples/components/meta/hello_world.cmx
diff --git a/examples/components/meta/hello_world2.cmx b/garnet/examples/components/meta/hello_world2.cmx similarity index 100% rename from examples/components/meta/hello_world2.cmx rename to garnet/examples/components/meta/hello_world2.cmx
diff --git a/examples/components/meta/hello_world_test.cmx b/garnet/examples/components/meta/hello_world_test.cmx similarity index 100% rename from examples/components/meta/hello_world_test.cmx rename to garnet/examples/components/meta/hello_world_test.cmx
diff --git a/examples/components/v2/BUILD.gn b/garnet/examples/components/v2/BUILD.gn similarity index 100% rename from examples/components/v2/BUILD.gn rename to garnet/examples/components/v2/BUILD.gn
diff --git a/examples/components/v2/meta/hello_world.cml b/garnet/examples/components/v2/meta/hello_world.cml similarity index 100% rename from examples/components/v2/meta/hello_world.cml rename to garnet/examples/components/v2/meta/hello_world.cml
diff --git a/examples/components/v2/src/main.rs b/garnet/examples/components/v2/src/main.rs similarity index 100% rename from examples/components/v2/src/main.rs rename to garnet/examples/components/v2/src/main.rs
diff --git a/examples/escher/BUILD.gn b/garnet/examples/escher/BUILD.gn similarity index 100% rename from examples/escher/BUILD.gn rename to garnet/examples/escher/BUILD.gn
diff --git a/examples/escher/MAINTAINERS b/garnet/examples/escher/MAINTAINERS similarity index 100% rename from examples/escher/MAINTAINERS rename to garnet/examples/escher/MAINTAINERS
diff --git a/examples/escher/common/BUILD.gn b/garnet/examples/escher/common/BUILD.gn similarity index 100% rename from examples/escher/common/BUILD.gn rename to garnet/examples/escher/common/BUILD.gn
diff --git a/examples/escher/common/demo.cc b/garnet/examples/escher/common/demo.cc similarity index 100% rename from examples/escher/common/demo.cc rename to garnet/examples/escher/common/demo.cc
diff --git a/examples/escher/common/demo.h b/garnet/examples/escher/common/demo.h similarity index 100% rename from examples/escher/common/demo.h rename to garnet/examples/escher/common/demo.h
diff --git a/examples/escher/common/demo_harness.cc b/garnet/examples/escher/common/demo_harness.cc similarity index 100% rename from examples/escher/common/demo_harness.cc rename to garnet/examples/escher/common/demo_harness.cc
diff --git a/examples/escher/common/demo_harness.h b/garnet/examples/escher/common/demo_harness.h similarity index 100% rename from examples/escher/common/demo_harness.h rename to garnet/examples/escher/common/demo_harness.h
diff --git a/examples/escher/common/demo_harness_fuchsia.cc b/garnet/examples/escher/common/demo_harness_fuchsia.cc similarity index 100% rename from examples/escher/common/demo_harness_fuchsia.cc rename to garnet/examples/escher/common/demo_harness_fuchsia.cc
diff --git a/examples/escher/common/demo_harness_fuchsia.h b/garnet/examples/escher/common/demo_harness_fuchsia.h similarity index 100% rename from examples/escher/common/demo_harness_fuchsia.h rename to garnet/examples/escher/common/demo_harness_fuchsia.h
diff --git a/examples/escher/common/demo_harness_linux.cc b/garnet/examples/escher/common/demo_harness_linux.cc similarity index 100% rename from examples/escher/common/demo_harness_linux.cc rename to garnet/examples/escher/common/demo_harness_linux.cc
diff --git a/examples/escher/common/demo_harness_linux.h b/garnet/examples/escher/common/demo_harness_linux.h similarity index 100% rename from examples/escher/common/demo_harness_linux.h rename to garnet/examples/escher/common/demo_harness_linux.h
diff --git a/examples/escher/meta/escher_examples.cmx b/garnet/examples/escher/meta/escher_examples.cmx similarity index 100% rename from examples/escher/meta/escher_examples.cmx rename to garnet/examples/escher/meta/escher_examples.cmx
diff --git a/examples/escher/waterfall/BUILD.gn b/garnet/examples/escher/waterfall/BUILD.gn similarity index 100% rename from examples/escher/waterfall/BUILD.gn rename to garnet/examples/escher/waterfall/BUILD.gn
diff --git a/examples/escher/waterfall/scenes/app_test_scene.cc b/garnet/examples/escher/waterfall/scenes/app_test_scene.cc similarity index 100% rename from examples/escher/waterfall/scenes/app_test_scene.cc rename to garnet/examples/escher/waterfall/scenes/app_test_scene.cc
diff --git a/examples/escher/waterfall/scenes/app_test_scene.h b/garnet/examples/escher/waterfall/scenes/app_test_scene.h similarity index 100% rename from examples/escher/waterfall/scenes/app_test_scene.h rename to garnet/examples/escher/waterfall/scenes/app_test_scene.h
diff --git a/examples/escher/waterfall/scenes/demo_scene.cc b/garnet/examples/escher/waterfall/scenes/demo_scene.cc similarity index 100% rename from examples/escher/waterfall/scenes/demo_scene.cc rename to garnet/examples/escher/waterfall/scenes/demo_scene.cc
diff --git a/examples/escher/waterfall/scenes/demo_scene.h b/garnet/examples/escher/waterfall/scenes/demo_scene.h similarity index 100% rename from examples/escher/waterfall/scenes/demo_scene.h rename to garnet/examples/escher/waterfall/scenes/demo_scene.h
diff --git a/examples/escher/waterfall/scenes/paper_demo_scene1.cc b/garnet/examples/escher/waterfall/scenes/paper_demo_scene1.cc similarity index 100% rename from examples/escher/waterfall/scenes/paper_demo_scene1.cc rename to garnet/examples/escher/waterfall/scenes/paper_demo_scene1.cc
diff --git a/examples/escher/waterfall/scenes/paper_demo_scene1.h b/garnet/examples/escher/waterfall/scenes/paper_demo_scene1.h similarity index 100% rename from examples/escher/waterfall/scenes/paper_demo_scene1.h rename to garnet/examples/escher/waterfall/scenes/paper_demo_scene1.h
diff --git a/examples/escher/waterfall/scenes/ring_tricks1.cc b/garnet/examples/escher/waterfall/scenes/ring_tricks1.cc similarity index 100% rename from examples/escher/waterfall/scenes/ring_tricks1.cc rename to garnet/examples/escher/waterfall/scenes/ring_tricks1.cc
diff --git a/examples/escher/waterfall/scenes/ring_tricks1.h b/garnet/examples/escher/waterfall/scenes/ring_tricks1.h similarity index 100% rename from examples/escher/waterfall/scenes/ring_tricks1.h rename to garnet/examples/escher/waterfall/scenes/ring_tricks1.h
diff --git a/examples/escher/waterfall/scenes/ring_tricks2.cc b/garnet/examples/escher/waterfall/scenes/ring_tricks2.cc similarity index 100% rename from examples/escher/waterfall/scenes/ring_tricks2.cc rename to garnet/examples/escher/waterfall/scenes/ring_tricks2.cc
diff --git a/examples/escher/waterfall/scenes/ring_tricks2.h b/garnet/examples/escher/waterfall/scenes/ring_tricks2.h similarity index 100% rename from examples/escher/waterfall/scenes/ring_tricks2.h rename to garnet/examples/escher/waterfall/scenes/ring_tricks2.h
diff --git a/examples/escher/waterfall/scenes/ring_tricks3.cc b/garnet/examples/escher/waterfall/scenes/ring_tricks3.cc similarity index 100% rename from examples/escher/waterfall/scenes/ring_tricks3.cc rename to garnet/examples/escher/waterfall/scenes/ring_tricks3.cc
diff --git a/examples/escher/waterfall/scenes/ring_tricks3.h b/garnet/examples/escher/waterfall/scenes/ring_tricks3.h similarity index 100% rename from examples/escher/waterfall/scenes/ring_tricks3.h rename to garnet/examples/escher/waterfall/scenes/ring_tricks3.h
diff --git a/examples/escher/waterfall/scenes/scene.cc b/garnet/examples/escher/waterfall/scenes/scene.cc similarity index 100% rename from examples/escher/waterfall/scenes/scene.cc rename to garnet/examples/escher/waterfall/scenes/scene.cc
diff --git a/examples/escher/waterfall/scenes/scene.h b/garnet/examples/escher/waterfall/scenes/scene.h similarity index 100% rename from examples/escher/waterfall/scenes/scene.h rename to garnet/examples/escher/waterfall/scenes/scene.h
diff --git a/examples/escher/waterfall/scenes/shadow_test_scene.cc b/garnet/examples/escher/waterfall/scenes/shadow_test_scene.cc similarity index 100% rename from examples/escher/waterfall/scenes/shadow_test_scene.cc rename to garnet/examples/escher/waterfall/scenes/shadow_test_scene.cc
diff --git a/examples/escher/waterfall/scenes/shadow_test_scene.h b/garnet/examples/escher/waterfall/scenes/shadow_test_scene.h similarity index 100% rename from examples/escher/waterfall/scenes/shadow_test_scene.h rename to garnet/examples/escher/waterfall/scenes/shadow_test_scene.h
diff --git a/examples/escher/waterfall/scenes/uber_scene.cc b/garnet/examples/escher/waterfall/scenes/uber_scene.cc similarity index 100% rename from examples/escher/waterfall/scenes/uber_scene.cc rename to garnet/examples/escher/waterfall/scenes/uber_scene.cc
diff --git a/examples/escher/waterfall/scenes/uber_scene.h b/garnet/examples/escher/waterfall/scenes/uber_scene.h similarity index 100% rename from examples/escher/waterfall/scenes/uber_scene.h rename to garnet/examples/escher/waterfall/scenes/uber_scene.h
diff --git a/examples/escher/waterfall/scenes/uber_scene2.cc b/garnet/examples/escher/waterfall/scenes/uber_scene2.cc similarity index 100% rename from examples/escher/waterfall/scenes/uber_scene2.cc rename to garnet/examples/escher/waterfall/scenes/uber_scene2.cc
diff --git a/examples/escher/waterfall/scenes/uber_scene2.h b/garnet/examples/escher/waterfall/scenes/uber_scene2.h similarity index 100% rename from examples/escher/waterfall/scenes/uber_scene2.h rename to garnet/examples/escher/waterfall/scenes/uber_scene2.h
diff --git a/examples/escher/waterfall/scenes/uber_scene3.cc b/garnet/examples/escher/waterfall/scenes/uber_scene3.cc similarity index 100% rename from examples/escher/waterfall/scenes/uber_scene3.cc rename to garnet/examples/escher/waterfall/scenes/uber_scene3.cc
diff --git a/examples/escher/waterfall/scenes/uber_scene3.h b/garnet/examples/escher/waterfall/scenes/uber_scene3.h similarity index 100% rename from examples/escher/waterfall/scenes/uber_scene3.h rename to garnet/examples/escher/waterfall/scenes/uber_scene3.h
diff --git a/examples/escher/waterfall/scenes/wobbly_ocean_scene.cc b/garnet/examples/escher/waterfall/scenes/wobbly_ocean_scene.cc similarity index 100% rename from examples/escher/waterfall/scenes/wobbly_ocean_scene.cc rename to garnet/examples/escher/waterfall/scenes/wobbly_ocean_scene.cc
diff --git a/examples/escher/waterfall/scenes/wobbly_ocean_scene.h b/garnet/examples/escher/waterfall/scenes/wobbly_ocean_scene.h similarity index 100% rename from examples/escher/waterfall/scenes/wobbly_ocean_scene.h rename to garnet/examples/escher/waterfall/scenes/wobbly_ocean_scene.h
diff --git a/examples/escher/waterfall/scenes/wobbly_rings_scene.cc b/garnet/examples/escher/waterfall/scenes/wobbly_rings_scene.cc similarity index 100% rename from examples/escher/waterfall/scenes/wobbly_rings_scene.cc rename to garnet/examples/escher/waterfall/scenes/wobbly_rings_scene.cc
diff --git a/examples/escher/waterfall/scenes/wobbly_rings_scene.h b/garnet/examples/escher/waterfall/scenes/wobbly_rings_scene.h similarity index 100% rename from examples/escher/waterfall/scenes/wobbly_rings_scene.h rename to garnet/examples/escher/waterfall/scenes/wobbly_rings_scene.h
diff --git a/examples/escher/waterfall/waterfall_demo.cc b/garnet/examples/escher/waterfall/waterfall_demo.cc similarity index 100% rename from examples/escher/waterfall/waterfall_demo.cc rename to garnet/examples/escher/waterfall/waterfall_demo.cc
diff --git a/examples/escher/waterfall/waterfall_demo.h b/garnet/examples/escher/waterfall/waterfall_demo.h similarity index 100% rename from examples/escher/waterfall/waterfall_demo.h rename to garnet/examples/escher/waterfall/waterfall_demo.h
diff --git a/examples/escher/waterfall/waterfall_main.cc b/garnet/examples/escher/waterfall/waterfall_main.cc similarity index 100% rename from examples/escher/waterfall/waterfall_main.cc rename to garnet/examples/escher/waterfall/waterfall_main.cc
diff --git a/examples/escher/waterfall2/BUILD.gn b/garnet/examples/escher/waterfall2/BUILD.gn similarity index 100% rename from examples/escher/waterfall2/BUILD.gn rename to garnet/examples/escher/waterfall2/BUILD.gn
diff --git a/examples/escher/waterfall2/waterfall_demo.cc b/garnet/examples/escher/waterfall2/waterfall_demo.cc similarity index 100% rename from examples/escher/waterfall2/waterfall_demo.cc rename to garnet/examples/escher/waterfall2/waterfall_demo.cc
diff --git a/examples/escher/waterfall2/waterfall_demo.h b/garnet/examples/escher/waterfall2/waterfall_demo.h similarity index 100% rename from examples/escher/waterfall2/waterfall_demo.h rename to garnet/examples/escher/waterfall2/waterfall_demo.h
diff --git a/examples/escher/waterfall2/waterfall_main.cc b/garnet/examples/escher/waterfall2/waterfall_main.cc similarity index 100% rename from examples/escher/waterfall2/waterfall_main.cc rename to garnet/examples/escher/waterfall2/waterfall_main.cc
diff --git a/examples/fidl/TESTING b/garnet/examples/fidl/TESTING similarity index 100% rename from examples/fidl/TESTING rename to garnet/examples/fidl/TESTING
diff --git a/examples/fidl/echo2_client_cpp/BUILD.gn b/garnet/examples/fidl/echo2_client_cpp/BUILD.gn similarity index 100% rename from examples/fidl/echo2_client_cpp/BUILD.gn rename to garnet/examples/fidl/echo2_client_cpp/BUILD.gn
diff --git a/examples/fidl/echo2_client_cpp/echo2_client.cc b/garnet/examples/fidl/echo2_client_cpp/echo2_client.cc similarity index 100% rename from examples/fidl/echo2_client_cpp/echo2_client.cc rename to garnet/examples/fidl/echo2_client_cpp/echo2_client.cc
diff --git a/examples/fidl/echo2_client_cpp/echo_client_app.cc b/garnet/examples/fidl/echo2_client_cpp/echo_client_app.cc similarity index 100% rename from examples/fidl/echo2_client_cpp/echo_client_app.cc rename to garnet/examples/fidl/echo2_client_cpp/echo_client_app.cc
diff --git a/examples/fidl/echo2_client_cpp/echo_client_app.h b/garnet/examples/fidl/echo2_client_cpp/echo_client_app.h similarity index 100% rename from examples/fidl/echo2_client_cpp/echo_client_app.h rename to garnet/examples/fidl/echo2_client_cpp/echo_client_app.h
diff --git a/examples/fidl/echo2_client_go/BUILD.gn b/garnet/examples/fidl/echo2_client_go/BUILD.gn similarity index 100% rename from examples/fidl/echo2_client_go/BUILD.gn rename to garnet/examples/fidl/echo2_client_go/BUILD.gn
diff --git a/examples/fidl/echo2_client_go/echo2_client.go b/garnet/examples/fidl/echo2_client_go/echo2_client.go similarity index 100% rename from examples/fidl/echo2_client_go/echo2_client.go rename to garnet/examples/fidl/echo2_client_go/echo2_client.go
diff --git a/examples/fidl/echo2_client_rust/BUILD.gn b/garnet/examples/fidl/echo2_client_rust/BUILD.gn similarity index 100% rename from examples/fidl/echo2_client_rust/BUILD.gn rename to garnet/examples/fidl/echo2_client_rust/BUILD.gn
diff --git a/examples/fidl/echo2_client_rust/src/main.rs b/garnet/examples/fidl/echo2_client_rust/src/main.rs similarity index 100% rename from examples/fidl/echo2_client_rust/src/main.rs rename to garnet/examples/fidl/echo2_client_rust/src/main.rs
diff --git a/examples/fidl/echo2_client_rust_synchronous/BUILD.gn b/garnet/examples/fidl/echo2_client_rust_synchronous/BUILD.gn similarity index 100% rename from examples/fidl/echo2_client_rust_synchronous/BUILD.gn rename to garnet/examples/fidl/echo2_client_rust_synchronous/BUILD.gn
diff --git a/examples/fidl/echo2_client_rust_synchronous/src/main.rs b/garnet/examples/fidl/echo2_client_rust_synchronous/src/main.rs similarity index 100% rename from examples/fidl/echo2_client_rust_synchronous/src/main.rs rename to garnet/examples/fidl/echo2_client_rust_synchronous/src/main.rs
diff --git a/examples/fidl/echo2_server_c/BUILD.gn b/garnet/examples/fidl/echo2_server_c/BUILD.gn similarity index 100% rename from examples/fidl/echo2_server_c/BUILD.gn rename to garnet/examples/fidl/echo2_server_c/BUILD.gn
diff --git a/examples/fidl/echo2_server_c/echo_server.c b/garnet/examples/fidl/echo2_server_c/echo_server.c similarity index 100% rename from examples/fidl/echo2_server_c/echo_server.c rename to garnet/examples/fidl/echo2_server_c/echo_server.c
diff --git a/examples/fidl/echo2_server_cpp/BUILD.gn b/garnet/examples/fidl/echo2_server_cpp/BUILD.gn similarity index 100% rename from examples/fidl/echo2_server_cpp/BUILD.gn rename to garnet/examples/fidl/echo2_server_cpp/BUILD.gn
diff --git a/examples/fidl/echo2_server_cpp/echo2_server.cc b/garnet/examples/fidl/echo2_server_cpp/echo2_server.cc similarity index 100% rename from examples/fidl/echo2_server_cpp/echo2_server.cc rename to garnet/examples/fidl/echo2_server_cpp/echo2_server.cc
diff --git a/examples/fidl/echo2_server_cpp/echo_server_app.cc b/garnet/examples/fidl/echo2_server_cpp/echo_server_app.cc similarity index 100% rename from examples/fidl/echo2_server_cpp/echo_server_app.cc rename to garnet/examples/fidl/echo2_server_cpp/echo_server_app.cc
diff --git a/examples/fidl/echo2_server_cpp/echo_server_app.h b/garnet/examples/fidl/echo2_server_cpp/echo_server_app.h similarity index 100% rename from examples/fidl/echo2_server_cpp/echo_server_app.h rename to garnet/examples/fidl/echo2_server_cpp/echo_server_app.h
diff --git a/examples/fidl/echo2_server_cpp/echo_server_app_unittest.cc b/garnet/examples/fidl/echo2_server_cpp/echo_server_app_unittest.cc similarity index 100% rename from examples/fidl/echo2_server_cpp/echo_server_app_unittest.cc rename to garnet/examples/fidl/echo2_server_cpp/echo_server_app_unittest.cc
diff --git a/examples/fidl/echo2_server_go/BUILD.gn b/garnet/examples/fidl/echo2_server_go/BUILD.gn similarity index 100% rename from examples/fidl/echo2_server_go/BUILD.gn rename to garnet/examples/fidl/echo2_server_go/BUILD.gn
diff --git a/examples/fidl/echo2_server_go/echo2_server.go b/garnet/examples/fidl/echo2_server_go/echo2_server.go similarity index 100% rename from examples/fidl/echo2_server_go/echo2_server.go rename to garnet/examples/fidl/echo2_server_go/echo2_server.go
diff --git a/examples/fidl/echo2_server_rust/BUILD.gn b/garnet/examples/fidl/echo2_server_rust/BUILD.gn similarity index 100% rename from examples/fidl/echo2_server_rust/BUILD.gn rename to garnet/examples/fidl/echo2_server_rust/BUILD.gn
diff --git a/examples/fidl/echo2_server_rust/src/main.rs b/garnet/examples/fidl/echo2_server_rust/src/main.rs similarity index 100% rename from examples/fidl/echo2_server_rust/src/main.rs rename to garnet/examples/fidl/echo2_server_rust/src/main.rs
diff --git a/examples/fidl/heartbeat_client_go/BUILD.gn b/garnet/examples/fidl/heartbeat_client_go/BUILD.gn similarity index 100% rename from examples/fidl/heartbeat_client_go/BUILD.gn rename to garnet/examples/fidl/heartbeat_client_go/BUILD.gn
diff --git a/examples/fidl/heartbeat_client_go/heartbeat_client.go b/garnet/examples/fidl/heartbeat_client_go/heartbeat_client.go similarity index 100% rename from examples/fidl/heartbeat_client_go/heartbeat_client.go rename to garnet/examples/fidl/heartbeat_client_go/heartbeat_client.go
diff --git a/examples/fidl/heartbeat_client_go/meta/heartbeat_client_go.cmx b/garnet/examples/fidl/heartbeat_client_go/meta/heartbeat_client_go.cmx similarity index 100% rename from examples/fidl/heartbeat_client_go/meta/heartbeat_client_go.cmx rename to garnet/examples/fidl/heartbeat_client_go/meta/heartbeat_client_go.cmx
diff --git a/examples/fidl/heartbeat_server_go/BUILD.gn b/garnet/examples/fidl/heartbeat_server_go/BUILD.gn similarity index 100% rename from examples/fidl/heartbeat_server_go/BUILD.gn rename to garnet/examples/fidl/heartbeat_server_go/BUILD.gn
diff --git a/examples/fidl/heartbeat_server_go/heartbeat_server.go b/garnet/examples/fidl/heartbeat_server_go/heartbeat_server.go similarity index 100% rename from examples/fidl/heartbeat_server_go/heartbeat_server.go rename to garnet/examples/fidl/heartbeat_server_go/heartbeat_server.go
diff --git a/examples/fidl/heartbeat_server_go/meta/heartbeat_server_go.cmx b/garnet/examples/fidl/heartbeat_server_go/meta/heartbeat_server_go.cmx similarity index 100% rename from examples/fidl/heartbeat_server_go/meta/heartbeat_server_go.cmx rename to garnet/examples/fidl/heartbeat_server_go/meta/heartbeat_server_go.cmx
diff --git a/examples/fidl/meta/echo2_client.cmx b/garnet/examples/fidl/meta/echo2_client.cmx similarity index 100% rename from examples/fidl/meta/echo2_client.cmx rename to garnet/examples/fidl/meta/echo2_client.cmx
diff --git a/examples/fidl/meta/echo2_server.cmx b/garnet/examples/fidl/meta/echo2_server.cmx similarity index 100% rename from examples/fidl/meta/echo2_server.cmx rename to garnet/examples/fidl/meta/echo2_server.cmx
diff --git a/examples/fidl/services/BUILD.gn b/garnet/examples/fidl/services/BUILD.gn similarity index 100% rename from examples/fidl/services/BUILD.gn rename to garnet/examples/fidl/services/BUILD.gn
diff --git a/examples/fidl/services/echo2.fidl b/garnet/examples/fidl/services/echo2.fidl similarity index 100% rename from examples/fidl/services/echo2.fidl rename to garnet/examples/fidl/services/echo2.fidl
diff --git a/examples/fidl/services/heartbeat.fidl b/garnet/examples/fidl/services/heartbeat.fidl similarity index 100% rename from examples/fidl/services/heartbeat.fidl rename to garnet/examples/fidl/services/heartbeat.fidl
diff --git a/examples/http/example_http_server/BUILD.gn b/garnet/examples/http/example_http_server/BUILD.gn similarity index 100% rename from examples/http/example_http_server/BUILD.gn rename to garnet/examples/http/example_http_server/BUILD.gn
diff --git a/examples/http/example_http_server/MAINTAINERS b/garnet/examples/http/example_http_server/MAINTAINERS similarity index 100% rename from examples/http/example_http_server/MAINTAINERS rename to garnet/examples/http/example_http_server/MAINTAINERS
diff --git a/examples/http/example_http_server/README.md b/garnet/examples/http/example_http_server/README.md similarity index 100% rename from examples/http/example_http_server/README.md rename to garnet/examples/http/example_http_server/README.md
diff --git a/examples/http/example_http_server/meta/example_http_server.cmx b/garnet/examples/http/example_http_server/meta/example_http_server.cmx similarity index 100% rename from examples/http/example_http_server/meta/example_http_server.cmx rename to garnet/examples/http/example_http_server/meta/example_http_server.cmx
diff --git a/examples/http/example_http_server/public/index.html b/garnet/examples/http/example_http_server/public/index.html similarity index 100% rename from examples/http/example_http_server/public/index.html rename to garnet/examples/http/example_http_server/public/index.html
diff --git a/examples/http/example_http_server/src/main.rs b/garnet/examples/http/example_http_server/src/main.rs similarity index 100% rename from examples/http/example_http_server/src/main.rs rename to garnet/examples/http/example_http_server/src/main.rs
diff --git a/examples/http/httpget_cpp/BUILD.gn b/garnet/examples/http/httpget_cpp/BUILD.gn similarity index 100% rename from examples/http/httpget_cpp/BUILD.gn rename to garnet/examples/http/httpget_cpp/BUILD.gn
diff --git a/examples/http/httpget_cpp/httpget.cc b/garnet/examples/http/httpget_cpp/httpget.cc similarity index 100% rename from examples/http/httpget_cpp/httpget.cc rename to garnet/examples/http/httpget_cpp/httpget.cc
diff --git a/examples/http/httpget_cpp/meta/httpget_cpp.cmx b/garnet/examples/http/httpget_cpp/meta/httpget_cpp.cmx similarity index 100% rename from examples/http/httpget_cpp/meta/httpget_cpp.cmx rename to garnet/examples/http/httpget_cpp/meta/httpget_cpp.cmx
diff --git a/examples/http/httpget_rust/BUILD.gn b/garnet/examples/http/httpget_rust/BUILD.gn similarity index 100% rename from examples/http/httpget_rust/BUILD.gn rename to garnet/examples/http/httpget_rust/BUILD.gn
diff --git a/examples/http/httpget_rust/meta/httpget_rust.cmx b/garnet/examples/http/httpget_rust/meta/httpget_rust.cmx similarity index 100% rename from examples/http/httpget_rust/meta/httpget_rust.cmx rename to garnet/examples/http/httpget_rust/meta/httpget_rust.cmx
diff --git a/examples/http/httpget_rust/src/main.rs b/garnet/examples/http/httpget_rust/src/main.rs similarity index 100% rename from examples/http/httpget_rust/src/main.rs rename to garnet/examples/http/httpget_rust/src/main.rs
diff --git a/examples/http/postfile/BUILD.gn b/garnet/examples/http/postfile/BUILD.gn similarity index 100% rename from examples/http/postfile/BUILD.gn rename to garnet/examples/http/postfile/BUILD.gn
diff --git a/examples/http/postfile/postfile.cc b/garnet/examples/http/postfile/postfile.cc similarity index 100% rename from examples/http/postfile/postfile.cc rename to garnet/examples/http/postfile/postfile.cc
diff --git a/examples/intl/BUILD.gn b/garnet/examples/intl/BUILD.gn similarity index 100% rename from examples/intl/BUILD.gn rename to garnet/examples/intl/BUILD.gn
diff --git a/examples/intl/README.md b/garnet/examples/intl/README.md similarity index 100% rename from examples/intl/README.md rename to garnet/examples/intl/README.md
diff --git a/examples/intl/client/BUILD.gn b/garnet/examples/intl/client/BUILD.gn similarity index 100% rename from examples/intl/client/BUILD.gn rename to garnet/examples/intl/client/BUILD.gn
diff --git a/examples/intl/client/intl_wisdom_client.cc b/garnet/examples/intl/client/intl_wisdom_client.cc similarity index 100% rename from examples/intl/client/intl_wisdom_client.cc rename to garnet/examples/intl/client/intl_wisdom_client.cc
diff --git a/examples/intl/client/intl_wisdom_client.h b/garnet/examples/intl/client/intl_wisdom_client.h similarity index 100% rename from examples/intl/client/intl_wisdom_client.h rename to garnet/examples/intl/client/intl_wisdom_client.h
diff --git a/examples/intl/client/main.cc b/garnet/examples/intl/client/main.cc similarity index 100% rename from examples/intl/client/main.cc rename to garnet/examples/intl/client/main.cc
diff --git a/examples/intl/fidl/BUILD.gn b/garnet/examples/intl/fidl/BUILD.gn similarity index 100% rename from examples/intl/fidl/BUILD.gn rename to garnet/examples/intl/fidl/BUILD.gn
diff --git a/examples/intl/fidl/intl_wisdom.fidl b/garnet/examples/intl/fidl/intl_wisdom.fidl similarity index 100% rename from examples/intl/fidl/intl_wisdom.fidl rename to garnet/examples/intl/fidl/intl_wisdom.fidl
diff --git a/examples/intl/meta/intl_wisdom_client.cmx b/garnet/examples/intl/meta/intl_wisdom_client.cmx similarity index 100% rename from examples/intl/meta/intl_wisdom_client.cmx rename to garnet/examples/intl/meta/intl_wisdom_client.cmx
diff --git a/examples/intl/meta/intl_wisdom_server.cmx b/garnet/examples/intl/meta/intl_wisdom_server.cmx similarity index 100% rename from examples/intl/meta/intl_wisdom_server.cmx rename to garnet/examples/intl/meta/intl_wisdom_server.cmx
diff --git a/examples/intl/server/BUILD.gn b/garnet/examples/intl/server/BUILD.gn similarity index 100% rename from examples/intl/server/BUILD.gn rename to garnet/examples/intl/server/BUILD.gn
diff --git a/examples/intl/server/intl_wisdom_server_impl.cc b/garnet/examples/intl/server/intl_wisdom_server_impl.cc similarity index 100% rename from examples/intl/server/intl_wisdom_server_impl.cc rename to garnet/examples/intl/server/intl_wisdom_server_impl.cc
diff --git a/examples/intl/server/intl_wisdom_server_impl.h b/garnet/examples/intl/server/intl_wisdom_server_impl.h similarity index 100% rename from examples/intl/server/intl_wisdom_server_impl.h rename to garnet/examples/intl/server/intl_wisdom_server_impl.h
diff --git a/examples/intl/server/main.cc b/garnet/examples/intl/server/main.cc similarity index 100% rename from examples/intl/server/main.cc rename to garnet/examples/intl/server/main.cc
diff --git a/examples/intl/test/BUILD.gn b/garnet/examples/intl/test/BUILD.gn similarity index 100% rename from examples/intl/test/BUILD.gn rename to garnet/examples/intl/test/BUILD.gn
diff --git a/examples/intl/test/golden-output.txt b/garnet/examples/intl/test/golden-output.txt similarity index 100% rename from examples/intl/test/golden-output.txt rename to garnet/examples/intl/test/golden-output.txt
diff --git a/examples/intl/test/intl_wisdom_test.cc b/garnet/examples/intl/test/intl_wisdom_test.cc similarity index 100% rename from examples/intl/test/intl_wisdom_test.cc rename to garnet/examples/intl/test/intl_wisdom_test.cc
diff --git a/examples/intl/test/meta/intl_wisdom_test.cmx b/garnet/examples/intl/test/meta/intl_wisdom_test.cmx similarity index 100% rename from examples/intl/test/meta/intl_wisdom_test.cmx rename to garnet/examples/intl/test/meta/intl_wisdom_test.cmx
diff --git a/examples/media/BUILD.gn b/garnet/examples/media/BUILD.gn similarity index 100% rename from examples/media/BUILD.gn rename to garnet/examples/media/BUILD.gn
diff --git a/examples/media/fx/BUILD.gn b/garnet/examples/media/fx/BUILD.gn similarity index 100% rename from examples/media/fx/BUILD.gn rename to garnet/examples/media/fx/BUILD.gn
diff --git a/examples/media/fx/fx.cpp b/garnet/examples/media/fx/fx.cpp similarity index 100% rename from examples/media/fx/fx.cpp rename to garnet/examples/media/fx/fx.cpp
diff --git a/examples/media/fx/meta/fx.cmx b/garnet/examples/media/fx/meta/fx.cmx similarity index 100% rename from examples/media/fx/meta/fx.cmx rename to garnet/examples/media/fx/meta/fx.cmx
diff --git a/examples/media/simple_sine/BUILD.gn b/garnet/examples/media/simple_sine/BUILD.gn similarity index 100% rename from examples/media/simple_sine/BUILD.gn rename to garnet/examples/media/simple_sine/BUILD.gn
diff --git a/examples/media/simple_sine/README.md b/garnet/examples/media/simple_sine/README.md similarity index 100% rename from examples/media/simple_sine/README.md rename to garnet/examples/media/simple_sine/README.md
diff --git a/examples/media/simple_sine/meta/simple_sine.cmx b/garnet/examples/media/simple_sine/meta/simple_sine.cmx similarity index 100% rename from examples/media/simple_sine/meta/simple_sine.cmx rename to garnet/examples/media/simple_sine/meta/simple_sine.cmx
diff --git a/examples/media/simple_sine/simple_sine.cc b/garnet/examples/media/simple_sine/simple_sine.cc similarity index 100% rename from examples/media/simple_sine/simple_sine.cc rename to garnet/examples/media/simple_sine/simple_sine.cc
diff --git a/examples/media/simple_sine/simple_sine.h b/garnet/examples/media/simple_sine/simple_sine.h similarity index 100% rename from examples/media/simple_sine/simple_sine.h rename to garnet/examples/media/simple_sine/simple_sine.h
diff --git a/examples/media/simple_sine_sync/BUILD.gn b/garnet/examples/media/simple_sine_sync/BUILD.gn similarity index 100% rename from examples/media/simple_sine_sync/BUILD.gn rename to garnet/examples/media/simple_sine_sync/BUILD.gn
diff --git a/examples/media/simple_sine_sync/README.md b/garnet/examples/media/simple_sine_sync/README.md similarity index 100% rename from examples/media/simple_sine_sync/README.md rename to garnet/examples/media/simple_sine_sync/README.md
diff --git a/examples/media/simple_sine_sync/main.cc b/garnet/examples/media/simple_sine_sync/main.cc similarity index 100% rename from examples/media/simple_sine_sync/main.cc rename to garnet/examples/media/simple_sine_sync/main.cc
diff --git a/examples/media/simple_sine_sync/meta/simple_sine_sync.cmx b/garnet/examples/media/simple_sine_sync/meta/simple_sine_sync.cmx similarity index 100% rename from examples/media/simple_sine_sync/meta/simple_sine_sync.cmx rename to garnet/examples/media/simple_sine_sync/meta/simple_sine_sync.cmx
diff --git a/examples/media/simple_sine_sync/simple_sine_sync.cc b/garnet/examples/media/simple_sine_sync/simple_sine_sync.cc similarity index 100% rename from examples/media/simple_sine_sync/simple_sine_sync.cc rename to garnet/examples/media/simple_sine_sync/simple_sine_sync.cc
diff --git a/examples/media/simple_sine_sync/simple_sine_sync.h b/garnet/examples/media/simple_sine_sync/simple_sine_sync.h similarity index 100% rename from examples/media/simple_sine_sync/simple_sine_sync.h rename to garnet/examples/media/simple_sine_sync/simple_sine_sync.h
diff --git a/examples/media/tones/BUILD.gn b/garnet/examples/media/tones/BUILD.gn similarity index 100% rename from examples/media/tones/BUILD.gn rename to garnet/examples/media/tones/BUILD.gn
diff --git a/examples/media/tones/README.md b/garnet/examples/media/tones/README.md similarity index 100% rename from examples/media/tones/README.md rename to garnet/examples/media/tones/README.md
diff --git a/examples/media/tones/main.cc b/garnet/examples/media/tones/main.cc similarity index 100% rename from examples/media/tones/main.cc rename to garnet/examples/media/tones/main.cc
diff --git a/examples/media/tones/meta/tones.cmx b/garnet/examples/media/tones/meta/tones.cmx similarity index 100% rename from examples/media/tones/meta/tones.cmx rename to garnet/examples/media/tones/meta/tones.cmx
diff --git a/examples/media/tones/midi.h b/garnet/examples/media/tones/midi.h similarity index 100% rename from examples/media/tones/midi.h rename to garnet/examples/media/tones/midi.h
diff --git a/examples/media/tones/midi_keyboard.cc b/garnet/examples/media/tones/midi_keyboard.cc similarity index 100% rename from examples/media/tones/midi_keyboard.cc rename to garnet/examples/media/tones/midi_keyboard.cc
diff --git a/examples/media/tones/midi_keyboard.h b/garnet/examples/media/tones/midi_keyboard.h similarity index 100% rename from examples/media/tones/midi_keyboard.h rename to garnet/examples/media/tones/midi_keyboard.h
diff --git a/examples/media/tones/tone_generator.cc b/garnet/examples/media/tones/tone_generator.cc similarity index 100% rename from examples/media/tones/tone_generator.cc rename to garnet/examples/media/tones/tone_generator.cc
diff --git a/examples/media/tones/tone_generator.h b/garnet/examples/media/tones/tone_generator.h similarity index 100% rename from examples/media/tones/tone_generator.h rename to garnet/examples/media/tones/tone_generator.h
diff --git a/examples/media/tones/tones.cc b/garnet/examples/media/tones/tones.cc similarity index 100% rename from examples/media/tones/tones.cc rename to garnet/examples/media/tones/tones.cc
diff --git a/examples/media/tones/tones.h b/garnet/examples/media/tones/tones.h similarity index 100% rename from examples/media/tones/tones.h rename to garnet/examples/media/tones/tones.h
diff --git a/examples/media/tts/BUILD.gn b/garnet/examples/media/tts/BUILD.gn similarity index 100% rename from examples/media/tts/BUILD.gn rename to garnet/examples/media/tts/BUILD.gn
diff --git a/examples/media/tts/main.cc b/garnet/examples/media/tts/main.cc similarity index 100% rename from examples/media/tts/main.cc rename to garnet/examples/media/tts/main.cc
diff --git a/examples/media/tts/meta/tts.cmx b/garnet/examples/media/tts/meta/tts.cmx similarity index 100% rename from examples/media/tts/meta/tts.cmx rename to garnet/examples/media/tts/meta/tts.cmx
diff --git a/examples/media/use_media_decoder/BUILD.gn b/garnet/examples/media/use_media_decoder/BUILD.gn similarity index 100% rename from examples/media/use_media_decoder/BUILD.gn rename to garnet/examples/media/use_media_decoder/BUILD.gn
diff --git a/examples/media/use_media_decoder/main.cc b/garnet/examples/media/use_media_decoder/main.cc similarity index 100% rename from examples/media/use_media_decoder/main.cc rename to garnet/examples/media/use_media_decoder/main.cc
diff --git a/examples/media/use_media_decoder/meta/use_aac_decoder_test.cmx b/garnet/examples/media/use_media_decoder/meta/use_aac_decoder_test.cmx similarity index 100% rename from examples/media/use_media_decoder/meta/use_aac_decoder_test.cmx rename to garnet/examples/media/use_media_decoder/meta/use_aac_decoder_test.cmx
diff --git a/examples/media/use_media_decoder/meta/use_media_decoder.cmx b/garnet/examples/media/use_media_decoder/meta/use_media_decoder.cmx similarity index 100% rename from examples/media/use_media_decoder/meta/use_media_decoder.cmx rename to garnet/examples/media/use_media_decoder/meta/use_media_decoder.cmx
diff --git a/examples/media/use_media_decoder/test/test_audio.adts b/garnet/examples/media/use_media_decoder/test/test_audio.adts similarity index 100% rename from examples/media/use_media_decoder/test/test_audio.adts rename to garnet/examples/media/use_media_decoder/test/test_audio.adts Binary files differ
diff --git a/examples/media/use_media_decoder/test/use_aac_decoder_test.cc b/garnet/examples/media/use_media_decoder/test/use_aac_decoder_test.cc similarity index 100% rename from examples/media/use_media_decoder/test/use_aac_decoder_test.cc rename to garnet/examples/media/use_media_decoder/test/use_aac_decoder_test.cc
diff --git a/examples/media/use_media_decoder/test/use_h264_decoder_test.cc b/garnet/examples/media/use_media_decoder/test/use_h264_decoder_test.cc similarity index 100% rename from examples/media/use_media_decoder/test/use_h264_decoder_test.cc rename to garnet/examples/media/use_media_decoder/test/use_h264_decoder_test.cc
diff --git a/examples/media/use_media_decoder/use_aac_decoder.cc b/garnet/examples/media/use_media_decoder/use_aac_decoder.cc similarity index 100% rename from examples/media/use_media_decoder/use_aac_decoder.cc rename to garnet/examples/media/use_media_decoder/use_aac_decoder.cc
diff --git a/examples/media/use_media_decoder/use_aac_decoder.h b/garnet/examples/media/use_media_decoder/use_aac_decoder.h similarity index 100% rename from examples/media/use_media_decoder/use_aac_decoder.h rename to garnet/examples/media/use_media_decoder/use_aac_decoder.h
diff --git a/examples/media/use_media_decoder/use_video_decoder.cc b/garnet/examples/media/use_media_decoder/use_video_decoder.cc similarity index 100% rename from examples/media/use_media_decoder/use_video_decoder.cc rename to garnet/examples/media/use_media_decoder/use_video_decoder.cc
diff --git a/examples/media/use_media_decoder/use_video_decoder.h b/garnet/examples/media/use_media_decoder/use_video_decoder.h similarity index 100% rename from examples/media/use_media_decoder/use_video_decoder.h rename to garnet/examples/media/use_media_decoder/use_video_decoder.h
diff --git a/examples/media/use_media_decoder/util.cc b/garnet/examples/media/use_media_decoder/util.cc similarity index 100% rename from examples/media/use_media_decoder/util.cc rename to garnet/examples/media/use_media_decoder/util.cc
diff --git a/examples/media/use_media_decoder/util.h b/garnet/examples/media/use_media_decoder/util.h similarity index 100% rename from examples/media/use_media_decoder/util.h rename to garnet/examples/media/use_media_decoder/util.h
diff --git a/examples/mediaplayer/BUILD.gn b/garnet/examples/mediaplayer/BUILD.gn similarity index 100% rename from examples/mediaplayer/BUILD.gn rename to garnet/examples/mediaplayer/BUILD.gn
diff --git a/examples/mediaplayer/MAINTAINERS b/garnet/examples/mediaplayer/MAINTAINERS similarity index 100% rename from examples/mediaplayer/MAINTAINERS rename to garnet/examples/mediaplayer/MAINTAINERS
diff --git a/examples/mediaplayer/audio_player/BUILD.gn b/garnet/examples/mediaplayer/audio_player/BUILD.gn similarity index 100% rename from examples/mediaplayer/audio_player/BUILD.gn rename to garnet/examples/mediaplayer/audio_player/BUILD.gn
diff --git a/examples/mediaplayer/audio_player/README.md b/garnet/examples/mediaplayer/audio_player/README.md similarity index 100% rename from examples/mediaplayer/audio_player/README.md rename to garnet/examples/mediaplayer/audio_player/README.md
diff --git a/examples/mediaplayer/audio_player/audio_player.cc b/garnet/examples/mediaplayer/audio_player/audio_player.cc similarity index 100% rename from examples/mediaplayer/audio_player/audio_player.cc rename to garnet/examples/mediaplayer/audio_player/audio_player.cc
diff --git a/examples/mediaplayer/audio_player/audio_player.h b/garnet/examples/mediaplayer/audio_player/audio_player.h similarity index 100% rename from examples/mediaplayer/audio_player/audio_player.h rename to garnet/examples/mediaplayer/audio_player/audio_player.h
diff --git a/examples/mediaplayer/audio_player/audio_player_params.cc b/garnet/examples/mediaplayer/audio_player/audio_player_params.cc similarity index 100% rename from examples/mediaplayer/audio_player/audio_player_params.cc rename to garnet/examples/mediaplayer/audio_player/audio_player_params.cc
diff --git a/examples/mediaplayer/audio_player/audio_player_params.h b/garnet/examples/mediaplayer/audio_player/audio_player_params.h similarity index 100% rename from examples/mediaplayer/audio_player/audio_player_params.h rename to garnet/examples/mediaplayer/audio_player/audio_player_params.h
diff --git a/examples/mediaplayer/audio_player/main.cc b/garnet/examples/mediaplayer/audio_player/main.cc similarity index 100% rename from examples/mediaplayer/audio_player/main.cc rename to garnet/examples/mediaplayer/audio_player/main.cc
diff --git a/examples/mediaplayer/audio_player_rust/BUILD.gn b/garnet/examples/mediaplayer/audio_player_rust/BUILD.gn similarity index 100% rename from examples/mediaplayer/audio_player_rust/BUILD.gn rename to garnet/examples/mediaplayer/audio_player_rust/BUILD.gn
diff --git a/examples/mediaplayer/audio_player_rust/src/main.rs b/garnet/examples/mediaplayer/audio_player_rust/src/main.rs similarity index 100% rename from examples/mediaplayer/audio_player_rust/src/main.rs rename to garnet/examples/mediaplayer/audio_player_rust/src/main.rs
diff --git a/examples/network/BUILD.gn b/garnet/examples/network/BUILD.gn similarity index 100% rename from examples/network/BUILD.gn rename to garnet/examples/network/BUILD.gn
diff --git a/examples/network/third_party/asio/BUILD.gn b/garnet/examples/network/third_party/asio/BUILD.gn similarity index 100% rename from examples/network/third_party/asio/BUILD.gn rename to garnet/examples/network/third_party/asio/BUILD.gn
diff --git a/examples/network/third_party/asio/async_client.cpp b/garnet/examples/network/third_party/asio/async_client.cpp similarity index 100% rename from examples/network/third_party/asio/async_client.cpp rename to garnet/examples/network/third_party/asio/async_client.cpp
diff --git a/examples/network/third_party/asio/async_https.cpp b/garnet/examples/network/third_party/asio/async_https.cpp similarity index 100% rename from examples/network/third_party/asio/async_https.cpp rename to garnet/examples/network/third_party/asio/async_https.cpp
diff --git a/examples/network/third_party/openbsd-netcat/BUILD.gn b/garnet/examples/network/third_party/openbsd-netcat/BUILD.gn similarity index 100% rename from examples/network/third_party/openbsd-netcat/BUILD.gn rename to garnet/examples/network/third_party/openbsd-netcat/BUILD.gn
diff --git a/examples/network/third_party/openbsd-netcat/atomicio.c b/garnet/examples/network/third_party/openbsd-netcat/atomicio.c similarity index 100% rename from examples/network/third_party/openbsd-netcat/atomicio.c rename to garnet/examples/network/third_party/openbsd-netcat/atomicio.c
diff --git a/examples/network/third_party/openbsd-netcat/atomicio.h b/garnet/examples/network/third_party/openbsd-netcat/atomicio.h similarity index 100% rename from examples/network/third_party/openbsd-netcat/atomicio.h rename to garnet/examples/network/third_party/openbsd-netcat/atomicio.h
diff --git a/examples/network/third_party/openbsd-netcat/netcat.c b/garnet/examples/network/third_party/openbsd-netcat/netcat.c similarity index 100% rename from examples/network/third_party/openbsd-netcat/netcat.c rename to garnet/examples/network/third_party/openbsd-netcat/netcat.c
diff --git a/examples/network/third_party/openbsd-netcat/openbsd_compat.c b/garnet/examples/network/third_party/openbsd-netcat/openbsd_compat.c similarity index 100% rename from examples/network/third_party/openbsd-netcat/openbsd_compat.c rename to garnet/examples/network/third_party/openbsd-netcat/openbsd_compat.c
diff --git a/examples/network/third_party/openbsd-netcat/openbsd_compat.h b/garnet/examples/network/third_party/openbsd-netcat/openbsd_compat.h similarity index 100% rename from examples/network/third_party/openbsd-netcat/openbsd_compat.h rename to garnet/examples/network/third_party/openbsd-netcat/openbsd_compat.h
diff --git a/examples/network/third_party/openbsd-netcat/socks.c b/garnet/examples/network/third_party/openbsd-netcat/socks.c similarity index 100% rename from examples/network/third_party/openbsd-netcat/socks.c rename to garnet/examples/network/third_party/openbsd-netcat/socks.c
diff --git a/examples/overnet/echo/client/BUILD.gn b/garnet/examples/overnet/echo/client/BUILD.gn similarity index 100% rename from examples/overnet/echo/client/BUILD.gn rename to garnet/examples/overnet/echo/client/BUILD.gn
diff --git a/examples/overnet/echo/client/src/main.rs b/garnet/examples/overnet/echo/client/src/main.rs similarity index 100% rename from examples/overnet/echo/client/src/main.rs rename to garnet/examples/overnet/echo/client/src/main.rs
diff --git a/examples/overnet/echo/server/BUILD.gn b/garnet/examples/overnet/echo/server/BUILD.gn similarity index 100% rename from examples/overnet/echo/server/BUILD.gn rename to garnet/examples/overnet/echo/server/BUILD.gn
diff --git a/examples/overnet/echo/server/src/main.rs b/garnet/examples/overnet/echo/server/src/main.rs similarity index 100% rename from examples/overnet/echo/server/src/main.rs rename to garnet/examples/overnet/echo/server/src/main.rs
diff --git a/examples/overnet/interface_passing/client/BUILD.gn b/garnet/examples/overnet/interface_passing/client/BUILD.gn similarity index 100% rename from examples/overnet/interface_passing/client/BUILD.gn rename to garnet/examples/overnet/interface_passing/client/BUILD.gn
diff --git a/examples/overnet/interface_passing/client/src/main.rs b/garnet/examples/overnet/interface_passing/client/src/main.rs similarity index 100% rename from examples/overnet/interface_passing/client/src/main.rs rename to garnet/examples/overnet/interface_passing/client/src/main.rs
diff --git a/examples/overnet/interface_passing/server/BUILD.gn b/garnet/examples/overnet/interface_passing/server/BUILD.gn similarity index 100% rename from examples/overnet/interface_passing/server/BUILD.gn rename to garnet/examples/overnet/interface_passing/server/BUILD.gn
diff --git a/examples/overnet/interface_passing/server/src/main.rs b/garnet/examples/overnet/interface_passing/server/src/main.rs similarity index 100% rename from examples/overnet/interface_passing/server/src/main.rs rename to garnet/examples/overnet/interface_passing/server/src/main.rs
diff --git a/examples/overnet/interface_passing/service/BUILD.gn b/garnet/examples/overnet/interface_passing/service/BUILD.gn similarity index 100% rename from examples/overnet/interface_passing/service/BUILD.gn rename to garnet/examples/overnet/interface_passing/service/BUILD.gn
diff --git a/examples/overnet/interface_passing/service/interface_passing.fidl b/garnet/examples/overnet/interface_passing/service/interface_passing.fidl similarity index 100% rename from examples/overnet/interface_passing/service/interface_passing.fidl rename to garnet/examples/overnet/interface_passing/service/interface_passing.fidl
diff --git a/examples/overnet/meta/overnet_example.cmx b/garnet/examples/overnet/meta/overnet_example.cmx similarity index 100% rename from examples/overnet/meta/overnet_example.cmx rename to garnet/examples/overnet/meta/overnet_example.cmx
diff --git a/examples/profiler/BUILD.gn b/garnet/examples/profiler/BUILD.gn similarity index 100% rename from examples/profiler/BUILD.gn rename to garnet/examples/profiler/BUILD.gn
diff --git a/examples/profiler/magic_numbers.cc b/garnet/examples/profiler/magic_numbers.cc similarity index 100% rename from examples/profiler/magic_numbers.cc rename to garnet/examples/profiler/magic_numbers.cc
diff --git a/examples/profiler/main.cc b/garnet/examples/profiler/main.cc similarity index 100% rename from examples/profiler/main.cc rename to garnet/examples/profiler/main.cc
diff --git a/examples/profiler/meta/profiler_example.cmx b/garnet/examples/profiler/meta/profiler_example.cmx similarity index 100% rename from examples/profiler/meta/profiler_example.cmx rename to garnet/examples/profiler/meta/profiler_example.cmx
diff --git a/examples/profiler/trie.h b/garnet/examples/profiler/trie.h similarity index 100% rename from examples/profiler/trie.h rename to garnet/examples/profiler/trie.h
diff --git a/examples/profiler/words.cc b/garnet/examples/profiler/words.cc similarity index 100% rename from examples/profiler/words.cc rename to garnet/examples/profiler/words.cc
diff --git a/examples/rust/BUILD.gn b/garnet/examples/rust/BUILD.gn similarity index 100% rename from examples/rust/BUILD.gn rename to garnet/examples/rust/BUILD.gn
diff --git a/examples/rust/eth-rs/BUILD.gn b/garnet/examples/rust/eth-rs/BUILD.gn similarity index 100% rename from examples/rust/eth-rs/BUILD.gn rename to garnet/examples/rust/eth-rs/BUILD.gn
diff --git a/examples/rust/eth-rs/meta/eth-rs.cmx b/garnet/examples/rust/eth-rs/meta/eth-rs.cmx similarity index 100% rename from examples/rust/eth-rs/meta/eth-rs.cmx rename to garnet/examples/rust/eth-rs/meta/eth-rs.cmx
diff --git a/examples/rust/eth-rs/src/main.rs b/garnet/examples/rust/eth-rs/src/main.rs similarity index 100% rename from examples/rust/eth-rs/src/main.rs rename to garnet/examples/rust/eth-rs/src/main.rs
diff --git a/examples/rust/staticlib/BUILD.gn b/garnet/examples/rust/staticlib/BUILD.gn similarity index 100% rename from examples/rust/staticlib/BUILD.gn rename to garnet/examples/rust/staticlib/BUILD.gn
diff --git a/examples/rust/staticlib/c/BUILD.gn b/garnet/examples/rust/staticlib/c/BUILD.gn similarity index 100% rename from examples/rust/staticlib/c/BUILD.gn rename to garnet/examples/rust/staticlib/c/BUILD.gn
diff --git a/examples/rust/staticlib/c/crust.c b/garnet/examples/rust/staticlib/c/crust.c similarity index 100% rename from examples/rust/staticlib/c/crust.c rename to garnet/examples/rust/staticlib/c/crust.c
diff --git a/examples/rust/staticlib/c/lib.c b/garnet/examples/rust/staticlib/c/lib.c similarity index 100% rename from examples/rust/staticlib/c/lib.c rename to garnet/examples/rust/staticlib/c/lib.c
diff --git a/examples/rust/staticlib/c/lib.h b/garnet/examples/rust/staticlib/c/lib.h similarity index 100% rename from examples/rust/staticlib/c/lib.h rename to garnet/examples/rust/staticlib/c/lib.h
diff --git a/examples/rust/staticlib/meta/crust.cmx b/garnet/examples/rust/staticlib/meta/crust.cmx similarity index 100% rename from examples/rust/staticlib/meta/crust.cmx rename to garnet/examples/rust/staticlib/meta/crust.cmx
diff --git a/examples/rust/staticlib/rust/BUILD.gn b/garnet/examples/rust/staticlib/rust/BUILD.gn similarity index 100% rename from examples/rust/staticlib/rust/BUILD.gn rename to garnet/examples/rust/staticlib/rust/BUILD.gn
diff --git a/examples/rust/staticlib/rust/crust.h b/garnet/examples/rust/staticlib/rust/crust.h similarity index 100% rename from examples/rust/staticlib/rust/crust.h rename to garnet/examples/rust/staticlib/rust/crust.h
diff --git a/examples/rust/staticlib/rust/src/lib.rs b/garnet/examples/rust/staticlib/rust/src/lib.rs similarity index 100% rename from examples/rust/staticlib/rust/src/lib.rs rename to garnet/examples/rust/staticlib/rust/src/lib.rs
diff --git a/examples/rust/testing/BUILD.gn b/garnet/examples/rust/testing/BUILD.gn similarity index 100% rename from examples/rust/testing/BUILD.gn rename to garnet/examples/rust/testing/BUILD.gn
diff --git a/examples/rust/testing/src/lib.rs b/garnet/examples/rust/testing/src/lib.rs similarity index 100% rename from examples/rust/testing/src/lib.rs rename to garnet/examples/rust/testing/src/lib.rs
diff --git a/examples/rust/testing/tests/integration_test.rs b/garnet/examples/rust/testing/tests/integration_test.rs similarity index 100% rename from examples/rust/testing/tests/integration_test.rs rename to garnet/examples/rust/testing/tests/integration_test.rs
diff --git a/examples/rust/testing/tests/integration_test_two.rs b/garnet/examples/rust/testing/tests/integration_test_two.rs similarity index 100% rename from examples/rust/testing/tests/integration_test_two.rs rename to garnet/examples/rust/testing/tests/integration_test_two.rs
diff --git a/examples/tcp/tcp_file_sender/BUILD.gn b/garnet/examples/tcp/tcp_file_sender/BUILD.gn similarity index 100% rename from examples/tcp/tcp_file_sender/BUILD.gn rename to garnet/examples/tcp/tcp_file_sender/BUILD.gn
diff --git a/examples/tcp/tcp_file_sender/MAINTAINERS b/garnet/examples/tcp/tcp_file_sender/MAINTAINERS similarity index 100% rename from examples/tcp/tcp_file_sender/MAINTAINERS rename to garnet/examples/tcp/tcp_file_sender/MAINTAINERS
diff --git a/examples/tcp/tcp_file_sender/README.md b/garnet/examples/tcp/tcp_file_sender/README.md similarity index 100% rename from examples/tcp/tcp_file_sender/README.md rename to garnet/examples/tcp/tcp_file_sender/README.md
diff --git a/examples/tcp/tcp_file_sender/meta/tcp_file_sender.cmx b/garnet/examples/tcp/tcp_file_sender/meta/tcp_file_sender.cmx similarity index 100% rename from examples/tcp/tcp_file_sender/meta/tcp_file_sender.cmx rename to garnet/examples/tcp/tcp_file_sender/meta/tcp_file_sender.cmx
diff --git a/examples/tcp/tcp_file_sender/src/main.rs b/garnet/examples/tcp/tcp_file_sender/src/main.rs similarity index 100% rename from examples/tcp/tcp_file_sender/src/main.rs rename to garnet/examples/tcp/tcp_file_sender/src/main.rs
diff --git a/examples/testing/BUILD.gn b/garnet/examples/testing/BUILD.gn similarity index 100% rename from examples/testing/BUILD.gn rename to garnet/examples/testing/BUILD.gn
diff --git a/examples/testing/test_with_context_example_test.cc b/garnet/examples/testing/test_with_context_example_test.cc similarity index 100% rename from examples/testing/test_with_context_example_test.cc rename to garnet/examples/testing/test_with_context_example_test.cc
diff --git a/examples/testing/test_with_environment/BUILD.gn b/garnet/examples/testing/test_with_environment/BUILD.gn similarity index 100% rename from examples/testing/test_with_environment/BUILD.gn rename to garnet/examples/testing/test_with_environment/BUILD.gn
diff --git a/examples/testing/test_with_environment/fake_echo.cc b/garnet/examples/testing/test_with_environment/fake_echo.cc similarity index 100% rename from examples/testing/test_with_environment/fake_echo.cc rename to garnet/examples/testing/test_with_environment/fake_echo.cc
diff --git a/examples/testing/test_with_environment/fake_echo.h b/garnet/examples/testing/test_with_environment/fake_echo.h similarity index 100% rename from examples/testing/test_with_environment/fake_echo.h rename to garnet/examples/testing/test_with_environment/fake_echo.h
diff --git a/examples/testing/test_with_environment/meta/fake_echo_app.cmx b/garnet/examples/testing/test_with_environment/meta/fake_echo_app.cmx similarity index 100% rename from examples/testing/test_with_environment/meta/fake_echo_app.cmx rename to garnet/examples/testing/test_with_environment/meta/fake_echo_app.cmx
diff --git a/examples/testing/test_with_environment/meta/test_with_environment_example_test.cmx b/garnet/examples/testing/test_with_environment/meta/test_with_environment_example_test.cmx similarity index 100% rename from examples/testing/test_with_environment/meta/test_with_environment_example_test.cmx rename to garnet/examples/testing/test_with_environment/meta/test_with_environment_example_test.cmx
diff --git a/examples/testing/test_with_environment/test_with_environment_example_test.cc b/garnet/examples/testing/test_with_environment/test_with_environment_example_test.cc similarity index 100% rename from examples/testing/test_with_environment/test_with_environment_example_test.cc rename to garnet/examples/testing/test_with_environment/test_with_environment_example_test.cc
diff --git a/examples/ui/BUILD.gn b/garnet/examples/ui/BUILD.gn similarity index 100% rename from examples/ui/BUILD.gn rename to garnet/examples/ui/BUILD.gn
diff --git a/examples/ui/MAINTAINERS b/garnet/examples/ui/MAINTAINERS similarity index 100% rename from examples/ui/MAINTAINERS rename to garnet/examples/ui/MAINTAINERS
diff --git a/examples/ui/bouncing_ball/BUILD.gn b/garnet/examples/ui/bouncing_ball/BUILD.gn similarity index 100% rename from examples/ui/bouncing_ball/BUILD.gn rename to garnet/examples/ui/bouncing_ball/BUILD.gn
diff --git a/examples/ui/bouncing_ball/README.md b/garnet/examples/ui/bouncing_ball/README.md similarity index 100% rename from examples/ui/bouncing_ball/README.md rename to garnet/examples/ui/bouncing_ball/README.md
diff --git a/examples/ui/bouncing_ball/main.cc b/garnet/examples/ui/bouncing_ball/main.cc similarity index 100% rename from examples/ui/bouncing_ball/main.cc rename to garnet/examples/ui/bouncing_ball/main.cc
diff --git a/examples/ui/bouncing_ball/meta/bouncing_ball.cmx b/garnet/examples/ui/bouncing_ball/meta/bouncing_ball.cmx similarity index 100% rename from examples/ui/bouncing_ball/meta/bouncing_ball.cmx rename to garnet/examples/ui/bouncing_ball/meta/bouncing_ball.cmx
diff --git a/examples/ui/hello_base_view/BUILD.gn b/garnet/examples/ui/hello_base_view/BUILD.gn similarity index 100% rename from examples/ui/hello_base_view/BUILD.gn rename to garnet/examples/ui/hello_base_view/BUILD.gn
diff --git a/examples/ui/hello_base_view/README.md b/garnet/examples/ui/hello_base_view/README.md similarity index 100% rename from examples/ui/hello_base_view/README.md rename to garnet/examples/ui/hello_base_view/README.md
diff --git a/examples/ui/hello_base_view/example_presenter.cc b/garnet/examples/ui/hello_base_view/example_presenter.cc similarity index 100% rename from examples/ui/hello_base_view/example_presenter.cc rename to garnet/examples/ui/hello_base_view/example_presenter.cc
diff --git a/examples/ui/hello_base_view/example_presenter.h b/garnet/examples/ui/hello_base_view/example_presenter.h similarity index 100% rename from examples/ui/hello_base_view/example_presenter.h rename to garnet/examples/ui/hello_base_view/example_presenter.h
diff --git a/examples/ui/hello_base_view/main.cc b/garnet/examples/ui/hello_base_view/main.cc similarity index 100% rename from examples/ui/hello_base_view/main.cc rename to garnet/examples/ui/hello_base_view/main.cc
diff --git a/examples/ui/hello_base_view/view.cc b/garnet/examples/ui/hello_base_view/view.cc similarity index 100% rename from examples/ui/hello_base_view/view.cc rename to garnet/examples/ui/hello_base_view/view.cc
diff --git a/examples/ui/hello_base_view/view.h b/garnet/examples/ui/hello_base_view/view.h similarity index 100% rename from examples/ui/hello_base_view/view.h rename to garnet/examples/ui/hello_base_view/view.h
diff --git a/examples/ui/hello_input/BUILD.gn b/garnet/examples/ui/hello_input/BUILD.gn similarity index 100% rename from examples/ui/hello_input/BUILD.gn rename to garnet/examples/ui/hello_input/BUILD.gn
diff --git a/examples/ui/hello_input/README.md b/garnet/examples/ui/hello_input/README.md similarity index 100% rename from examples/ui/hello_input/README.md rename to garnet/examples/ui/hello_input/README.md
diff --git a/examples/ui/hello_input/app.cc b/garnet/examples/ui/hello_input/app.cc similarity index 100% rename from examples/ui/hello_input/app.cc rename to garnet/examples/ui/hello_input/app.cc
diff --git a/examples/ui/hello_input/app.h b/garnet/examples/ui/hello_input/app.h similarity index 100% rename from examples/ui/hello_input/app.h rename to garnet/examples/ui/hello_input/app.h
diff --git a/examples/ui/hello_input/child/BUILD.gn b/garnet/examples/ui/hello_input/child/BUILD.gn similarity index 100% rename from examples/ui/hello_input/child/BUILD.gn rename to garnet/examples/ui/hello_input/child/BUILD.gn
diff --git a/examples/ui/hello_input/child/app.cc b/garnet/examples/ui/hello_input/child/app.cc similarity index 100% rename from examples/ui/hello_input/child/app.cc rename to garnet/examples/ui/hello_input/child/app.cc
diff --git a/examples/ui/hello_input/child/app.h b/garnet/examples/ui/hello_input/child/app.h similarity index 100% rename from examples/ui/hello_input/child/app.h rename to garnet/examples/ui/hello_input/child/app.h
diff --git a/examples/ui/hello_input/child/main.cc b/garnet/examples/ui/hello_input/child/main.cc similarity index 100% rename from examples/ui/hello_input/child/main.cc rename to garnet/examples/ui/hello_input/child/main.cc
diff --git a/examples/ui/hello_input/main.cc b/garnet/examples/ui/hello_input/main.cc similarity index 100% rename from examples/ui/hello_input/main.cc rename to garnet/examples/ui/hello_input/main.cc
diff --git a/examples/ui/hello_input/meta/hello_input.cmx b/garnet/examples/ui/hello_input/meta/hello_input.cmx similarity index 100% rename from examples/ui/hello_input/meta/hello_input.cmx rename to garnet/examples/ui/hello_input/meta/hello_input.cmx
diff --git a/examples/ui/hello_pose_buffer/BUILD.gn b/garnet/examples/ui/hello_pose_buffer/BUILD.gn similarity index 100% rename from examples/ui/hello_pose_buffer/BUILD.gn rename to garnet/examples/ui/hello_pose_buffer/BUILD.gn
diff --git a/examples/ui/hello_pose_buffer/README.md b/garnet/examples/ui/hello_pose_buffer/README.md similarity index 100% rename from examples/ui/hello_pose_buffer/README.md rename to garnet/examples/ui/hello_pose_buffer/README.md
diff --git a/examples/ui/hello_pose_buffer/app.cc b/garnet/examples/ui/hello_pose_buffer/app.cc similarity index 100% rename from examples/ui/hello_pose_buffer/app.cc rename to garnet/examples/ui/hello_pose_buffer/app.cc
diff --git a/examples/ui/hello_pose_buffer/app.h b/garnet/examples/ui/hello_pose_buffer/app.h similarity index 100% rename from examples/ui/hello_pose_buffer/app.h rename to garnet/examples/ui/hello_pose_buffer/app.h
diff --git a/examples/ui/hello_pose_buffer/main.cc b/garnet/examples/ui/hello_pose_buffer/main.cc similarity index 100% rename from examples/ui/hello_pose_buffer/main.cc rename to garnet/examples/ui/hello_pose_buffer/main.cc
diff --git a/examples/ui/hello_pose_buffer_provider/BUILD.gn b/garnet/examples/ui/hello_pose_buffer_provider/BUILD.gn similarity index 100% rename from examples/ui/hello_pose_buffer_provider/BUILD.gn rename to garnet/examples/ui/hello_pose_buffer_provider/BUILD.gn
diff --git a/examples/ui/hello_pose_buffer_provider/README.md b/garnet/examples/ui/hello_pose_buffer_provider/README.md similarity index 100% rename from examples/ui/hello_pose_buffer_provider/README.md rename to garnet/examples/ui/hello_pose_buffer_provider/README.md
diff --git a/examples/ui/hello_pose_buffer_provider/app.cc b/garnet/examples/ui/hello_pose_buffer_provider/app.cc similarity index 100% rename from examples/ui/hello_pose_buffer_provider/app.cc rename to garnet/examples/ui/hello_pose_buffer_provider/app.cc
diff --git a/examples/ui/hello_pose_buffer_provider/app.h b/garnet/examples/ui/hello_pose_buffer_provider/app.h similarity index 100% rename from examples/ui/hello_pose_buffer_provider/app.h rename to garnet/examples/ui/hello_pose_buffer_provider/app.h
diff --git a/examples/ui/hello_pose_buffer_provider/main.cc b/garnet/examples/ui/hello_pose_buffer_provider/main.cc similarity index 100% rename from examples/ui/hello_pose_buffer_provider/main.cc rename to garnet/examples/ui/hello_pose_buffer_provider/main.cc
diff --git a/examples/ui/hello_scenic/BUILD.gn b/garnet/examples/ui/hello_scenic/BUILD.gn similarity index 100% rename from examples/ui/hello_scenic/BUILD.gn rename to garnet/examples/ui/hello_scenic/BUILD.gn
diff --git a/examples/ui/hello_scenic/README.md b/garnet/examples/ui/hello_scenic/README.md similarity index 100% rename from examples/ui/hello_scenic/README.md rename to garnet/examples/ui/hello_scenic/README.md
diff --git a/examples/ui/hello_scenic/app.cc b/garnet/examples/ui/hello_scenic/app.cc similarity index 100% rename from examples/ui/hello_scenic/app.cc rename to garnet/examples/ui/hello_scenic/app.cc
diff --git a/examples/ui/hello_scenic/app.h b/garnet/examples/ui/hello_scenic/app.h similarity index 100% rename from examples/ui/hello_scenic/app.h rename to garnet/examples/ui/hello_scenic/app.h
diff --git a/examples/ui/hello_scenic/main.cc b/garnet/examples/ui/hello_scenic/main.cc similarity index 100% rename from examples/ui/hello_scenic/main.cc rename to garnet/examples/ui/hello_scenic/main.cc
diff --git a/examples/ui/hello_stereo/BUILD.gn b/garnet/examples/ui/hello_stereo/BUILD.gn similarity index 100% rename from examples/ui/hello_stereo/BUILD.gn rename to garnet/examples/ui/hello_stereo/BUILD.gn
diff --git a/examples/ui/hello_stereo/README.md b/garnet/examples/ui/hello_stereo/README.md similarity index 100% rename from examples/ui/hello_stereo/README.md rename to garnet/examples/ui/hello_stereo/README.md
diff --git a/examples/ui/hello_stereo/app.cc b/garnet/examples/ui/hello_stereo/app.cc similarity index 100% rename from examples/ui/hello_stereo/app.cc rename to garnet/examples/ui/hello_stereo/app.cc
diff --git a/examples/ui/hello_stereo/app.h b/garnet/examples/ui/hello_stereo/app.h similarity index 100% rename from examples/ui/hello_stereo/app.h rename to garnet/examples/ui/hello_stereo/app.h
diff --git a/examples/ui/hello_stereo/main.cc b/garnet/examples/ui/hello_stereo/main.cc similarity index 100% rename from examples/ui/hello_stereo/main.cc rename to garnet/examples/ui/hello_stereo/main.cc
diff --git a/examples/ui/hello_views/BUILD.gn b/garnet/examples/ui/hello_views/BUILD.gn similarity index 100% rename from examples/ui/hello_views/BUILD.gn rename to garnet/examples/ui/hello_views/BUILD.gn
diff --git a/examples/ui/hello_views/app.cc b/garnet/examples/ui/hello_views/app.cc similarity index 100% rename from examples/ui/hello_views/app.cc rename to garnet/examples/ui/hello_views/app.cc
diff --git a/examples/ui/hello_views/app.h b/garnet/examples/ui/hello_views/app.h similarity index 100% rename from examples/ui/hello_views/app.h rename to garnet/examples/ui/hello_views/app.h
diff --git a/examples/ui/hello_views/example_view_provider_service.cc b/garnet/examples/ui/hello_views/example_view_provider_service.cc similarity index 100% rename from examples/ui/hello_views/example_view_provider_service.cc rename to garnet/examples/ui/hello_views/example_view_provider_service.cc
diff --git a/examples/ui/hello_views/example_view_provider_service.h b/garnet/examples/ui/hello_views/example_view_provider_service.h similarity index 100% rename from examples/ui/hello_views/example_view_provider_service.h rename to garnet/examples/ui/hello_views/example_view_provider_service.h
diff --git a/examples/ui/hello_views/main.cc b/garnet/examples/ui/hello_views/main.cc similarity index 100% rename from examples/ui/hello_views/main.cc rename to garnet/examples/ui/hello_views/main.cc
diff --git a/examples/ui/hello_views/meta/hello_subview.cmx b/garnet/examples/ui/hello_views/meta/hello_subview.cmx similarity index 100% rename from examples/ui/hello_views/meta/hello_subview.cmx rename to garnet/examples/ui/hello_views/meta/hello_subview.cmx
diff --git a/examples/ui/hello_views/meta/hello_views.cmx b/garnet/examples/ui/hello_views/meta/hello_views.cmx similarity index 100% rename from examples/ui/hello_views/meta/hello_views.cmx rename to garnet/examples/ui/hello_views/meta/hello_views.cmx
diff --git a/examples/ui/hello_views/subview.cc b/garnet/examples/ui/hello_views/subview.cc similarity index 100% rename from examples/ui/hello_views/subview.cc rename to garnet/examples/ui/hello_views/subview.cc
diff --git a/examples/ui/meta/hello_pose_buffer_provider.cmx b/garnet/examples/ui/meta/hello_pose_buffer_provider.cmx similarity index 100% rename from examples/ui/meta/hello_pose_buffer_provider.cmx rename to garnet/examples/ui/meta/hello_pose_buffer_provider.cmx
diff --git a/examples/ui/meta/ui_example.cmx b/garnet/examples/ui/meta/ui_example.cmx similarity index 100% rename from examples/ui/meta/ui_example.cmx rename to garnet/examples/ui/meta/ui_example.cmx
diff --git a/examples/ui/shadertoy/client/BUILD.gn b/garnet/examples/ui/shadertoy/client/BUILD.gn similarity index 100% rename from examples/ui/shadertoy/client/BUILD.gn rename to garnet/examples/ui/shadertoy/client/BUILD.gn
diff --git a/examples/ui/shadertoy/client/glsl_strings.cc b/garnet/examples/ui/shadertoy/client/glsl_strings.cc similarity index 100% rename from examples/ui/shadertoy/client/glsl_strings.cc rename to garnet/examples/ui/shadertoy/client/glsl_strings.cc
diff --git a/examples/ui/shadertoy/client/glsl_strings.h b/garnet/examples/ui/shadertoy/client/glsl_strings.h similarity index 100% rename from examples/ui/shadertoy/client/glsl_strings.h rename to garnet/examples/ui/shadertoy/client/glsl_strings.h
diff --git a/examples/ui/shadertoy/client/main.cc b/garnet/examples/ui/shadertoy/client/main.cc similarity index 100% rename from examples/ui/shadertoy/client/main.cc rename to garnet/examples/ui/shadertoy/client/main.cc
diff --git a/examples/ui/shadertoy/client/meta/shadertoy_client.cmx b/garnet/examples/ui/shadertoy/client/meta/shadertoy_client.cmx similarity index 100% rename from examples/ui/shadertoy/client/meta/shadertoy_client.cmx rename to garnet/examples/ui/shadertoy/client/meta/shadertoy_client.cmx
diff --git a/examples/ui/shadertoy/client/view.cc b/garnet/examples/ui/shadertoy/client/view.cc similarity index 100% rename from examples/ui/shadertoy/client/view.cc rename to garnet/examples/ui/shadertoy/client/view.cc
diff --git a/examples/ui/shadertoy/client/view.h b/garnet/examples/ui/shadertoy/client/view.h similarity index 100% rename from examples/ui/shadertoy/client/view.h rename to garnet/examples/ui/shadertoy/client/view.h
diff --git a/examples/ui/shadertoy/service/BUILD.gn b/garnet/examples/ui/shadertoy/service/BUILD.gn similarity index 100% rename from examples/ui/shadertoy/service/BUILD.gn rename to garnet/examples/ui/shadertoy/service/BUILD.gn
diff --git a/examples/ui/shadertoy/service/app.cc b/garnet/examples/ui/shadertoy/service/app.cc similarity index 100% rename from examples/ui/shadertoy/service/app.cc rename to garnet/examples/ui/shadertoy/service/app.cc
diff --git a/examples/ui/shadertoy/service/app.h b/garnet/examples/ui/shadertoy/service/app.h similarity index 100% rename from examples/ui/shadertoy/service/app.h rename to garnet/examples/ui/shadertoy/service/app.h
diff --git a/examples/ui/shadertoy/service/compiler.cc b/garnet/examples/ui/shadertoy/service/compiler.cc similarity index 100% rename from examples/ui/shadertoy/service/compiler.cc rename to garnet/examples/ui/shadertoy/service/compiler.cc
diff --git a/examples/ui/shadertoy/service/compiler.h b/garnet/examples/ui/shadertoy/service/compiler.h similarity index 100% rename from examples/ui/shadertoy/service/compiler.h rename to garnet/examples/ui/shadertoy/service/compiler.h
diff --git a/examples/ui/shadertoy/service/glm_hack.h b/garnet/examples/ui/shadertoy/service/glm_hack.h similarity index 100% rename from examples/ui/shadertoy/service/glm_hack.h rename to garnet/examples/ui/shadertoy/service/glm_hack.h
diff --git a/examples/ui/shadertoy/service/imagepipe_shadertoy.cc b/garnet/examples/ui/shadertoy/service/imagepipe_shadertoy.cc similarity index 100% rename from examples/ui/shadertoy/service/imagepipe_shadertoy.cc rename to garnet/examples/ui/shadertoy/service/imagepipe_shadertoy.cc
diff --git a/examples/ui/shadertoy/service/imagepipe_shadertoy.h b/garnet/examples/ui/shadertoy/service/imagepipe_shadertoy.h similarity index 100% rename from examples/ui/shadertoy/service/imagepipe_shadertoy.h rename to garnet/examples/ui/shadertoy/service/imagepipe_shadertoy.h
diff --git a/examples/ui/shadertoy/service/main.cc b/garnet/examples/ui/shadertoy/service/main.cc similarity index 100% rename from examples/ui/shadertoy/service/main.cc rename to garnet/examples/ui/shadertoy/service/main.cc
diff --git a/examples/ui/shadertoy/service/meta/shadertoy_service.cmx b/garnet/examples/ui/shadertoy/service/meta/shadertoy_service.cmx similarity index 100% rename from examples/ui/shadertoy/service/meta/shadertoy_service.cmx rename to garnet/examples/ui/shadertoy/service/meta/shadertoy_service.cmx
diff --git a/examples/ui/shadertoy/service/pipeline.cc b/garnet/examples/ui/shadertoy/service/pipeline.cc similarity index 100% rename from examples/ui/shadertoy/service/pipeline.cc rename to garnet/examples/ui/shadertoy/service/pipeline.cc
diff --git a/examples/ui/shadertoy/service/pipeline.h b/garnet/examples/ui/shadertoy/service/pipeline.h similarity index 100% rename from examples/ui/shadertoy/service/pipeline.h rename to garnet/examples/ui/shadertoy/service/pipeline.h
diff --git a/examples/ui/shadertoy/service/renderer.cc b/garnet/examples/ui/shadertoy/service/renderer.cc similarity index 100% rename from examples/ui/shadertoy/service/renderer.cc rename to garnet/examples/ui/shadertoy/service/renderer.cc
diff --git a/examples/ui/shadertoy/service/renderer.h b/garnet/examples/ui/shadertoy/service/renderer.h similarity index 100% rename from examples/ui/shadertoy/service/renderer.h rename to garnet/examples/ui/shadertoy/service/renderer.h
diff --git a/examples/ui/shadertoy/service/services/BUILD.gn b/garnet/examples/ui/shadertoy/service/services/BUILD.gn similarity index 100% rename from examples/ui/shadertoy/service/services/BUILD.gn rename to garnet/examples/ui/shadertoy/service/services/BUILD.gn
diff --git a/examples/ui/shadertoy/service/services/shadertoy.fidl b/garnet/examples/ui/shadertoy/service/services/shadertoy.fidl similarity index 100% rename from examples/ui/shadertoy/service/services/shadertoy.fidl rename to garnet/examples/ui/shadertoy/service/services/shadertoy.fidl
diff --git a/examples/ui/shadertoy/service/services/shadertoy_factory.fidl b/garnet/examples/ui/shadertoy/service/services/shadertoy_factory.fidl similarity index 100% rename from examples/ui/shadertoy/service/services/shadertoy_factory.fidl rename to garnet/examples/ui/shadertoy/service/services/shadertoy_factory.fidl
diff --git a/examples/ui/shadertoy/service/shadertoy_impl.cc b/garnet/examples/ui/shadertoy/service/shadertoy_impl.cc similarity index 100% rename from examples/ui/shadertoy/service/shadertoy_impl.cc rename to garnet/examples/ui/shadertoy/service/shadertoy_impl.cc
diff --git a/examples/ui/shadertoy/service/shadertoy_impl.h b/garnet/examples/ui/shadertoy/service/shadertoy_impl.h similarity index 100% rename from examples/ui/shadertoy/service/shadertoy_impl.h rename to garnet/examples/ui/shadertoy/service/shadertoy_impl.h
diff --git a/examples/ui/shadertoy/service/shadertoy_state.cc b/garnet/examples/ui/shadertoy/service/shadertoy_state.cc similarity index 100% rename from examples/ui/shadertoy/service/shadertoy_state.cc rename to garnet/examples/ui/shadertoy/service/shadertoy_state.cc
diff --git a/examples/ui/shadertoy/service/shadertoy_state.h b/garnet/examples/ui/shadertoy/service/shadertoy_state.h similarity index 100% rename from examples/ui/shadertoy/service/shadertoy_state.h rename to garnet/examples/ui/shadertoy/service/shadertoy_state.h
diff --git a/examples/ui/shadertoy/service/view_shadertoy.cc b/garnet/examples/ui/shadertoy/service/view_shadertoy.cc similarity index 100% rename from examples/ui/shadertoy/service/view_shadertoy.cc rename to garnet/examples/ui/shadertoy/service/view_shadertoy.cc
diff --git a/examples/ui/shadertoy/service/view_shadertoy.h b/garnet/examples/ui/shadertoy/service/view_shadertoy.h similarity index 100% rename from examples/ui/shadertoy/service/view_shadertoy.h rename to garnet/examples/ui/shadertoy/service/view_shadertoy.h
diff --git a/examples/ui/shapes/BUILD.gn b/garnet/examples/ui/shapes/BUILD.gn similarity index 100% rename from examples/ui/shapes/BUILD.gn rename to garnet/examples/ui/shapes/BUILD.gn
diff --git a/examples/ui/shapes/README.md b/garnet/examples/ui/shapes/README.md similarity index 100% rename from examples/ui/shapes/README.md rename to garnet/examples/ui/shapes/README.md
diff --git a/examples/ui/shapes/main.cc b/garnet/examples/ui/shapes/main.cc similarity index 100% rename from examples/ui/shapes/main.cc rename to garnet/examples/ui/shapes/main.cc
diff --git a/examples/ui/shapes/shapes_view.cc b/garnet/examples/ui/shapes/shapes_view.cc similarity index 100% rename from examples/ui/shapes/shapes_view.cc rename to garnet/examples/ui/shapes/shapes_view.cc
diff --git a/examples/ui/shapes/shapes_view.h b/garnet/examples/ui/shapes/shapes_view.h similarity index 100% rename from examples/ui/shapes/shapes_view.h rename to garnet/examples/ui/shapes/shapes_view.h
diff --git a/examples/ui/sketchy/BUILD.gn b/garnet/examples/ui/sketchy/BUILD.gn similarity index 100% rename from examples/ui/sketchy/BUILD.gn rename to garnet/examples/ui/sketchy/BUILD.gn
diff --git a/examples/ui/sketchy/README.md b/garnet/examples/ui/sketchy/README.md similarity index 100% rename from examples/ui/sketchy/README.md rename to garnet/examples/ui/sketchy/README.md
diff --git a/examples/ui/sketchy/main.cc b/garnet/examples/ui/sketchy/main.cc similarity index 100% rename from examples/ui/sketchy/main.cc rename to garnet/examples/ui/sketchy/main.cc
diff --git a/examples/ui/sketchy/meta/sketchy.cmx b/garnet/examples/ui/sketchy/meta/sketchy.cmx similarity index 100% rename from examples/ui/sketchy/meta/sketchy.cmx rename to garnet/examples/ui/sketchy/meta/sketchy.cmx
diff --git a/examples/ui/sketchy/view.cc b/garnet/examples/ui/sketchy/view.cc similarity index 100% rename from examples/ui/sketchy/view.cc rename to garnet/examples/ui/sketchy/view.cc
diff --git a/examples/ui/sketchy/view.h b/garnet/examples/ui/sketchy/view.h similarity index 100% rename from examples/ui/sketchy/view.h rename to garnet/examples/ui/sketchy/view.h
diff --git a/examples/ui/spinning_square/BUILD.gn b/garnet/examples/ui/spinning_square/BUILD.gn similarity index 100% rename from examples/ui/spinning_square/BUILD.gn rename to garnet/examples/ui/spinning_square/BUILD.gn
diff --git a/examples/ui/spinning_square/README.md b/garnet/examples/ui/spinning_square/README.md similarity index 100% rename from examples/ui/spinning_square/README.md rename to garnet/examples/ui/spinning_square/README.md
diff --git a/examples/ui/spinning_square/main.cc b/garnet/examples/ui/spinning_square/main.cc similarity index 100% rename from examples/ui/spinning_square/main.cc rename to garnet/examples/ui/spinning_square/main.cc
diff --git a/examples/ui/spinning_square/spinning_square_view.cc b/garnet/examples/ui/spinning_square/spinning_square_view.cc similarity index 100% rename from examples/ui/spinning_square/spinning_square_view.cc rename to garnet/examples/ui/spinning_square/spinning_square_view.cc
diff --git a/examples/ui/spinning_square/spinning_square_view.h b/garnet/examples/ui/spinning_square/spinning_square_view.h similarity index 100% rename from examples/ui/spinning_square/spinning_square_view.h rename to garnet/examples/ui/spinning_square/spinning_square_view.h
diff --git a/examples/ui/tile/BUILD.gn b/garnet/examples/ui/tile/BUILD.gn similarity index 100% rename from examples/ui/tile/BUILD.gn rename to garnet/examples/ui/tile/BUILD.gn
diff --git a/examples/ui/tile/README.md b/garnet/examples/ui/tile/README.md similarity index 100% rename from examples/ui/tile/README.md rename to garnet/examples/ui/tile/README.md
diff --git a/examples/ui/tile/main.cc b/garnet/examples/ui/tile/main.cc similarity index 100% rename from examples/ui/tile/main.cc rename to garnet/examples/ui/tile/main.cc
diff --git a/examples/ui/tile/tile_params.cc b/garnet/examples/ui/tile/tile_params.cc similarity index 100% rename from examples/ui/tile/tile_params.cc rename to garnet/examples/ui/tile/tile_params.cc
diff --git a/examples/ui/tile/tile_params.h b/garnet/examples/ui/tile/tile_params.h similarity index 100% rename from examples/ui/tile/tile_params.h rename to garnet/examples/ui/tile/tile_params.h
diff --git a/examples/ui/tile/tile_view.cc b/garnet/examples/ui/tile/tile_view.cc similarity index 100% rename from examples/ui/tile/tile_view.cc rename to garnet/examples/ui/tile/tile_view.cc
diff --git a/examples/ui/tile/tile_view.h b/garnet/examples/ui/tile/tile_view.h similarity index 100% rename from examples/ui/tile/tile_view.h rename to garnet/examples/ui/tile/tile_view.h
diff --git a/examples/ui/video_display/BUILD.gn b/garnet/examples/ui/video_display/BUILD.gn similarity index 100% rename from examples/ui/video_display/BUILD.gn rename to garnet/examples/ui/video_display/BUILD.gn
diff --git a/examples/ui/video_display/README.md b/garnet/examples/ui/video_display/README.md similarity index 100% rename from examples/ui/video_display/README.md rename to garnet/examples/ui/video_display/README.md
diff --git a/examples/ui/video_display/main.cc b/garnet/examples/ui/video_display/main.cc similarity index 100% rename from examples/ui/video_display/main.cc rename to garnet/examples/ui/video_display/main.cc
diff --git a/examples/ui/video_display/simple_camera_view.cc b/garnet/examples/ui/video_display/simple_camera_view.cc similarity index 100% rename from examples/ui/video_display/simple_camera_view.cc rename to garnet/examples/ui/video_display/simple_camera_view.cc
diff --git a/examples/ui/video_display/simple_camera_view.h b/garnet/examples/ui/video_display/simple_camera_view.h similarity index 100% rename from examples/ui/video_display/simple_camera_view.h rename to garnet/examples/ui/video_display/simple_camera_view.h
diff --git a/examples/ui/yuv_to_image_pipe/BUILD.gn b/garnet/examples/ui/yuv_to_image_pipe/BUILD.gn similarity index 100% rename from examples/ui/yuv_to_image_pipe/BUILD.gn rename to garnet/examples/ui/yuv_to_image_pipe/BUILD.gn
diff --git a/examples/ui/yuv_to_image_pipe/README.md b/garnet/examples/ui/yuv_to_image_pipe/README.md similarity index 100% rename from examples/ui/yuv_to_image_pipe/README.md rename to garnet/examples/ui/yuv_to_image_pipe/README.md
diff --git a/examples/ui/yuv_to_image_pipe/main.cc b/garnet/examples/ui/yuv_to_image_pipe/main.cc similarity index 100% rename from examples/ui/yuv_to_image_pipe/main.cc rename to garnet/examples/ui/yuv_to_image_pipe/main.cc
diff --git a/examples/ui/yuv_to_image_pipe/yuv_view.cc b/garnet/examples/ui/yuv_to_image_pipe/yuv_view.cc similarity index 100% rename from examples/ui/yuv_to_image_pipe/yuv_view.cc rename to garnet/examples/ui/yuv_to_image_pipe/yuv_view.cc
diff --git a/examples/ui/yuv_to_image_pipe/yuv_view.h b/garnet/examples/ui/yuv_to_image_pipe/yuv_view.h similarity index 100% rename from examples/ui/yuv_to_image_pipe/yuv_view.h rename to garnet/examples/ui/yuv_to_image_pipe/yuv_view.h
diff --git a/go/MAINTAINERS b/garnet/go/MAINTAINERS similarity index 100% rename from go/MAINTAINERS rename to garnet/go/MAINTAINERS
diff --git a/go/src/amber/BUILD.gn b/garnet/go/src/amber/BUILD.gn similarity index 100% rename from go/src/amber/BUILD.gn rename to garnet/go/src/amber/BUILD.gn
diff --git a/go/src/amber/README.md b/garnet/go/src/amber/README.md similarity index 100% rename from go/src/amber/README.md rename to garnet/go/src/amber/README.md
diff --git a/go/src/amber/amberctl/amberctl.go b/garnet/go/src/amber/amberctl/amberctl.go similarity index 100% rename from go/src/amber/amberctl/amberctl.go rename to garnet/go/src/amber/amberctl/amberctl.go
diff --git a/go/src/amber/amberd/amberd.go b/garnet/go/src/amber/amberd/amberd.go similarity index 100% rename from go/src/amber/amberd/amberd.go rename to garnet/go/src/amber/amberd/amberd.go
diff --git a/go/src/amber/atonce/atonce.go b/garnet/go/src/amber/atonce/atonce.go similarity index 100% rename from go/src/amber/atonce/atonce.go rename to garnet/go/src/amber/atonce/atonce.go
diff --git a/go/src/amber/control_server/control_server.go b/garnet/go/src/amber/control_server/control_server.go similarity index 100% rename from go/src/amber/control_server/control_server.go rename to garnet/go/src/amber/control_server/control_server.go
diff --git a/go/src/amber/control_server/control_server_test.go b/garnet/go/src/amber/control_server/control_server_test.go similarity index 100% rename from go/src/amber/control_server/control_server_test.go rename to garnet/go/src/amber/control_server/control_server_test.go
diff --git a/go/src/amber/daemon/activation_watcher.go b/garnet/go/src/amber/daemon/activation_watcher.go similarity index 100% rename from go/src/amber/daemon/activation_watcher.go rename to garnet/go/src/amber/daemon/activation_watcher.go
diff --git a/go/src/amber/daemon/daemon.go b/garnet/go/src/amber/daemon/daemon.go similarity index 100% rename from go/src/amber/daemon/daemon.go rename to garnet/go/src/amber/daemon/daemon.go
diff --git a/go/src/amber/daemon/daemon_test.go b/garnet/go/src/amber/daemon/daemon_test.go similarity index 100% rename from go/src/amber/daemon/daemon_test.go rename to garnet/go/src/amber/daemon/daemon_test.go
diff --git a/go/src/amber/etc/sources/test1/config.json b/garnet/go/src/amber/etc/sources/test1/config.json similarity index 100% rename from go/src/amber/etc/sources/test1/config.json rename to garnet/go/src/amber/etc/sources/test1/config.json
diff --git a/go/src/amber/etc/sources/test2/config.json b/garnet/go/src/amber/etc/sources/test2/config.json similarity index 100% rename from go/src/amber/etc/sources/test2/config.json rename to garnet/go/src/amber/etc/sources/test2/config.json
diff --git a/go/src/amber/keys/root.json b/garnet/go/src/amber/keys/root.json similarity index 100% rename from go/src/amber/keys/root.json rename to garnet/go/src/amber/keys/root.json
diff --git a/go/src/amber/keys/root_manifest.json b/garnet/go/src/amber/keys/root_manifest.json similarity index 100% rename from go/src/amber/keys/root_manifest.json rename to garnet/go/src/amber/keys/root_manifest.json
diff --git a/go/src/amber/keys/root_sig.json b/garnet/go/src/amber/keys/root_sig.json similarity index 100% rename from go/src/amber/keys/root_sig.json rename to garnet/go/src/amber/keys/root_sig.json
diff --git a/go/src/amber/keys/snapshot.json b/garnet/go/src/amber/keys/snapshot.json similarity index 100% rename from go/src/amber/keys/snapshot.json rename to garnet/go/src/amber/keys/snapshot.json
diff --git a/go/src/amber/keys/targets.json b/garnet/go/src/amber/keys/targets.json similarity index 100% rename from go/src/amber/keys/targets.json rename to garnet/go/src/amber/keys/targets.json
diff --git a/go/src/amber/keys/timestamp.json b/garnet/go/src/amber/keys/timestamp.json similarity index 100% rename from go/src/amber/keys/timestamp.json rename to garnet/go/src/amber/keys/timestamp.json
diff --git a/go/src/amber/meta/amber.cmx b/garnet/go/src/amber/meta/amber.cmx similarity index 100% rename from go/src/amber/meta/amber.cmx rename to garnet/go/src/amber/meta/amber.cmx
diff --git a/go/src/amber/metrics/indices.go b/garnet/go/src/amber/metrics/indices.go similarity index 100% rename from go/src/amber/metrics/indices.go rename to garnet/go/src/amber/metrics/indices.go
diff --git a/go/src/amber/metrics/metrics.go b/garnet/go/src/amber/metrics/metrics.go similarity index 100% rename from go/src/amber/metrics/metrics.go rename to garnet/go/src/amber/metrics/metrics.go
diff --git a/go/src/amber/metrics/wrappers.go b/garnet/go/src/amber/metrics/wrappers.go similarity index 100% rename from go/src/amber/metrics/wrappers.go rename to garnet/go/src/amber/metrics/wrappers.go
diff --git a/go/src/amber/ota_config/BUILD.gn b/garnet/go/src/amber/ota_config/BUILD.gn similarity index 100% rename from go/src/amber/ota_config/BUILD.gn rename to garnet/go/src/amber/ota_config/BUILD.gn
diff --git a/go/src/amber/ota_config/auto-apply.flags b/garnet/go/src/amber/ota_config/auto-apply.flags similarity index 100% rename from go/src/amber/ota_config/auto-apply.flags rename to garnet/go/src/amber/ota_config/auto-apply.flags
diff --git a/go/src/amber/source/file_store.go b/garnet/go/src/amber/source/file_store.go similarity index 100% rename from go/src/amber/source/file_store.go rename to garnet/go/src/amber/source/file_store.go
diff --git a/go/src/amber/source/file_store_test.go b/garnet/go/src/amber/source/file_store_test.go similarity index 100% rename from go/src/amber/source/file_store_test.go rename to garnet/go/src/amber/source/file_store_test.go
diff --git a/go/src/amber/source/source.go b/garnet/go/src/amber/source/source.go similarity index 100% rename from go/src/amber/source/source.go rename to garnet/go/src/amber/source/source.go
diff --git a/go/src/amber/source/token_loader.go b/garnet/go/src/amber/source/token_loader.go similarity index 100% rename from go/src/amber/source/token_loader.go rename to garnet/go/src/amber/source/token_loader.go
diff --git a/go/src/amber/startup.config b/garnet/go/src/amber/startup.config similarity index 100% rename from go/src/amber/startup.config rename to garnet/go/src/amber/startup.config
diff --git a/go/src/amber/sys_update/sys_update.go b/garnet/go/src/amber/sys_update/sys_update.go similarity index 100% rename from go/src/amber/sys_update/sys_update.go rename to garnet/go/src/amber/sys_update/sys_update.go
diff --git a/go/src/amber/system_updater/BUILD.gn b/garnet/go/src/amber/system_updater/BUILD.gn similarity index 100% rename from go/src/amber/system_updater/BUILD.gn rename to garnet/go/src/amber/system_updater/BUILD.gn
diff --git a/go/src/amber/system_updater/blobfs.go b/garnet/go/src/amber/system_updater/blobfs.go similarity index 100% rename from go/src/amber/system_updater/blobfs.go rename to garnet/go/src/amber/system_updater/blobfs.go
diff --git a/go/src/amber/system_updater/efi b/garnet/go/src/amber/system_updater/efi similarity index 100% rename from go/src/amber/system_updater/efi rename to garnet/go/src/amber/system_updater/efi
diff --git a/go/src/amber/system_updater/history.go b/garnet/go/src/amber/system_updater/history.go similarity index 100% rename from go/src/amber/system_updater/history.go rename to garnet/go/src/amber/system_updater/history.go
diff --git a/go/src/amber/system_updater/images b/garnet/go/src/amber/system_updater/images similarity index 100% rename from go/src/amber/system_updater/images rename to garnet/go/src/amber/system_updater/images
diff --git a/go/src/amber/system_updater/kernc b/garnet/go/src/amber/system_updater/kernc similarity index 100% rename from go/src/amber/system_updater/kernc rename to garnet/go/src/amber/system_updater/kernc
diff --git a/go/src/amber/system_updater/main.go b/garnet/go/src/amber/system_updater/main.go similarity index 100% rename from go/src/amber/system_updater/main.go rename to garnet/go/src/amber/system_updater/main.go
diff --git a/go/src/amber/system_updater/meta/system_updater.cmx b/garnet/go/src/amber/system_updater/meta/system_updater.cmx similarity index 100% rename from go/src/amber/system_updater/meta/system_updater.cmx rename to garnet/go/src/amber/system_updater/meta/system_updater.cmx
diff --git a/go/src/amber/system_updater/packages b/garnet/go/src/amber/system_updater/packages similarity index 100% rename from go/src/amber/system_updater/packages rename to garnet/go/src/amber/system_updater/packages
diff --git a/go/src/amber/system_updater/processor.go b/garnet/go/src/amber/system_updater/processor.go similarity index 100% rename from go/src/amber/system_updater/processor.go rename to garnet/go/src/amber/system_updater/processor.go
diff --git a/go/src/amber/system_updater/processor_test.go b/garnet/go/src/amber/system_updater/processor_test.go similarity index 100% rename from go/src/amber/system_updater/processor_test.go rename to garnet/go/src/amber/system_updater/processor_test.go
diff --git a/go/src/amber/system_updater/test_images b/garnet/go/src/amber/system_updater/test_images similarity index 100% rename from go/src/amber/system_updater/test_images rename to garnet/go/src/amber/system_updater/test_images
diff --git a/go/src/amber/system_updater/test_packages b/garnet/go/src/amber/system_updater/test_packages similarity index 100% rename from go/src/amber/system_updater/test_packages rename to garnet/go/src/amber/system_updater/test_packages
diff --git a/go/src/amber/tests/ota/BUILD.gn b/garnet/go/src/amber/tests/ota/BUILD.gn similarity index 100% rename from go/src/amber/tests/ota/BUILD.gn rename to garnet/go/src/amber/tests/ota/BUILD.gn
diff --git a/go/src/amber/tests/ota/README.md b/garnet/go/src/amber/tests/ota/README.md similarity index 100% rename from go/src/amber/tests/ota/README.md rename to garnet/go/src/amber/tests/ota/README.md
diff --git a/go/src/amber/tests/ota/bin/make-vol.sh b/garnet/go/src/amber/tests/ota/bin/make-vol.sh similarity index 100% rename from go/src/amber/tests/ota/bin/make-vol.sh rename to garnet/go/src/amber/tests/ota/bin/make-vol.sh
diff --git a/go/src/amber/tests/ota/bin/run-qemu.sh b/garnet/go/src/amber/tests/ota/bin/run-qemu.sh similarity index 100% rename from go/src/amber/tests/ota/bin/run-qemu.sh rename to garnet/go/src/amber/tests/ota/bin/run-qemu.sh
diff --git a/go/src/amber/tests/ota/ota-test-app/BUILD.gn b/garnet/go/src/amber/tests/ota/ota-test-app/BUILD.gn similarity index 100% rename from go/src/amber/tests/ota/ota-test-app/BUILD.gn rename to garnet/go/src/amber/tests/ota/ota-test-app/BUILD.gn
diff --git a/go/src/amber/tests/ota/ota-test-app/meta/ota-test-package.cmx b/garnet/go/src/amber/tests/ota/ota-test-app/meta/ota-test-package.cmx similarity index 100% rename from go/src/amber/tests/ota/ota-test-app/meta/ota-test-package.cmx rename to garnet/go/src/amber/tests/ota/ota-test-app/meta/ota-test-package.cmx
diff --git a/go/src/amber/tests/ota/ota-test-app/ota-test-app.go b/garnet/go/src/amber/tests/ota/ota-test-app/ota-test-app.go similarity index 100% rename from go/src/amber/tests/ota/ota-test-app/ota-test-app.go rename to garnet/go/src/amber/tests/ota/ota-test-app/ota-test-app.go
diff --git a/go/src/amber/tests/ota/ota-test.package b/garnet/go/src/amber/tests/ota/ota-test.package similarity index 100% rename from go/src/amber/tests/ota/ota-test.package rename to garnet/go/src/amber/tests/ota/ota-test.package
diff --git a/go/src/amber/tests/ota/system_ota.go b/garnet/go/src/amber/tests/ota/system_ota.go similarity index 100% rename from go/src/amber/tests/ota/system_ota.go rename to garnet/go/src/amber/tests/ota/system_ota.go
diff --git a/go/src/amber/tests/ota/system_ota_test.go b/garnet/go/src/amber/tests/ota/system_ota_test.go similarity index 100% rename from go/src/amber/tests/ota/system_ota_test.go rename to garnet/go/src/amber/tests/ota/system_ota_test.go
diff --git a/go/src/amber/urlscope/urlscope.go b/garnet/go/src/amber/urlscope/urlscope.go similarity index 100% rename from go/src/amber/urlscope/urlscope.go rename to garnet/go/src/amber/urlscope/urlscope.go
diff --git a/go/src/amber/urlscope/urlscope_test.go b/garnet/go/src/amber/urlscope/urlscope_test.go similarity index 100% rename from go/src/amber/urlscope/urlscope_test.go rename to garnet/go/src/amber/urlscope/urlscope_test.go
diff --git a/go/src/benchmarking/BUILD.gn b/garnet/go/src/benchmarking/BUILD.gn similarity index 100% rename from go/src/benchmarking/BUILD.gn rename to garnet/go/src/benchmarking/BUILD.gn
diff --git a/go/src/benchmarking/MAINTAINERS b/garnet/go/src/benchmarking/MAINTAINERS similarity index 100% rename from go/src/benchmarking/MAINTAINERS rename to garnet/go/src/benchmarking/MAINTAINERS
diff --git a/go/src/benchmarking/README.md b/garnet/go/src/benchmarking/README.md similarity index 100% rename from go/src/benchmarking/README.md rename to garnet/go/src/benchmarking/README.md
diff --git a/go/src/benchmarking/results.go b/garnet/go/src/benchmarking/results.go similarity index 100% rename from go/src/benchmarking/results.go rename to garnet/go/src/benchmarking/results.go
diff --git a/go/src/benchmarking/results_test.go b/garnet/go/src/benchmarking/results_test.go similarity index 100% rename from go/src/benchmarking/results_test.go rename to garnet/go/src/benchmarking/results_test.go
diff --git a/go/src/benchmarking/tracing.go b/garnet/go/src/benchmarking/tracing.go similarity index 100% rename from go/src/benchmarking/tracing.go rename to garnet/go/src/benchmarking/tracing.go
diff --git a/go/src/benchmarking/tracing_test.go b/garnet/go/src/benchmarking/tracing_test.go similarity index 100% rename from go/src/benchmarking/tracing_test.go rename to garnet/go/src/benchmarking/tracing_test.go
diff --git a/go/src/device_settings/BUILD.gn b/garnet/go/src/device_settings/BUILD.gn similarity index 100% rename from go/src/device_settings/BUILD.gn rename to garnet/go/src/device_settings/BUILD.gn
diff --git a/go/src/device_settings/device_settings_test.go b/garnet/go/src/device_settings/device_settings_test.go similarity index 100% rename from go/src/device_settings/device_settings_test.go rename to garnet/go/src/device_settings/device_settings_test.go
diff --git a/go/src/far/BUILD.gn b/garnet/go/src/far/BUILD.gn similarity index 100% rename from go/src/far/BUILD.gn rename to garnet/go/src/far/BUILD.gn
diff --git a/go/src/far/far.go b/garnet/go/src/far/far.go similarity index 100% rename from go/src/far/far.go rename to garnet/go/src/far/far.go
diff --git a/go/src/far/far_test.go b/garnet/go/src/far/far_test.go similarity index 100% rename from go/src/far/far_test.go rename to garnet/go/src/far/far_test.go
diff --git a/go/src/fidl/BUILD.gn b/garnet/go/src/fidl/BUILD.gn similarity index 100% rename from go/src/fidl/BUILD.gn rename to garnet/go/src/fidl/BUILD.gn
diff --git a/go/src/fidl/compatibility_test/BUILD.gn b/garnet/go/src/fidl/compatibility_test/BUILD.gn similarity index 100% rename from go/src/fidl/compatibility_test/BUILD.gn rename to garnet/go/src/fidl/compatibility_test/BUILD.gn
diff --git a/go/src/fidl/compatibility_test/compatibility_test_server_go.go b/garnet/go/src/fidl/compatibility_test/compatibility_test_server_go.go similarity index 100% rename from go/src/fidl/compatibility_test/compatibility_test_server_go.go rename to garnet/go/src/fidl/compatibility_test/compatibility_test_server_go.go
diff --git a/go/src/fidl/compatibility_test/meta/fidl_compatibility_test_server_go.cmx b/garnet/go/src/fidl/compatibility_test/meta/fidl_compatibility_test_server_go.cmx similarity index 100% rename from go/src/fidl/compatibility_test/meta/fidl_compatibility_test_server_go.cmx rename to garnet/go/src/fidl/compatibility_test/meta/fidl_compatibility_test_server_go.cmx
diff --git a/go/src/fidl/compiler/backend/backend.go b/garnet/go/src/fidl/compiler/backend/backend.go similarity index 100% rename from go/src/fidl/compiler/backend/backend.go rename to garnet/go/src/fidl/compiler/backend/backend.go
diff --git a/go/src/fidl/compiler/backend/cmdline/flags.go b/garnet/go/src/fidl/compiler/backend/cmdline/flags.go similarity index 100% rename from go/src/fidl/compiler/backend/cmdline/flags.go rename to garnet/go/src/fidl/compiler/backend/cmdline/flags.go
diff --git a/go/src/fidl/compiler/backend/common/names.go b/garnet/go/src/fidl/compiler/backend/common/names.go similarity index 100% rename from go/src/fidl/compiler/backend/common/names.go rename to garnet/go/src/fidl/compiler/backend/common/names.go
diff --git a/go/src/fidl/compiler/backend/cpp/codegen_test.go b/garnet/go/src/fidl/compiler/backend/cpp/codegen_test.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/codegen_test.go rename to garnet/go/src/fidl/compiler/backend/cpp/codegen_test.go
diff --git a/go/src/fidl/compiler/backend/cpp/generator.go b/garnet/go/src/fidl/compiler/backend/cpp/generator.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/generator.go rename to garnet/go/src/fidl/compiler/backend/cpp/generator.go
diff --git a/go/src/fidl/compiler/backend/cpp/ir/ir.go b/garnet/go/src/fidl/compiler/backend/cpp/ir/ir.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/ir/ir.go rename to garnet/go/src/fidl/compiler/backend/cpp/ir/ir.go
diff --git a/go/src/fidl/compiler/backend/cpp/ir/ir_test.go b/garnet/go/src/fidl/compiler/backend/cpp/ir/ir_test.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/ir/ir_test.go rename to garnet/go/src/fidl/compiler/backend/cpp/ir/ir_test.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/const.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/const.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/const.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/const.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/enum.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/enum.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/enum.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/enum.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/header.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/header.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/header.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/header.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/implementation.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/implementation.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/implementation.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/implementation.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/interface.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/interface.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/interface.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/interface.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/struct.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/struct.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/struct.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/struct.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/table.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/table.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/table.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/table.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/test_base.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/test_base.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/test_base.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/test_base.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/union.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/union.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/union.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/union.tmpl.go
diff --git a/go/src/fidl/compiler/backend/cpp/templates/xunion.tmpl.go b/garnet/go/src/fidl/compiler/backend/cpp/templates/xunion.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/cpp/templates/xunion.tmpl.go rename to garnet/go/src/fidl/compiler/backend/cpp/templates/xunion.tmpl.go
diff --git a/go/src/fidl/compiler/backend/golang/codegen_test.go b/garnet/go/src/fidl/compiler/backend/golang/codegen_test.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/codegen_test.go rename to garnet/go/src/fidl/compiler/backend/golang/codegen_test.go
diff --git a/go/src/fidl/compiler/backend/golang/generator.go b/garnet/go/src/fidl/compiler/backend/golang/generator.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/generator.go rename to garnet/go/src/fidl/compiler/backend/golang/generator.go
diff --git a/go/src/fidl/compiler/backend/golang/ir/ir.go b/garnet/go/src/fidl/compiler/backend/golang/ir/ir.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/ir/ir.go rename to garnet/go/src/fidl/compiler/backend/golang/ir/ir.go
diff --git a/go/src/fidl/compiler/backend/golang/ir/ir_test.go b/garnet/go/src/fidl/compiler/backend/golang/ir/ir_test.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/ir/ir_test.go rename to garnet/go/src/fidl/compiler/backend/golang/ir/ir_test.go
diff --git a/go/src/fidl/compiler/backend/golang/templates/enum.tmpl.go b/garnet/go/src/fidl/compiler/backend/golang/templates/enum.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/templates/enum.tmpl.go rename to garnet/go/src/fidl/compiler/backend/golang/templates/enum.tmpl.go
diff --git a/go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go b/garnet/go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go rename to garnet/go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go
diff --git a/go/src/fidl/compiler/backend/golang/templates/library.tmpl.go b/garnet/go/src/fidl/compiler/backend/golang/templates/library.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/templates/library.tmpl.go rename to garnet/go/src/fidl/compiler/backend/golang/templates/library.tmpl.go
diff --git a/go/src/fidl/compiler/backend/golang/templates/struct.tmpl.go b/garnet/go/src/fidl/compiler/backend/golang/templates/struct.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/templates/struct.tmpl.go rename to garnet/go/src/fidl/compiler/backend/golang/templates/struct.tmpl.go
diff --git a/go/src/fidl/compiler/backend/golang/templates/table.tmpl.go b/garnet/go/src/fidl/compiler/backend/golang/templates/table.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/templates/table.tmpl.go rename to garnet/go/src/fidl/compiler/backend/golang/templates/table.tmpl.go
diff --git a/go/src/fidl/compiler/backend/golang/templates/union.tmpl.go b/garnet/go/src/fidl/compiler/backend/golang/templates/union.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/golang/templates/union.tmpl.go rename to garnet/go/src/fidl/compiler/backend/golang/templates/union.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/codegen_test.go b/garnet/go/src/fidl/compiler/backend/llcpp/codegen_test.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/codegen_test.go rename to garnet/go/src/fidl/compiler/backend/llcpp/codegen_test.go
diff --git a/go/src/fidl/compiler/backend/llcpp/generator.go b/garnet/go/src/fidl/compiler/backend/llcpp/generator.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/generator.go rename to garnet/go/src/fidl/compiler/backend/llcpp/generator.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/files/header.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/files/header.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/files/header.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/files/header.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/files/source.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/files/source.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/files/source.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/files/source.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/const.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/const.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/const.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/const.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/enum.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/enum.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/enum.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/enum.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/interface.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/interface.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/interface.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/interface.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/struct.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/struct.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/struct.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/struct.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_c_flavor.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_c_flavor.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_c_flavor.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_c_flavor.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_in_place.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_in_place.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_in_place.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/sync_request_in_place.tmpl.go
diff --git a/go/src/fidl/compiler/backend/llcpp/templates/fragments/union.tmpl.go b/garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/union.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/llcpp/templates/fragments/union.tmpl.go rename to garnet/go/src/fidl/compiler/backend/llcpp/templates/fragments/union.tmpl.go
diff --git a/go/src/fidl/compiler/backend/rust/codegen_test.go b/garnet/go/src/fidl/compiler/backend/rust/codegen_test.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/codegen_test.go rename to garnet/go/src/fidl/compiler/backend/rust/codegen_test.go
diff --git a/go/src/fidl/compiler/backend/rust/generator.go b/garnet/go/src/fidl/compiler/backend/rust/generator.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/generator.go rename to garnet/go/src/fidl/compiler/backend/rust/generator.go
diff --git a/go/src/fidl/compiler/backend/rust/ir/ir.go b/garnet/go/src/fidl/compiler/backend/rust/ir/ir.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/ir/ir.go rename to garnet/go/src/fidl/compiler/backend/rust/ir/ir.go
diff --git a/go/src/fidl/compiler/backend/rust/templates/const.tmpl.go b/garnet/go/src/fidl/compiler/backend/rust/templates/const.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/templates/const.tmpl.go rename to garnet/go/src/fidl/compiler/backend/rust/templates/const.tmpl.go
diff --git a/go/src/fidl/compiler/backend/rust/templates/enum.tmpl.go b/garnet/go/src/fidl/compiler/backend/rust/templates/enum.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/templates/enum.tmpl.go rename to garnet/go/src/fidl/compiler/backend/rust/templates/enum.tmpl.go
diff --git a/go/src/fidl/compiler/backend/rust/templates/interface.tmpl.go b/garnet/go/src/fidl/compiler/backend/rust/templates/interface.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/templates/interface.tmpl.go rename to garnet/go/src/fidl/compiler/backend/rust/templates/interface.tmpl.go
diff --git a/go/src/fidl/compiler/backend/rust/templates/sourcefile.tmpl.go b/garnet/go/src/fidl/compiler/backend/rust/templates/sourcefile.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/templates/sourcefile.tmpl.go rename to garnet/go/src/fidl/compiler/backend/rust/templates/sourcefile.tmpl.go
diff --git a/go/src/fidl/compiler/backend/rust/templates/struct.tmpl.go b/garnet/go/src/fidl/compiler/backend/rust/templates/struct.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/templates/struct.tmpl.go rename to garnet/go/src/fidl/compiler/backend/rust/templates/struct.tmpl.go
diff --git a/go/src/fidl/compiler/backend/rust/templates/table.tmpl.go b/garnet/go/src/fidl/compiler/backend/rust/templates/table.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/templates/table.tmpl.go rename to garnet/go/src/fidl/compiler/backend/rust/templates/table.tmpl.go
diff --git a/go/src/fidl/compiler/backend/rust/templates/union.tmpl.go b/garnet/go/src/fidl/compiler/backend/rust/templates/union.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/rust/templates/union.tmpl.go rename to garnet/go/src/fidl/compiler/backend/rust/templates/union.tmpl.go
diff --git a/go/src/fidl/compiler/backend/syzkaller/generator.go b/garnet/go/src/fidl/compiler/backend/syzkaller/generator.go similarity index 100% rename from go/src/fidl/compiler/backend/syzkaller/generator.go rename to garnet/go/src/fidl/compiler/backend/syzkaller/generator.go
diff --git a/go/src/fidl/compiler/backend/syzkaller/ir/ir.go b/garnet/go/src/fidl/compiler/backend/syzkaller/ir/ir.go similarity index 100% rename from go/src/fidl/compiler/backend/syzkaller/ir/ir.go rename to garnet/go/src/fidl/compiler/backend/syzkaller/ir/ir.go
diff --git a/go/src/fidl/compiler/backend/syzkaller/templates/description.tmpl.go b/garnet/go/src/fidl/compiler/backend/syzkaller/templates/description.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/syzkaller/templates/description.tmpl.go rename to garnet/go/src/fidl/compiler/backend/syzkaller/templates/description.tmpl.go
diff --git a/go/src/fidl/compiler/backend/syzkaller/templates/interface.tmpl.go b/garnet/go/src/fidl/compiler/backend/syzkaller/templates/interface.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/syzkaller/templates/interface.tmpl.go rename to garnet/go/src/fidl/compiler/backend/syzkaller/templates/interface.tmpl.go
diff --git a/go/src/fidl/compiler/backend/syzkaller/templates/struct.tmpl.go b/garnet/go/src/fidl/compiler/backend/syzkaller/templates/struct.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/syzkaller/templates/struct.tmpl.go rename to garnet/go/src/fidl/compiler/backend/syzkaller/templates/struct.tmpl.go
diff --git a/go/src/fidl/compiler/backend/syzkaller/templates/union.tmpl.go b/garnet/go/src/fidl/compiler/backend/syzkaller/templates/union.tmpl.go similarity index 100% rename from go/src/fidl/compiler/backend/syzkaller/templates/union.tmpl.go rename to garnet/go/src/fidl/compiler/backend/syzkaller/templates/union.tmpl.go
diff --git a/go/src/fidl/compiler/backend/types/config.go b/garnet/go/src/fidl/compiler/backend/types/config.go similarity index 100% rename from go/src/fidl/compiler/backend/types/config.go rename to garnet/go/src/fidl/compiler/backend/types/config.go
diff --git a/go/src/fidl/compiler/backend/types/types.go b/garnet/go/src/fidl/compiler/backend/types/types.go similarity index 100% rename from go/src/fidl/compiler/backend/types/types.go rename to garnet/go/src/fidl/compiler/backend/types/types.go
diff --git a/go/src/fidl/compiler/backend/typestest/README.md b/garnet/go/src/fidl/compiler/backend/typestest/README.md similarity index 100% rename from go/src/fidl/compiler/backend/typestest/README.md rename to garnet/go/src/fidl/compiler/backend/typestest/README.md
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.cc.golden b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.cc.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.cc.golden rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.cc.golden
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.go.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.go.golden rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.go.golden
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.cpp.golden b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.cpp.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.cpp.golden rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.cpp.golden
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.llcpp.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.rs.golden b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.rs.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.rs.golden rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json.rs.golden
diff --git a/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json_test_base.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json_test_base.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json_test_base.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/doc_comments.fidl.json_test_base.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.cc.golden b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.cc.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.cc.golden rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.cc.golden
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.go.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.go.golden rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.go.golden
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.cpp.golden b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.cpp.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.cpp.golden rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.cpp.golden
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.llcpp.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.rs.golden b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.rs.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.rs.golden rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json.rs.golden
diff --git a/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json_test_base.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json_test_base.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json_test_base.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/empty_struct.fidl.json_test_base.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.cc.golden b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.cc.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.cc.golden rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.cc.golden
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.go.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.go.golden rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.go.golden
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.cpp.golden b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.cpp.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.cpp.golden rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.cpp.golden
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.llcpp.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.rs.golden b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.rs.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.rs.golden rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json.rs.golden
diff --git a/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json_test_base.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json_test_base.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json_test_base.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/ordinal_switch.fidl.json_test_base.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/regen.sh b/garnet/go/src/fidl/compiler/backend/typestest/regen.sh similarity index 100% rename from go/src/fidl/compiler/backend/typestest/regen.sh rename to garnet/go/src/fidl/compiler/backend/typestest/regen.sh
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json.cc.golden b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.cc.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json.cc.golden rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.cc.golden
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.go.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json.go.golden rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.go.golden
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.cpp.golden b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.cpp.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.cpp.golden rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.cpp.golden
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.llcpp.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json.rs.golden b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.rs.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json.rs.golden rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json.rs.golden
diff --git a/go/src/fidl/compiler/backend/typestest/tables.fidl.json_test_base.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json_test_base.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/tables.fidl.json_test_base.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/tables.fidl.json_test_base.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/testutil.go b/garnet/go/src/fidl/compiler/backend/typestest/testutil.go similarity index 100% rename from go/src/fidl/compiler/backend/typestest/testutil.go rename to garnet/go/src/fidl/compiler/backend/typestest/testutil.go
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json.cc.golden b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.cc.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json.cc.golden rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.cc.golden
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.go.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json.go.golden rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.go.golden
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.cpp.golden b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.cpp.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.cpp.golden rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.cpp.golden
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.llcpp.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json.rs.golden b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.rs.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json.rs.golden rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json.rs.golden
diff --git a/go/src/fidl/compiler/backend/typestest/union.fidl.json_test_base.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json_test_base.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/union.fidl.json_test_base.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/union.fidl.json_test_base.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.cc.golden b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.cc.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json.cc.golden rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.cc.golden
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.go.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json.go.golden rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.go.golden
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.cpp.golden b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.cpp.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.cpp.golden rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.cpp.golden
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.llcpp.h.golden
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.rs.golden b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.rs.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json.rs.golden rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json.rs.golden
diff --git a/go/src/fidl/compiler/backend/typestest/xunion.fidl.json_test_base.h.golden b/garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json_test_base.h.golden similarity index 100% rename from go/src/fidl/compiler/backend/typestest/xunion.fidl.json_test_base.h.golden rename to garnet/go/src/fidl/compiler/backend/typestest/xunion.fidl.json_test_base.h.golden
diff --git a/go/src/fidl/compiler/backend/utils.go b/garnet/go/src/fidl/compiler/backend/utils.go similarity index 100% rename from go/src/fidl/compiler/backend/utils.go rename to garnet/go/src/fidl/compiler/backend/utils.go
diff --git a/go/src/fidl/examples/BUILD.gn b/garnet/go/src/fidl/examples/BUILD.gn similarity index 100% rename from go/src/fidl/examples/BUILD.gn rename to garnet/go/src/fidl/examples/BUILD.gn
diff --git a/go/src/fidlext/fuchsia/hardware/ethernet/BUILD.gn b/garnet/go/src/fidlext/fuchsia/hardware/ethernet/BUILD.gn similarity index 100% rename from go/src/fidlext/fuchsia/hardware/ethernet/BUILD.gn rename to garnet/go/src/fidlext/fuchsia/hardware/ethernet/BUILD.gn
diff --git a/go/src/fidlext/fuchsia/hardware/ethernet/ethernet_fake.go b/garnet/go/src/fidlext/fuchsia/hardware/ethernet/ethernet_fake.go similarity index 100% rename from go/src/fidlext/fuchsia/hardware/ethernet/ethernet_fake.go rename to garnet/go/src/fidlext/fuchsia/hardware/ethernet/ethernet_fake.go
diff --git a/go/src/fidlmerge/BUILD.gn b/garnet/go/src/fidlmerge/BUILD.gn similarity index 100% rename from go/src/fidlmerge/BUILD.gn rename to garnet/go/src/fidlmerge/BUILD.gn
diff --git a/go/src/fidlmerge/README.md b/garnet/go/src/fidlmerge/README.md similarity index 100% rename from go/src/fidlmerge/README.md rename to garnet/go/src/fidlmerge/README.md
diff --git a/go/src/fidlmerge/examples/ostream b/garnet/go/src/fidlmerge/examples/ostream similarity index 100% rename from go/src/fidlmerge/examples/ostream rename to garnet/go/src/fidlmerge/examples/ostream
diff --git a/go/src/fidlmerge/examples/serviceimpl b/garnet/go/src/fidlmerge/examples/serviceimpl similarity index 100% rename from go/src/fidlmerge/examples/serviceimpl rename to garnet/go/src/fidlmerge/examples/serviceimpl
diff --git a/go/src/fidlmerge/fidlmerge.go b/garnet/go/src/fidlmerge/fidlmerge.go similarity index 100% rename from go/src/fidlmerge/fidlmerge.go rename to garnet/go/src/fidlmerge/fidlmerge.go
diff --git a/go/src/fidlmerge/flags.go b/garnet/go/src/fidlmerge/flags.go similarity index 100% rename from go/src/fidlmerge/flags.go rename to garnet/go/src/fidlmerge/flags.go
diff --git a/go/src/grand_unified_binary/BUILD.gn b/garnet/go/src/grand_unified_binary/BUILD.gn similarity index 100% rename from go/src/grand_unified_binary/BUILD.gn rename to garnet/go/src/grand_unified_binary/BUILD.gn
diff --git a/go/src/grand_unified_binary/gub.go b/garnet/go/src/grand_unified_binary/gub.go similarity index 100% rename from go/src/grand_unified_binary/gub.go rename to garnet/go/src/grand_unified_binary/gub.go
diff --git a/go/src/installblob/BUILD.gn b/garnet/go/src/installblob/BUILD.gn similarity index 100% rename from go/src/installblob/BUILD.gn rename to garnet/go/src/installblob/BUILD.gn
diff --git a/go/src/installblob/installblob.go b/garnet/go/src/installblob/installblob.go similarity index 100% rename from go/src/installblob/installblob.go rename to garnet/go/src/installblob/installblob.go
diff --git a/go/src/make-efi/BUILD.gn b/garnet/go/src/make-efi/BUILD.gn similarity index 100% rename from go/src/make-efi/BUILD.gn rename to garnet/go/src/make-efi/BUILD.gn
diff --git a/go/src/make-efi/README.md b/garnet/go/src/make-efi/README.md similarity index 100% rename from go/src/make-efi/README.md rename to garnet/go/src/make-efi/README.md
diff --git a/go/src/make-efi/make-efi.go b/garnet/go/src/make-efi/make-efi.go similarity index 100% rename from go/src/make-efi/make-efi.go rename to garnet/go/src/make-efi/make-efi.go
diff --git a/go/src/make-fuchsia-vol/BUILD.gn b/garnet/go/src/make-fuchsia-vol/BUILD.gn similarity index 100% rename from go/src/make-fuchsia-vol/BUILD.gn rename to garnet/go/src/make-fuchsia-vol/BUILD.gn
diff --git a/go/src/make-fuchsia-vol/make-fuchsia-vol.go b/garnet/go/src/make-fuchsia-vol/make-fuchsia-vol.go similarity index 100% rename from go/src/make-fuchsia-vol/make-fuchsia-vol.go rename to garnet/go/src/make-fuchsia-vol/make-fuchsia-vol.go
diff --git a/go/src/merkle/BUILD.gn b/garnet/go/src/merkle/BUILD.gn similarity index 100% rename from go/src/merkle/BUILD.gn rename to garnet/go/src/merkle/BUILD.gn
diff --git a/go/src/merkle/merkle.go b/garnet/go/src/merkle/merkle.go similarity index 100% rename from go/src/merkle/merkle.go rename to garnet/go/src/merkle/merkle.go
diff --git a/go/src/merkle/merkle_test.go b/garnet/go/src/merkle/merkle_test.go similarity index 100% rename from go/src/merkle/merkle_test.go rename to garnet/go/src/merkle/merkle_test.go
diff --git a/go/src/netstack/BUILD.gn b/garnet/go/src/netstack/BUILD.gn similarity index 100% rename from go/src/netstack/BUILD.gn rename to garnet/go/src/netstack/BUILD.gn
diff --git a/go/src/netstack/README.md b/garnet/go/src/netstack/README.md similarity index 100% rename from go/src/netstack/README.md rename to garnet/go/src/netstack/README.md
diff --git a/go/src/netstack/connectivity/connectivity.go b/garnet/go/src/netstack/connectivity/connectivity.go similarity index 100% rename from go/src/netstack/connectivity/connectivity.go rename to garnet/go/src/netstack/connectivity/connectivity.go
diff --git a/go/src/netstack/connectivity/connectivity_test.go b/garnet/go/src/netstack/connectivity/connectivity_test.go similarity index 100% rename from go/src/netstack/connectivity/connectivity_test.go rename to garnet/go/src/netstack/connectivity/connectivity_test.go
diff --git a/go/src/netstack/dns/BUILD.gn b/garnet/go/src/netstack/dns/BUILD.gn similarity index 100% rename from go/src/netstack/dns/BUILD.gn rename to garnet/go/src/netstack/dns/BUILD.gn
diff --git a/go/src/netstack/dns/addrselect.go b/garnet/go/src/netstack/dns/addrselect.go similarity index 100% rename from go/src/netstack/dns/addrselect.go rename to garnet/go/src/netstack/dns/addrselect.go
diff --git a/go/src/netstack/dns/cache.go b/garnet/go/src/netstack/dns/cache.go similarity index 100% rename from go/src/netstack/dns/cache.go rename to garnet/go/src/netstack/dns/cache.go
diff --git a/go/src/netstack/dns/cache_test.go b/garnet/go/src/netstack/dns/cache_test.go similarity index 100% rename from go/src/netstack/dns/cache_test.go rename to garnet/go/src/netstack/dns/cache_test.go
diff --git a/go/src/netstack/dns/client.go b/garnet/go/src/netstack/dns/client.go similarity index 100% rename from go/src/netstack/dns/client.go rename to garnet/go/src/netstack/dns/client.go
diff --git a/go/src/netstack/fidlconv/fidlconv.go b/garnet/go/src/netstack/fidlconv/fidlconv.go similarity index 100% rename from go/src/netstack/fidlconv/fidlconv.go rename to garnet/go/src/netstack/fidlconv/fidlconv.go
diff --git a/go/src/netstack/fidlconv/fidlconv_test.go b/garnet/go/src/netstack/fidlconv/fidlconv_test.go similarity index 100% rename from go/src/netstack/fidlconv/fidlconv_test.go rename to garnet/go/src/netstack/fidlconv/fidlconv_test.go
diff --git a/go/src/netstack/filter/endpoint.go b/garnet/go/src/netstack/filter/endpoint.go similarity index 100% rename from go/src/netstack/filter/endpoint.go rename to garnet/go/src/netstack/filter/endpoint.go
diff --git a/go/src/netstack/filter/errors.go b/garnet/go/src/netstack/filter/errors.go similarity index 100% rename from go/src/netstack/filter/errors.go rename to garnet/go/src/netstack/filter/errors.go
diff --git a/go/src/netstack/filter/fidlconv.go b/garnet/go/src/netstack/filter/fidlconv.go similarity index 100% rename from go/src/netstack/filter/fidlconv.go rename to garnet/go/src/netstack/filter/fidlconv.go
diff --git a/go/src/netstack/filter/fidlconv_test.go b/garnet/go/src/netstack/filter/fidlconv_test.go similarity index 100% rename from go/src/netstack/filter/fidlconv_test.go rename to garnet/go/src/netstack/filter/fidlconv_test.go
diff --git a/go/src/netstack/filter/filter.go b/garnet/go/src/netstack/filter/filter.go similarity index 100% rename from go/src/netstack/filter/filter.go rename to garnet/go/src/netstack/filter/filter.go
diff --git a/go/src/netstack/filter/filter_service.go b/garnet/go/src/netstack/filter/filter_service.go similarity index 100% rename from go/src/netstack/filter/filter_service.go rename to garnet/go/src/netstack/filter/filter_service.go
diff --git a/go/src/netstack/filter/filter_service_test.go b/garnet/go/src/netstack/filter/filter_service_test.go similarity index 100% rename from go/src/netstack/filter/filter_service_test.go rename to garnet/go/src/netstack/filter/filter_service_test.go
diff --git a/go/src/netstack/filter/filter_test.go b/garnet/go/src/netstack/filter/filter_test.go similarity index 100% rename from go/src/netstack/filter/filter_test.go rename to garnet/go/src/netstack/filter/filter_test.go
diff --git a/go/src/netstack/filter/nat_test.go b/garnet/go/src/netstack/filter/nat_test.go similarity index 100% rename from go/src/netstack/filter/nat_test.go rename to garnet/go/src/netstack/filter/nat_test.go
diff --git a/go/src/netstack/filter/packet_test.go b/garnet/go/src/netstack/filter/packet_test.go similarity index 100% rename from go/src/netstack/filter/packet_test.go rename to garnet/go/src/netstack/filter/packet_test.go
diff --git a/go/src/netstack/filter/rdr_test.go b/garnet/go/src/netstack/filter/rdr_test.go similarity index 100% rename from go/src/netstack/filter/rdr_test.go rename to garnet/go/src/netstack/filter/rdr_test.go
diff --git a/go/src/netstack/filter/rewrite_packet.go b/garnet/go/src/netstack/filter/rewrite_packet.go similarity index 100% rename from go/src/netstack/filter/rewrite_packet.go rename to garnet/go/src/netstack/filter/rewrite_packet.go
diff --git a/go/src/netstack/filter/rewrite_packet_test.go b/garnet/go/src/netstack/filter/rewrite_packet_test.go similarity index 100% rename from go/src/netstack/filter/rewrite_packet_test.go rename to garnet/go/src/netstack/filter/rewrite_packet_test.go
diff --git a/go/src/netstack/filter/ruleset.go b/garnet/go/src/netstack/filter/ruleset.go similarity index 100% rename from go/src/netstack/filter/ruleset.go rename to garnet/go/src/netstack/filter/ruleset.go
diff --git a/go/src/netstack/filter/seqnum.go b/garnet/go/src/netstack/filter/seqnum.go similarity index 100% rename from go/src/netstack/filter/seqnum.go rename to garnet/go/src/netstack/filter/seqnum.go
diff --git a/go/src/netstack/filter/state.go b/garnet/go/src/netstack/filter/state.go similarity index 100% rename from go/src/netstack/filter/state.go rename to garnet/go/src/netstack/filter/state.go
diff --git a/go/src/netstack/filter/state_test.go b/garnet/go/src/netstack/filter/state_test.go similarity index 100% rename from go/src/netstack/filter/state_test.go rename to garnet/go/src/netstack/filter/state_test.go
diff --git a/go/src/netstack/fuchsia_net_socket.go b/garnet/go/src/netstack/fuchsia_net_socket.go similarity index 100% rename from go/src/netstack/fuchsia_net_socket.go rename to garnet/go/src/netstack/fuchsia_net_socket.go
diff --git a/go/src/netstack/fuchsia_net_stack.go b/garnet/go/src/netstack/fuchsia_net_stack.go similarity index 100% rename from go/src/netstack/fuchsia_net_stack.go rename to garnet/go/src/netstack/fuchsia_net_stack.go
diff --git a/go/src/netstack/fuchsia_net_stack_test.go b/garnet/go/src/netstack/fuchsia_net_stack_test.go similarity index 100% rename from go/src/netstack/fuchsia_net_stack_test.go rename to garnet/go/src/netstack/fuchsia_net_stack_test.go
diff --git a/go/src/netstack/ifconfig/BUILD.gn b/garnet/go/src/netstack/ifconfig/BUILD.gn similarity index 100% rename from go/src/netstack/ifconfig/BUILD.gn rename to garnet/go/src/netstack/ifconfig/BUILD.gn
diff --git a/go/src/netstack/ifconfig/ifconfig.go b/garnet/go/src/netstack/ifconfig/ifconfig.go similarity index 100% rename from go/src/netstack/ifconfig/ifconfig.go rename to garnet/go/src/netstack/ifconfig/ifconfig.go
diff --git a/go/src/netstack/ifconfig/ifconfig_test.go b/garnet/go/src/netstack/ifconfig/ifconfig_test.go similarity index 100% rename from go/src/netstack/ifconfig/ifconfig_test.go rename to garnet/go/src/netstack/ifconfig/ifconfig_test.go
diff --git a/go/src/netstack/ifinfo/BUILD.gn b/garnet/go/src/netstack/ifinfo/BUILD.gn similarity index 100% rename from go/src/netstack/ifinfo/BUILD.gn rename to garnet/go/src/netstack/ifinfo/BUILD.gn
diff --git a/go/src/netstack/ifinfo/ifinfo.go b/garnet/go/src/netstack/ifinfo/ifinfo.go similarity index 100% rename from go/src/netstack/ifinfo/ifinfo.go rename to garnet/go/src/netstack/ifinfo/ifinfo.go
diff --git a/go/src/netstack/link/bridge/BUILD.gn b/garnet/go/src/netstack/link/bridge/BUILD.gn similarity index 100% rename from go/src/netstack/link/bridge/BUILD.gn rename to garnet/go/src/netstack/link/bridge/BUILD.gn
diff --git a/go/src/netstack/link/bridge/bridge.go b/garnet/go/src/netstack/link/bridge/bridge.go similarity index 100% rename from go/src/netstack/link/bridge/bridge.go rename to garnet/go/src/netstack/link/bridge/bridge.go
diff --git a/go/src/netstack/link/bridge/bridge_test.go b/garnet/go/src/netstack/link/bridge/bridge_test.go similarity index 100% rename from go/src/netstack/link/bridge/bridge_test.go rename to garnet/go/src/netstack/link/bridge/bridge_test.go
diff --git a/go/src/netstack/link/bridge/bridgeable.go b/garnet/go/src/netstack/link/bridge/bridgeable.go similarity index 100% rename from go/src/netstack/link/bridge/bridgeable.go rename to garnet/go/src/netstack/link/bridge/bridgeable.go
diff --git a/go/src/netstack/link/controller.go b/garnet/go/src/netstack/link/controller.go similarity index 100% rename from go/src/netstack/link/controller.go rename to garnet/go/src/netstack/link/controller.go
diff --git a/go/src/netstack/link/eth/arena.go b/garnet/go/src/netstack/link/eth/arena.go similarity index 100% rename from go/src/netstack/link/eth/arena.go rename to garnet/go/src/netstack/link/eth/arena.go
diff --git a/go/src/netstack/link/eth/client.go b/garnet/go/src/netstack/link/eth/client.go similarity index 100% rename from go/src/netstack/link/eth/client.go rename to garnet/go/src/netstack/link/eth/client.go
diff --git a/go/src/netstack/link/eth/client_test.go b/garnet/go/src/netstack/link/eth/client_test.go similarity index 100% rename from go/src/netstack/link/eth/client_test.go rename to garnet/go/src/netstack/link/eth/client_test.go
diff --git a/go/src/netstack/link/eth/endpoint.go b/garnet/go/src/netstack/link/eth/endpoint.go similarity index 100% rename from go/src/netstack/link/eth/endpoint.go rename to garnet/go/src/netstack/link/eth/endpoint.go
diff --git a/go/src/netstack/link/eth/endpoint_test.go b/garnet/go/src/netstack/link/eth/endpoint_test.go similarity index 100% rename from go/src/netstack/link/eth/endpoint_test.go rename to garnet/go/src/netstack/link/eth/endpoint_test.go
diff --git a/go/src/netstack/link/stats/stats.go b/garnet/go/src/netstack/link/stats/stats.go similarity index 100% rename from go/src/netstack/link/stats/stats.go rename to garnet/go/src/netstack/link/stats/stats.go
diff --git a/go/src/netstack/main.go b/garnet/go/src/netstack/main.go similarity index 100% rename from go/src/netstack/main.go rename to garnet/go/src/netstack/main.go
diff --git a/go/src/netstack/meta/netstack.cmx b/garnet/go/src/netstack/meta/netstack.cmx similarity index 100% rename from go/src/netstack/meta/netstack.cmx rename to garnet/go/src/netstack/meta/netstack.cmx
diff --git a/go/src/netstack/netiface/netiface.go b/garnet/go/src/netstack/netiface/netiface.go similarity index 100% rename from go/src/netstack/netiface/netiface.go rename to garnet/go/src/netstack/netiface/netiface.go
diff --git a/go/src/netstack/netiface/netiface_test.go b/garnet/go/src/netstack/netiface/netiface_test.go similarity index 100% rename from go/src/netstack/netiface/netiface_test.go rename to garnet/go/src/netstack/netiface/netiface_test.go
diff --git a/go/src/netstack/netstack.go b/garnet/go/src/netstack/netstack.go similarity index 100% rename from go/src/netstack/netstack.go rename to garnet/go/src/netstack/netstack.go
diff --git a/go/src/netstack/netstack_service.go b/garnet/go/src/netstack/netstack_service.go similarity index 100% rename from go/src/netstack/netstack_service.go rename to garnet/go/src/netstack/netstack_service.go
diff --git a/go/src/netstack/netstack_service_impl_test.go b/garnet/go/src/netstack/netstack_service_impl_test.go similarity index 100% rename from go/src/netstack/netstack_service_impl_test.go rename to garnet/go/src/netstack/netstack_service_impl_test.go
diff --git a/go/src/netstack/netstack_service_test/BUILD.gn b/garnet/go/src/netstack/netstack_service_test/BUILD.gn similarity index 100% rename from go/src/netstack/netstack_service_test/BUILD.gn rename to garnet/go/src/netstack/netstack_service_test/BUILD.gn
diff --git a/go/src/netstack/netstack_service_test/main.go b/garnet/go/src/netstack/netstack_service_test/main.go similarity index 100% rename from go/src/netstack/netstack_service_test/main.go rename to garnet/go/src/netstack/netstack_service_test/main.go
diff --git a/go/src/netstack/netstack_test.go b/garnet/go/src/netstack/netstack_test.go similarity index 100% rename from go/src/netstack/netstack_test.go rename to garnet/go/src/netstack/netstack_test.go
diff --git a/go/src/netstack/netstat/BUILD.gn b/garnet/go/src/netstack/netstat/BUILD.gn similarity index 100% rename from go/src/netstack/netstat/BUILD.gn rename to garnet/go/src/netstack/netstat/BUILD.gn
diff --git a/go/src/netstack/netstat/netstat.go b/garnet/go/src/netstack/netstat/netstat.go similarity index 100% rename from go/src/netstack/netstat/netstat.go rename to garnet/go/src/netstack/netstat/netstat.go
diff --git a/go/src/netstack/netstat/netstat_test.go b/garnet/go/src/netstack/netstat/netstat_test.go similarity index 100% rename from go/src/netstack/netstat/netstat_test.go rename to garnet/go/src/netstack/netstat/netstat_test.go
diff --git a/go/src/netstack/pprof.go b/garnet/go/src/netstack/pprof.go similarity index 100% rename from go/src/netstack/pprof.go rename to garnet/go/src/netstack/pprof.go
diff --git a/go/src/netstack/services.go b/garnet/go/src/netstack/services.go similarity index 100% rename from go/src/netstack/services.go rename to garnet/go/src/netstack/services.go
diff --git a/go/src/netstack/socket_conv.go b/garnet/go/src/netstack/socket_conv.go similarity index 100% rename from go/src/netstack/socket_conv.go rename to garnet/go/src/netstack/socket_conv.go
diff --git a/go/src/netstack/socket_encode.go b/garnet/go/src/netstack/socket_encode.go similarity index 100% rename from go/src/netstack/socket_encode.go rename to garnet/go/src/netstack/socket_encode.go
diff --git a/go/src/netstack/socket_server.go b/garnet/go/src/netstack/socket_server.go similarity index 100% rename from go/src/netstack/socket_server.go rename to garnet/go/src/netstack/socket_server.go
diff --git a/go/src/netstack/tests/BUILD.gn b/garnet/go/src/netstack/tests/BUILD.gn similarity index 100% rename from go/src/netstack/tests/BUILD.gn rename to garnet/go/src/netstack/tests/BUILD.gn
diff --git a/go/src/netstack/tests/automated/BUILD.gn b/garnet/go/src/netstack/tests/automated/BUILD.gn similarity index 100% rename from go/src/netstack/tests/automated/BUILD.gn rename to garnet/go/src/netstack/tests/automated/BUILD.gn
diff --git a/go/src/netstack/tests/automated/getaddrinfotest.cc b/garnet/go/src/netstack/tests/automated/getaddrinfotest.cc similarity index 100% rename from go/src/netstack/tests/automated/getaddrinfotest.cc rename to garnet/go/src/netstack/tests/automated/getaddrinfotest.cc
diff --git a/go/src/netstack/tests/automated/getsocknametest.cc b/garnet/go/src/netstack/tests/automated/getsocknametest.cc similarity index 100% rename from go/src/netstack/tests/automated/getsocknametest.cc rename to garnet/go/src/netstack/tests/automated/getsocknametest.cc
diff --git a/go/src/netstack/tests/automated/netstack_gonet_test/BUILD.gn b/garnet/go/src/netstack/tests/automated/netstack_gonet_test/BUILD.gn similarity index 100% rename from go/src/netstack/tests/automated/netstack_gonet_test/BUILD.gn rename to garnet/go/src/netstack/tests/automated/netstack_gonet_test/BUILD.gn
diff --git a/go/src/netstack/tests/automated/netstack_gonet_test/netstack_gonet_test.go b/garnet/go/src/netstack/tests/automated/netstack_gonet_test/netstack_gonet_test.go similarity index 100% rename from go/src/netstack/tests/automated/netstack_gonet_test/netstack_gonet_test.go rename to garnet/go/src/netstack/tests/automated/netstack_gonet_test/netstack_gonet_test.go
diff --git a/go/src/netstack/tests/automated/netstack_loopback_test/BUILD.gn b/garnet/go/src/netstack/tests/automated/netstack_loopback_test/BUILD.gn similarity index 100% rename from go/src/netstack/tests/automated/netstack_loopback_test/BUILD.gn rename to garnet/go/src/netstack/tests/automated/netstack_loopback_test/BUILD.gn
diff --git a/go/src/netstack/tests/automated/netstack_loopback_test/datagram_sendto_recvfrom.cc b/garnet/go/src/netstack/tests/automated/netstack_loopback_test/datagram_sendto_recvfrom.cc similarity index 100% rename from go/src/netstack/tests/automated/netstack_loopback_test/datagram_sendto_recvfrom.cc rename to garnet/go/src/netstack/tests/automated/netstack_loopback_test/datagram_sendto_recvfrom.cc
diff --git a/go/src/netstack/tests/automated/netstack_loopback_test/loopbacktest.cc b/garnet/go/src/netstack/tests/automated/netstack_loopback_test/loopbacktest.cc similarity index 100% rename from go/src/netstack/tests/automated/netstack_loopback_test/loopbacktest.cc rename to garnet/go/src/netstack/tests/automated/netstack_loopback_test/loopbacktest.cc
diff --git a/go/src/netstack/tests/automated/netstack_loopback_test/multiple_listening_sockets.cc b/garnet/go/src/netstack/tests/automated/netstack_loopback_test/multiple_listening_sockets.cc similarity index 100% rename from go/src/netstack/tests/automated/netstack_loopback_test/multiple_listening_sockets.cc rename to garnet/go/src/netstack/tests/automated/netstack_loopback_test/multiple_listening_sockets.cc
diff --git a/go/src/netstack/tests/manual/BUILD.gn b/garnet/go/src/netstack/tests/manual/BUILD.gn similarity index 100% rename from go/src/netstack/tests/manual/BUILD.gn rename to garnet/go/src/netstack/tests/manual/BUILD.gn
diff --git a/go/src/netstack/tests/manual/closetest.c b/garnet/go/src/netstack/tests/manual/closetest.c similarity index 100% rename from go/src/netstack/tests/manual/closetest.c rename to garnet/go/src/netstack/tests/manual/closetest.c
diff --git a/go/src/netstack/tests/manual/connect_twice_test.c b/garnet/go/src/netstack/tests/manual/connect_twice_test.c similarity index 100% rename from go/src/netstack/tests/manual/connect_twice_test.c rename to garnet/go/src/netstack/tests/manual/connect_twice_test.c
diff --git a/go/src/netstack/tests/manual/getaddrinfo_test.c b/garnet/go/src/netstack/tests/manual/getaddrinfo_test.c similarity index 100% rename from go/src/netstack/tests/manual/getaddrinfo_test.c rename to garnet/go/src/netstack/tests/manual/getaddrinfo_test.c
diff --git a/go/src/netstack/tests/manual/gethostbyname_test.c b/garnet/go/src/netstack/tests/manual/gethostbyname_test.c similarity index 100% rename from go/src/netstack/tests/manual/gethostbyname_test.c rename to garnet/go/src/netstack/tests/manual/gethostbyname_test.c
diff --git a/go/src/netstack/tests/manual/keepalivetest.c b/garnet/go/src/netstack/tests/manual/keepalivetest.c similarity index 100% rename from go/src/netstack/tests/manual/keepalivetest.c rename to garnet/go/src/netstack/tests/manual/keepalivetest.c
diff --git a/go/src/netstack/tests/manual/mctest.c b/garnet/go/src/netstack/tests/manual/mctest.c similarity index 100% rename from go/src/netstack/tests/manual/mctest.c rename to garnet/go/src/netstack/tests/manual/mctest.c
diff --git a/go/src/netstack/tests/manual/nbiotest.c b/garnet/go/src/netstack/tests/manual/nbiotest.c similarity index 100% rename from go/src/netstack/tests/manual/nbiotest.c rename to garnet/go/src/netstack/tests/manual/nbiotest.c
diff --git a/go/src/netstack/tests/manual/passfdtest.c b/garnet/go/src/netstack/tests/manual/passfdtest.c similarity index 100% rename from go/src/netstack/tests/manual/passfdtest.c rename to garnet/go/src/netstack/tests/manual/passfdtest.c
diff --git a/go/src/netstack/tests/manual/polltest.c b/garnet/go/src/netstack/tests/manual/polltest.c similarity index 100% rename from go/src/netstack/tests/manual/polltest.c rename to garnet/go/src/netstack/tests/manual/polltest.c
diff --git a/go/src/netstack/tests/manual/selecttest.c b/garnet/go/src/netstack/tests/manual/selecttest.c similarity index 100% rename from go/src/netstack/tests/manual/selecttest.c rename to garnet/go/src/netstack/tests/manual/selecttest.c
diff --git a/go/src/netstack/tests/manual/sockettest.c b/garnet/go/src/netstack/tests/manual/sockettest.c similarity index 100% rename from go/src/netstack/tests/manual/sockettest.c rename to garnet/go/src/netstack/tests/manual/sockettest.c
diff --git a/go/src/netstack/tests/manual/sockopttest.c b/garnet/go/src/netstack/tests/manual/sockopttest.c similarity index 100% rename from go/src/netstack/tests/manual/sockopttest.c rename to garnet/go/src/netstack/tests/manual/sockopttest.c
diff --git a/go/src/netstack/tests/manual/udptest.c b/garnet/go/src/netstack/tests/manual/udptest.c similarity index 100% rename from go/src/netstack/tests/manual/udptest.c rename to garnet/go/src/netstack/tests/manual/udptest.c
diff --git a/go/src/netstack/tests/meta/netstack_getaddrinfo_test.cmx b/garnet/go/src/netstack/tests/meta/netstack_getaddrinfo_test.cmx similarity index 100% rename from go/src/netstack/tests/meta/netstack_getaddrinfo_test.cmx rename to garnet/go/src/netstack/tests/meta/netstack_getaddrinfo_test.cmx
diff --git a/go/src/netstack/tests/meta/netstack_getsockname_test.cmx b/garnet/go/src/netstack/tests/meta/netstack_getsockname_test.cmx similarity index 100% rename from go/src/netstack/tests/meta/netstack_getsockname_test.cmx rename to garnet/go/src/netstack/tests/meta/netstack_getsockname_test.cmx
diff --git a/go/src/netstack/tests/meta/netstack_gonet_test.cmx b/garnet/go/src/netstack/tests/meta/netstack_gonet_test.cmx similarity index 100% rename from go/src/netstack/tests/meta/netstack_gonet_test.cmx rename to garnet/go/src/netstack/tests/meta/netstack_gonet_test.cmx
diff --git a/go/src/netstack/tests/meta/netstack_loopback_test.cmx b/garnet/go/src/netstack/tests/meta/netstack_loopback_test.cmx similarity index 100% rename from go/src/netstack/tests/meta/netstack_loopback_test.cmx rename to garnet/go/src/netstack/tests/meta/netstack_loopback_test.cmx
diff --git a/go/src/netstack/trace/trace.go b/garnet/go/src/netstack/trace/trace.go similarity index 100% rename from go/src/netstack/trace/trace.go rename to garnet/go/src/netstack/trace/trace.go
diff --git a/go/src/netstack/util/BUILD.gn b/garnet/go/src/netstack/util/BUILD.gn similarity index 100% rename from go/src/netstack/util/BUILD.gn rename to garnet/go/src/netstack/util/BUILD.gn
diff --git a/go/src/netstack/util/parse.go b/garnet/go/src/netstack/util/parse.go similarity index 100% rename from go/src/netstack/util/parse.go rename to garnet/go/src/netstack/util/parse.go
diff --git a/go/src/netstack/util/parse_test.go b/garnet/go/src/netstack/util/parse_test.go similarity index 100% rename from go/src/netstack/util/parse_test.go rename to garnet/go/src/netstack/util/parse_test.go
diff --git a/go/src/pm/BUILD.gn b/garnet/go/src/pm/BUILD.gn similarity index 100% rename from go/src/pm/BUILD.gn rename to garnet/go/src/pm/BUILD.gn
diff --git a/go/src/pm/README.md b/garnet/go/src/pm/README.md similarity index 100% rename from go/src/pm/README.md rename to garnet/go/src/pm/README.md
diff --git a/go/src/pm/build/blobs.go b/garnet/go/src/pm/build/blobs.go similarity index 100% rename from go/src/pm/build/blobs.go rename to garnet/go/src/pm/build/blobs.go
diff --git a/go/src/pm/build/config.go b/garnet/go/src/pm/build/config.go similarity index 100% rename from go/src/pm/build/config.go rename to garnet/go/src/pm/build/config.go
diff --git a/go/src/pm/build/contents.go b/garnet/go/src/pm/build/contents.go similarity index 100% rename from go/src/pm/build/contents.go rename to garnet/go/src/pm/build/contents.go
diff --git a/go/src/pm/build/contents_test.go b/garnet/go/src/pm/build/contents_test.go similarity index 100% rename from go/src/pm/build/contents_test.go rename to garnet/go/src/pm/build/contents_test.go
diff --git a/go/src/pm/build/delta.go b/garnet/go/src/pm/build/delta.go similarity index 100% rename from go/src/pm/build/delta.go rename to garnet/go/src/pm/build/delta.go
diff --git a/go/src/pm/build/delta_test.go b/garnet/go/src/pm/build/delta_test.go similarity index 100% rename from go/src/pm/build/delta_test.go rename to garnet/go/src/pm/build/delta_test.go
diff --git a/go/src/pm/build/doc.go b/garnet/go/src/pm/build/doc.go similarity index 100% rename from go/src/pm/build/doc.go rename to garnet/go/src/pm/build/doc.go
diff --git a/go/src/pm/build/manifest.go b/garnet/go/src/pm/build/manifest.go similarity index 100% rename from go/src/pm/build/manifest.go rename to garnet/go/src/pm/build/manifest.go
diff --git a/go/src/pm/build/manifest_test.go b/garnet/go/src/pm/build/manifest_test.go similarity index 100% rename from go/src/pm/build/manifest_test.go rename to garnet/go/src/pm/build/manifest_test.go
diff --git a/go/src/pm/build/package.go b/garnet/go/src/pm/build/package.go similarity index 100% rename from go/src/pm/build/package.go rename to garnet/go/src/pm/build/package.go
diff --git a/go/src/pm/build/package_test.go b/garnet/go/src/pm/build/package_test.go similarity index 100% rename from go/src/pm/build/package_test.go rename to garnet/go/src/pm/build/package_test.go
diff --git a/go/src/pm/build/snapshot.go b/garnet/go/src/pm/build/snapshot.go similarity index 100% rename from go/src/pm/build/snapshot.go rename to garnet/go/src/pm/build/snapshot.go
diff --git a/go/src/pm/build/snapshot_test.go b/garnet/go/src/pm/build/snapshot_test.go similarity index 100% rename from go/src/pm/build/snapshot_test.go rename to garnet/go/src/pm/build/snapshot_test.go
diff --git a/go/src/pm/build/testutil.go b/garnet/go/src/pm/build/testutil.go similarity index 100% rename from go/src/pm/build/testutil.go rename to garnet/go/src/pm/build/testutil.go
diff --git a/go/src/pm/cmd/pm/archive/archive.go b/garnet/go/src/pm/cmd/pm/archive/archive.go similarity index 100% rename from go/src/pm/cmd/pm/archive/archive.go rename to garnet/go/src/pm/cmd/pm/archive/archive.go
diff --git a/go/src/pm/cmd/pm/build/build.go b/garnet/go/src/pm/cmd/pm/build/build.go similarity index 100% rename from go/src/pm/cmd/pm/build/build.go rename to garnet/go/src/pm/cmd/pm/build/build.go
diff --git a/go/src/pm/cmd/pm/delta/delta.go b/garnet/go/src/pm/cmd/pm/delta/delta.go similarity index 100% rename from go/src/pm/cmd/pm/delta/delta.go rename to garnet/go/src/pm/cmd/pm/delta/delta.go
diff --git a/go/src/pm/cmd/pm/expand/expand.go b/garnet/go/src/pm/cmd/pm/expand/expand.go similarity index 100% rename from go/src/pm/cmd/pm/expand/expand.go rename to garnet/go/src/pm/cmd/pm/expand/expand.go
diff --git a/go/src/pm/cmd/pm/genkey/genkey.go b/garnet/go/src/pm/cmd/pm/genkey/genkey.go similarity index 100% rename from go/src/pm/cmd/pm/genkey/genkey.go rename to garnet/go/src/pm/cmd/pm/genkey/genkey.go
diff --git a/go/src/pm/cmd/pm/genkey/genkey_test.go b/garnet/go/src/pm/cmd/pm/genkey/genkey_test.go similarity index 100% rename from go/src/pm/cmd/pm/genkey/genkey_test.go rename to garnet/go/src/pm/cmd/pm/genkey/genkey_test.go
diff --git a/go/src/pm/cmd/pm/init/init.go b/garnet/go/src/pm/cmd/pm/init/init.go similarity index 100% rename from go/src/pm/cmd/pm/init/init.go rename to garnet/go/src/pm/cmd/pm/init/init.go
diff --git a/go/src/pm/cmd/pm/install/install.go b/garnet/go/src/pm/cmd/pm/install/install.go similarity index 100% rename from go/src/pm/cmd/pm/install/install.go rename to garnet/go/src/pm/cmd/pm/install/install.go
diff --git a/go/src/pm/cmd/pm/newrepo/newrepo.go b/garnet/go/src/pm/cmd/pm/newrepo/newrepo.go similarity index 100% rename from go/src/pm/cmd/pm/newrepo/newrepo.go rename to garnet/go/src/pm/cmd/pm/newrepo/newrepo.go
diff --git a/go/src/pm/cmd/pm/pm.go b/garnet/go/src/pm/cmd/pm/pm.go similarity index 100% rename from go/src/pm/cmd/pm/pm.go rename to garnet/go/src/pm/cmd/pm/pm.go
diff --git a/go/src/pm/cmd/pm/publish/publish.go b/garnet/go/src/pm/cmd/pm/publish/publish.go similarity index 100% rename from go/src/pm/cmd/pm/publish/publish.go rename to garnet/go/src/pm/cmd/pm/publish/publish.go
diff --git a/go/src/pm/cmd/pm/seal/seal.go b/garnet/go/src/pm/cmd/pm/seal/seal.go similarity index 100% rename from go/src/pm/cmd/pm/seal/seal.go rename to garnet/go/src/pm/cmd/pm/seal/seal.go
diff --git a/go/src/pm/cmd/pm/serve/serve.go b/garnet/go/src/pm/cmd/pm/serve/serve.go similarity index 100% rename from go/src/pm/cmd/pm/serve/serve.go rename to garnet/go/src/pm/cmd/pm/serve/serve.go
diff --git a/go/src/pm/cmd/pm/sign/sign.go b/garnet/go/src/pm/cmd/pm/sign/sign.go similarity index 100% rename from go/src/pm/cmd/pm/sign/sign.go rename to garnet/go/src/pm/cmd/pm/sign/sign.go
diff --git a/go/src/pm/cmd/pm/snapshot/snapshot.go b/garnet/go/src/pm/cmd/pm/snapshot/snapshot.go similarity index 100% rename from go/src/pm/cmd/pm/snapshot/snapshot.go rename to garnet/go/src/pm/cmd/pm/snapshot/snapshot.go
diff --git a/go/src/pm/cmd/pm/update/update.go b/garnet/go/src/pm/cmd/pm/update/update.go similarity index 100% rename from go/src/pm/cmd/pm/update/update.go rename to garnet/go/src/pm/cmd/pm/update/update.go
diff --git a/go/src/pm/cmd/pm/verify/verify.go b/garnet/go/src/pm/cmd/pm/verify/verify.go similarity index 100% rename from go/src/pm/cmd/pm/verify/verify.go rename to garnet/go/src/pm/cmd/pm/verify/verify.go
diff --git a/go/src/pm/examples/snapshots/delta.json b/garnet/go/src/pm/examples/snapshots/delta.json similarity index 100% rename from go/src/pm/examples/snapshots/delta.json rename to garnet/go/src/pm/examples/snapshots/delta.json
diff --git a/go/src/pm/examples/snapshots/delta.output b/garnet/go/src/pm/examples/snapshots/delta.output similarity index 100% rename from go/src/pm/examples/snapshots/delta.output rename to garnet/go/src/pm/examples/snapshots/delta.output
diff --git a/go/src/pm/examples/snapshots/regen.sh b/garnet/go/src/pm/examples/snapshots/regen.sh similarity index 100% rename from go/src/pm/examples/snapshots/regen.sh rename to garnet/go/src/pm/examples/snapshots/regen.sh
diff --git a/go/src/pm/examples/snapshots/source/packages.manifest b/garnet/go/src/pm/examples/snapshots/source/packages.manifest similarity index 100% rename from go/src/pm/examples/snapshots/source/packages.manifest rename to garnet/go/src/pm/examples/snapshots/source/packages.manifest
diff --git a/go/src/pm/examples/snapshots/source/packages.snapshot b/garnet/go/src/pm/examples/snapshots/source/packages.snapshot similarity index 100% rename from go/src/pm/examples/snapshots/source/packages.snapshot rename to garnet/go/src/pm/examples/snapshots/source/packages.snapshot
diff --git a/go/src/pm/examples/snapshots/source/pkg_a.json b/garnet/go/src/pm/examples/snapshots/source/pkg_a.json similarity index 100% rename from go/src/pm/examples/snapshots/source/pkg_a.json rename to garnet/go/src/pm/examples/snapshots/source/pkg_a.json
diff --git a/go/src/pm/examples/snapshots/source/pkg_b.json b/garnet/go/src/pm/examples/snapshots/source/pkg_b.json similarity index 100% rename from go/src/pm/examples/snapshots/source/pkg_b.json rename to garnet/go/src/pm/examples/snapshots/source/pkg_b.json
diff --git a/go/src/pm/ignores/ignores.go b/garnet/go/src/pm/ignores/ignores.go similarity index 100% rename from go/src/pm/ignores/ignores.go rename to garnet/go/src/pm/ignores/ignores.go
diff --git a/go/src/pm/ignores/ignores_test.go b/garnet/go/src/pm/ignores/ignores_test.go similarity index 100% rename from go/src/pm/ignores/ignores_test.go rename to garnet/go/src/pm/ignores/ignores_test.go
diff --git a/go/src/pm/keys/keys.go b/garnet/go/src/pm/keys/keys.go similarity index 100% rename from go/src/pm/keys/keys.go rename to garnet/go/src/pm/keys/keys.go
diff --git a/go/src/pm/keys/keys_test.go b/garnet/go/src/pm/keys/keys_test.go similarity index 100% rename from go/src/pm/keys/keys_test.go rename to garnet/go/src/pm/keys/keys_test.go
diff --git a/go/src/pm/pkg/package.go b/garnet/go/src/pm/pkg/package.go similarity index 100% rename from go/src/pm/pkg/package.go rename to garnet/go/src/pm/pkg/package.go
diff --git a/go/src/pm/pm.gni b/garnet/go/src/pm/pm.gni similarity index 100% rename from go/src/pm/pm.gni rename to garnet/go/src/pm/pm.gni
diff --git a/go/src/pm/repo/config.go b/garnet/go/src/pm/repo/config.go similarity index 100% rename from go/src/pm/repo/config.go rename to garnet/go/src/pm/repo/config.go
diff --git a/go/src/pm/repo/repo.go b/garnet/go/src/pm/repo/repo.go similarity index 100% rename from go/src/pm/repo/repo.go rename to garnet/go/src/pm/repo/repo.go
diff --git a/go/src/pm/repo/repo_test.go b/garnet/go/src/pm/repo/repo_test.go similarity index 100% rename from go/src/pm/repo/repo_test.go rename to garnet/go/src/pm/repo/repo_test.go
diff --git a/go/src/pmd/BUILD.gn b/garnet/go/src/pmd/BUILD.gn similarity index 100% rename from go/src/pmd/BUILD.gn rename to garnet/go/src/pmd/BUILD.gn
diff --git a/go/src/pmd/amberer/amberer.go b/garnet/go/src/pmd/amberer/amberer.go similarity index 100% rename from go/src/pmd/amberer/amberer.go rename to garnet/go/src/pmd/amberer/amberer.go
diff --git a/go/src/pmd/blobfs/blobfs.go b/garnet/go/src/pmd/blobfs/blobfs.go similarity index 100% rename from go/src/pmd/blobfs/blobfs.go rename to garnet/go/src/pmd/blobfs/blobfs.go
diff --git a/go/src/pmd/index/dynamic_index.go b/garnet/go/src/pmd/index/dynamic_index.go similarity index 100% rename from go/src/pmd/index/dynamic_index.go rename to garnet/go/src/pmd/index/dynamic_index.go
diff --git a/go/src/pmd/index/dynamic_index_test.go b/garnet/go/src/pmd/index/dynamic_index_test.go similarity index 100% rename from go/src/pmd/index/dynamic_index_test.go rename to garnet/go/src/pmd/index/dynamic_index_test.go
diff --git a/go/src/pmd/index/static_index.go b/garnet/go/src/pmd/index/static_index.go similarity index 100% rename from go/src/pmd/index/static_index.go rename to garnet/go/src/pmd/index/static_index.go
diff --git a/go/src/pmd/index/static_index_test.go b/garnet/go/src/pmd/index/static_index_test.go similarity index 100% rename from go/src/pmd/index/static_index_test.go rename to garnet/go/src/pmd/index/static_index_test.go
diff --git a/go/src/pmd/meta/pkgsvr.cmx b/garnet/go/src/pmd/meta/pkgsvr.cmx similarity index 100% rename from go/src/pmd/meta/pkgsvr.cmx rename to garnet/go/src/pmd/meta/pkgsvr.cmx
diff --git a/go/src/pmd/pkgfs/dents.go b/garnet/go/src/pmd/pkgfs/dents.go similarity index 100% rename from go/src/pmd/pkgfs/dents.go rename to garnet/go/src/pmd/pkgfs/dents.go
diff --git a/go/src/pmd/pkgfs/metafar.go b/garnet/go/src/pmd/pkgfs/metafar.go similarity index 100% rename from go/src/pmd/pkgfs/metafar.go rename to garnet/go/src/pmd/pkgfs/metafar.go
diff --git a/go/src/pmd/pkgfs/needs_directory.go b/garnet/go/src/pmd/pkgfs/needs_directory.go similarity index 100% rename from go/src/pmd/pkgfs/needs_directory.go rename to garnet/go/src/pmd/pkgfs/needs_directory.go
diff --git a/go/src/pmd/pkgfs/package_directory.go b/garnet/go/src/pmd/pkgfs/package_directory.go similarity index 100% rename from go/src/pmd/pkgfs/package_directory.go rename to garnet/go/src/pmd/pkgfs/package_directory.go
diff --git a/go/src/pmd/pkgfs/package_install_directory.go b/garnet/go/src/pmd/pkgfs/package_install_directory.go similarity index 100% rename from go/src/pmd/pkgfs/package_install_directory.go rename to garnet/go/src/pmd/pkgfs/package_install_directory.go
diff --git a/go/src/pmd/pkgfs/package_list_directories.go b/garnet/go/src/pmd/pkgfs/package_list_directories.go similarity index 100% rename from go/src/pmd/pkgfs/package_list_directories.go rename to garnet/go/src/pmd/pkgfs/package_list_directories.go
diff --git a/go/src/pmd/pkgfs/pkgfs.go b/garnet/go/src/pmd/pkgfs/pkgfs.go similarity index 100% rename from go/src/pmd/pkgfs/pkgfs.go rename to garnet/go/src/pmd/pkgfs/pkgfs.go
diff --git a/go/src/pmd/pkgfs/pkgfs_test.go b/garnet/go/src/pmd/pkgfs/pkgfs_test.go similarity index 100% rename from go/src/pmd/pkgfs/pkgfs_test.go rename to garnet/go/src/pmd/pkgfs/pkgfs_test.go
diff --git a/go/src/pmd/pkgfs/root_directory.go b/garnet/go/src/pmd/pkgfs/root_directory.go similarity index 100% rename from go/src/pmd/pkgfs/root_directory.go rename to garnet/go/src/pmd/pkgfs/root_directory.go
diff --git a/go/src/pmd/pkgfs/unsupported_vnodes.go b/garnet/go/src/pmd/pkgfs/unsupported_vnodes.go similarity index 100% rename from go/src/pmd/pkgfs/unsupported_vnodes.go rename to garnet/go/src/pmd/pkgfs/unsupported_vnodes.go
diff --git a/go/src/pmd/pkgfs/validation_directory.go b/garnet/go/src/pmd/pkgfs/validation_directory.go similarity index 100% rename from go/src/pmd/pkgfs/validation_directory.go rename to garnet/go/src/pmd/pkgfs/validation_directory.go
diff --git a/go/src/pmd/pkgfs/validation_directory_test.go b/garnet/go/src/pmd/pkgfs/validation_directory_test.go similarity index 100% rename from go/src/pmd/pkgfs/validation_directory_test.go rename to garnet/go/src/pmd/pkgfs/validation_directory_test.go
diff --git a/go/src/pmd/pkgfs/versions_directory.go b/garnet/go/src/pmd/pkgfs/versions_directory.go similarity index 100% rename from go/src/pmd/pkgfs/versions_directory.go rename to garnet/go/src/pmd/pkgfs/versions_directory.go
diff --git a/go/src/pmd/pkgsvr/pkgsvr.go b/garnet/go/src/pmd/pkgsvr/pkgsvr.go similarity index 100% rename from go/src/pmd/pkgsvr/pkgsvr.go rename to garnet/go/src/pmd/pkgsvr/pkgsvr.go
diff --git a/go/src/pmd/ramdisk/ramdisk_fuchsia.go b/garnet/go/src/pmd/ramdisk/ramdisk_fuchsia.go similarity index 100% rename from go/src/pmd/ramdisk/ramdisk_fuchsia.go rename to garnet/go/src/pmd/ramdisk/ramdisk_fuchsia.go
diff --git a/go/src/power_manager/BUILD.gn b/garnet/go/src/power_manager/BUILD.gn similarity index 100% rename from go/src/power_manager/BUILD.gn rename to garnet/go/src/power_manager/BUILD.gn
diff --git a/go/src/power_manager/power_manager_test.go b/garnet/go/src/power_manager/power_manager_test.go similarity index 100% rename from go/src/power_manager/power_manager_test.go rename to garnet/go/src/power_manager/power_manager_test.go
diff --git a/go/src/sse/BUILD.gn b/garnet/go/src/sse/BUILD.gn similarity index 100% rename from go/src/sse/BUILD.gn rename to garnet/go/src/sse/BUILD.gn
diff --git a/go/src/sse/client.go b/garnet/go/src/sse/client.go similarity index 100% rename from go/src/sse/client.go rename to garnet/go/src/sse/client.go
diff --git a/go/src/sse/client_test.go b/garnet/go/src/sse/client_test.go similarity index 100% rename from go/src/sse/client_test.go rename to garnet/go/src/sse/client_test.go
diff --git a/go/src/sse/event.go b/garnet/go/src/sse/event.go similarity index 100% rename from go/src/sse/event.go rename to garnet/go/src/sse/event.go
diff --git a/go/src/sse/event_test.go b/garnet/go/src/sse/event_test.go similarity index 100% rename from go/src/sse/event_test.go rename to garnet/go/src/sse/event_test.go
diff --git a/go/src/sse/sse.go b/garnet/go/src/sse/sse.go similarity index 100% rename from go/src/sse/sse.go rename to garnet/go/src/sse/sse.go
diff --git a/go/src/sse/sse_test.go b/garnet/go/src/sse/sse_test.go similarity index 100% rename from go/src/sse/sse_test.go rename to garnet/go/src/sse/sse_test.go
diff --git a/go/src/syslog_tests/BUILD.gn b/garnet/go/src/syslog_tests/BUILD.gn similarity index 100% rename from go/src/syslog_tests/BUILD.gn rename to garnet/go/src/syslog_tests/BUILD.gn
diff --git a/go/src/syslog_tests/syslog_test.go b/garnet/go/src/syslog_tests/syslog_test.go similarity index 100% rename from go/src/syslog_tests/syslog_test.go rename to garnet/go/src/syslog_tests/syslog_test.go
diff --git a/go/src/thinfs/BUILD.gn b/garnet/go/src/thinfs/BUILD.gn similarity index 100% rename from go/src/thinfs/BUILD.gn rename to garnet/go/src/thinfs/BUILD.gn
diff --git a/go/src/thinfs/README.md b/garnet/go/src/thinfs/README.md similarity index 100% rename from go/src/thinfs/README.md rename to garnet/go/src/thinfs/README.md
diff --git a/go/src/thinfs/bitmap/bitmap.go b/garnet/go/src/thinfs/bitmap/bitmap.go similarity index 100% rename from go/src/thinfs/bitmap/bitmap.go rename to garnet/go/src/thinfs/bitmap/bitmap.go
diff --git a/go/src/thinfs/bitmap/bitmap_test.go b/garnet/go/src/thinfs/bitmap/bitmap_test.go similarity index 100% rename from go/src/thinfs/bitmap/bitmap_test.go rename to garnet/go/src/thinfs/bitmap/bitmap_test.go
diff --git a/go/src/thinfs/bitops/bitops.go b/garnet/go/src/thinfs/bitops/bitops.go similarity index 100% rename from go/src/thinfs/bitops/bitops.go rename to garnet/go/src/thinfs/bitops/bitops.go
diff --git a/go/src/thinfs/bitops/bitops_386.s b/garnet/go/src/thinfs/bitops/bitops_386.s similarity index 100% rename from go/src/thinfs/bitops/bitops_386.s rename to garnet/go/src/thinfs/bitops/bitops_386.s
diff --git a/go/src/thinfs/bitops/bitops_amd64.s b/garnet/go/src/thinfs/bitops/bitops_amd64.s similarity index 100% rename from go/src/thinfs/bitops/bitops_amd64.s rename to garnet/go/src/thinfs/bitops/bitops_amd64.s
diff --git a/go/src/thinfs/bitops/bitops_amd64p32.s b/garnet/go/src/thinfs/bitops/bitops_amd64p32.s similarity index 100% rename from go/src/thinfs/bitops/bitops_amd64p32.s rename to garnet/go/src/thinfs/bitops/bitops_amd64p32.s
diff --git a/go/src/thinfs/bitops/bitops_arm.s b/garnet/go/src/thinfs/bitops/bitops_arm.s similarity index 100% rename from go/src/thinfs/bitops/bitops_arm.s rename to garnet/go/src/thinfs/bitops/bitops_arm.s
diff --git a/go/src/thinfs/bitops/bitops_arm64.s b/garnet/go/src/thinfs/bitops/bitops_arm64.s similarity index 100% rename from go/src/thinfs/bitops/bitops_arm64.s rename to garnet/go/src/thinfs/bitops/bitops_arm64.s
diff --git a/go/src/thinfs/bitops/bitops_test.go b/garnet/go/src/thinfs/bitops/bitops_test.go similarity index 100% rename from go/src/thinfs/bitops/bitops_test.go rename to garnet/go/src/thinfs/bitops/bitops_test.go
diff --git a/go/src/thinfs/bitops/common_test.go b/garnet/go/src/thinfs/bitops/common_test.go similarity index 100% rename from go/src/thinfs/bitops/common_test.go rename to garnet/go/src/thinfs/bitops/common_test.go
diff --git a/go/src/thinfs/bitops/little_endian.go b/garnet/go/src/thinfs/bitops/little_endian.go similarity index 100% rename from go/src/thinfs/bitops/little_endian.go rename to garnet/go/src/thinfs/bitops/little_endian.go
diff --git a/go/src/thinfs/bitops/little_endian_test.go b/garnet/go/src/thinfs/bitops/little_endian_test.go similarity index 100% rename from go/src/thinfs/bitops/little_endian_test.go rename to garnet/go/src/thinfs/bitops/little_endian_test.go
diff --git a/go/src/thinfs/bitops/two_bit_array.go b/garnet/go/src/thinfs/bitops/two_bit_array.go similarity index 100% rename from go/src/thinfs/bitops/two_bit_array.go rename to garnet/go/src/thinfs/bitops/two_bit_array.go
diff --git a/go/src/thinfs/bitops/two_bit_array_test.go b/garnet/go/src/thinfs/bitops/two_bit_array_test.go similarity index 100% rename from go/src/thinfs/bitops/two_bit_array_test.go rename to garnet/go/src/thinfs/bitops/two_bit_array_test.go
diff --git a/go/src/thinfs/block/blocktest/blocktest.go b/garnet/go/src/thinfs/block/blocktest/blocktest.go similarity index 100% rename from go/src/thinfs/block/blocktest/blocktest.go rename to garnet/go/src/thinfs/block/blocktest/blocktest.go
diff --git a/go/src/thinfs/block/device.go b/garnet/go/src/thinfs/block/device.go similarity index 100% rename from go/src/thinfs/block/device.go rename to garnet/go/src/thinfs/block/device.go
diff --git a/go/src/thinfs/block/fake/device.go b/garnet/go/src/thinfs/block/fake/device.go similarity index 100% rename from go/src/thinfs/block/fake/device.go rename to garnet/go/src/thinfs/block/fake/device.go
diff --git a/go/src/thinfs/block/fake/device_test.go b/garnet/go/src/thinfs/block/fake/device_test.go similarity index 100% rename from go/src/thinfs/block/fake/device_test.go rename to garnet/go/src/thinfs/block/fake/device_test.go
diff --git a/go/src/thinfs/block/file/file.go b/garnet/go/src/thinfs/block/file/file.go similarity index 100% rename from go/src/thinfs/block/file/file.go rename to garnet/go/src/thinfs/block/file/file.go
diff --git a/go/src/thinfs/block/file/file_fuchsia.go b/garnet/go/src/thinfs/block/file/file_fuchsia.go similarity index 100% rename from go/src/thinfs/block/file/file_fuchsia.go rename to garnet/go/src/thinfs/block/file/file_fuchsia.go
diff --git a/go/src/thinfs/block/file/file_linux.go b/garnet/go/src/thinfs/block/file/file_linux.go similarity index 100% rename from go/src/thinfs/block/file/file_linux.go rename to garnet/go/src/thinfs/block/file/file_linux.go
diff --git a/go/src/thinfs/block/file/file_other.go b/garnet/go/src/thinfs/block/file/file_other.go similarity index 100% rename from go/src/thinfs/block/file/file_other.go rename to garnet/go/src/thinfs/block/file/file_other.go
diff --git a/go/src/thinfs/block/file/file_test.go b/garnet/go/src/thinfs/block/file/file_test.go similarity index 100% rename from go/src/thinfs/block/file/file_test.go rename to garnet/go/src/thinfs/block/file/file_test.go
diff --git a/go/src/thinfs/buddy/buddy.go b/garnet/go/src/thinfs/buddy/buddy.go similarity index 100% rename from go/src/thinfs/buddy/buddy.go rename to garnet/go/src/thinfs/buddy/buddy.go
diff --git a/go/src/thinfs/buddy/buddy_test.go b/garnet/go/src/thinfs/buddy/buddy_test.go similarity index 100% rename from go/src/thinfs/buddy/buddy_test.go rename to garnet/go/src/thinfs/buddy/buddy_test.go
diff --git a/go/src/thinfs/cache/arc.go b/garnet/go/src/thinfs/cache/arc.go similarity index 100% rename from go/src/thinfs/cache/arc.go rename to garnet/go/src/thinfs/cache/arc.go
diff --git a/go/src/thinfs/cache/arc_test.go b/garnet/go/src/thinfs/cache/arc_test.go similarity index 100% rename from go/src/thinfs/cache/arc_test.go rename to garnet/go/src/thinfs/cache/arc_test.go
diff --git a/go/src/thinfs/cmd/parttool/README.md b/garnet/go/src/thinfs/cmd/parttool/README.md similarity index 100% rename from go/src/thinfs/cmd/parttool/README.md rename to garnet/go/src/thinfs/cmd/parttool/README.md
diff --git a/go/src/thinfs/cmd/parttool/parttool.go b/garnet/go/src/thinfs/cmd/parttool/parttool.go similarity index 100% rename from go/src/thinfs/cmd/parttool/parttool.go rename to garnet/go/src/thinfs/cmd/parttool/parttool.go
diff --git a/go/src/thinfs/cmd/parttool/parttool_test.go b/garnet/go/src/thinfs/cmd/parttool/parttool_test.go similarity index 100% rename from go/src/thinfs/cmd/parttool/parttool_test.go rename to garnet/go/src/thinfs/cmd/parttool/parttool_test.go
diff --git a/go/src/thinfs/cmd/thinfs/thinfs.go b/garnet/go/src/thinfs/cmd/thinfs/thinfs.go similarity index 100% rename from go/src/thinfs/cmd/thinfs/thinfs.go rename to garnet/go/src/thinfs/cmd/thinfs/thinfs.go
diff --git a/go/src/thinfs/cpointer/cpointer.go b/garnet/go/src/thinfs/cpointer/cpointer.go similarity index 100% rename from go/src/thinfs/cpointer/cpointer.go rename to garnet/go/src/thinfs/cpointer/cpointer.go
diff --git a/go/src/thinfs/cpointer/cpointer_test.go b/garnet/go/src/thinfs/cpointer/cpointer_test.go similarity index 100% rename from go/src/thinfs/cpointer/cpointer_test.go rename to garnet/go/src/thinfs/cpointer/cpointer_test.go
diff --git a/go/src/thinfs/fs/fs.go b/garnet/go/src/thinfs/fs/fs.go similarity index 100% rename from go/src/thinfs/fs/fs.go rename to garnet/go/src/thinfs/fs/fs.go
diff --git a/go/src/thinfs/fs/fs_fuchsia.go b/garnet/go/src/thinfs/fs/fs_fuchsia.go similarity index 100% rename from go/src/thinfs/fs/fs_fuchsia.go rename to garnet/go/src/thinfs/fs/fs_fuchsia.go
diff --git a/go/src/thinfs/fs/fs_other.go b/garnet/go/src/thinfs/fs/fs_other.go similarity index 100% rename from go/src/thinfs/fs/fs_other.go rename to garnet/go/src/thinfs/fs/fs_other.go
diff --git a/go/src/thinfs/fs/msdosfs/README.md b/garnet/go/src/thinfs/fs/msdosfs/README.md similarity index 100% rename from go/src/thinfs/fs/msdosfs/README.md rename to garnet/go/src/thinfs/fs/msdosfs/README.md
diff --git a/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord.go b/garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/bootrecord/bootrecord.go rename to garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord.go
diff --git a/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large.go b/garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large.go rename to garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large.go
diff --git a/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large_test.go b/garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large_test.go rename to garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_large_test.go
diff --git a/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_shared.go b/garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_shared.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_shared.go rename to garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_shared.go
diff --git a/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small.go b/garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small.go rename to garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small.go
diff --git a/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small_test.go b/garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small_test.go rename to garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_small_test.go
diff --git a/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_test.go b/garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_test.go rename to garnet/go/src/thinfs/fs/msdosfs/bootrecord/bootrecord_test.go
diff --git a/go/src/thinfs/fs/msdosfs/clock/clock.go b/garnet/go/src/thinfs/fs/msdosfs/clock/clock.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/clock/clock.go rename to garnet/go/src/thinfs/fs/msdosfs/clock/clock.go
diff --git a/go/src/thinfs/fs/msdosfs/cluster/cluster.go b/garnet/go/src/thinfs/fs/msdosfs/cluster/cluster.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/cluster/cluster.go rename to garnet/go/src/thinfs/fs/msdosfs/cluster/cluster.go
diff --git a/go/src/thinfs/fs/msdosfs/cluster/cluster_test.go b/garnet/go/src/thinfs/fs/msdosfs/cluster/cluster_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/cluster/cluster_test.go rename to garnet/go/src/thinfs/fs/msdosfs/cluster/cluster_test.go
diff --git a/go/src/thinfs/fs/msdosfs/cluster/fat/fat.go b/garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fat.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/cluster/fat/fat.go rename to garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fat.go
diff --git a/go/src/thinfs/fs/msdosfs/cluster/fat/fat_test.go b/garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fat_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/cluster/fat/fat_test.go rename to garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fat_test.go
diff --git a/go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo.go b/garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo.go rename to garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo.go
diff --git a/go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo_test.go b/garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo_test.go rename to garnet/go/src/thinfs/fs/msdosfs/cluster/fat/fsinfo/fsinfo_test.go
diff --git a/go/src/thinfs/fs/msdosfs/directory.go b/garnet/go/src/thinfs/fs/msdosfs/directory.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/directory.go rename to garnet/go/src/thinfs/fs/msdosfs/directory.go
diff --git a/go/src/thinfs/fs/msdosfs/direntry/dirent.go b/garnet/go/src/thinfs/fs/msdosfs/direntry/dirent.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/direntry/dirent.go rename to garnet/go/src/thinfs/fs/msdosfs/direntry/dirent.go
diff --git a/go/src/thinfs/fs/msdosfs/direntry/dirent_test.go b/garnet/go/src/thinfs/fs/msdosfs/direntry/dirent_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/direntry/dirent_test.go rename to garnet/go/src/thinfs/fs/msdosfs/direntry/dirent_test.go
diff --git a/go/src/thinfs/fs/msdosfs/direntry/direntry_long.go b/garnet/go/src/thinfs/fs/msdosfs/direntry/direntry_long.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/direntry/direntry_long.go rename to garnet/go/src/thinfs/fs/msdosfs/direntry/direntry_long.go
diff --git a/go/src/thinfs/fs/msdosfs/direntry/direntry_short.go b/garnet/go/src/thinfs/fs/msdosfs/direntry/direntry_short.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/direntry/direntry_short.go rename to garnet/go/src/thinfs/fs/msdosfs/direntry/direntry_short.go
diff --git a/go/src/thinfs/fs/msdosfs/direntry/filename_conversion.go b/garnet/go/src/thinfs/fs/msdosfs/direntry/filename_conversion.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/direntry/filename_conversion.go rename to garnet/go/src/thinfs/fs/msdosfs/direntry/filename_conversion.go
diff --git a/go/src/thinfs/fs/msdosfs/direntry/filename_conversion_test.go b/garnet/go/src/thinfs/fs/msdosfs/direntry/filename_conversion_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/direntry/filename_conversion_test.go rename to garnet/go/src/thinfs/fs/msdosfs/direntry/filename_conversion_test.go
diff --git a/go/src/thinfs/fs/msdosfs/file.go b/garnet/go/src/thinfs/fs/msdosfs/file.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/file.go rename to garnet/go/src/thinfs/fs/msdosfs/file.go
diff --git a/go/src/thinfs/fs/msdosfs/fs.go b/garnet/go/src/thinfs/fs/msdosfs/fs.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/fs.go rename to garnet/go/src/thinfs/fs/msdosfs/fs.go
diff --git a/go/src/thinfs/fs/msdosfs/msdosfs_helper_test.go b/garnet/go/src/thinfs/fs/msdosfs/msdosfs_helper_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/msdosfs_helper_test.go rename to garnet/go/src/thinfs/fs/msdosfs/msdosfs_helper_test.go
diff --git a/go/src/thinfs/fs/msdosfs/msdosfs_test.go b/garnet/go/src/thinfs/fs/msdosfs/msdosfs_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/msdosfs_test.go rename to garnet/go/src/thinfs/fs/msdosfs/msdosfs_test.go
diff --git a/go/src/thinfs/fs/msdosfs/node/dcache.go b/garnet/go/src/thinfs/fs/msdosfs/node/dcache.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/dcache.go rename to garnet/go/src/thinfs/fs/msdosfs/node/dcache.go
diff --git a/go/src/thinfs/fs/msdosfs/node/dcache_test.go b/garnet/go/src/thinfs/fs/msdosfs/node/dcache_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/dcache_test.go rename to garnet/go/src/thinfs/fs/msdosfs/node/dcache_test.go
diff --git a/go/src/thinfs/fs/msdosfs/node/directory.go b/garnet/go/src/thinfs/fs/msdosfs/node/directory.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/directory.go rename to garnet/go/src/thinfs/fs/msdosfs/node/directory.go
diff --git a/go/src/thinfs/fs/msdosfs/node/directory_test.go b/garnet/go/src/thinfs/fs/msdosfs/node/directory_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/directory_test.go rename to garnet/go/src/thinfs/fs/msdosfs/node/directory_test.go
diff --git a/go/src/thinfs/fs/msdosfs/node/metadata.go b/garnet/go/src/thinfs/fs/msdosfs/node/metadata.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/metadata.go rename to garnet/go/src/thinfs/fs/msdosfs/node/metadata.go
diff --git a/go/src/thinfs/fs/msdosfs/node/node.go b/garnet/go/src/thinfs/fs/msdosfs/node/node.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/node.go rename to garnet/go/src/thinfs/fs/msdosfs/node/node.go
diff --git a/go/src/thinfs/fs/msdosfs/node/node_interface.go b/garnet/go/src/thinfs/fs/msdosfs/node/node_interface.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/node_interface.go rename to garnet/go/src/thinfs/fs/msdosfs/node/node_interface.go
diff --git a/go/src/thinfs/fs/msdosfs/node/node_test.go b/garnet/go/src/thinfs/fs/msdosfs/node/node_test.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/node_test.go rename to garnet/go/src/thinfs/fs/msdosfs/node/node_test.go
diff --git a/go/src/thinfs/fs/msdosfs/node/root16.go b/garnet/go/src/thinfs/fs/msdosfs/node/root16.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/node/root16.go rename to garnet/go/src/thinfs/fs/msdosfs/node/root16.go
diff --git a/go/src/thinfs/fs/msdosfs/ops.go b/garnet/go/src/thinfs/fs/msdosfs/ops.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/ops.go rename to garnet/go/src/thinfs/fs/msdosfs/ops.go
diff --git a/go/src/thinfs/fs/msdosfs/path.go b/garnet/go/src/thinfs/fs/msdosfs/path.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/path.go rename to garnet/go/src/thinfs/fs/msdosfs/path.go
diff --git a/go/src/thinfs/fs/msdosfs/testutil/mkfs.go b/garnet/go/src/thinfs/fs/msdosfs/testutil/mkfs.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/testutil/mkfs.go rename to garnet/go/src/thinfs/fs/msdosfs/testutil/mkfs.go
diff --git a/go/src/thinfs/fs/msdosfs/testutil/random.go b/garnet/go/src/thinfs/fs/msdosfs/testutil/random.go similarity index 100% rename from go/src/thinfs/fs/msdosfs/testutil/random.go rename to garnet/go/src/thinfs/fs/msdosfs/testutil/random.go
diff --git a/go/src/thinfs/gpt/gpt.go b/garnet/go/src/thinfs/gpt/gpt.go similarity index 100% rename from go/src/thinfs/gpt/gpt.go rename to garnet/go/src/thinfs/gpt/gpt.go
diff --git a/go/src/thinfs/gpt/gpt_darwin.go b/garnet/go/src/thinfs/gpt/gpt_darwin.go similarity index 100% rename from go/src/thinfs/gpt/gpt_darwin.go rename to garnet/go/src/thinfs/gpt/gpt_darwin.go
diff --git a/go/src/thinfs/gpt/gpt_fuchsia.go b/garnet/go/src/thinfs/gpt/gpt_fuchsia.go similarity index 100% rename from go/src/thinfs/gpt/gpt_fuchsia.go rename to garnet/go/src/thinfs/gpt/gpt_fuchsia.go
diff --git a/go/src/thinfs/gpt/gpt_linux.go b/garnet/go/src/thinfs/gpt/gpt_linux.go similarity index 100% rename from go/src/thinfs/gpt/gpt_linux.go rename to garnet/go/src/thinfs/gpt/gpt_linux.go
diff --git a/go/src/thinfs/gpt/gpt_test.go b/garnet/go/src/thinfs/gpt/gpt_test.go similarity index 100% rename from go/src/thinfs/gpt/gpt_test.go rename to garnet/go/src/thinfs/gpt/gpt_test.go
diff --git a/go/src/thinfs/gpt/gpt_unix.go b/garnet/go/src/thinfs/gpt/gpt_unix.go similarity index 100% rename from go/src/thinfs/gpt/gpt_unix.go rename to garnet/go/src/thinfs/gpt/gpt_unix.go
diff --git a/go/src/thinfs/mbr/mbr.go b/garnet/go/src/thinfs/mbr/mbr.go similarity index 100% rename from go/src/thinfs/mbr/mbr.go rename to garnet/go/src/thinfs/mbr/mbr.go
diff --git a/go/src/thinfs/mbr/mbr_test.go b/garnet/go/src/thinfs/mbr/mbr_test.go similarity index 100% rename from go/src/thinfs/mbr/mbr_test.go rename to garnet/go/src/thinfs/mbr/mbr_test.go
diff --git a/go/src/thinfs/mbr/ostype_string.go b/garnet/go/src/thinfs/mbr/ostype_string.go similarity index 100% rename from go/src/thinfs/mbr/ostype_string.go rename to garnet/go/src/thinfs/mbr/ostype_string.go
diff --git a/go/src/thinfs/mbr/signature_string.go b/garnet/go/src/thinfs/mbr/signature_string.go similarity index 100% rename from go/src/thinfs/mbr/signature_string.go rename to garnet/go/src/thinfs/mbr/signature_string.go
diff --git a/go/src/thinfs/thinio/conductor.go b/garnet/go/src/thinfs/thinio/conductor.go similarity index 100% rename from go/src/thinfs/thinio/conductor.go rename to garnet/go/src/thinfs/thinio/conductor.go
diff --git a/go/src/thinfs/thinio/conductor_test.go b/garnet/go/src/thinfs/thinio/conductor_test.go similarity index 100% rename from go/src/thinfs/thinio/conductor_test.go rename to garnet/go/src/thinfs/thinio/conductor_test.go
diff --git a/go/src/thinfs/vendor/.gitignore b/garnet/go/src/thinfs/vendor/.gitignore similarity index 100% rename from go/src/thinfs/vendor/.gitignore rename to garnet/go/src/thinfs/vendor/.gitignore
diff --git a/go/src/thinfs/zircon/rpc/rpc.go b/garnet/go/src/thinfs/zircon/rpc/rpc.go similarity index 100% rename from go/src/thinfs/zircon/rpc/rpc.go rename to garnet/go/src/thinfs/zircon/rpc/rpc.go
diff --git a/go/src/trace_to_csv_playback/README.md b/garnet/go/src/trace_to_csv_playback/README.md similarity index 100% rename from go/src/trace_to_csv_playback/README.md rename to garnet/go/src/trace_to_csv_playback/README.md
diff --git a/go/src/trace_to_csv_playback/driver-trace-parsing.go b/garnet/go/src/trace_to_csv_playback/driver-trace-parsing.go similarity index 100% rename from go/src/trace_to_csv_playback/driver-trace-parsing.go rename to garnet/go/src/trace_to_csv_playback/driver-trace-parsing.go
diff --git a/go/src/wlan/BUILD.gn b/garnet/go/src/wlan/BUILD.gn similarity index 100% rename from go/src/wlan/BUILD.gn rename to garnet/go/src/wlan/BUILD.gn
diff --git a/go/src/wlan/wlantool/wlantool.go b/garnet/go/src/wlan/wlantool/wlantool.go similarity index 100% rename from go/src/wlan/wlantool/wlantool.go rename to garnet/go/src/wlan/wlantool/wlantool.go
diff --git a/lib/BUILD.gn b/garnet/lib/BUILD.gn similarity index 100% rename from lib/BUILD.gn rename to garnet/lib/BUILD.gn
diff --git a/lib/MAINTAINERS b/garnet/lib/MAINTAINERS similarity index 100% rename from lib/MAINTAINERS rename to garnet/lib/MAINTAINERS
diff --git a/lib/auth/BUILD.gn b/garnet/lib/auth/BUILD.gn similarity index 100% rename from lib/auth/BUILD.gn rename to garnet/lib/auth/BUILD.gn
diff --git a/lib/auth/MAINTAINERS b/garnet/lib/auth/MAINTAINERS similarity index 100% rename from lib/auth/MAINTAINERS rename to garnet/lib/auth/MAINTAINERS
diff --git a/lib/auth/README.md b/garnet/lib/auth/README.md similarity index 100% rename from lib/auth/README.md rename to garnet/lib/auth/README.md
diff --git a/lib/auth/account_common/BUILD.gn b/garnet/lib/auth/account_common/BUILD.gn similarity index 100% rename from lib/auth/account_common/BUILD.gn rename to garnet/lib/auth/account_common/BUILD.gn
diff --git a/lib/auth/account_common/README.md b/garnet/lib/auth/account_common/README.md similarity index 100% rename from lib/auth/account_common/README.md rename to garnet/lib/auth/account_common/README.md
diff --git a/lib/auth/account_common/src/error.rs b/garnet/lib/auth/account_common/src/error.rs similarity index 100% rename from lib/auth/account_common/src/error.rs rename to garnet/lib/auth/account_common/src/error.rs
diff --git a/lib/auth/account_common/src/identifiers.rs b/garnet/lib/auth/account_common/src/identifiers.rs similarity index 100% rename from lib/auth/account_common/src/identifiers.rs rename to garnet/lib/auth/account_common/src/identifiers.rs
diff --git a/lib/auth/account_common/src/lib.rs b/garnet/lib/auth/account_common/src/lib.rs similarity index 100% rename from lib/auth/account_common/src/lib.rs rename to garnet/lib/auth/account_common/src/lib.rs
diff --git a/lib/auth/cache/BUILD.gn b/garnet/lib/auth/cache/BUILD.gn similarity index 100% rename from lib/auth/cache/BUILD.gn rename to garnet/lib/auth/cache/BUILD.gn
diff --git a/lib/auth/cache/README.md b/garnet/lib/auth/cache/README.md similarity index 100% rename from lib/auth/cache/README.md rename to garnet/lib/auth/cache/README.md
diff --git a/lib/auth/cache/src/lib.rs b/garnet/lib/auth/cache/src/lib.rs similarity index 100% rename from lib/auth/cache/src/lib.rs rename to garnet/lib/auth/cache/src/lib.rs
diff --git a/lib/auth/fidl/BUILD.gn b/garnet/lib/auth/fidl/BUILD.gn similarity index 100% rename from lib/auth/fidl/BUILD.gn rename to garnet/lib/auth/fidl/BUILD.gn
diff --git a/lib/auth/fidl/account_handler.fidl b/garnet/lib/auth/fidl/account_handler.fidl similarity index 100% rename from lib/auth/fidl/account_handler.fidl rename to garnet/lib/auth/fidl/account_handler.fidl
diff --git a/lib/auth/store/BUILD.gn b/garnet/lib/auth/store/BUILD.gn similarity index 100% rename from lib/auth/store/BUILD.gn rename to garnet/lib/auth/store/BUILD.gn
diff --git a/lib/auth/store/README.md b/garnet/lib/auth/store/README.md similarity index 100% rename from lib/auth/store/README.md rename to garnet/lib/auth/store/README.md
diff --git a/lib/auth/store/src/file.rs b/garnet/lib/auth/store/src/file.rs similarity index 100% rename from lib/auth/store/src/file.rs rename to garnet/lib/auth/store/src/file.rs
diff --git a/lib/auth/store/src/lib.rs b/garnet/lib/auth/store/src/lib.rs similarity index 100% rename from lib/auth/store/src/lib.rs rename to garnet/lib/auth/store/src/lib.rs
diff --git a/lib/auth/store/src/macros.rs b/garnet/lib/auth/store/src/macros.rs similarity index 100% rename from lib/auth/store/src/macros.rs rename to garnet/lib/auth/store/src/macros.rs
diff --git a/lib/auth/store/src/serializer.rs b/garnet/lib/auth/store/src/serializer.rs similarity index 100% rename from lib/auth/store/src/serializer.rs rename to garnet/lib/auth/store/src/serializer.rs
diff --git a/lib/auth/token_manager/BUILD.gn b/garnet/lib/auth/token_manager/BUILD.gn similarity index 100% rename from lib/auth/token_manager/BUILD.gn rename to garnet/lib/auth/token_manager/BUILD.gn
diff --git a/lib/auth/token_manager/README.md b/garnet/lib/auth/token_manager/README.md similarity index 100% rename from lib/auth/token_manager/README.md rename to garnet/lib/auth/token_manager/README.md
diff --git a/lib/auth/token_manager/src/auth_provider_connection.rs b/garnet/lib/auth/token_manager/src/auth_provider_connection.rs similarity index 100% rename from lib/auth/token_manager/src/auth_provider_connection.rs rename to garnet/lib/auth/token_manager/src/auth_provider_connection.rs
diff --git a/lib/auth/token_manager/src/error.rs b/garnet/lib/auth/token_manager/src/error.rs similarity index 100% rename from lib/auth/token_manager/src/error.rs rename to garnet/lib/auth/token_manager/src/error.rs
diff --git a/lib/auth/token_manager/src/lib.rs b/garnet/lib/auth/token_manager/src/lib.rs similarity index 100% rename from lib/auth/token_manager/src/lib.rs rename to garnet/lib/auth/token_manager/src/lib.rs
diff --git a/lib/auth/token_manager/src/token_manager.rs b/garnet/lib/auth/token_manager/src/token_manager.rs similarity index 100% rename from lib/auth/token_manager/src/token_manager.rs rename to garnet/lib/auth/token_manager/src/token_manager.rs
diff --git a/lib/bluetooth/MAINTAINERS b/garnet/lib/bluetooth/MAINTAINERS similarity index 100% rename from lib/bluetooth/MAINTAINERS rename to garnet/lib/bluetooth/MAINTAINERS
diff --git a/lib/bluetooth/README.md b/garnet/lib/bluetooth/README.md similarity index 100% rename from lib/bluetooth/README.md rename to garnet/lib/bluetooth/README.md
diff --git a/lib/bluetooth/c/BUILD.gn b/garnet/lib/bluetooth/c/BUILD.gn similarity index 100% rename from lib/bluetooth/c/BUILD.gn rename to garnet/lib/bluetooth/c/BUILD.gn
diff --git a/lib/bluetooth/c/bt_host.h b/garnet/lib/bluetooth/c/bt_host.h similarity index 100% rename from lib/bluetooth/c/bt_host.h rename to garnet/lib/bluetooth/c/bt_host.h
diff --git a/lib/bluetooth/fidl/BUILD.gn b/garnet/lib/bluetooth/fidl/BUILD.gn similarity index 100% rename from lib/bluetooth/fidl/BUILD.gn rename to garnet/lib/bluetooth/fidl/BUILD.gn
diff --git a/lib/bluetooth/fidl/bonding.fidl b/garnet/lib/bluetooth/fidl/bonding.fidl similarity index 100% rename from lib/bluetooth/fidl/bonding.fidl rename to garnet/lib/bluetooth/fidl/bonding.fidl
diff --git a/lib/bluetooth/fidl/host.fidl b/garnet/lib/bluetooth/fidl/host.fidl similarity index 100% rename from lib/bluetooth/fidl/host.fidl rename to garnet/lib/bluetooth/fidl/host.fidl
diff --git a/lib/chrealm/BUILD.gn b/garnet/lib/chrealm/BUILD.gn similarity index 100% rename from lib/chrealm/BUILD.gn rename to garnet/lib/chrealm/BUILD.gn
diff --git a/lib/chrealm/chrealm.cc b/garnet/lib/chrealm/chrealm.cc similarity index 100% rename from lib/chrealm/chrealm.cc rename to garnet/lib/chrealm/chrealm.cc
diff --git a/lib/chrealm/chrealm.h b/garnet/lib/chrealm/chrealm.h similarity index 100% rename from lib/chrealm/chrealm.h rename to garnet/lib/chrealm/chrealm.h
diff --git a/lib/cmx/BUILD.gn b/garnet/lib/cmx/BUILD.gn similarity index 100% rename from lib/cmx/BUILD.gn rename to garnet/lib/cmx/BUILD.gn
diff --git a/lib/cmx/cmx.cc b/garnet/lib/cmx/cmx.cc similarity index 100% rename from lib/cmx/cmx.cc rename to garnet/lib/cmx/cmx.cc
diff --git a/lib/cmx/cmx.h b/garnet/lib/cmx/cmx.h similarity index 100% rename from lib/cmx/cmx.h rename to garnet/lib/cmx/cmx.h
diff --git a/lib/cmx/cmx_unittest.cc b/garnet/lib/cmx/cmx_unittest.cc similarity index 100% rename from lib/cmx/cmx_unittest.cc rename to garnet/lib/cmx/cmx_unittest.cc
diff --git a/lib/cmx/program.cc b/garnet/lib/cmx/program.cc similarity index 100% rename from lib/cmx/program.cc rename to garnet/lib/cmx/program.cc
diff --git a/lib/cmx/program.h b/garnet/lib/cmx/program.h similarity index 100% rename from lib/cmx/program.h rename to garnet/lib/cmx/program.h
diff --git a/lib/cmx/program_unittest.cc b/garnet/lib/cmx/program_unittest.cc similarity index 100% rename from lib/cmx/program_unittest.cc rename to garnet/lib/cmx/program_unittest.cc
diff --git a/lib/cmx/runtime.cc b/garnet/lib/cmx/runtime.cc similarity index 100% rename from lib/cmx/runtime.cc rename to garnet/lib/cmx/runtime.cc
diff --git a/lib/cmx/runtime.h b/garnet/lib/cmx/runtime.h similarity index 100% rename from lib/cmx/runtime.h rename to garnet/lib/cmx/runtime.h
diff --git a/lib/cmx/runtime_unittest.cc b/garnet/lib/cmx/runtime_unittest.cc similarity index 100% rename from lib/cmx/runtime_unittest.cc rename to garnet/lib/cmx/runtime_unittest.cc
diff --git a/lib/cmx/sandbox.cc b/garnet/lib/cmx/sandbox.cc similarity index 100% rename from lib/cmx/sandbox.cc rename to garnet/lib/cmx/sandbox.cc
diff --git a/lib/cmx/sandbox.h b/garnet/lib/cmx/sandbox.h similarity index 100% rename from lib/cmx/sandbox.h rename to garnet/lib/cmx/sandbox.h
diff --git a/lib/cmx/sandbox_unittest.cc b/garnet/lib/cmx/sandbox_unittest.cc similarity index 100% rename from lib/cmx/sandbox_unittest.cc rename to garnet/lib/cmx/sandbox_unittest.cc
diff --git a/lib/cpuperf/BUILD.gn b/garnet/lib/cpuperf/BUILD.gn similarity index 100% rename from lib/cpuperf/BUILD.gn rename to garnet/lib/cpuperf/BUILD.gn
diff --git a/lib/cpuperf/MAINTAINERS b/garnet/lib/cpuperf/MAINTAINERS similarity index 100% rename from lib/cpuperf/MAINTAINERS rename to garnet/lib/cpuperf/MAINTAINERS
diff --git a/lib/cpuperf/buffer_reader.cc b/garnet/lib/cpuperf/buffer_reader.cc similarity index 100% rename from lib/cpuperf/buffer_reader.cc rename to garnet/lib/cpuperf/buffer_reader.cc
diff --git a/lib/cpuperf/buffer_reader.h b/garnet/lib/cpuperf/buffer_reader.h similarity index 100% rename from lib/cpuperf/buffer_reader.h rename to garnet/lib/cpuperf/buffer_reader.h
diff --git a/lib/cpuperf/controller.cc b/garnet/lib/cpuperf/controller.cc similarity index 100% rename from lib/cpuperf/controller.cc rename to garnet/lib/cpuperf/controller.cc
diff --git a/lib/cpuperf/controller.h b/garnet/lib/cpuperf/controller.h similarity index 100% rename from lib/cpuperf/controller.h rename to garnet/lib/cpuperf/controller.h
diff --git a/lib/cpuperf/device_reader.cc b/garnet/lib/cpuperf/device_reader.cc similarity index 100% rename from lib/cpuperf/device_reader.cc rename to garnet/lib/cpuperf/device_reader.cc
diff --git a/lib/cpuperf/device_reader.h b/garnet/lib/cpuperf/device_reader.h similarity index 100% rename from lib/cpuperf/device_reader.h rename to garnet/lib/cpuperf/device_reader.h
diff --git a/lib/cpuperf/events.cc b/garnet/lib/cpuperf/events.cc similarity index 100% rename from lib/cpuperf/events.cc rename to garnet/lib/cpuperf/events.cc
diff --git a/lib/cpuperf/events.h b/garnet/lib/cpuperf/events.h similarity index 100% rename from lib/cpuperf/events.h rename to garnet/lib/cpuperf/events.h
diff --git a/lib/cpuperf/file_reader.cc b/garnet/lib/cpuperf/file_reader.cc similarity index 100% rename from lib/cpuperf/file_reader.cc rename to garnet/lib/cpuperf/file_reader.cc
diff --git a/lib/cpuperf/file_reader.h b/garnet/lib/cpuperf/file_reader.h similarity index 100% rename from lib/cpuperf/file_reader.h rename to garnet/lib/cpuperf/file_reader.h
diff --git a/lib/cpuperf/reader.cc b/garnet/lib/cpuperf/reader.cc similarity index 100% rename from lib/cpuperf/reader.cc rename to garnet/lib/cpuperf/reader.cc
diff --git a/lib/cpuperf/reader.h b/garnet/lib/cpuperf/reader.h similarity index 100% rename from lib/cpuperf/reader.h rename to garnet/lib/cpuperf/reader.h
diff --git a/lib/cpuperf/records.cc b/garnet/lib/cpuperf/records.cc similarity index 100% rename from lib/cpuperf/records.cc rename to garnet/lib/cpuperf/records.cc
diff --git a/lib/cpuperf/records.h b/garnet/lib/cpuperf/records.h similarity index 100% rename from lib/cpuperf/records.h rename to garnet/lib/cpuperf/records.h
diff --git a/lib/cpuperf/types.cc b/garnet/lib/cpuperf/types.cc similarity index 100% rename from lib/cpuperf/types.cc rename to garnet/lib/cpuperf/types.cc
diff --git a/lib/cpuperf/types.h b/garnet/lib/cpuperf/types.h similarity index 100% rename from lib/cpuperf/types.h rename to garnet/lib/cpuperf/types.h
diff --git a/lib/cpuperf/writer.h b/garnet/lib/cpuperf/writer.h similarity index 100% rename from lib/cpuperf/writer.h rename to garnet/lib/cpuperf/writer.h
diff --git a/lib/debug_ipc/BUILD.gn b/garnet/lib/debug_ipc/BUILD.gn similarity index 100% rename from lib/debug_ipc/BUILD.gn rename to garnet/lib/debug_ipc/BUILD.gn
diff --git a/lib/debug_ipc/README.md b/garnet/lib/debug_ipc/README.md similarity index 100% rename from lib/debug_ipc/README.md rename to garnet/lib/debug_ipc/README.md
diff --git a/lib/debug_ipc/agent_protocol.cc b/garnet/lib/debug_ipc/agent_protocol.cc similarity index 100% rename from lib/debug_ipc/agent_protocol.cc rename to garnet/lib/debug_ipc/agent_protocol.cc
diff --git a/lib/debug_ipc/agent_protocol.h b/garnet/lib/debug_ipc/agent_protocol.h similarity index 100% rename from lib/debug_ipc/agent_protocol.h rename to garnet/lib/debug_ipc/agent_protocol.h
diff --git a/lib/debug_ipc/client_protocol.cc b/garnet/lib/debug_ipc/client_protocol.cc similarity index 100% rename from lib/debug_ipc/client_protocol.cc rename to garnet/lib/debug_ipc/client_protocol.cc
diff --git a/lib/debug_ipc/client_protocol.h b/garnet/lib/debug_ipc/client_protocol.h similarity index 100% rename from lib/debug_ipc/client_protocol.h rename to garnet/lib/debug_ipc/client_protocol.h
diff --git a/lib/debug_ipc/helper/BUILD.gn b/garnet/lib/debug_ipc/helper/BUILD.gn similarity index 100% rename from lib/debug_ipc/helper/BUILD.gn rename to garnet/lib/debug_ipc/helper/BUILD.gn
diff --git a/lib/debug_ipc/helper/arch_arm64.h b/garnet/lib/debug_ipc/helper/arch_arm64.h similarity index 100% rename from lib/debug_ipc/helper/arch_arm64.h rename to garnet/lib/debug_ipc/helper/arch_arm64.h
diff --git a/lib/debug_ipc/helper/arch_x86.h b/garnet/lib/debug_ipc/helper/arch_x86.h similarity index 100% rename from lib/debug_ipc/helper/arch_x86.h rename to garnet/lib/debug_ipc/helper/arch_x86.h
diff --git a/lib/debug_ipc/helper/buffered_fd.cc b/garnet/lib/debug_ipc/helper/buffered_fd.cc similarity index 100% rename from lib/debug_ipc/helper/buffered_fd.cc rename to garnet/lib/debug_ipc/helper/buffered_fd.cc
diff --git a/lib/debug_ipc/helper/buffered_fd.h b/garnet/lib/debug_ipc/helper/buffered_fd.h similarity index 100% rename from lib/debug_ipc/helper/buffered_fd.h rename to garnet/lib/debug_ipc/helper/buffered_fd.h
diff --git a/lib/debug_ipc/helper/buffered_zx_socket.cc b/garnet/lib/debug_ipc/helper/buffered_zx_socket.cc similarity index 100% rename from lib/debug_ipc/helper/buffered_zx_socket.cc rename to garnet/lib/debug_ipc/helper/buffered_zx_socket.cc
diff --git a/lib/debug_ipc/helper/buffered_zx_socket.h b/garnet/lib/debug_ipc/helper/buffered_zx_socket.h similarity index 100% rename from lib/debug_ipc/helper/buffered_zx_socket.h rename to garnet/lib/debug_ipc/helper/buffered_zx_socket.h
diff --git a/lib/debug_ipc/helper/elf.cc b/garnet/lib/debug_ipc/helper/elf.cc similarity index 100% rename from lib/debug_ipc/helper/elf.cc rename to garnet/lib/debug_ipc/helper/elf.cc
diff --git a/lib/debug_ipc/helper/elf.h b/garnet/lib/debug_ipc/helper/elf.h similarity index 100% rename from lib/debug_ipc/helper/elf.h rename to garnet/lib/debug_ipc/helper/elf.h
diff --git a/lib/debug_ipc/helper/elf_unittest.cc b/garnet/lib/debug_ipc/helper/elf_unittest.cc similarity index 100% rename from lib/debug_ipc/helper/elf_unittest.cc rename to garnet/lib/debug_ipc/helper/elf_unittest.cc
diff --git a/lib/debug_ipc/helper/fd_watcher.h b/garnet/lib/debug_ipc/helper/fd_watcher.h similarity index 100% rename from lib/debug_ipc/helper/fd_watcher.h rename to garnet/lib/debug_ipc/helper/fd_watcher.h
diff --git a/lib/debug_ipc/helper/file_line_function.cc b/garnet/lib/debug_ipc/helper/file_line_function.cc similarity index 100% rename from lib/debug_ipc/helper/file_line_function.cc rename to garnet/lib/debug_ipc/helper/file_line_function.cc
diff --git a/lib/debug_ipc/helper/file_line_function.h b/garnet/lib/debug_ipc/helper/file_line_function.h similarity index 100% rename from lib/debug_ipc/helper/file_line_function.h rename to garnet/lib/debug_ipc/helper/file_line_function.h
diff --git a/lib/debug_ipc/helper/message_loop.cc b/garnet/lib/debug_ipc/helper/message_loop.cc similarity index 100% rename from lib/debug_ipc/helper/message_loop.cc rename to garnet/lib/debug_ipc/helper/message_loop.cc
diff --git a/lib/debug_ipc/helper/message_loop.h b/garnet/lib/debug_ipc/helper/message_loop.h similarity index 100% rename from lib/debug_ipc/helper/message_loop.h rename to garnet/lib/debug_ipc/helper/message_loop.h
diff --git a/lib/debug_ipc/helper/message_loop_poll.cc b/garnet/lib/debug_ipc/helper/message_loop_poll.cc similarity index 100% rename from lib/debug_ipc/helper/message_loop_poll.cc rename to garnet/lib/debug_ipc/helper/message_loop_poll.cc
diff --git a/lib/debug_ipc/helper/message_loop_poll.h b/garnet/lib/debug_ipc/helper/message_loop_poll.h similarity index 100% rename from lib/debug_ipc/helper/message_loop_poll.h rename to garnet/lib/debug_ipc/helper/message_loop_poll.h
diff --git a/lib/debug_ipc/helper/message_loop_unittest.cc b/garnet/lib/debug_ipc/helper/message_loop_unittest.cc similarity index 100% rename from lib/debug_ipc/helper/message_loop_unittest.cc rename to garnet/lib/debug_ipc/helper/message_loop_unittest.cc
diff --git a/lib/debug_ipc/helper/message_loop_zircon.cc b/garnet/lib/debug_ipc/helper/message_loop_zircon.cc similarity index 100% rename from lib/debug_ipc/helper/message_loop_zircon.cc rename to garnet/lib/debug_ipc/helper/message_loop_zircon.cc
diff --git a/lib/debug_ipc/helper/message_loop_zircon.h b/garnet/lib/debug_ipc/helper/message_loop_zircon.h similarity index 100% rename from lib/debug_ipc/helper/message_loop_zircon.h rename to garnet/lib/debug_ipc/helper/message_loop_zircon.h
diff --git a/lib/debug_ipc/helper/platform_message_loop.h b/garnet/lib/debug_ipc/helper/platform_message_loop.h similarity index 100% rename from lib/debug_ipc/helper/platform_message_loop.h rename to garnet/lib/debug_ipc/helper/platform_message_loop.h
diff --git a/lib/debug_ipc/helper/socket_watcher.h b/garnet/lib/debug_ipc/helper/socket_watcher.h similarity index 100% rename from lib/debug_ipc/helper/socket_watcher.h rename to garnet/lib/debug_ipc/helper/socket_watcher.h
diff --git a/lib/debug_ipc/helper/stream_buffer.cc b/garnet/lib/debug_ipc/helper/stream_buffer.cc similarity index 100% rename from lib/debug_ipc/helper/stream_buffer.cc rename to garnet/lib/debug_ipc/helper/stream_buffer.cc
diff --git a/lib/debug_ipc/helper/stream_buffer.h b/garnet/lib/debug_ipc/helper/stream_buffer.h similarity index 100% rename from lib/debug_ipc/helper/stream_buffer.h rename to garnet/lib/debug_ipc/helper/stream_buffer.h
diff --git a/lib/debug_ipc/helper/stream_buffer_unittest.cc b/garnet/lib/debug_ipc/helper/stream_buffer_unittest.cc similarity index 100% rename from lib/debug_ipc/helper/stream_buffer_unittest.cc rename to garnet/lib/debug_ipc/helper/stream_buffer_unittest.cc
diff --git a/lib/debug_ipc/helper/test_stream_buffer.cc b/garnet/lib/debug_ipc/helper/test_stream_buffer.cc similarity index 100% rename from lib/debug_ipc/helper/test_stream_buffer.cc rename to garnet/lib/debug_ipc/helper/test_stream_buffer.cc
diff --git a/lib/debug_ipc/helper/test_stream_buffer.h b/garnet/lib/debug_ipc/helper/test_stream_buffer.h similarity index 100% rename from lib/debug_ipc/helper/test_stream_buffer.h rename to garnet/lib/debug_ipc/helper/test_stream_buffer.h
diff --git a/lib/debug_ipc/helper/testdata/small_test_file.elf b/garnet/lib/debug_ipc/helper/testdata/small_test_file.elf similarity index 100% rename from lib/debug_ipc/helper/testdata/small_test_file.elf rename to garnet/lib/debug_ipc/helper/testdata/small_test_file.elf Binary files differ
diff --git a/lib/debug_ipc/helper/zircon_exception_watcher.h b/garnet/lib/debug_ipc/helper/zircon_exception_watcher.h similarity index 100% rename from lib/debug_ipc/helper/zircon_exception_watcher.h rename to garnet/lib/debug_ipc/helper/zircon_exception_watcher.h
diff --git a/lib/debug_ipc/helper/zx_status.cc b/garnet/lib/debug_ipc/helper/zx_status.cc similarity index 100% rename from lib/debug_ipc/helper/zx_status.cc rename to garnet/lib/debug_ipc/helper/zx_status.cc
diff --git a/lib/debug_ipc/helper/zx_status.h b/garnet/lib/debug_ipc/helper/zx_status.h similarity index 100% rename from lib/debug_ipc/helper/zx_status.h rename to garnet/lib/debug_ipc/helper/zx_status.h
diff --git a/lib/debug_ipc/helper/zx_status_definitions.h b/garnet/lib/debug_ipc/helper/zx_status_definitions.h similarity index 100% rename from lib/debug_ipc/helper/zx_status_definitions.h rename to garnet/lib/debug_ipc/helper/zx_status_definitions.h
diff --git a/lib/debug_ipc/message_reader.cc b/garnet/lib/debug_ipc/message_reader.cc similarity index 100% rename from lib/debug_ipc/message_reader.cc rename to garnet/lib/debug_ipc/message_reader.cc
diff --git a/lib/debug_ipc/message_reader.h b/garnet/lib/debug_ipc/message_reader.h similarity index 100% rename from lib/debug_ipc/message_reader.h rename to garnet/lib/debug_ipc/message_reader.h
diff --git a/lib/debug_ipc/message_unittests.cc b/garnet/lib/debug_ipc/message_unittests.cc similarity index 100% rename from lib/debug_ipc/message_unittests.cc rename to garnet/lib/debug_ipc/message_unittests.cc
diff --git a/lib/debug_ipc/message_writer.cc b/garnet/lib/debug_ipc/message_writer.cc similarity index 100% rename from lib/debug_ipc/message_writer.cc rename to garnet/lib/debug_ipc/message_writer.cc
diff --git a/lib/debug_ipc/message_writer.h b/garnet/lib/debug_ipc/message_writer.h similarity index 100% rename from lib/debug_ipc/message_writer.h rename to garnet/lib/debug_ipc/message_writer.h
diff --git a/lib/debug_ipc/protocol.cc b/garnet/lib/debug_ipc/protocol.cc similarity index 100% rename from lib/debug_ipc/protocol.cc rename to garnet/lib/debug_ipc/protocol.cc
diff --git a/lib/debug_ipc/protocol.h b/garnet/lib/debug_ipc/protocol.h similarity index 100% rename from lib/debug_ipc/protocol.h rename to garnet/lib/debug_ipc/protocol.h
diff --git a/lib/debug_ipc/protocol_helpers.cc b/garnet/lib/debug_ipc/protocol_helpers.cc similarity index 100% rename from lib/debug_ipc/protocol_helpers.cc rename to garnet/lib/debug_ipc/protocol_helpers.cc
diff --git a/lib/debug_ipc/protocol_helpers.h b/garnet/lib/debug_ipc/protocol_helpers.h similarity index 100% rename from lib/debug_ipc/protocol_helpers.h rename to garnet/lib/debug_ipc/protocol_helpers.h
diff --git a/lib/debug_ipc/protocol_unittests.cc b/garnet/lib/debug_ipc/protocol_unittests.cc similarity index 100% rename from lib/debug_ipc/protocol_unittests.cc rename to garnet/lib/debug_ipc/protocol_unittests.cc
diff --git a/lib/debug_ipc/records.cc b/garnet/lib/debug_ipc/records.cc similarity index 100% rename from lib/debug_ipc/records.cc rename to garnet/lib/debug_ipc/records.cc
diff --git a/lib/debug_ipc/records.h b/garnet/lib/debug_ipc/records.h similarity index 100% rename from lib/debug_ipc/records.h rename to garnet/lib/debug_ipc/records.h
diff --git a/lib/debug_ipc/records_unittest.cc b/garnet/lib/debug_ipc/records_unittest.cc similarity index 100% rename from lib/debug_ipc/records_unittest.cc rename to garnet/lib/debug_ipc/records_unittest.cc
diff --git a/lib/debug_ipc/records_utils.cc b/garnet/lib/debug_ipc/records_utils.cc similarity index 100% rename from lib/debug_ipc/records_utils.cc rename to garnet/lib/debug_ipc/records_utils.cc
diff --git a/lib/debug_ipc/records_utils.h b/garnet/lib/debug_ipc/records_utils.h similarity index 100% rename from lib/debug_ipc/records_utils.h rename to garnet/lib/debug_ipc/records_utils.h
diff --git a/lib/debug_ipc/register_desc.cc b/garnet/lib/debug_ipc/register_desc.cc similarity index 100% rename from lib/debug_ipc/register_desc.cc rename to garnet/lib/debug_ipc/register_desc.cc
diff --git a/lib/debug_ipc/register_desc.h b/garnet/lib/debug_ipc/register_desc.h similarity index 100% rename from lib/debug_ipc/register_desc.h rename to garnet/lib/debug_ipc/register_desc.h
diff --git a/lib/debug_ipc/register_test_support.cc b/garnet/lib/debug_ipc/register_test_support.cc similarity index 100% rename from lib/debug_ipc/register_test_support.cc rename to garnet/lib/debug_ipc/register_test_support.cc
diff --git a/lib/debug_ipc/register_test_support.h b/garnet/lib/debug_ipc/register_test_support.h similarity index 100% rename from lib/debug_ipc/register_test_support.h rename to garnet/lib/debug_ipc/register_test_support.h
diff --git a/lib/debugger_utils/BUILD.gn b/garnet/lib/debugger_utils/BUILD.gn similarity index 100% rename from lib/debugger_utils/BUILD.gn rename to garnet/lib/debugger_utils/BUILD.gn
diff --git a/lib/debugger_utils/MAINTAINERS b/garnet/lib/debugger_utils/MAINTAINERS similarity index 100% rename from lib/debugger_utils/MAINTAINERS rename to garnet/lib/debugger_utils/MAINTAINERS
diff --git a/lib/debugger_utils/README.md b/garnet/lib/debugger_utils/README.md similarity index 100% rename from lib/debugger_utils/README.md rename to garnet/lib/debugger_utils/README.md
diff --git a/lib/debugger_utils/build_ids.cc b/garnet/lib/debugger_utils/build_ids.cc similarity index 100% rename from lib/debugger_utils/build_ids.cc rename to garnet/lib/debugger_utils/build_ids.cc
diff --git a/lib/debugger_utils/build_ids.h b/garnet/lib/debugger_utils/build_ids.h similarity index 100% rename from lib/debugger_utils/build_ids.h rename to garnet/lib/debugger_utils/build_ids.h
diff --git a/lib/debugger_utils/byte_block.h b/garnet/lib/debugger_utils/byte_block.h similarity index 100% rename from lib/debugger_utils/byte_block.h rename to garnet/lib/debugger_utils/byte_block.h
diff --git a/lib/debugger_utils/byte_block_file.cc b/garnet/lib/debugger_utils/byte_block_file.cc similarity index 100% rename from lib/debugger_utils/byte_block_file.cc rename to garnet/lib/debugger_utils/byte_block_file.cc
diff --git a/lib/debugger_utils/byte_block_file.h b/garnet/lib/debugger_utils/byte_block_file.h similarity index 100% rename from lib/debugger_utils/byte_block_file.h rename to garnet/lib/debugger_utils/byte_block_file.h
diff --git a/lib/debugger_utils/dso_list.cc b/garnet/lib/debugger_utils/dso_list.cc similarity index 100% rename from lib/debugger_utils/dso_list.cc rename to garnet/lib/debugger_utils/dso_list.cc
diff --git a/lib/debugger_utils/dso_list.h b/garnet/lib/debugger_utils/dso_list.h similarity index 100% rename from lib/debugger_utils/dso_list.h rename to garnet/lib/debugger_utils/dso_list.h
diff --git a/lib/debugger_utils/elf_reader.cc b/garnet/lib/debugger_utils/elf_reader.cc similarity index 100% rename from lib/debugger_utils/elf_reader.cc rename to garnet/lib/debugger_utils/elf_reader.cc
diff --git a/lib/debugger_utils/elf_reader.h b/garnet/lib/debugger_utils/elf_reader.h similarity index 100% rename from lib/debugger_utils/elf_reader.h rename to garnet/lib/debugger_utils/elf_reader.h
diff --git a/lib/debugger_utils/elf_symtab.cc b/garnet/lib/debugger_utils/elf_symtab.cc similarity index 100% rename from lib/debugger_utils/elf_symtab.cc rename to garnet/lib/debugger_utils/elf_symtab.cc
diff --git a/lib/debugger_utils/elf_symtab.h b/garnet/lib/debugger_utils/elf_symtab.h similarity index 100% rename from lib/debugger_utils/elf_symtab.h rename to garnet/lib/debugger_utils/elf_symtab.h
diff --git a/lib/debugger_utils/jobs.cc b/garnet/lib/debugger_utils/jobs.cc similarity index 100% rename from lib/debugger_utils/jobs.cc rename to garnet/lib/debugger_utils/jobs.cc
diff --git a/lib/debugger_utils/jobs.h b/garnet/lib/debugger_utils/jobs.h similarity index 100% rename from lib/debugger_utils/jobs.h rename to garnet/lib/debugger_utils/jobs.h
diff --git a/lib/debugger_utils/jobs_unittest.cc b/garnet/lib/debugger_utils/jobs_unittest.cc similarity index 100% rename from lib/debugger_utils/jobs_unittest.cc rename to garnet/lib/debugger_utils/jobs_unittest.cc
diff --git a/lib/debugger_utils/ktrace_reader.cc b/garnet/lib/debugger_utils/ktrace_reader.cc similarity index 100% rename from lib/debugger_utils/ktrace_reader.cc rename to garnet/lib/debugger_utils/ktrace_reader.cc
diff --git a/lib/debugger_utils/ktrace_reader.h b/garnet/lib/debugger_utils/ktrace_reader.h similarity index 100% rename from lib/debugger_utils/ktrace_reader.h rename to garnet/lib/debugger_utils/ktrace_reader.h
diff --git a/lib/debugger_utils/load_maps.cc b/garnet/lib/debugger_utils/load_maps.cc similarity index 100% rename from lib/debugger_utils/load_maps.cc rename to garnet/lib/debugger_utils/load_maps.cc
diff --git a/lib/debugger_utils/load_maps.h b/garnet/lib/debugger_utils/load_maps.h similarity index 100% rename from lib/debugger_utils/load_maps.h rename to garnet/lib/debugger_utils/load_maps.h
diff --git a/lib/debugger_utils/run_all_unittests.cc b/garnet/lib/debugger_utils/run_all_unittests.cc similarity index 100% rename from lib/debugger_utils/run_all_unittests.cc rename to garnet/lib/debugger_utils/run_all_unittests.cc
diff --git a/lib/debugger_utils/sysinfo.cc b/garnet/lib/debugger_utils/sysinfo.cc similarity index 100% rename from lib/debugger_utils/sysinfo.cc rename to garnet/lib/debugger_utils/sysinfo.cc
diff --git a/lib/debugger_utils/sysinfo.h b/garnet/lib/debugger_utils/sysinfo.h similarity index 100% rename from lib/debugger_utils/sysinfo.h rename to garnet/lib/debugger_utils/sysinfo.h
diff --git a/lib/debugger_utils/third_party/musl/COPYRIGHT b/garnet/lib/debugger_utils/third_party/musl/COPYRIGHT similarity index 100% rename from lib/debugger_utils/third_party/musl/COPYRIGHT rename to garnet/lib/debugger_utils/third_party/musl/COPYRIGHT
diff --git a/lib/debugger_utils/third_party/musl/README.fuchsia.md b/garnet/lib/debugger_utils/third_party/musl/README.fuchsia.md similarity index 100% rename from lib/debugger_utils/third_party/musl/README.fuchsia.md rename to garnet/lib/debugger_utils/third_party/musl/README.fuchsia.md
diff --git a/lib/debugger_utils/third_party/musl/include/elf.h b/garnet/lib/debugger_utils/third_party/musl/include/elf.h similarity index 100% rename from lib/debugger_utils/third_party/musl/include/elf.h rename to garnet/lib/debugger_utils/third_party/musl/include/elf.h
diff --git a/lib/debugger_utils/threads.cc b/garnet/lib/debugger_utils/threads.cc similarity index 100% rename from lib/debugger_utils/threads.cc rename to garnet/lib/debugger_utils/threads.cc
diff --git a/lib/debugger_utils/threads.h b/garnet/lib/debugger_utils/threads.h similarity index 100% rename from lib/debugger_utils/threads.h rename to garnet/lib/debugger_utils/threads.h
diff --git a/lib/debugger_utils/threads_unittest.cc b/garnet/lib/debugger_utils/threads_unittest.cc similarity index 100% rename from lib/debugger_utils/threads_unittest.cc rename to garnet/lib/debugger_utils/threads_unittest.cc
diff --git a/lib/debugger_utils/util.cc b/garnet/lib/debugger_utils/util.cc similarity index 100% rename from lib/debugger_utils/util.cc rename to garnet/lib/debugger_utils/util.cc
diff --git a/lib/debugger_utils/util.h b/garnet/lib/debugger_utils/util.h similarity index 100% rename from lib/debugger_utils/util.h rename to garnet/lib/debugger_utils/util.h
diff --git a/lib/debugger_utils/util_unittest.cc b/garnet/lib/debugger_utils/util_unittest.cc similarity index 100% rename from lib/debugger_utils/util_unittest.cc rename to garnet/lib/debugger_utils/util_unittest.cc
diff --git a/lib/debugger_utils/util_zx.cc b/garnet/lib/debugger_utils/util_zx.cc similarity index 100% rename from lib/debugger_utils/util_zx.cc rename to garnet/lib/debugger_utils/util_zx.cc
diff --git a/lib/debugger_utils/util_zx_unittest.cc b/garnet/lib/debugger_utils/util_zx_unittest.cc similarity index 100% rename from lib/debugger_utils/util_zx_unittest.cc rename to garnet/lib/debugger_utils/util_zx_unittest.cc
diff --git a/lib/debugger_utils/x86_cpuid.cc b/garnet/lib/debugger_utils/x86_cpuid.cc similarity index 100% rename from lib/debugger_utils/x86_cpuid.cc rename to garnet/lib/debugger_utils/x86_cpuid.cc
diff --git a/lib/debugger_utils/x86_cpuid.h b/garnet/lib/debugger_utils/x86_cpuid.h similarity index 100% rename from lib/debugger_utils/x86_cpuid.h rename to garnet/lib/debugger_utils/x86_cpuid.h
diff --git a/lib/debugger_utils/x86_pt.cc b/garnet/lib/debugger_utils/x86_pt.cc similarity index 100% rename from lib/debugger_utils/x86_pt.cc rename to garnet/lib/debugger_utils/x86_pt.cc
diff --git a/lib/debugger_utils/x86_pt.h b/garnet/lib/debugger_utils/x86_pt.h similarity index 100% rename from lib/debugger_utils/x86_pt.h rename to garnet/lib/debugger_utils/x86_pt.h
diff --git a/lib/elflib/BUILD.gn b/garnet/lib/elflib/BUILD.gn similarity index 100% rename from lib/elflib/BUILD.gn rename to garnet/lib/elflib/BUILD.gn
diff --git a/lib/elflib/MAINTAINERS b/garnet/lib/elflib/MAINTAINERS similarity index 100% rename from lib/elflib/MAINTAINERS rename to garnet/lib/elflib/MAINTAINERS
diff --git a/lib/elflib/README.md b/garnet/lib/elflib/README.md similarity index 100% rename from lib/elflib/README.md rename to garnet/lib/elflib/README.md
diff --git a/lib/elflib/elflib.cc b/garnet/lib/elflib/elflib.cc similarity index 100% rename from lib/elflib/elflib.cc rename to garnet/lib/elflib/elflib.cc
diff --git a/lib/elflib/elflib.h b/garnet/lib/elflib/elflib.h similarity index 100% rename from lib/elflib/elflib.h rename to garnet/lib/elflib/elflib.h
diff --git a/lib/elflib/elflib_unittest.cc b/garnet/lib/elflib/elflib_unittest.cc similarity index 100% rename from lib/elflib/elflib_unittest.cc rename to garnet/lib/elflib/elflib_unittest.cc
diff --git a/lib/elflib/test_data/stripped_example.elf b/garnet/lib/elflib/test_data/stripped_example.elf similarity index 100% rename from lib/elflib/test_data/stripped_example.elf rename to garnet/lib/elflib/test_data/stripped_example.elf Binary files differ
diff --git a/lib/far/BUILD.gn b/garnet/lib/far/BUILD.gn similarity index 100% rename from lib/far/BUILD.gn rename to garnet/lib/far/BUILD.gn
diff --git a/lib/far/MAINTAINERS b/garnet/lib/far/MAINTAINERS similarity index 100% rename from lib/far/MAINTAINERS rename to garnet/lib/far/MAINTAINERS
diff --git a/lib/far/alignment.h b/garnet/lib/far/alignment.h similarity index 100% rename from lib/far/alignment.h rename to garnet/lib/far/alignment.h
diff --git a/lib/far/archive_entry.cc b/garnet/lib/far/archive_entry.cc similarity index 100% rename from lib/far/archive_entry.cc rename to garnet/lib/far/archive_entry.cc
diff --git a/lib/far/archive_entry.h b/garnet/lib/far/archive_entry.h similarity index 100% rename from lib/far/archive_entry.h rename to garnet/lib/far/archive_entry.h
diff --git a/lib/far/archive_reader.cc b/garnet/lib/far/archive_reader.cc similarity index 100% rename from lib/far/archive_reader.cc rename to garnet/lib/far/archive_reader.cc
diff --git a/lib/far/archive_reader.h b/garnet/lib/far/archive_reader.h similarity index 100% rename from lib/far/archive_reader.h rename to garnet/lib/far/archive_reader.h
diff --git a/lib/far/archive_writer.cc b/garnet/lib/far/archive_writer.cc similarity index 100% rename from lib/far/archive_writer.cc rename to garnet/lib/far/archive_writer.cc
diff --git a/lib/far/archive_writer.h b/garnet/lib/far/archive_writer.h similarity index 100% rename from lib/far/archive_writer.h rename to garnet/lib/far/archive_writer.h
diff --git a/lib/far/far.cc b/garnet/lib/far/far.cc similarity index 100% rename from lib/far/far.cc rename to garnet/lib/far/far.cc
diff --git a/lib/far/far.h b/garnet/lib/far/far.h similarity index 100% rename from lib/far/far.h rename to garnet/lib/far/far.h
diff --git a/lib/far/file_operations.cc b/garnet/lib/far/file_operations.cc similarity index 100% rename from lib/far/file_operations.cc rename to garnet/lib/far/file_operations.cc
diff --git a/lib/far/file_operations.h b/garnet/lib/far/file_operations.h similarity index 100% rename from lib/far/file_operations.h rename to garnet/lib/far/file_operations.h
diff --git a/lib/far/format.h b/garnet/lib/far/format.h similarity index 100% rename from lib/far/format.h rename to garnet/lib/far/format.h
diff --git a/lib/far/manifest.cc b/garnet/lib/far/manifest.cc similarity index 100% rename from lib/far/manifest.cc rename to garnet/lib/far/manifest.cc
diff --git a/lib/far/manifest.h b/garnet/lib/far/manifest.h similarity index 100% rename from lib/far/manifest.h rename to garnet/lib/far/manifest.h
diff --git a/lib/inet/BUILD.gn b/garnet/lib/inet/BUILD.gn similarity index 100% rename from lib/inet/BUILD.gn rename to garnet/lib/inet/BUILD.gn
diff --git a/lib/inet/README.md b/garnet/lib/inet/README.md similarity index 100% rename from lib/inet/README.md rename to garnet/lib/inet/README.md
diff --git a/lib/inet/ip_address.cc b/garnet/lib/inet/ip_address.cc similarity index 100% rename from lib/inet/ip_address.cc rename to garnet/lib/inet/ip_address.cc
diff --git a/lib/inet/ip_address.h b/garnet/lib/inet/ip_address.h similarity index 100% rename from lib/inet/ip_address.h rename to garnet/lib/inet/ip_address.h
diff --git a/lib/inet/ip_port.cc b/garnet/lib/inet/ip_port.cc similarity index 100% rename from lib/inet/ip_port.cc rename to garnet/lib/inet/ip_port.cc
diff --git a/lib/inet/ip_port.h b/garnet/lib/inet/ip_port.h similarity index 100% rename from lib/inet/ip_port.h rename to garnet/lib/inet/ip_port.h
diff --git a/lib/inet/socket_address.cc b/garnet/lib/inet/socket_address.cc similarity index 100% rename from lib/inet/socket_address.cc rename to garnet/lib/inet/socket_address.cc
diff --git a/lib/inet/socket_address.h b/garnet/lib/inet/socket_address.h similarity index 100% rename from lib/inet/socket_address.h rename to garnet/lib/inet/socket_address.h
diff --git a/lib/inferior_control/BUILD.gn b/garnet/lib/inferior_control/BUILD.gn similarity index 100% rename from lib/inferior_control/BUILD.gn rename to garnet/lib/inferior_control/BUILD.gn
diff --git a/lib/inferior_control/MAINTAINERS b/garnet/lib/inferior_control/MAINTAINERS similarity index 100% rename from lib/inferior_control/MAINTAINERS rename to garnet/lib/inferior_control/MAINTAINERS
diff --git a/lib/inferior_control/README.md b/garnet/lib/inferior_control/README.md similarity index 100% rename from lib/inferior_control/README.md rename to garnet/lib/inferior_control/README.md
diff --git a/lib/inferior_control/arch.h b/garnet/lib/inferior_control/arch.h similarity index 100% rename from lib/inferior_control/arch.h rename to garnet/lib/inferior_control/arch.h
diff --git a/lib/inferior_control/arch_amd64.cc b/garnet/lib/inferior_control/arch_amd64.cc similarity index 100% rename from lib/inferior_control/arch_amd64.cc rename to garnet/lib/inferior_control/arch_amd64.cc
diff --git a/lib/inferior_control/arch_arm64.cc b/garnet/lib/inferior_control/arch_arm64.cc similarity index 100% rename from lib/inferior_control/arch_arm64.cc rename to garnet/lib/inferior_control/arch_arm64.cc
diff --git a/lib/inferior_control/arch_default.cc b/garnet/lib/inferior_control/arch_default.cc similarity index 100% rename from lib/inferior_control/arch_default.cc rename to garnet/lib/inferior_control/arch_default.cc
diff --git a/lib/inferior_control/arch_x86.h b/garnet/lib/inferior_control/arch_x86.h similarity index 100% rename from lib/inferior_control/arch_x86.h rename to garnet/lib/inferior_control/arch_x86.h
diff --git a/lib/inferior_control/breakpoint.cc b/garnet/lib/inferior_control/breakpoint.cc similarity index 100% rename from lib/inferior_control/breakpoint.cc rename to garnet/lib/inferior_control/breakpoint.cc
diff --git a/lib/inferior_control/breakpoint.h b/garnet/lib/inferior_control/breakpoint.h similarity index 100% rename from lib/inferior_control/breakpoint.h rename to garnet/lib/inferior_control/breakpoint.h
diff --git a/lib/inferior_control/breakpoint_amd64.cc b/garnet/lib/inferior_control/breakpoint_amd64.cc similarity index 100% rename from lib/inferior_control/breakpoint_amd64.cc rename to garnet/lib/inferior_control/breakpoint_amd64.cc
diff --git a/lib/inferior_control/breakpoint_arm64.cc b/garnet/lib/inferior_control/breakpoint_arm64.cc similarity index 100% rename from lib/inferior_control/breakpoint_arm64.cc rename to garnet/lib/inferior_control/breakpoint_arm64.cc
diff --git a/lib/inferior_control/breakpoint_default.cc b/garnet/lib/inferior_control/breakpoint_default.cc similarity index 100% rename from lib/inferior_control/breakpoint_default.cc rename to garnet/lib/inferior_control/breakpoint_default.cc
diff --git a/lib/inferior_control/exception_port.cc b/garnet/lib/inferior_control/exception_port.cc similarity index 100% rename from lib/inferior_control/exception_port.cc rename to garnet/lib/inferior_control/exception_port.cc
diff --git a/lib/inferior_control/exception_port.h b/garnet/lib/inferior_control/exception_port.h similarity index 100% rename from lib/inferior_control/exception_port.h rename to garnet/lib/inferior_control/exception_port.h
diff --git a/lib/inferior_control/io_loop.cc b/garnet/lib/inferior_control/io_loop.cc similarity index 100% rename from lib/inferior_control/io_loop.cc rename to garnet/lib/inferior_control/io_loop.cc
diff --git a/lib/inferior_control/io_loop.h b/garnet/lib/inferior_control/io_loop.h similarity index 100% rename from lib/inferior_control/io_loop.h rename to garnet/lib/inferior_control/io_loop.h
diff --git a/lib/inferior_control/io_loop_unittest.cc b/garnet/lib/inferior_control/io_loop_unittest.cc similarity index 100% rename from lib/inferior_control/io_loop_unittest.cc rename to garnet/lib/inferior_control/io_loop_unittest.cc
diff --git a/lib/inferior_control/memory_process.cc b/garnet/lib/inferior_control/memory_process.cc similarity index 100% rename from lib/inferior_control/memory_process.cc rename to garnet/lib/inferior_control/memory_process.cc
diff --git a/lib/inferior_control/memory_process.h b/garnet/lib/inferior_control/memory_process.h similarity index 100% rename from lib/inferior_control/memory_process.h rename to garnet/lib/inferior_control/memory_process.h
diff --git a/lib/inferior_control/process.cc b/garnet/lib/inferior_control/process.cc similarity index 100% rename from lib/inferior_control/process.cc rename to garnet/lib/inferior_control/process.cc
diff --git a/lib/inferior_control/process.h b/garnet/lib/inferior_control/process.h similarity index 100% rename from lib/inferior_control/process.h rename to garnet/lib/inferior_control/process.h
diff --git a/lib/inferior_control/process_unittest.cc b/garnet/lib/inferior_control/process_unittest.cc similarity index 100% rename from lib/inferior_control/process_unittest.cc rename to garnet/lib/inferior_control/process_unittest.cc
diff --git a/lib/inferior_control/registers.cc b/garnet/lib/inferior_control/registers.cc similarity index 100% rename from lib/inferior_control/registers.cc rename to garnet/lib/inferior_control/registers.cc
diff --git a/lib/inferior_control/registers.h b/garnet/lib/inferior_control/registers.h similarity index 100% rename from lib/inferior_control/registers.h rename to garnet/lib/inferior_control/registers.h
diff --git a/lib/inferior_control/registers_amd64.cc b/garnet/lib/inferior_control/registers_amd64.cc similarity index 100% rename from lib/inferior_control/registers_amd64.cc rename to garnet/lib/inferior_control/registers_amd64.cc
diff --git a/lib/inferior_control/registers_amd64.h b/garnet/lib/inferior_control/registers_amd64.h similarity index 100% rename from lib/inferior_control/registers_amd64.h rename to garnet/lib/inferior_control/registers_amd64.h
diff --git a/lib/inferior_control/registers_arm64.cc b/garnet/lib/inferior_control/registers_arm64.cc similarity index 100% rename from lib/inferior_control/registers_arm64.cc rename to garnet/lib/inferior_control/registers_arm64.cc
diff --git a/lib/inferior_control/registers_arm64.h b/garnet/lib/inferior_control/registers_arm64.h similarity index 100% rename from lib/inferior_control/registers_arm64.h rename to garnet/lib/inferior_control/registers_arm64.h
diff --git a/lib/inferior_control/registers_default.cc b/garnet/lib/inferior_control/registers_default.cc similarity index 100% rename from lib/inferior_control/registers_default.cc rename to garnet/lib/inferior_control/registers_default.cc
diff --git a/lib/inferior_control/server.cc b/garnet/lib/inferior_control/server.cc similarity index 100% rename from lib/inferior_control/server.cc rename to garnet/lib/inferior_control/server.cc
diff --git a/lib/inferior_control/server.h b/garnet/lib/inferior_control/server.h similarity index 100% rename from lib/inferior_control/server.h rename to garnet/lib/inferior_control/server.h
diff --git a/lib/inferior_control/test_helper.cc b/garnet/lib/inferior_control/test_helper.cc similarity index 100% rename from lib/inferior_control/test_helper.cc rename to garnet/lib/inferior_control/test_helper.cc
diff --git a/lib/inferior_control/test_server.cc b/garnet/lib/inferior_control/test_server.cc similarity index 100% rename from lib/inferior_control/test_server.cc rename to garnet/lib/inferior_control/test_server.cc
diff --git a/lib/inferior_control/test_server.h b/garnet/lib/inferior_control/test_server.h similarity index 100% rename from lib/inferior_control/test_server.h rename to garnet/lib/inferior_control/test_server.h
diff --git a/lib/inferior_control/thread.cc b/garnet/lib/inferior_control/thread.cc similarity index 100% rename from lib/inferior_control/thread.cc rename to garnet/lib/inferior_control/thread.cc
diff --git a/lib/inferior_control/thread.h b/garnet/lib/inferior_control/thread.h similarity index 100% rename from lib/inferior_control/thread.h rename to garnet/lib/inferior_control/thread.h
diff --git a/lib/intel_pt_decode/BUILD.gn b/garnet/lib/intel_pt_decode/BUILD.gn similarity index 100% rename from lib/intel_pt_decode/BUILD.gn rename to garnet/lib/intel_pt_decode/BUILD.gn
diff --git a/lib/intel_pt_decode/MAINTAINERS b/garnet/lib/intel_pt_decode/MAINTAINERS similarity index 100% rename from lib/intel_pt_decode/MAINTAINERS rename to garnet/lib/intel_pt_decode/MAINTAINERS
diff --git a/lib/intel_pt_decode/README.md b/garnet/lib/intel_pt_decode/README.md similarity index 100% rename from lib/intel_pt_decode/README.md rename to garnet/lib/intel_pt_decode/README.md
diff --git a/lib/intel_pt_decode/decoder.cc b/garnet/lib/intel_pt_decode/decoder.cc similarity index 100% rename from lib/intel_pt_decode/decoder.cc rename to garnet/lib/intel_pt_decode/decoder.cc
diff --git a/lib/intel_pt_decode/decoder.h b/garnet/lib/intel_pt_decode/decoder.h similarity index 100% rename from lib/intel_pt_decode/decoder.h rename to garnet/lib/intel_pt_decode/decoder.h
diff --git a/lib/intel_pt_decode/sideband.cc b/garnet/lib/intel_pt_decode/sideband.cc similarity index 100% rename from lib/intel_pt_decode/sideband.cc rename to garnet/lib/intel_pt_decode/sideband.cc
diff --git a/lib/intel_pt_decode/third_party/simple-pt/BUILD.gn b/garnet/lib/intel_pt_decode/third_party/simple-pt/BUILD.gn similarity index 100% rename from lib/intel_pt_decode/third_party/simple-pt/BUILD.gn rename to garnet/lib/intel_pt_decode/third_party/simple-pt/BUILD.gn
diff --git a/lib/intel_pt_decode/third_party/simple-pt/LICENSE b/garnet/lib/intel_pt_decode/third_party/simple-pt/LICENSE similarity index 100% rename from lib/intel_pt_decode/third_party/simple-pt/LICENSE rename to garnet/lib/intel_pt_decode/third_party/simple-pt/LICENSE
diff --git a/lib/intel_pt_decode/third_party/simple-pt/README.fuchsia.md b/garnet/lib/intel_pt_decode/third_party/simple-pt/README.fuchsia.md similarity index 100% rename from lib/intel_pt_decode/third_party/simple-pt/README.fuchsia.md rename to garnet/lib/intel_pt_decode/third_party/simple-pt/README.fuchsia.md
diff --git a/lib/intel_pt_decode/third_party/simple-pt/elf.cc b/garnet/lib/intel_pt_decode/third_party/simple-pt/elf.cc similarity index 100% rename from lib/intel_pt_decode/third_party/simple-pt/elf.cc rename to garnet/lib/intel_pt_decode/third_party/simple-pt/elf.cc
diff --git a/lib/intel_pt_decode/third_party/simple-pt/elf.h b/garnet/lib/intel_pt_decode/third_party/simple-pt/elf.h similarity index 100% rename from lib/intel_pt_decode/third_party/simple-pt/elf.h rename to garnet/lib/intel_pt_decode/third_party/simple-pt/elf.h
diff --git a/lib/intel_pt_decode/third_party/simple-pt/symtab.cc b/garnet/lib/intel_pt_decode/third_party/simple-pt/symtab.cc similarity index 100% rename from lib/intel_pt_decode/third_party/simple-pt/symtab.cc rename to garnet/lib/intel_pt_decode/third_party/simple-pt/symtab.cc
diff --git a/lib/intel_pt_decode/third_party/simple-pt/symtab.h b/garnet/lib/intel_pt_decode/third_party/simple-pt/symtab.h similarity index 100% rename from lib/intel_pt_decode/third_party/simple-pt/symtab.h rename to garnet/lib/intel_pt_decode/third_party/simple-pt/symtab.h
diff --git a/lib/loader/BUILD.gn b/garnet/lib/loader/BUILD.gn similarity index 100% rename from lib/loader/BUILD.gn rename to garnet/lib/loader/BUILD.gn
diff --git a/lib/loader/package_loader.cc b/garnet/lib/loader/package_loader.cc similarity index 100% rename from lib/loader/package_loader.cc rename to garnet/lib/loader/package_loader.cc
diff --git a/lib/loader/package_loader.h b/garnet/lib/loader/package_loader.h similarity index 100% rename from lib/loader/package_loader.h rename to garnet/lib/loader/package_loader.h
diff --git a/lib/magma/.clang-format b/garnet/lib/magma/.clang-format similarity index 100% rename from lib/magma/.clang-format rename to garnet/lib/magma/.clang-format
diff --git a/lib/magma/BUILD.gn b/garnet/lib/magma/BUILD.gn similarity index 100% rename from lib/magma/BUILD.gn rename to garnet/lib/magma/BUILD.gn
diff --git a/lib/magma/MAINTAINERS b/garnet/lib/magma/MAINTAINERS similarity index 100% rename from lib/magma/MAINTAINERS rename to garnet/lib/magma/MAINTAINERS
diff --git a/lib/magma/README.md b/garnet/lib/magma/README.md similarity index 100% rename from lib/magma/README.md rename to garnet/lib/magma/README.md
diff --git a/lib/magma/docs/block_diagram.png b/garnet/lib/magma/docs/block_diagram.png similarity index 100% rename from lib/magma/docs/block_diagram.png rename to garnet/lib/magma/docs/block_diagram.png Binary files differ
diff --git a/lib/magma/docs/block_diagram.svg b/garnet/lib/magma/docs/block_diagram.svg similarity index 100% rename from lib/magma/docs/block_diagram.svg rename to garnet/lib/magma/docs/block_diagram.svg
diff --git a/lib/magma/docs/contributing.md b/garnet/lib/magma/docs/contributing.md similarity index 100% rename from lib/magma/docs/contributing.md rename to garnet/lib/magma/docs/contributing.md
diff --git a/lib/magma/docs/design.md b/garnet/lib/magma/docs/design.md similarity index 100% rename from lib/magma/docs/design.md rename to garnet/lib/magma/docs/design.md
diff --git a/lib/magma/docs/overview.md b/garnet/lib/magma/docs/overview.md similarity index 100% rename from lib/magma/docs/overview.md rename to garnet/lib/magma/docs/overview.md
diff --git a/lib/magma/docs/porting.md b/garnet/lib/magma/docs/porting.md similarity index 100% rename from lib/magma/docs/porting.md rename to garnet/lib/magma/docs/porting.md
diff --git a/lib/magma/docs/test_strategy.md b/garnet/lib/magma/docs/test_strategy.md similarity index 100% rename from lib/magma/docs/test_strategy.md rename to garnet/lib/magma/docs/test_strategy.md
diff --git a/lib/magma/docs/vulkan.md b/garnet/lib/magma/docs/vulkan.md similarity index 100% rename from lib/magma/docs/vulkan.md rename to garnet/lib/magma/docs/vulkan.md
diff --git a/lib/magma/docs/vulkan_driver_thread_model.png b/garnet/lib/magma/docs/vulkan_driver_thread_model.png similarity index 100% rename from lib/magma/docs/vulkan_driver_thread_model.png rename to garnet/lib/magma/docs/vulkan_driver_thread_model.png Binary files differ
diff --git a/lib/magma/fidl/BUILD.gn b/garnet/lib/magma/fidl/BUILD.gn similarity index 100% rename from lib/magma/fidl/BUILD.gn rename to garnet/lib/magma/fidl/BUILD.gn
diff --git a/lib/magma/fidl/magma.fidl b/garnet/lib/magma/fidl/magma.fidl similarity index 100% rename from lib/magma/fidl/magma.fidl rename to garnet/lib/magma/fidl/magma.fidl
diff --git a/lib/magma/gnbuild/magma-arm-mali/BUILD.gn b/garnet/lib/magma/gnbuild/magma-arm-mali/BUILD.gn similarity index 100% rename from lib/magma/gnbuild/magma-arm-mali/BUILD.gn rename to garnet/lib/magma/gnbuild/magma-arm-mali/BUILD.gn
diff --git a/lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_integration_tests.cmx b/garnet/lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_integration_tests.cmx similarity index 100% rename from lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_integration_tests.cmx rename to garnet/lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_integration_tests.cmx
diff --git a/lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_nonhardware_tests.cmx b/garnet/lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_nonhardware_tests.cmx similarity index 100% rename from lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_nonhardware_tests.cmx rename to garnet/lib/magma/gnbuild/magma-arm-mali/meta/msd_arm_mali_nonhardware_tests.cmx
diff --git a/lib/magma/gnbuild/magma-intel-gen/BUILD.gn b/garnet/lib/magma/gnbuild/magma-intel-gen/BUILD.gn similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/BUILD.gn rename to garnet/lib/magma/gnbuild/magma-intel-gen/BUILD.gn
diff --git a/lib/magma/gnbuild/magma-intel-gen/meta/block_pool_no_free.cmx b/garnet/lib/magma/gnbuild/magma-intel-gen/meta/block_pool_no_free.cmx similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/meta/block_pool_no_free.cmx rename to garnet/lib/magma/gnbuild/magma-intel-gen/meta/block_pool_no_free.cmx
diff --git a/lib/magma/gnbuild/magma-intel-gen/meta/mesa_unit_tests.cmx b/garnet/lib/magma/gnbuild/magma-intel-gen/meta/mesa_unit_tests.cmx similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/meta/mesa_unit_tests.cmx rename to garnet/lib/magma/gnbuild/magma-intel-gen/meta/mesa_unit_tests.cmx
diff --git a/lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_integration_tests.cmx b/garnet/lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_integration_tests.cmx similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_integration_tests.cmx rename to garnet/lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_integration_tests.cmx
diff --git a/lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_nonhardware_tests.cmx b/garnet/lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_nonhardware_tests.cmx similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_nonhardware_tests.cmx rename to garnet/lib/magma/gnbuild/magma-intel-gen/meta/msd_intel_gen_nonhardware_tests.cmx
diff --git a/lib/magma/gnbuild/magma-intel-gen/meta/state_pool.cmx b/garnet/lib/magma/gnbuild/magma-intel-gen/meta/state_pool.cmx similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/meta/state_pool.cmx rename to garnet/lib/magma/gnbuild/magma-intel-gen/meta/state_pool.cmx
diff --git a/lib/magma/gnbuild/magma-intel-gen/meta/state_pool_free_list_only.cmx b/garnet/lib/magma/gnbuild/magma-intel-gen/meta/state_pool_free_list_only.cmx similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/meta/state_pool_free_list_only.cmx rename to garnet/lib/magma/gnbuild/magma-intel-gen/meta/state_pool_free_list_only.cmx
diff --git a/lib/magma/gnbuild/magma-intel-gen/meta/state_pool_no_free.cmx b/garnet/lib/magma/gnbuild/magma-intel-gen/meta/state_pool_no_free.cmx similarity index 100% rename from lib/magma/gnbuild/magma-intel-gen/meta/state_pool_no_free.cmx rename to garnet/lib/magma/gnbuild/magma-intel-gen/meta/state_pool_no_free.cmx
diff --git a/lib/magma/gnbuild/magma-vsl-gc/BUILD.gn b/garnet/lib/magma/gnbuild/magma-vsl-gc/BUILD.gn similarity index 100% rename from lib/magma/gnbuild/magma-vsl-gc/BUILD.gn rename to garnet/lib/magma/gnbuild/magma-vsl-gc/BUILD.gn
diff --git a/lib/magma/gnbuild/magma.gni b/garnet/lib/magma/gnbuild/magma.gni similarity index 100% rename from lib/magma/gnbuild/magma.gni rename to garnet/lib/magma/gnbuild/magma.gni
diff --git a/lib/magma/include/BUILD.gn b/garnet/lib/magma/include/BUILD.gn similarity index 100% rename from lib/magma/include/BUILD.gn rename to garnet/lib/magma/include/BUILD.gn
diff --git a/lib/magma/include/magma_abi/magma.h b/garnet/lib/magma/include/magma_abi/magma.h similarity index 100% rename from lib/magma/include/magma_abi/magma.h rename to garnet/lib/magma/include/magma_abi/magma.h
diff --git a/lib/magma/include/magma_abi/magma_common_defs.h b/garnet/lib/magma/include/magma_abi/magma_common_defs.h similarity index 100% rename from lib/magma/include/magma_abi/magma_common_defs.h rename to garnet/lib/magma/include/magma_abi/magma_common_defs.h
diff --git a/lib/magma/include/magma_abi/magma_sysmem.h b/garnet/lib/magma/include/magma_abi/magma_sysmem.h similarity index 100% rename from lib/magma/include/magma_abi/magma_sysmem.h rename to garnet/lib/magma/include/magma_abi/magma_sysmem.h
diff --git a/lib/magma/include/msd_abi/msd.h b/garnet/lib/magma/include/msd_abi/msd.h similarity index 100% rename from lib/magma/include/msd_abi/msd.h rename to garnet/lib/magma/include/msd_abi/msd.h
diff --git a/lib/magma/include/msd_abi/msd_defs.h b/garnet/lib/magma/include/msd_abi/msd_defs.h similarity index 100% rename from lib/magma/include/msd_abi/msd_defs.h rename to garnet/lib/magma/include/msd_abi/msd_defs.h
diff --git a/lib/magma/include/virtio/generate_linux_header.sh b/garnet/lib/magma/include/virtio/generate_linux_header.sh similarity index 100% rename from lib/magma/include/virtio/generate_linux_header.sh rename to garnet/lib/magma/include/virtio/generate_linux_header.sh
diff --git a/lib/magma/include/virtio/virtio_magma.h b/garnet/lib/magma/include/virtio/virtio_magma.h similarity index 100% rename from lib/magma/include/virtio/virtio_magma.h rename to garnet/lib/magma/include/virtio/virtio_magma.h
diff --git a/lib/magma/meta/magma-tools.cmx b/garnet/lib/magma/meta/magma-tools.cmx similarity index 100% rename from lib/magma/meta/magma-tools.cmx rename to garnet/lib/magma/meta/magma-tools.cmx
diff --git a/lib/magma/meta/vkcube.cmx b/garnet/lib/magma/meta/vkcube.cmx similarity index 100% rename from lib/magma/meta/vkcube.cmx rename to garnet/lib/magma/meta/vkcube.cmx
diff --git a/lib/magma/scripts/autorun b/garnet/lib/magma/scripts/autorun similarity index 100% rename from lib/magma/scripts/autorun rename to garnet/lib/magma/scripts/autorun
diff --git a/lib/magma/scripts/autorun_mali b/garnet/lib/magma/scripts/autorun_mali similarity index 100% rename from lib/magma/scripts/autorun_mali rename to garnet/lib/magma/scripts/autorun_mali
diff --git a/lib/magma/scripts/build-doom3.sh b/garnet/lib/magma/scripts/build-doom3.sh similarity index 100% rename from lib/magma/scripts/build-doom3.sh rename to garnet/lib/magma/scripts/build-doom3.sh
diff --git a/lib/magma/scripts/build-vkquake.sh b/garnet/lib/magma/scripts/build-vkquake.sh similarity index 100% rename from lib/magma/scripts/build-vkquake.sh rename to garnet/lib/magma/scripts/build-vkquake.sh
diff --git a/lib/magma/scripts/libvulkan.version b/garnet/lib/magma/scripts/libvulkan.version similarity index 100% rename from lib/magma/scripts/libvulkan.version rename to garnet/lib/magma/scripts/libvulkan.version
diff --git a/lib/magma/scripts/stress.sh b/garnet/lib/magma/scripts/stress.sh similarity index 100% rename from lib/magma/scripts/stress.sh rename to garnet/lib/magma/scripts/stress.sh
diff --git a/lib/magma/scripts/test.sh b/garnet/lib/magma/scripts/test.sh similarity index 100% rename from lib/magma/scripts/test.sh rename to garnet/lib/magma/scripts/test.sh
diff --git a/lib/magma/src/libmagma/BUILD.gn b/garnet/lib/magma/src/libmagma/BUILD.gn similarity index 100% rename from lib/magma/src/libmagma/BUILD.gn rename to garnet/lib/magma/src/libmagma/BUILD.gn
diff --git a/lib/magma/src/libmagma/async-default.c b/garnet/lib/magma/src/libmagma/async-default.c similarity index 100% rename from lib/magma/src/libmagma/async-default.c rename to garnet/lib/magma/src/libmagma/async-default.c
diff --git a/lib/magma/src/libmagma/magma.cc b/garnet/lib/magma/src/libmagma/magma.cc similarity index 100% rename from lib/magma/src/libmagma/magma.cc rename to garnet/lib/magma/src/libmagma/magma.cc
diff --git a/lib/magma/src/libmagma_linux/BUILD.gn b/garnet/lib/magma/src/libmagma_linux/BUILD.gn similarity index 100% rename from lib/magma/src/libmagma_linux/BUILD.gn rename to garnet/lib/magma/src/libmagma_linux/BUILD.gn
diff --git a/lib/magma/src/libmagma_linux/magma.cc b/garnet/lib/magma/src/libmagma_linux/magma.cc similarity index 100% rename from lib/magma/src/libmagma_linux/magma.cc rename to garnet/lib/magma/src/libmagma_linux/magma.cc
diff --git a/lib/magma/src/libmagma_linux/magma_test.cc b/garnet/lib/magma/src/libmagma_linux/magma_test.cc similarity index 100% rename from lib/magma/src/libmagma_linux/magma_test.cc rename to garnet/lib/magma/src/libmagma_linux/magma_test.cc
diff --git a/lib/magma/src/libmagma_linux/makefile b/garnet/lib/magma/src/libmagma_linux/makefile similarity index 100% rename from lib/magma/src/libmagma_linux/makefile rename to garnet/lib/magma/src/libmagma_linux/makefile
diff --git a/lib/magma/src/libmagma_linux/virtio_magma_connection.cc b/garnet/lib/magma/src/libmagma_linux/virtio_magma_connection.cc similarity index 100% rename from lib/magma/src/libmagma_linux/virtio_magma_connection.cc rename to garnet/lib/magma/src/libmagma_linux/virtio_magma_connection.cc
diff --git a/lib/magma/src/libmagma_linux/virtio_magma_connection.h b/garnet/lib/magma/src/libmagma_linux/virtio_magma_connection.h similarity index 100% rename from lib/magma/src/libmagma_linux/virtio_magma_connection.h rename to garnet/lib/magma/src/libmagma_linux/virtio_magma_connection.h
diff --git a/lib/magma/src/magma_util/BUILD.gn b/garnet/lib/magma/src/magma_util/BUILD.gn similarity index 100% rename from lib/magma/src/magma_util/BUILD.gn rename to garnet/lib/magma/src/magma_util/BUILD.gn
diff --git a/lib/magma/src/magma_util/address_space_allocator.h b/garnet/lib/magma/src/magma_util/address_space_allocator.h similarity index 100% rename from lib/magma/src/magma_util/address_space_allocator.h rename to garnet/lib/magma/src/magma_util/address_space_allocator.h
diff --git a/lib/magma/src/magma_util/cache_flush.h b/garnet/lib/magma/src/magma_util/cache_flush.h similarity index 100% rename from lib/magma/src/magma_util/cache_flush.h rename to garnet/lib/magma/src/magma_util/cache_flush.h
diff --git a/lib/magma/src/magma_util/command_buffer.cc b/garnet/lib/magma/src/magma_util/command_buffer.cc similarity index 100% rename from lib/magma/src/magma_util/command_buffer.cc rename to garnet/lib/magma/src/magma_util/command_buffer.cc
diff --git a/lib/magma/src/magma_util/command_buffer.h b/garnet/lib/magma/src/magma_util/command_buffer.h similarity index 100% rename from lib/magma/src/magma_util/command_buffer.h rename to garnet/lib/magma/src/magma_util/command_buffer.h
diff --git a/lib/magma/src/magma_util/dlog.h b/garnet/lib/magma/src/magma_util/dlog.h similarity index 100% rename from lib/magma/src/magma_util/dlog.h rename to garnet/lib/magma/src/magma_util/dlog.h
diff --git a/lib/magma/src/magma_util/fps_printer.h b/garnet/lib/magma/src/magma_util/fps_printer.h similarity index 100% rename from lib/magma/src/magma_util/fps_printer.h rename to garnet/lib/magma/src/magma_util/fps_printer.h
diff --git a/lib/magma/src/magma_util/inflight_list.h b/garnet/lib/magma/src/magma_util/inflight_list.h similarity index 100% rename from lib/magma/src/magma_util/inflight_list.h rename to garnet/lib/magma/src/magma_util/inflight_list.h
diff --git a/lib/magma/src/magma_util/macros.h b/garnet/lib/magma/src/magma_util/macros.h similarity index 100% rename from lib/magma/src/magma_util/macros.h rename to garnet/lib/magma/src/magma_util/macros.h
diff --git a/lib/magma/src/magma_util/platform/BUILD.gn b/garnet/lib/magma/src/magma_util/platform/BUILD.gn similarity index 100% rename from lib/magma/src/magma_util/platform/BUILD.gn rename to garnet/lib/magma/src/magma_util/platform/BUILD.gn
diff --git a/lib/magma/src/magma_util/platform/platform_address_range.h b/garnet/lib/magma/src/magma_util/platform/platform_address_range.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_address_range.h rename to garnet/lib/magma/src/magma_util/platform/platform_address_range.h
diff --git a/lib/magma/src/magma_util/platform/platform_barriers.h b/garnet/lib/magma/src/magma_util/platform/platform_barriers.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_barriers.h rename to garnet/lib/magma/src/magma_util/platform/platform_barriers.h
diff --git a/lib/magma/src/magma_util/platform/platform_buffer.h b/garnet/lib/magma/src/magma_util/platform/platform_buffer.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_buffer.h rename to garnet/lib/magma/src/magma_util/platform/platform_buffer.h
diff --git a/lib/magma/src/magma_util/platform/platform_bus_mapper.h b/garnet/lib/magma/src/magma_util/platform/platform_bus_mapper.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_bus_mapper.h rename to garnet/lib/magma/src/magma_util/platform/platform_bus_mapper.h
diff --git a/lib/magma/src/magma_util/platform/platform_connection.h b/garnet/lib/magma/src/magma_util/platform/platform_connection.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_connection.h rename to garnet/lib/magma/src/magma_util/platform/platform_connection.h
diff --git a/lib/magma/src/magma_util/platform/platform_connection_client.h b/garnet/lib/magma/src/magma_util/platform/platform_connection_client.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_connection_client.h rename to garnet/lib/magma/src/magma_util/platform/platform_connection_client.h
diff --git a/lib/magma/src/magma_util/platform/platform_device.h b/garnet/lib/magma/src/magma_util/platform/platform_device.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_device.h rename to garnet/lib/magma/src/magma_util/platform/platform_device.h
diff --git a/lib/magma/src/magma_util/platform/platform_event.h b/garnet/lib/magma/src/magma_util/platform/platform_event.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_event.h rename to garnet/lib/magma/src/magma_util/platform/platform_event.h
diff --git a/lib/magma/src/magma_util/platform/platform_futex.h b/garnet/lib/magma/src/magma_util/platform/platform_futex.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_futex.h rename to garnet/lib/magma/src/magma_util/platform/platform_futex.h
diff --git a/lib/magma/src/magma_util/platform/platform_handle.h b/garnet/lib/magma/src/magma_util/platform/platform_handle.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_handle.h rename to garnet/lib/magma/src/magma_util/platform/platform_handle.h
diff --git a/lib/magma/src/magma_util/platform/platform_interrupt.h b/garnet/lib/magma/src/magma_util/platform/platform_interrupt.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_interrupt.h rename to garnet/lib/magma/src/magma_util/platform/platform_interrupt.h
diff --git a/lib/magma/src/magma_util/platform/platform_mmio.h b/garnet/lib/magma/src/magma_util/platform/platform_mmio.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_mmio.h rename to garnet/lib/magma/src/magma_util/platform/platform_mmio.h
diff --git a/lib/magma/src/magma_util/platform/platform_object.h b/garnet/lib/magma/src/magma_util/platform/platform_object.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_object.h rename to garnet/lib/magma/src/magma_util/platform/platform_object.h
diff --git a/lib/magma/src/magma_util/platform/platform_pci_device.h b/garnet/lib/magma/src/magma_util/platform/platform_pci_device.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_pci_device.h rename to garnet/lib/magma/src/magma_util/platform/platform_pci_device.h
diff --git a/lib/magma/src/magma_util/platform/platform_port.h b/garnet/lib/magma/src/magma_util/platform/platform_port.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_port.h rename to garnet/lib/magma/src/magma_util/platform/platform_port.h
diff --git a/lib/magma/src/magma_util/platform/platform_random.h b/garnet/lib/magma/src/magma_util/platform/platform_random.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_random.h rename to garnet/lib/magma/src/magma_util/platform/platform_random.h
diff --git a/lib/magma/src/magma_util/platform/platform_semaphore.h b/garnet/lib/magma/src/magma_util/platform/platform_semaphore.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_semaphore.h rename to garnet/lib/magma/src/magma_util/platform/platform_semaphore.h
diff --git a/lib/magma/src/magma_util/platform/platform_sysmem_connection.h b/garnet/lib/magma/src/magma_util/platform/platform_sysmem_connection.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_sysmem_connection.h rename to garnet/lib/magma/src/magma_util/platform/platform_sysmem_connection.h
diff --git a/lib/magma/src/magma_util/platform/platform_thread.h b/garnet/lib/magma/src/magma_util/platform/platform_thread.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_thread.h rename to garnet/lib/magma/src/magma_util/platform/platform_thread.h
diff --git a/lib/magma/src/magma_util/platform/platform_trace.h b/garnet/lib/magma/src/magma_util/platform/platform_trace.h similarity index 100% rename from lib/magma/src/magma_util/platform/platform_trace.h rename to garnet/lib/magma/src/magma_util/platform/platform_trace.h
diff --git a/lib/magma/src/magma_util/platform/zircon/BUILD.gn b/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/BUILD.gn rename to garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_address_range.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_address_range.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_address_range.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_address_range.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_buffer.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_bus_mapper.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection_client.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection_client.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_connection_client.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_connection_client.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_device.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_device.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_device.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_device.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_device.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_device.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_device.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_device.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_event.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_event.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_event.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_event.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_event.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_event.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_event.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_event.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_futex.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_futex.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_futex.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_futex.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_handle.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_interrupt.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_interrupt.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_interrupt.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_interrupt.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_mmio.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_object.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_object.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_object.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_object.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_pci_device.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_port.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_port.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_port.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_port.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_port.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_port.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_port.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_port.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_random.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_random.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_random.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_random.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_semaphore.h
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_sysmem_connection.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_sysmem_connection.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_sysmem_connection.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_sysmem_connection.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_thread.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_thread.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_thread.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_thread.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.cc b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.cc similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.cc rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.cc
diff --git a/lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.h b/garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.h similarity index 100% rename from lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.h rename to garnet/lib/magma/src/magma_util/platform/zircon/zircon_platform_trace.h
diff --git a/lib/magma/src/magma_util/register_bitfields.h b/garnet/lib/magma/src/magma_util/register_bitfields.h similarity index 100% rename from lib/magma/src/magma_util/register_bitfields.h rename to garnet/lib/magma/src/magma_util/register_bitfields.h
diff --git a/lib/magma/src/magma_util/register_io.cc b/garnet/lib/magma/src/magma_util/register_io.cc similarity index 100% rename from lib/magma/src/magma_util/register_io.cc rename to garnet/lib/magma/src/magma_util/register_io.cc
diff --git a/lib/magma/src/magma_util/register_io.h b/garnet/lib/magma/src/magma_util/register_io.h similarity index 100% rename from lib/magma/src/magma_util/register_io.h rename to garnet/lib/magma/src/magma_util/register_io.h
diff --git a/lib/magma/src/magma_util/retry_allocator.cc b/garnet/lib/magma/src/magma_util/retry_allocator.cc similarity index 100% rename from lib/magma/src/magma_util/retry_allocator.cc rename to garnet/lib/magma/src/magma_util/retry_allocator.cc
diff --git a/lib/magma/src/magma_util/retry_allocator.h b/garnet/lib/magma/src/magma_util/retry_allocator.h similarity index 100% rename from lib/magma/src/magma_util/retry_allocator.h rename to garnet/lib/magma/src/magma_util/retry_allocator.h
diff --git a/lib/magma/src/magma_util/semaphore_port.h b/garnet/lib/magma/src/magma_util/semaphore_port.h similarity index 100% rename from lib/magma/src/magma_util/semaphore_port.h rename to garnet/lib/magma/src/magma_util/semaphore_port.h
diff --git a/lib/magma/src/magma_util/simple_allocator.cc b/garnet/lib/magma/src/magma_util/simple_allocator.cc similarity index 100% rename from lib/magma/src/magma_util/simple_allocator.cc rename to garnet/lib/magma/src/magma_util/simple_allocator.cc
diff --git a/lib/magma/src/magma_util/simple_allocator.h b/garnet/lib/magma/src/magma_util/simple_allocator.h similarity index 100% rename from lib/magma/src/magma_util/simple_allocator.h rename to garnet/lib/magma/src/magma_util/simple_allocator.h
diff --git a/lib/magma/src/magma_util/status.h b/garnet/lib/magma/src/magma_util/status.h similarity index 100% rename from lib/magma/src/magma_util/status.h rename to garnet/lib/magma/src/magma_util/status.h
diff --git a/lib/magma/src/magma_util/thread.h b/garnet/lib/magma/src/magma_util/thread.h similarity index 100% rename from lib/magma/src/magma_util/thread.h rename to garnet/lib/magma/src/magma_util/thread.h
diff --git a/lib/magma/src/sys_driver/BUILD.gn b/garnet/lib/magma/src/sys_driver/BUILD.gn similarity index 100% rename from lib/magma/src/sys_driver/BUILD.gn rename to garnet/lib/magma/src/sys_driver/BUILD.gn
diff --git a/lib/magma/src/sys_driver/magma_driver.h b/garnet/lib/magma/src/sys_driver/magma_driver.h similarity index 100% rename from lib/magma/src/sys_driver/magma_driver.h rename to garnet/lib/magma/src/sys_driver/magma_driver.h
diff --git a/lib/magma/src/sys_driver/magma_entry.cc b/garnet/lib/magma/src/sys_driver/magma_entry.cc similarity index 100% rename from lib/magma/src/sys_driver/magma_entry.cc rename to garnet/lib/magma/src/sys_driver/magma_entry.cc
diff --git a/lib/magma/src/sys_driver/magma_system_buffer.cc b/garnet/lib/magma/src/sys_driver/magma_system_buffer.cc similarity index 100% rename from lib/magma/src/sys_driver/magma_system_buffer.cc rename to garnet/lib/magma/src/sys_driver/magma_system_buffer.cc
diff --git a/lib/magma/src/sys_driver/magma_system_buffer.h b/garnet/lib/magma/src/sys_driver/magma_system_buffer.h similarity index 100% rename from lib/magma/src/sys_driver/magma_system_buffer.h rename to garnet/lib/magma/src/sys_driver/magma_system_buffer.h
diff --git a/lib/magma/src/sys_driver/magma_system_connection.cc b/garnet/lib/magma/src/sys_driver/magma_system_connection.cc similarity index 100% rename from lib/magma/src/sys_driver/magma_system_connection.cc rename to garnet/lib/magma/src/sys_driver/magma_system_connection.cc
diff --git a/lib/magma/src/sys_driver/magma_system_connection.h b/garnet/lib/magma/src/sys_driver/magma_system_connection.h similarity index 100% rename from lib/magma/src/sys_driver/magma_system_connection.h rename to garnet/lib/magma/src/sys_driver/magma_system_connection.h
diff --git a/lib/magma/src/sys_driver/magma_system_context.cc b/garnet/lib/magma/src/sys_driver/magma_system_context.cc similarity index 100% rename from lib/magma/src/sys_driver/magma_system_context.cc rename to garnet/lib/magma/src/sys_driver/magma_system_context.cc
diff --git a/lib/magma/src/sys_driver/magma_system_context.h b/garnet/lib/magma/src/sys_driver/magma_system_context.h similarity index 100% rename from lib/magma/src/sys_driver/magma_system_context.h rename to garnet/lib/magma/src/sys_driver/magma_system_context.h
diff --git a/lib/magma/src/sys_driver/magma_system_device.cc b/garnet/lib/magma/src/sys_driver/magma_system_device.cc similarity index 100% rename from lib/magma/src/sys_driver/magma_system_device.cc rename to garnet/lib/magma/src/sys_driver/magma_system_device.cc
diff --git a/lib/magma/src/sys_driver/magma_system_device.h b/garnet/lib/magma/src/sys_driver/magma_system_device.h similarity index 100% rename from lib/magma/src/sys_driver/magma_system_device.h rename to garnet/lib/magma/src/sys_driver/magma_system_device.h
diff --git a/lib/magma/src/sys_driver/magma_system_semaphore.cc b/garnet/lib/magma/src/sys_driver/magma_system_semaphore.cc similarity index 100% rename from lib/magma/src/sys_driver/magma_system_semaphore.cc rename to garnet/lib/magma/src/sys_driver/magma_system_semaphore.cc
diff --git a/lib/magma/src/sys_driver/magma_system_semaphore.h b/garnet/lib/magma/src/sys_driver/magma_system_semaphore.h similarity index 100% rename from lib/magma/src/sys_driver/magma_system_semaphore.h rename to garnet/lib/magma/src/sys_driver/magma_system_semaphore.h
diff --git a/lib/magma/src/sys_driver/pci_driver_test_gtest.cc b/garnet/lib/magma/src/sys_driver/pci_driver_test_gtest.cc similarity index 100% rename from lib/magma/src/sys_driver/pci_driver_test_gtest.cc rename to garnet/lib/magma/src/sys_driver/pci_driver_test_gtest.cc
diff --git a/lib/magma/src/sys_driver/pci_entry.cc b/garnet/lib/magma/src/sys_driver/pci_entry.cc similarity index 100% rename from lib/magma/src/sys_driver/pci_entry.cc rename to garnet/lib/magma/src/sys_driver/pci_entry.cc
diff --git a/lib/magma/src/sys_driver/pdev_driver_test_gtest.cc b/garnet/lib/magma/src/sys_driver/pdev_driver_test_gtest.cc similarity index 100% rename from lib/magma/src/sys_driver/pdev_driver_test_gtest.cc rename to garnet/lib/magma/src/sys_driver/pdev_driver_test_gtest.cc
diff --git a/lib/magma/src/sys_driver/pdev_entry.cc b/garnet/lib/magma/src/sys_driver/pdev_entry.cc similarity index 100% rename from lib/magma/src/sys_driver/pdev_entry.cc rename to garnet/lib/magma/src/sys_driver/pdev_entry.cc
diff --git a/lib/magma/src/tools/BUILD.gn b/garnet/lib/magma/src/tools/BUILD.gn similarity index 100% rename from lib/magma/src/tools/BUILD.gn rename to garnet/lib/magma/src/tools/BUILD.gn
diff --git a/lib/magma/src/tools/info.cc b/garnet/lib/magma/src/tools/info.cc similarity index 100% rename from lib/magma/src/tools/info.cc rename to garnet/lib/magma/src/tools/info.cc
diff --git a/lib/magma/tests/BUILD.gn b/garnet/lib/magma/tests/BUILD.gn similarity index 100% rename from lib/magma/tests/BUILD.gn rename to garnet/lib/magma/tests/BUILD.gn
diff --git a/lib/magma/tests/benchmark/BUILD.gn b/garnet/lib/magma/tests/benchmark/BUILD.gn similarity index 100% rename from lib/magma/tests/benchmark/BUILD.gn rename to garnet/lib/magma/tests/benchmark/BUILD.gn
diff --git a/lib/magma/tests/benchmark/test_memcpy.cc b/garnet/lib/magma/tests/benchmark/test_memcpy.cc similarity index 100% rename from lib/magma/tests/benchmark/test_memcpy.cc rename to garnet/lib/magma/tests/benchmark/test_memcpy.cc
diff --git a/lib/magma/tests/benchmark/test_vkcopy.cc b/garnet/lib/magma/tests/benchmark/test_vkcopy.cc similarity index 100% rename from lib/magma/tests/benchmark/test_vkcopy.cc rename to garnet/lib/magma/tests/benchmark/test_vkcopy.cc
diff --git a/lib/magma/tests/helper/BUILD.gn b/garnet/lib/magma/tests/helper/BUILD.gn similarity index 100% rename from lib/magma/tests/helper/BUILD.gn rename to garnet/lib/magma/tests/helper/BUILD.gn
diff --git a/lib/magma/tests/helper/command_buffer_helper.h b/garnet/lib/magma/tests/helper/command_buffer_helper.h similarity index 100% rename from lib/magma/tests/helper/command_buffer_helper.h rename to garnet/lib/magma/tests/helper/command_buffer_helper.h
diff --git a/lib/magma/tests/helper/platform_device_helper.cc b/garnet/lib/magma/tests/helper/platform_device_helper.cc similarity index 100% rename from lib/magma/tests/helper/platform_device_helper.cc rename to garnet/lib/magma/tests/helper/platform_device_helper.cc
diff --git a/lib/magma/tests/helper/platform_device_helper.h b/garnet/lib/magma/tests/helper/platform_device_helper.h similarity index 100% rename from lib/magma/tests/helper/platform_device_helper.h rename to garnet/lib/magma/tests/helper/platform_device_helper.h
diff --git a/lib/magma/tests/integration/BUILD.gn b/garnet/lib/magma/tests/integration/BUILD.gn similarity index 100% rename from lib/magma/tests/integration/BUILD.gn rename to garnet/lib/magma/tests/integration/BUILD.gn
diff --git a/lib/magma/tests/integration/main.cc b/garnet/lib/magma/tests/integration/main.cc similarity index 100% rename from lib/magma/tests/integration/main.cc rename to garnet/lib/magma/tests/integration/main.cc
diff --git a/lib/magma/tests/integration/test_magma_abi.cc b/garnet/lib/magma/tests/integration/test_magma_abi.cc similarity index 100% rename from lib/magma/tests/integration/test_magma_abi.cc rename to garnet/lib/magma/tests/integration/test_magma_abi.cc
diff --git a/lib/magma/tests/integration/test_magma_abi.h b/garnet/lib/magma/tests/integration/test_magma_abi.h similarity index 100% rename from lib/magma/tests/integration/test_magma_abi.h rename to garnet/lib/magma/tests/integration/test_magma_abi.h
diff --git a/lib/magma/tests/integration/test_magma_abi_c.c b/garnet/lib/magma/tests/integration/test_magma_abi_c.c similarity index 100% rename from lib/magma/tests/integration/test_magma_abi_c.c rename to garnet/lib/magma/tests/integration/test_magma_abi_c.c
diff --git a/lib/magma/tests/meta/magma_abi_conformance_tests.cmx b/garnet/lib/magma/tests/meta/magma_abi_conformance_tests.cmx similarity index 100% rename from lib/magma/tests/meta/magma_abi_conformance_tests.cmx rename to garnet/lib/magma/tests/meta/magma_abi_conformance_tests.cmx
diff --git a/lib/magma/tests/meta/magma_unit_tests.cmx b/garnet/lib/magma/tests/meta/magma_unit_tests.cmx similarity index 100% rename from lib/magma/tests/meta/magma_unit_tests.cmx rename to garnet/lib/magma/tests/meta/magma_unit_tests.cmx
diff --git a/lib/magma/tests/meta/vkcopy.cmx b/garnet/lib/magma/tests/meta/vkcopy.cmx similarity index 100% rename from lib/magma/tests/meta/vkcopy.cmx rename to garnet/lib/magma/tests/meta/vkcopy.cmx
diff --git a/lib/magma/tests/meta/vkext.cmx b/garnet/lib/magma/tests/meta/vkext.cmx similarity index 100% rename from lib/magma/tests/meta/vkext.cmx rename to garnet/lib/magma/tests/meta/vkext.cmx
diff --git a/lib/magma/tests/meta/vkloop.cmx b/garnet/lib/magma/tests/meta/vkloop.cmx similarity index 100% rename from lib/magma/tests/meta/vkloop.cmx rename to garnet/lib/magma/tests/meta/vkloop.cmx
diff --git a/lib/magma/tests/meta/vkpriority.cmx b/garnet/lib/magma/tests/meta/vkpriority.cmx similarity index 100% rename from lib/magma/tests/meta/vkpriority.cmx rename to garnet/lib/magma/tests/meta/vkpriority.cmx
diff --git a/lib/magma/tests/meta/vkreadback.cmx b/garnet/lib/magma/tests/meta/vkreadback.cmx similarity index 100% rename from lib/magma/tests/meta/vkreadback.cmx rename to garnet/lib/magma/tests/meta/vkreadback.cmx
diff --git a/lib/magma/tests/mock/BUILD.gn b/garnet/lib/magma/tests/mock/BUILD.gn similarity index 100% rename from lib/magma/tests/mock/BUILD.gn rename to garnet/lib/magma/tests/mock/BUILD.gn
diff --git a/lib/magma/tests/mock/mock_bus_mapper.h b/garnet/lib/magma/tests/mock/mock_bus_mapper.h similarity index 100% rename from lib/magma/tests/mock/mock_bus_mapper.h rename to garnet/lib/magma/tests/mock/mock_bus_mapper.h
diff --git a/lib/magma/tests/mock/mock_magma_system.cc b/garnet/lib/magma/tests/mock/mock_magma_system.cc similarity index 100% rename from lib/magma/tests/mock/mock_magma_system.cc rename to garnet/lib/magma/tests/mock/mock_magma_system.cc
diff --git a/lib/magma/tests/mock/mock_mmio.cc b/garnet/lib/magma/tests/mock/mock_mmio.cc similarity index 100% rename from lib/magma/tests/mock/mock_mmio.cc rename to garnet/lib/magma/tests/mock/mock_mmio.cc
diff --git a/lib/magma/tests/mock/mock_mmio.h b/garnet/lib/magma/tests/mock/mock_mmio.h similarity index 100% rename from lib/magma/tests/mock/mock_mmio.h rename to garnet/lib/magma/tests/mock/mock_mmio.h
diff --git a/lib/magma/tests/mock/mock_msd.cc b/garnet/lib/magma/tests/mock/mock_msd.cc similarity index 100% rename from lib/magma/tests/mock/mock_msd.cc rename to garnet/lib/magma/tests/mock/mock_msd.cc
diff --git a/lib/magma/tests/mock/mock_msd.h b/garnet/lib/magma/tests/mock/mock_msd.h similarity index 100% rename from lib/magma/tests/mock/mock_msd.h rename to garnet/lib/magma/tests/mock/mock_msd.h
diff --git a/lib/magma/tests/unit_tests/BUILD.gn b/garnet/lib/magma/tests/unit_tests/BUILD.gn similarity index 100% rename from lib/magma/tests/unit_tests/BUILD.gn rename to garnet/lib/magma/tests/unit_tests/BUILD.gn
diff --git a/lib/magma/tests/unit_tests/main.cc b/garnet/lib/magma/tests/unit_tests/main.cc similarity index 100% rename from lib/magma/tests/unit_tests/main.cc rename to garnet/lib/magma/tests/unit_tests/main.cc
diff --git a/lib/magma/tests/unit_tests/test_address_space_allocator.cc b/garnet/lib/magma/tests/unit_tests/test_address_space_allocator.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_address_space_allocator.cc rename to garnet/lib/magma/tests/unit_tests/test_address_space_allocator.cc
diff --git a/lib/magma/tests/unit_tests/test_inflight_list.cc b/garnet/lib/magma/tests/unit_tests/test_inflight_list.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_inflight_list.cc rename to garnet/lib/magma/tests/unit_tests/test_inflight_list.cc
diff --git a/lib/magma/tests/unit_tests/test_macros.cc b/garnet/lib/magma/tests/unit_tests/test_macros.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_macros.cc rename to garnet/lib/magma/tests/unit_tests/test_macros.cc
diff --git a/lib/magma/tests/unit_tests/test_magma_driver.cc b/garnet/lib/magma/tests/unit_tests/test_magma_driver.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_magma_driver.cc rename to garnet/lib/magma/tests/unit_tests/test_magma_driver.cc
diff --git a/lib/magma/tests/unit_tests/test_magma_system_buffer.cc b/garnet/lib/magma/tests/unit_tests/test_magma_system_buffer.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_magma_system_buffer.cc rename to garnet/lib/magma/tests/unit_tests/test_magma_system_buffer.cc
diff --git a/lib/magma/tests/unit_tests/test_magma_system_connection.cc b/garnet/lib/magma/tests/unit_tests/test_magma_system_connection.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_magma_system_connection.cc rename to garnet/lib/magma/tests/unit_tests/test_magma_system_connection.cc
diff --git a/lib/magma/tests/unit_tests/test_magma_system_context.cc b/garnet/lib/magma/tests/unit_tests/test_magma_system_context.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_magma_system_context.cc rename to garnet/lib/magma/tests/unit_tests/test_magma_system_context.cc
diff --git a/lib/magma/tests/unit_tests/test_magma_system_multithread.cc b/garnet/lib/magma/tests/unit_tests/test_magma_system_multithread.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_magma_system_multithread.cc rename to garnet/lib/magma/tests/unit_tests/test_magma_system_multithread.cc
diff --git a/lib/magma/tests/unit_tests/test_mmio.cc b/garnet/lib/magma/tests/unit_tests/test_mmio.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_mmio.cc rename to garnet/lib/magma/tests/unit_tests/test_mmio.cc
diff --git a/lib/magma/tests/unit_tests/test_msd_buffer.cc b/garnet/lib/magma/tests/unit_tests/test_msd_buffer.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_msd_buffer.cc rename to garnet/lib/magma/tests/unit_tests/test_msd_buffer.cc
diff --git a/lib/magma/tests/unit_tests/test_msd_context.cc b/garnet/lib/magma/tests/unit_tests/test_msd_context.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_msd_context.cc rename to garnet/lib/magma/tests/unit_tests/test_msd_context.cc
diff --git a/lib/magma/tests/unit_tests/test_msd_device.cc b/garnet/lib/magma/tests/unit_tests/test_msd_device.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_msd_device.cc rename to garnet/lib/magma/tests/unit_tests/test_msd_device.cc
diff --git a/lib/magma/tests/unit_tests/test_msd_driver.cc b/garnet/lib/magma/tests/unit_tests/test_msd_driver.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_msd_driver.cc rename to garnet/lib/magma/tests/unit_tests/test_msd_driver.cc
diff --git a/lib/magma/tests/unit_tests/test_msd_semaphore.cc b/garnet/lib/magma/tests/unit_tests/test_msd_semaphore.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_msd_semaphore.cc rename to garnet/lib/magma/tests/unit_tests/test_msd_semaphore.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_buffer.cc b/garnet/lib/magma/tests/unit_tests/test_platform_buffer.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_buffer.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_buffer.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_bus_mapper.cc b/garnet/lib/magma/tests/unit_tests/test_platform_bus_mapper.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_bus_mapper.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_bus_mapper.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_connection.cc b/garnet/lib/magma/tests/unit_tests/test_platform_connection.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_connection.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_connection.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_device.cc b/garnet/lib/magma/tests/unit_tests/test_platform_device.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_device.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_device.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_event.cc b/garnet/lib/magma/tests/unit_tests/test_platform_event.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_event.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_event.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_futex.cc b/garnet/lib/magma/tests/unit_tests/test_platform_futex.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_futex.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_futex.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_handle.cc b/garnet/lib/magma/tests/unit_tests/test_platform_handle.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_handle.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_handle.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_interrupt.cc b/garnet/lib/magma/tests/unit_tests/test_platform_interrupt.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_interrupt.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_interrupt.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_pci_device.cc b/garnet/lib/magma/tests/unit_tests/test_platform_pci_device.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_pci_device.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_pci_device.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_port.cc b/garnet/lib/magma/tests/unit_tests/test_platform_port.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_port.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_port.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_random.cc b/garnet/lib/magma/tests/unit_tests/test_platform_random.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_random.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_random.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_semaphore.cc b/garnet/lib/magma/tests/unit_tests/test_platform_semaphore.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_semaphore.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_semaphore.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_sysmem_connection.cc b/garnet/lib/magma/tests/unit_tests/test_platform_sysmem_connection.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_sysmem_connection.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_sysmem_connection.cc
diff --git a/lib/magma/tests/unit_tests/test_platform_thread.cc b/garnet/lib/magma/tests/unit_tests/test_platform_thread.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_platform_thread.cc rename to garnet/lib/magma/tests/unit_tests/test_platform_thread.cc
diff --git a/lib/magma/tests/unit_tests/test_register_bitfields.cc b/garnet/lib/magma/tests/unit_tests/test_register_bitfields.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_register_bitfields.cc rename to garnet/lib/magma/tests/unit_tests/test_register_bitfields.cc
diff --git a/lib/magma/tests/unit_tests/test_semaphore_port.cc b/garnet/lib/magma/tests/unit_tests/test_semaphore_port.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_semaphore_port.cc rename to garnet/lib/magma/tests/unit_tests/test_semaphore_port.cc
diff --git a/lib/magma/tests/unit_tests/test_status.cc b/garnet/lib/magma/tests/unit_tests/test_status.cc similarity index 100% rename from lib/magma/tests/unit_tests/test_status.cc rename to garnet/lib/magma/tests/unit_tests/test_status.cc
diff --git a/lib/magma/tests/vkcube/BUILD.gn b/garnet/lib/magma/tests/vkcube/BUILD.gn similarity index 100% rename from lib/magma/tests/vkcube/BUILD.gn rename to garnet/lib/magma/tests/vkcube/BUILD.gn
diff --git a/lib/magma/tests/vkcube/magma.ppm.h b/garnet/lib/magma/tests/vkcube/magma.ppm.h similarity index 100% rename from lib/magma/tests/vkcube/magma.ppm.h rename to garnet/lib/magma/tests/vkcube/magma.ppm.h
diff --git a/lib/magma/tests/vkcube/main.cc b/garnet/lib/magma/tests/vkcube/main.cc similarity index 100% rename from lib/magma/tests/vkcube/main.cc rename to garnet/lib/magma/tests/vkcube/main.cc
diff --git a/lib/magma/tests/vkcube/vkcube.h b/garnet/lib/magma/tests/vkcube/vkcube.h similarity index 100% rename from lib/magma/tests/vkcube/vkcube.h rename to garnet/lib/magma/tests/vkcube/vkcube.h
diff --git a/lib/magma/tests/vkext/BUILD.gn b/garnet/lib/magma/tests/vkext/BUILD.gn similarity index 100% rename from lib/magma/tests/vkext/BUILD.gn rename to garnet/lib/magma/tests/vkext/BUILD.gn
diff --git a/lib/magma/tests/vkext/main.cc b/garnet/lib/magma/tests/vkext/main.cc similarity index 100% rename from lib/magma/tests/vkext/main.cc rename to garnet/lib/magma/tests/vkext/main.cc
diff --git a/lib/magma/tests/vkext/vk_ext_scanout.cc b/garnet/lib/magma/tests/vkext/vk_ext_scanout.cc similarity index 100% rename from lib/magma/tests/vkext/vk_ext_scanout.cc rename to garnet/lib/magma/tests/vkext/vk_ext_scanout.cc
diff --git a/lib/magma/tests/vkext/vk_external_semaphore_fuchsia.cc b/garnet/lib/magma/tests/vkext/vk_external_semaphore_fuchsia.cc similarity index 100% rename from lib/magma/tests/vkext/vk_external_semaphore_fuchsia.cc rename to garnet/lib/magma/tests/vkext/vk_external_semaphore_fuchsia.cc
diff --git a/lib/magma/tests/vkloop/BUILD.gn b/garnet/lib/magma/tests/vkloop/BUILD.gn similarity index 100% rename from lib/magma/tests/vkloop/BUILD.gn rename to garnet/lib/magma/tests/vkloop/BUILD.gn
diff --git a/lib/magma/tests/vkloop/loop.comp b/garnet/lib/magma/tests/vkloop/loop.comp similarity index 100% rename from lib/magma/tests/vkloop/loop.comp rename to garnet/lib/magma/tests/vkloop/loop.comp
diff --git a/lib/magma/tests/vkloop/loop.comp.h b/garnet/lib/magma/tests/vkloop/loop.comp.h similarity index 100% rename from lib/magma/tests/vkloop/loop.comp.h rename to garnet/lib/magma/tests/vkloop/loop.comp.h
diff --git a/lib/magma/tests/vkloop/main.cc b/garnet/lib/magma/tests/vkloop/main.cc similarity index 100% rename from lib/magma/tests/vkloop/main.cc rename to garnet/lib/magma/tests/vkloop/main.cc
diff --git a/lib/magma/tests/vkloop/vkloop.cc b/garnet/lib/magma/tests/vkloop/vkloop.cc similarity index 100% rename from lib/magma/tests/vkloop/vkloop.cc rename to garnet/lib/magma/tests/vkloop/vkloop.cc
diff --git a/lib/magma/tests/vkpriority/BUILD.gn b/garnet/lib/magma/tests/vkpriority/BUILD.gn similarity index 100% rename from lib/magma/tests/vkpriority/BUILD.gn rename to garnet/lib/magma/tests/vkpriority/BUILD.gn
diff --git a/lib/magma/tests/vkpriority/main.cc b/garnet/lib/magma/tests/vkpriority/main.cc similarity index 100% rename from lib/magma/tests/vkpriority/main.cc rename to garnet/lib/magma/tests/vkpriority/main.cc
diff --git a/lib/magma/tests/vkpriority/priority.comp b/garnet/lib/magma/tests/vkpriority/priority.comp similarity index 100% rename from lib/magma/tests/vkpriority/priority.comp rename to garnet/lib/magma/tests/vkpriority/priority.comp
diff --git a/lib/magma/tests/vkpriority/priority.comp.h b/garnet/lib/magma/tests/vkpriority/priority.comp.h similarity index 100% rename from lib/magma/tests/vkpriority/priority.comp.h rename to garnet/lib/magma/tests/vkpriority/priority.comp.h
diff --git a/lib/magma/tests/vkpriority/vkpriority.cc b/garnet/lib/magma/tests/vkpriority/vkpriority.cc similarity index 100% rename from lib/magma/tests/vkpriority/vkpriority.cc rename to garnet/lib/magma/tests/vkpriority/vkpriority.cc
diff --git a/lib/magma/tests/vkreadback/BUILD.gn b/garnet/lib/magma/tests/vkreadback/BUILD.gn similarity index 100% rename from lib/magma/tests/vkreadback/BUILD.gn rename to garnet/lib/magma/tests/vkreadback/BUILD.gn
diff --git a/lib/magma/tests/vkreadback/android/Makefile b/garnet/lib/magma/tests/vkreadback/android/Makefile similarity index 100% rename from lib/magma/tests/vkreadback/android/Makefile rename to garnet/lib/magma/tests/vkreadback/android/Makefile
diff --git a/lib/magma/tests/vkreadback/main.cc b/garnet/lib/magma/tests/vkreadback/main.cc similarity index 100% rename from lib/magma/tests/vkreadback/main.cc rename to garnet/lib/magma/tests/vkreadback/main.cc
diff --git a/lib/magma/tests/vkreadback/mt_create_vkdevice_loop.cc b/garnet/lib/magma/tests/vkreadback/mt_create_vkdevice_loop.cc similarity index 100% rename from lib/magma/tests/vkreadback/mt_create_vkdevice_loop.cc rename to garnet/lib/magma/tests/vkreadback/mt_create_vkdevice_loop.cc
diff --git a/lib/magma/tests/vkreadback/vkreadback.cc b/garnet/lib/magma/tests/vkreadback/vkreadback.cc similarity index 100% rename from lib/magma/tests/vkreadback/vkreadback.cc rename to garnet/lib/magma/tests/vkreadback/vkreadback.cc
diff --git a/lib/magma/tests/vulkan_shim/BUILD.gn b/garnet/lib/magma/tests/vulkan_shim/BUILD.gn similarity index 100% rename from lib/magma/tests/vulkan_shim/BUILD.gn rename to garnet/lib/magma/tests/vulkan_shim/BUILD.gn
diff --git a/lib/magma/tests/vulkan_shim/vulkan_shim.cc b/garnet/lib/magma/tests/vulkan_shim/vulkan_shim.cc similarity index 100% rename from lib/magma/tests/vulkan_shim/vulkan_shim.cc rename to garnet/lib/magma/tests/vulkan_shim/vulkan_shim.cc
diff --git a/lib/magma/tests/vulkan_shim/vulkan_shim.h b/garnet/lib/magma/tests/vulkan_shim/vulkan_shim.h similarity index 100% rename from lib/magma/tests/vulkan_shim/vulkan_shim.h rename to garnet/lib/magma/tests/vulkan_shim/vulkan_shim.h
diff --git a/lib/magma/third_party/vkcube/cube.cc b/garnet/lib/magma/third_party/vkcube/cube.cc similarity index 100% rename from lib/magma/third_party/vkcube/cube.cc rename to garnet/lib/magma/third_party/vkcube/cube.cc
diff --git a/lib/magma/third_party/vkcube/cube.frag.h b/garnet/lib/magma/third_party/vkcube/cube.frag.h similarity index 100% rename from lib/magma/third_party/vkcube/cube.frag.h rename to garnet/lib/magma/third_party/vkcube/cube.frag.h
diff --git a/lib/magma/third_party/vkcube/cube.vert.h b/garnet/lib/magma/third_party/vkcube/cube.vert.h similarity index 100% rename from lib/magma/third_party/vkcube/cube.vert.h rename to garnet/lib/magma/third_party/vkcube/cube.vert.h
diff --git a/lib/magma/third_party/vkcube/linmath.h b/garnet/lib/magma/third_party/vkcube/linmath.h similarity index 100% rename from lib/magma/third_party/vkcube/linmath.h rename to garnet/lib/magma/third_party/vkcube/linmath.h
diff --git a/lib/magma/third_party/vkcube/lunarg.ppm.h b/garnet/lib/magma/third_party/vkcube/lunarg.ppm.h similarity index 100% rename from lib/magma/third_party/vkcube/lunarg.ppm.h rename to garnet/lib/magma/third_party/vkcube/lunarg.ppm.h
diff --git a/lib/measure/BUILD.gn b/garnet/lib/measure/BUILD.gn similarity index 100% rename from lib/measure/BUILD.gn rename to garnet/lib/measure/BUILD.gn
diff --git a/lib/measure/README.md b/garnet/lib/measure/README.md similarity index 100% rename from lib/measure/README.md rename to garnet/lib/measure/README.md
diff --git a/lib/measure/argument_value.cc b/garnet/lib/measure/argument_value.cc similarity index 100% rename from lib/measure/argument_value.cc rename to garnet/lib/measure/argument_value.cc
diff --git a/lib/measure/argument_value.h b/garnet/lib/measure/argument_value.h similarity index 100% rename from lib/measure/argument_value.h rename to garnet/lib/measure/argument_value.h
diff --git a/lib/measure/argument_value_unittest.cc b/garnet/lib/measure/argument_value_unittest.cc similarity index 100% rename from lib/measure/argument_value_unittest.cc rename to garnet/lib/measure/argument_value_unittest.cc
diff --git a/lib/measure/duration.cc b/garnet/lib/measure/duration.cc similarity index 100% rename from lib/measure/duration.cc rename to garnet/lib/measure/duration.cc
diff --git a/lib/measure/duration.h b/garnet/lib/measure/duration.h similarity index 100% rename from lib/measure/duration.h rename to garnet/lib/measure/duration.h
diff --git a/lib/measure/duration_unittest.cc b/garnet/lib/measure/duration_unittest.cc similarity index 100% rename from lib/measure/duration_unittest.cc rename to garnet/lib/measure/duration_unittest.cc
diff --git a/lib/measure/event_spec.cc b/garnet/lib/measure/event_spec.cc similarity index 100% rename from lib/measure/event_spec.cc rename to garnet/lib/measure/event_spec.cc
diff --git a/lib/measure/event_spec.h b/garnet/lib/measure/event_spec.h similarity index 100% rename from lib/measure/event_spec.h rename to garnet/lib/measure/event_spec.h
diff --git a/lib/measure/measurements.h b/garnet/lib/measure/measurements.h similarity index 100% rename from lib/measure/measurements.h rename to garnet/lib/measure/measurements.h
diff --git a/lib/measure/results.cc b/garnet/lib/measure/results.cc similarity index 100% rename from lib/measure/results.cc rename to garnet/lib/measure/results.cc
diff --git a/lib/measure/results.h b/garnet/lib/measure/results.h similarity index 100% rename from lib/measure/results.h rename to garnet/lib/measure/results.h
diff --git a/lib/measure/results_unittest.cc b/garnet/lib/measure/results_unittest.cc similarity index 100% rename from lib/measure/results_unittest.cc rename to garnet/lib/measure/results_unittest.cc
diff --git a/lib/measure/test_events.cc b/garnet/lib/measure/test_events.cc similarity index 100% rename from lib/measure/test_events.cc rename to garnet/lib/measure/test_events.cc
diff --git a/lib/measure/test_events.h b/garnet/lib/measure/test_events.h similarity index 100% rename from lib/measure/test_events.h rename to garnet/lib/measure/test_events.h
diff --git a/lib/measure/time_between.cc b/garnet/lib/measure/time_between.cc similarity index 100% rename from lib/measure/time_between.cc rename to garnet/lib/measure/time_between.cc
diff --git a/lib/measure/time_between.h b/garnet/lib/measure/time_between.h similarity index 100% rename from lib/measure/time_between.h rename to garnet/lib/measure/time_between.h
diff --git a/lib/measure/time_between_unittest.cc b/garnet/lib/measure/time_between_unittest.cc similarity index 100% rename from lib/measure/time_between_unittest.cc rename to garnet/lib/measure/time_between_unittest.cc
diff --git a/lib/media/camera/simple_camera_lib/BUILD.gn b/garnet/lib/media/camera/simple_camera_lib/BUILD.gn similarity index 100% rename from lib/media/camera/simple_camera_lib/BUILD.gn rename to garnet/lib/media/camera/simple_camera_lib/BUILD.gn
diff --git a/lib/media/camera/simple_camera_lib/buffer_fence.cc b/garnet/lib/media/camera/simple_camera_lib/buffer_fence.cc similarity index 100% rename from lib/media/camera/simple_camera_lib/buffer_fence.cc rename to garnet/lib/media/camera/simple_camera_lib/buffer_fence.cc
diff --git a/lib/media/camera/simple_camera_lib/buffer_fence.h b/garnet/lib/media/camera/simple_camera_lib/buffer_fence.h similarity index 100% rename from lib/media/camera/simple_camera_lib/buffer_fence.h rename to garnet/lib/media/camera/simple_camera_lib/buffer_fence.h
diff --git a/lib/media/camera/simple_camera_lib/fake-control-impl.cc b/garnet/lib/media/camera/simple_camera_lib/fake-control-impl.cc similarity index 100% rename from lib/media/camera/simple_camera_lib/fake-control-impl.cc rename to garnet/lib/media/camera/simple_camera_lib/fake-control-impl.cc
diff --git a/lib/media/camera/simple_camera_lib/fake-control-impl.h b/garnet/lib/media/camera/simple_camera_lib/fake-control-impl.h similarity index 100% rename from lib/media/camera/simple_camera_lib/fake-control-impl.h rename to garnet/lib/media/camera/simple_camera_lib/fake-control-impl.h
diff --git a/lib/media/camera/simple_camera_lib/frame_scheduler.cc b/garnet/lib/media/camera/simple_camera_lib/frame_scheduler.cc similarity index 100% rename from lib/media/camera/simple_camera_lib/frame_scheduler.cc rename to garnet/lib/media/camera/simple_camera_lib/frame_scheduler.cc
diff --git a/lib/media/camera/simple_camera_lib/frame_scheduler.h b/garnet/lib/media/camera/simple_camera_lib/frame_scheduler.h similarity index 100% rename from lib/media/camera/simple_camera_lib/frame_scheduler.h rename to garnet/lib/media/camera/simple_camera_lib/frame_scheduler.h
diff --git a/lib/media/camera/simple_camera_lib/tests/buffer_fence_unittest.cc b/garnet/lib/media/camera/simple_camera_lib/tests/buffer_fence_unittest.cc similarity index 100% rename from lib/media/camera/simple_camera_lib/tests/buffer_fence_unittest.cc rename to garnet/lib/media/camera/simple_camera_lib/tests/buffer_fence_unittest.cc
diff --git a/lib/media/camera/simple_camera_lib/tests/meta/simple_camera_unittests.cmx b/garnet/lib/media/camera/simple_camera_lib/tests/meta/simple_camera_unittests.cmx similarity index 100% rename from lib/media/camera/simple_camera_lib/tests/meta/simple_camera_unittests.cmx rename to garnet/lib/media/camera/simple_camera_lib/tests/meta/simple_camera_unittests.cmx
diff --git a/lib/media/camera/simple_camera_lib/video_display.cc b/garnet/lib/media/camera/simple_camera_lib/video_display.cc similarity index 100% rename from lib/media/camera/simple_camera_lib/video_display.cc rename to garnet/lib/media/camera/simple_camera_lib/video_display.cc
diff --git a/lib/media/camera/simple_camera_lib/video_display.h b/garnet/lib/media/camera/simple_camera_lib/video_display.h similarity index 100% rename from lib/media/camera/simple_camera_lib/video_display.h rename to garnet/lib/media/camera/simple_camera_lib/video_display.h
diff --git a/lib/media/camera/simple_camera_server/BUILD.gn b/garnet/lib/media/camera/simple_camera_server/BUILD.gn similarity index 100% rename from lib/media/camera/simple_camera_server/BUILD.gn rename to garnet/lib/media/camera/simple_camera_server/BUILD.gn
diff --git a/lib/media/camera/simple_camera_server/meta/simple_camera_server_cpp.cmx b/garnet/lib/media/camera/simple_camera_server/meta/simple_camera_server_cpp.cmx similarity index 100% rename from lib/media/camera/simple_camera_server/meta/simple_camera_server_cpp.cmx rename to garnet/lib/media/camera/simple_camera_server/meta/simple_camera_server_cpp.cmx
diff --git a/lib/media/camera/simple_camera_server/simple_camera_server.cc b/garnet/lib/media/camera/simple_camera_server/simple_camera_server.cc similarity index 100% rename from lib/media/camera/simple_camera_server/simple_camera_server.cc rename to garnet/lib/media/camera/simple_camera_server/simple_camera_server.cc
diff --git a/lib/media/camera/simple_camera_server/simple_camera_server_app.cc b/garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.cc similarity index 100% rename from lib/media/camera/simple_camera_server/simple_camera_server_app.cc rename to garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.cc
diff --git a/lib/media/camera/simple_camera_server/simple_camera_server_app.h b/garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.h similarity index 100% rename from lib/media/camera/simple_camera_server/simple_camera_server_app.h rename to garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.h
diff --git a/lib/media/codec_impl/BUILD.gn b/garnet/lib/media/codec_impl/BUILD.gn similarity index 100% rename from lib/media/codec_impl/BUILD.gn rename to garnet/lib/media/codec_impl/BUILD.gn
diff --git a/lib/media/codec_impl/README.md b/garnet/lib/media/codec_impl/README.md similarity index 100% rename from lib/media/codec_impl/README.md rename to garnet/lib/media/codec_impl/README.md
diff --git a/lib/media/codec_impl/codec_adapter.cc b/garnet/lib/media/codec_impl/codec_adapter.cc similarity index 100% rename from lib/media/codec_impl/codec_adapter.cc rename to garnet/lib/media/codec_impl/codec_adapter.cc
diff --git a/lib/media/codec_impl/codec_adapter_events.cc b/garnet/lib/media/codec_impl/codec_adapter_events.cc similarity index 100% rename from lib/media/codec_impl/codec_adapter_events.cc rename to garnet/lib/media/codec_impl/codec_adapter_events.cc
diff --git a/lib/media/codec_impl/codec_admission_control.cc b/garnet/lib/media/codec_impl/codec_admission_control.cc similarity index 100% rename from lib/media/codec_impl/codec_admission_control.cc rename to garnet/lib/media/codec_impl/codec_admission_control.cc
diff --git a/lib/media/codec_impl/codec_buffer.cc b/garnet/lib/media/codec_impl/codec_buffer.cc similarity index 100% rename from lib/media/codec_impl/codec_buffer.cc rename to garnet/lib/media/codec_impl/codec_buffer.cc
diff --git a/lib/media/codec_impl/codec_impl.cc b/garnet/lib/media/codec_impl/codec_impl.cc similarity index 100% rename from lib/media/codec_impl/codec_impl.cc rename to garnet/lib/media/codec_impl/codec_impl.cc
diff --git a/lib/media/codec_impl/codec_input_item.cc b/garnet/lib/media/codec_impl/codec_input_item.cc similarity index 100% rename from lib/media/codec_impl/codec_input_item.cc rename to garnet/lib/media/codec_impl/codec_input_item.cc
diff --git a/lib/media/codec_impl/codec_packet.cc b/garnet/lib/media/codec_impl/codec_packet.cc similarity index 100% rename from lib/media/codec_impl/codec_packet.cc rename to garnet/lib/media/codec_impl/codec_packet.cc
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter_events.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter_events.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter_events.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_adapter_events.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_admission_control.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_admission_control.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_admission_control.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_admission_control.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_buffer.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_buffer.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_buffer.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_buffer.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_frame.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_frame.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_frame.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_frame.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_impl.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_impl.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_impl.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_impl.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_input_item.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_input_item.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_input_item.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_input_item.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_packet.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_packet.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_packet.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_packet.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/codec_port.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_port.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/codec_port.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/codec_port.h
diff --git a/lib/media/codec_impl/include/lib/media/codec_impl/fourcc.h b/garnet/lib/media/codec_impl/include/lib/media/codec_impl/fourcc.h similarity index 100% rename from lib/media/codec_impl/include/lib/media/codec_impl/fourcc.h rename to garnet/lib/media/codec_impl/include/lib/media/codec_impl/fourcc.h
diff --git a/lib/media/ffmpeg/.gitignore b/garnet/lib/media/ffmpeg/.gitignore similarity index 100% rename from lib/media/ffmpeg/.gitignore rename to garnet/lib/media/ffmpeg/.gitignore
diff --git a/lib/media/ffmpeg/BUILD.gn b/garnet/lib/media/ffmpeg/BUILD.gn similarity index 100% rename from lib/media/ffmpeg/BUILD.gn rename to garnet/lib/media/ffmpeg/BUILD.gn
diff --git a/lib/media/ffmpeg/README.md b/garnet/lib/media/ffmpeg/README.md similarity index 100% rename from lib/media/ffmpeg/README.md rename to garnet/lib/media/ffmpeg/README.md
diff --git a/lib/media/ffmpeg/update_prebuilt_ffmpeg.sh b/garnet/lib/media/ffmpeg/update_prebuilt_ffmpeg.sh similarity index 100% rename from lib/media/ffmpeg/update_prebuilt_ffmpeg.sh rename to garnet/lib/media/ffmpeg/update_prebuilt_ffmpeg.sh
diff --git a/lib/media/raw_video_writer/BUILD.gn b/garnet/lib/media/raw_video_writer/BUILD.gn similarity index 100% rename from lib/media/raw_video_writer/BUILD.gn rename to garnet/lib/media/raw_video_writer/BUILD.gn
diff --git a/lib/media/raw_video_writer/raw_video_writer.cc b/garnet/lib/media/raw_video_writer/raw_video_writer.cc similarity index 100% rename from lib/media/raw_video_writer/raw_video_writer.cc rename to garnet/lib/media/raw_video_writer/raw_video_writer.cc
diff --git a/lib/media/raw_video_writer/raw_video_writer.h b/garnet/lib/media/raw_video_writer/raw_video_writer.h similarity index 100% rename from lib/media/raw_video_writer/raw_video_writer.h rename to garnet/lib/media/raw_video_writer/raw_video_writer.h
diff --git a/lib/media/test/BUILD.gn b/garnet/lib/media/test/BUILD.gn similarity index 100% rename from lib/media/test/BUILD.gn rename to garnet/lib/media/test/BUILD.gn
diff --git a/lib/media/test/codec_buffer.cc b/garnet/lib/media/test/codec_buffer.cc similarity index 100% rename from lib/media/test/codec_buffer.cc rename to garnet/lib/media/test/codec_buffer.cc
diff --git a/lib/media/test/codec_client.cc b/garnet/lib/media/test/codec_client.cc similarity index 100% rename from lib/media/test/codec_client.cc rename to garnet/lib/media/test/codec_client.cc
diff --git a/lib/media/test/codec_output.cc b/garnet/lib/media/test/codec_output.cc similarity index 100% rename from lib/media/test/codec_output.cc rename to garnet/lib/media/test/codec_output.cc
diff --git a/lib/media/test/frame_sink.cc b/garnet/lib/media/test/frame_sink.cc similarity index 100% rename from lib/media/test/frame_sink.cc rename to garnet/lib/media/test/frame_sink.cc
diff --git a/lib/media/test/frame_sink_view.cc b/garnet/lib/media/test/frame_sink_view.cc similarity index 100% rename from lib/media/test/frame_sink_view.cc rename to garnet/lib/media/test/frame_sink_view.cc
diff --git a/lib/media/test/include/lib/media/test/codec_buffer.h b/garnet/lib/media/test/include/lib/media/test/codec_buffer.h similarity index 100% rename from lib/media/test/include/lib/media/test/codec_buffer.h rename to garnet/lib/media/test/include/lib/media/test/codec_buffer.h
diff --git a/lib/media/test/include/lib/media/test/codec_client.h b/garnet/lib/media/test/include/lib/media/test/codec_client.h similarity index 100% rename from lib/media/test/include/lib/media/test/codec_client.h rename to garnet/lib/media/test/include/lib/media/test/codec_client.h
diff --git a/lib/media/test/include/lib/media/test/codec_output.h b/garnet/lib/media/test/include/lib/media/test/codec_output.h similarity index 100% rename from lib/media/test/include/lib/media/test/codec_output.h rename to garnet/lib/media/test/include/lib/media/test/codec_output.h
diff --git a/lib/media/test/include/lib/media/test/frame_sink.h b/garnet/lib/media/test/include/lib/media/test/frame_sink.h similarity index 100% rename from lib/media/test/include/lib/media/test/frame_sink.h rename to garnet/lib/media/test/include/lib/media/test/frame_sink.h
diff --git a/lib/media/test/include/lib/media/test/frame_sink_view.h b/garnet/lib/media/test/include/lib/media/test/frame_sink_view.h similarity index 100% rename from lib/media/test/include/lib/media/test/frame_sink_view.h rename to garnet/lib/media/test/include/lib/media/test/frame_sink_view.h
diff --git a/lib/media/wav_writer/BUILD.gn b/garnet/lib/media/wav_writer/BUILD.gn similarity index 100% rename from lib/media/wav_writer/BUILD.gn rename to garnet/lib/media/wav_writer/BUILD.gn
diff --git a/lib/media/wav_writer/README.md b/garnet/lib/media/wav_writer/README.md similarity index 100% rename from lib/media/wav_writer/README.md rename to garnet/lib/media/wav_writer/README.md
diff --git a/lib/media/wav_writer/wav_writer.cc b/garnet/lib/media/wav_writer/wav_writer.cc similarity index 100% rename from lib/media/wav_writer/wav_writer.cc rename to garnet/lib/media/wav_writer/wav_writer.cc
diff --git a/lib/media/wav_writer/wav_writer.h b/garnet/lib/media/wav_writer/wav_writer.h similarity index 100% rename from lib/media/wav_writer/wav_writer.h rename to garnet/lib/media/wav_writer/wav_writer.h
diff --git a/lib/mime_sniffer/BUILD.gn b/garnet/lib/mime_sniffer/BUILD.gn similarity index 100% rename from lib/mime_sniffer/BUILD.gn rename to garnet/lib/mime_sniffer/BUILD.gn
diff --git a/lib/mime_sniffer/MAINTAINERS b/garnet/lib/mime_sniffer/MAINTAINERS similarity index 100% rename from lib/mime_sniffer/MAINTAINERS rename to garnet/lib/mime_sniffer/MAINTAINERS
diff --git a/lib/mime_sniffer/mime_sniffer.cc b/garnet/lib/mime_sniffer/mime_sniffer.cc similarity index 100% rename from lib/mime_sniffer/mime_sniffer.cc rename to garnet/lib/mime_sniffer/mime_sniffer.cc
diff --git a/lib/mime_sniffer/mime_sniffer.h b/garnet/lib/mime_sniffer/mime_sniffer.h similarity index 100% rename from lib/mime_sniffer/mime_sniffer.h rename to garnet/lib/mime_sniffer/mime_sniffer.h
diff --git a/lib/mime_sniffer/mime_sniffer_unittest.cc b/garnet/lib/mime_sniffer/mime_sniffer_unittest.cc similarity index 100% rename from lib/mime_sniffer/mime_sniffer_unittest.cc rename to garnet/lib/mime_sniffer/mime_sniffer_unittest.cc
diff --git a/lib/overnet/.gitignore b/garnet/lib/overnet/.gitignore similarity index 100% rename from lib/overnet/.gitignore rename to garnet/lib/overnet/.gitignore
diff --git a/lib/overnet/BUILD.gn b/garnet/lib/overnet/BUILD.gn similarity index 100% rename from lib/overnet/BUILD.gn rename to garnet/lib/overnet/BUILD.gn
diff --git a/lib/overnet/README.md b/garnet/lib/overnet/README.md similarity index 100% rename from lib/overnet/README.md rename to garnet/lib/overnet/README.md
diff --git a/lib/overnet/TODO b/garnet/lib/overnet/TODO similarity index 100% rename from lib/overnet/TODO rename to garnet/lib/overnet/TODO
diff --git a/lib/overnet/datagram_stream/BUILD.gn b/garnet/lib/overnet/datagram_stream/BUILD.gn similarity index 100% rename from lib/overnet/datagram_stream/BUILD.gn rename to garnet/lib/overnet/datagram_stream/BUILD.gn
diff --git a/lib/overnet/datagram_stream/datagram_stream.cc b/garnet/lib/overnet/datagram_stream/datagram_stream.cc similarity index 100% rename from lib/overnet/datagram_stream/datagram_stream.cc rename to garnet/lib/overnet/datagram_stream/datagram_stream.cc
diff --git a/lib/overnet/datagram_stream/datagram_stream.h b/garnet/lib/overnet/datagram_stream/datagram_stream.h similarity index 100% rename from lib/overnet/datagram_stream/datagram_stream.h rename to garnet/lib/overnet/datagram_stream/datagram_stream.h
diff --git a/lib/overnet/datagram_stream/datagram_stream_test.cc b/garnet/lib/overnet/datagram_stream/datagram_stream_test.cc similarity index 100% rename from lib/overnet/datagram_stream/datagram_stream_test.cc rename to garnet/lib/overnet/datagram_stream/datagram_stream_test.cc
diff --git a/lib/overnet/datagram_stream/linearizer.cc b/garnet/lib/overnet/datagram_stream/linearizer.cc similarity index 100% rename from lib/overnet/datagram_stream/linearizer.cc rename to garnet/lib/overnet/datagram_stream/linearizer.cc
diff --git a/lib/overnet/datagram_stream/linearizer.h b/garnet/lib/overnet/datagram_stream/linearizer.h similarity index 100% rename from lib/overnet/datagram_stream/linearizer.h rename to garnet/lib/overnet/datagram_stream/linearizer.h
diff --git a/lib/overnet/datagram_stream/linearizer_fuzzer.cc b/garnet/lib/overnet/datagram_stream/linearizer_fuzzer.cc similarity index 100% rename from lib/overnet/datagram_stream/linearizer_fuzzer.cc rename to garnet/lib/overnet/datagram_stream/linearizer_fuzzer.cc
diff --git a/lib/overnet/datagram_stream/linearizer_fuzzer.h b/garnet/lib/overnet/datagram_stream/linearizer_fuzzer.h similarity index 100% rename from lib/overnet/datagram_stream/linearizer_fuzzer.h rename to garnet/lib/overnet/datagram_stream/linearizer_fuzzer.h
diff --git a/lib/overnet/datagram_stream/linearizer_fuzzer_corpus_to_code.py b/garnet/lib/overnet/datagram_stream/linearizer_fuzzer_corpus_to_code.py similarity index 100% rename from lib/overnet/datagram_stream/linearizer_fuzzer_corpus_to_code.py rename to garnet/lib/overnet/datagram_stream/linearizer_fuzzer_corpus_to_code.py
diff --git a/lib/overnet/datagram_stream/linearizer_fuzzer_main.cc b/garnet/lib/overnet/datagram_stream/linearizer_fuzzer_main.cc similarity index 100% rename from lib/overnet/datagram_stream/linearizer_fuzzer_main.cc rename to garnet/lib/overnet/datagram_stream/linearizer_fuzzer_main.cc
diff --git a/lib/overnet/datagram_stream/linearizer_test.cc b/garnet/lib/overnet/datagram_stream/linearizer_test.cc similarity index 100% rename from lib/overnet/datagram_stream/linearizer_test.cc rename to garnet/lib/overnet/datagram_stream/linearizer_test.cc
diff --git a/lib/overnet/datagram_stream/receive_mode.cc b/garnet/lib/overnet/datagram_stream/receive_mode.cc similarity index 100% rename from lib/overnet/datagram_stream/receive_mode.cc rename to garnet/lib/overnet/datagram_stream/receive_mode.cc
diff --git a/lib/overnet/datagram_stream/receive_mode.h b/garnet/lib/overnet/datagram_stream/receive_mode.h similarity index 100% rename from lib/overnet/datagram_stream/receive_mode.h rename to garnet/lib/overnet/datagram_stream/receive_mode.h
diff --git a/lib/overnet/datagram_stream/receive_mode_fuzzer.cc b/garnet/lib/overnet/datagram_stream/receive_mode_fuzzer.cc similarity index 100% rename from lib/overnet/datagram_stream/receive_mode_fuzzer.cc rename to garnet/lib/overnet/datagram_stream/receive_mode_fuzzer.cc
diff --git a/lib/overnet/datagram_stream/receive_mode_fuzzer_corpus_to_code.py b/garnet/lib/overnet/datagram_stream/receive_mode_fuzzer_corpus_to_code.py similarity index 100% rename from lib/overnet/datagram_stream/receive_mode_fuzzer_corpus_to_code.py rename to garnet/lib/overnet/datagram_stream/receive_mode_fuzzer_corpus_to_code.py
diff --git a/lib/overnet/datagram_stream/receive_mode_fuzzer_helpers.h b/garnet/lib/overnet/datagram_stream/receive_mode_fuzzer_helpers.h similarity index 100% rename from lib/overnet/datagram_stream/receive_mode_fuzzer_helpers.h rename to garnet/lib/overnet/datagram_stream/receive_mode_fuzzer_helpers.h
diff --git a/lib/overnet/datagram_stream/receive_mode_test.cc b/garnet/lib/overnet/datagram_stream/receive_mode_test.cc similarity index 100% rename from lib/overnet/datagram_stream/receive_mode_test.cc rename to garnet/lib/overnet/datagram_stream/receive_mode_test.cc
diff --git a/lib/overnet/endpoint/BUILD.gn b/garnet/lib/overnet/endpoint/BUILD.gn similarity index 100% rename from lib/overnet/endpoint/BUILD.gn rename to garnet/lib/overnet/endpoint/BUILD.gn
diff --git a/lib/overnet/endpoint/message_builder.cc b/garnet/lib/overnet/endpoint/message_builder.cc similarity index 100% rename from lib/overnet/endpoint/message_builder.cc rename to garnet/lib/overnet/endpoint/message_builder.cc
diff --git a/lib/overnet/endpoint/message_builder.h b/garnet/lib/overnet/endpoint/message_builder.h similarity index 100% rename from lib/overnet/endpoint/message_builder.h rename to garnet/lib/overnet/endpoint/message_builder.h
diff --git a/lib/overnet/endpoint/router_endpoint.cc b/garnet/lib/overnet/endpoint/router_endpoint.cc similarity index 100% rename from lib/overnet/endpoint/router_endpoint.cc rename to garnet/lib/overnet/endpoint/router_endpoint.cc
diff --git a/lib/overnet/endpoint/router_endpoint.h b/garnet/lib/overnet/endpoint/router_endpoint.h similarity index 100% rename from lib/overnet/endpoint/router_endpoint.h rename to garnet/lib/overnet/endpoint/router_endpoint.h
diff --git a/lib/overnet/endpoint/router_endpoint_integration_test.cc b/garnet/lib/overnet/endpoint/router_endpoint_integration_test.cc similarity index 100% rename from lib/overnet/endpoint/router_endpoint_integration_test.cc rename to garnet/lib/overnet/endpoint/router_endpoint_integration_test.cc
diff --git a/lib/overnet/environment/BUILD.gn b/garnet/lib/overnet/environment/BUILD.gn similarity index 100% rename from lib/overnet/environment/BUILD.gn rename to garnet/lib/overnet/environment/BUILD.gn
diff --git a/lib/overnet/environment/timer.cc b/garnet/lib/overnet/environment/timer.cc similarity index 100% rename from lib/overnet/environment/timer.cc rename to garnet/lib/overnet/environment/timer.cc
diff --git a/lib/overnet/environment/timer.h b/garnet/lib/overnet/environment/timer.h similarity index 100% rename from lib/overnet/environment/timer.h rename to garnet/lib/overnet/environment/timer.h
diff --git a/lib/overnet/environment/trace.cc b/garnet/lib/overnet/environment/trace.cc similarity index 100% rename from lib/overnet/environment/trace.cc rename to garnet/lib/overnet/environment/trace.cc
diff --git a/lib/overnet/environment/trace.h b/garnet/lib/overnet/environment/trace.h similarity index 100% rename from lib/overnet/environment/trace.h rename to garnet/lib/overnet/environment/trace.h
diff --git a/lib/overnet/environment/trace_test.cc b/garnet/lib/overnet/environment/trace_test.cc similarity index 100% rename from lib/overnet/environment/trace_test.cc rename to garnet/lib/overnet/environment/trace_test.cc
diff --git a/lib/overnet/labels/BUILD.gn b/garnet/lib/overnet/labels/BUILD.gn similarity index 100% rename from lib/overnet/labels/BUILD.gn rename to garnet/lib/overnet/labels/BUILD.gn
diff --git a/lib/overnet/labels/node_id.cc b/garnet/lib/overnet/labels/node_id.cc similarity index 100% rename from lib/overnet/labels/node_id.cc rename to garnet/lib/overnet/labels/node_id.cc
diff --git a/lib/overnet/labels/node_id.h b/garnet/lib/overnet/labels/node_id.h similarity index 100% rename from lib/overnet/labels/node_id.h rename to garnet/lib/overnet/labels/node_id.h
diff --git a/lib/overnet/labels/node_id_test.cc b/garnet/lib/overnet/labels/node_id_test.cc similarity index 100% rename from lib/overnet/labels/node_id_test.cc rename to garnet/lib/overnet/labels/node_id_test.cc
diff --git a/lib/overnet/labels/seq_num.cc b/garnet/lib/overnet/labels/seq_num.cc similarity index 100% rename from lib/overnet/labels/seq_num.cc rename to garnet/lib/overnet/labels/seq_num.cc
diff --git a/lib/overnet/labels/seq_num.h b/garnet/lib/overnet/labels/seq_num.h similarity index 100% rename from lib/overnet/labels/seq_num.h rename to garnet/lib/overnet/labels/seq_num.h
diff --git a/lib/overnet/labels/seq_num_test.cc b/garnet/lib/overnet/labels/seq_num_test.cc similarity index 100% rename from lib/overnet/labels/seq_num_test.cc rename to garnet/lib/overnet/labels/seq_num_test.cc
diff --git a/lib/overnet/labels/stream_id.cc b/garnet/lib/overnet/labels/stream_id.cc similarity index 100% rename from lib/overnet/labels/stream_id.cc rename to garnet/lib/overnet/labels/stream_id.cc
diff --git a/lib/overnet/labels/stream_id.h b/garnet/lib/overnet/labels/stream_id.h similarity index 100% rename from lib/overnet/labels/stream_id.h rename to garnet/lib/overnet/labels/stream_id.h
diff --git a/lib/overnet/links/BUILD.gn b/garnet/lib/overnet/links/BUILD.gn similarity index 100% rename from lib/overnet/links/BUILD.gn rename to garnet/lib/overnet/links/BUILD.gn
diff --git a/lib/overnet/links/packet_link.cc b/garnet/lib/overnet/links/packet_link.cc similarity index 100% rename from lib/overnet/links/packet_link.cc rename to garnet/lib/overnet/links/packet_link.cc
diff --git a/lib/overnet/links/packet_link.h b/garnet/lib/overnet/links/packet_link.h similarity index 100% rename from lib/overnet/links/packet_link.h rename to garnet/lib/overnet/links/packet_link.h
diff --git a/lib/overnet/links/packet_link_test.cc b/garnet/lib/overnet/links/packet_link_test.cc similarity index 100% rename from lib/overnet/links/packet_link_test.cc rename to garnet/lib/overnet/links/packet_link_test.cc
diff --git a/lib/overnet/links/packet_nub.h b/garnet/lib/overnet/links/packet_nub.h similarity index 100% rename from lib/overnet/links/packet_nub.h rename to garnet/lib/overnet/links/packet_nub.h
diff --git a/lib/overnet/links/packet_nub_fuzzer.cc b/garnet/lib/overnet/links/packet_nub_fuzzer.cc similarity index 100% rename from lib/overnet/links/packet_nub_fuzzer.cc rename to garnet/lib/overnet/links/packet_nub_fuzzer.cc
diff --git a/lib/overnet/links/packet_nub_fuzzer.h b/garnet/lib/overnet/links/packet_nub_fuzzer.h similarity index 100% rename from lib/overnet/links/packet_nub_fuzzer.h rename to garnet/lib/overnet/links/packet_nub_fuzzer.h
diff --git a/lib/overnet/links/packet_nub_fuzzer_main.cc b/garnet/lib/overnet/links/packet_nub_fuzzer_main.cc similarity index 100% rename from lib/overnet/links/packet_nub_fuzzer_main.cc rename to garnet/lib/overnet/links/packet_nub_fuzzer_main.cc
diff --git a/lib/overnet/links/packet_nub_test.cc b/garnet/lib/overnet/links/packet_nub_test.cc similarity index 100% rename from lib/overnet/links/packet_nub_test.cc rename to garnet/lib/overnet/links/packet_nub_test.cc
diff --git a/lib/overnet/packet_protocol/BUILD.gn b/garnet/lib/overnet/packet_protocol/BUILD.gn similarity index 100% rename from lib/overnet/packet_protocol/BUILD.gn rename to garnet/lib/overnet/packet_protocol/BUILD.gn
diff --git a/lib/overnet/packet_protocol/aead_codec.cc b/garnet/lib/overnet/packet_protocol/aead_codec.cc similarity index 100% rename from lib/overnet/packet_protocol/aead_codec.cc rename to garnet/lib/overnet/packet_protocol/aead_codec.cc
diff --git a/lib/overnet/packet_protocol/aead_codec.h b/garnet/lib/overnet/packet_protocol/aead_codec.h similarity index 100% rename from lib/overnet/packet_protocol/aead_codec.h rename to garnet/lib/overnet/packet_protocol/aead_codec.h
diff --git a/lib/overnet/packet_protocol/aead_codec_test.cc b/garnet/lib/overnet/packet_protocol/aead_codec_test.cc similarity index 100% rename from lib/overnet/packet_protocol/aead_codec_test.cc rename to garnet/lib/overnet/packet_protocol/aead_codec_test.cc
diff --git a/lib/overnet/packet_protocol/bbr.cc b/garnet/lib/overnet/packet_protocol/bbr.cc similarity index 100% rename from lib/overnet/packet_protocol/bbr.cc rename to garnet/lib/overnet/packet_protocol/bbr.cc
diff --git a/lib/overnet/packet_protocol/bbr.h b/garnet/lib/overnet/packet_protocol/bbr.h similarity index 100% rename from lib/overnet/packet_protocol/bbr.h rename to garnet/lib/overnet/packet_protocol/bbr.h
diff --git a/lib/overnet/packet_protocol/bbr_test.cc b/garnet/lib/overnet/packet_protocol/bbr_test.cc similarity index 100% rename from lib/overnet/packet_protocol/bbr_test.cc rename to garnet/lib/overnet/packet_protocol/bbr_test.cc
diff --git a/lib/overnet/packet_protocol/packet_protocol.cc b/garnet/lib/overnet/packet_protocol/packet_protocol.cc similarity index 100% rename from lib/overnet/packet_protocol/packet_protocol.cc rename to garnet/lib/overnet/packet_protocol/packet_protocol.cc
diff --git a/lib/overnet/packet_protocol/packet_protocol.h b/garnet/lib/overnet/packet_protocol/packet_protocol.h similarity index 100% rename from lib/overnet/packet_protocol/packet_protocol.h rename to garnet/lib/overnet/packet_protocol/packet_protocol.h
diff --git a/lib/overnet/packet_protocol/packet_protocol_fuzzer.cc b/garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer.cc similarity index 100% rename from lib/overnet/packet_protocol/packet_protocol_fuzzer.cc rename to garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer.cc
diff --git a/lib/overnet/packet_protocol/packet_protocol_fuzzer.h b/garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer.h similarity index 100% rename from lib/overnet/packet_protocol/packet_protocol_fuzzer.h rename to garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer.h
diff --git a/lib/overnet/packet_protocol/packet_protocol_fuzzer_corpus_to_code.py b/garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer_corpus_to_code.py similarity index 100% rename from lib/overnet/packet_protocol/packet_protocol_fuzzer_corpus_to_code.py rename to garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer_corpus_to_code.py
diff --git a/lib/overnet/packet_protocol/packet_protocol_fuzzer_main.cc b/garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer_main.cc similarity index 100% rename from lib/overnet/packet_protocol/packet_protocol_fuzzer_main.cc rename to garnet/lib/overnet/packet_protocol/packet_protocol_fuzzer_main.cc
diff --git a/lib/overnet/packet_protocol/packet_protocol_test.cc b/garnet/lib/overnet/packet_protocol/packet_protocol_test.cc similarity index 100% rename from lib/overnet/packet_protocol/packet_protocol_test.cc rename to garnet/lib/overnet/packet_protocol/packet_protocol_test.cc
diff --git a/lib/overnet/packet_protocol/windowed_filter.h b/garnet/lib/overnet/packet_protocol/windowed_filter.h similarity index 100% rename from lib/overnet/packet_protocol/windowed_filter.h rename to garnet/lib/overnet/packet_protocol/windowed_filter.h
diff --git a/lib/overnet/protocol/BUILD.gn b/garnet/lib/overnet/protocol/BUILD.gn similarity index 100% rename from lib/overnet/protocol/BUILD.gn rename to garnet/lib/overnet/protocol/BUILD.gn
diff --git a/lib/overnet/protocol/ack_frame.cc b/garnet/lib/overnet/protocol/ack_frame.cc similarity index 100% rename from lib/overnet/protocol/ack_frame.cc rename to garnet/lib/overnet/protocol/ack_frame.cc
diff --git a/lib/overnet/protocol/ack_frame.h b/garnet/lib/overnet/protocol/ack_frame.h similarity index 100% rename from lib/overnet/protocol/ack_frame.h rename to garnet/lib/overnet/protocol/ack_frame.h
diff --git a/lib/overnet/protocol/ack_frame_test.cc b/garnet/lib/overnet/protocol/ack_frame_test.cc similarity index 100% rename from lib/overnet/protocol/ack_frame_test.cc rename to garnet/lib/overnet/protocol/ack_frame_test.cc
diff --git a/lib/overnet/protocol/fidl.h b/garnet/lib/overnet/protocol/fidl.h similarity index 100% rename from lib/overnet/protocol/fidl.h rename to garnet/lib/overnet/protocol/fidl.h
diff --git a/lib/overnet/protocol/routable_message.cc b/garnet/lib/overnet/protocol/routable_message.cc similarity index 100% rename from lib/overnet/protocol/routable_message.cc rename to garnet/lib/overnet/protocol/routable_message.cc
diff --git a/lib/overnet/protocol/routable_message.h b/garnet/lib/overnet/protocol/routable_message.h similarity index 100% rename from lib/overnet/protocol/routable_message.h rename to garnet/lib/overnet/protocol/routable_message.h
diff --git a/lib/overnet/protocol/routable_message_fuzzer.cc b/garnet/lib/overnet/protocol/routable_message_fuzzer.cc similarity index 100% rename from lib/overnet/protocol/routable_message_fuzzer.cc rename to garnet/lib/overnet/protocol/routable_message_fuzzer.cc
diff --git a/lib/overnet/protocol/routable_message_test.cc b/garnet/lib/overnet/protocol/routable_message_test.cc similarity index 100% rename from lib/overnet/protocol/routable_message_test.cc rename to garnet/lib/overnet/protocol/routable_message_test.cc
diff --git a/lib/overnet/protocol/serialization_helpers.h b/garnet/lib/overnet/protocol/serialization_helpers.h similarity index 100% rename from lib/overnet/protocol/serialization_helpers.h rename to garnet/lib/overnet/protocol/serialization_helpers.h
diff --git a/lib/overnet/protocol/varint.cc b/garnet/lib/overnet/protocol/varint.cc similarity index 100% rename from lib/overnet/protocol/varint.cc rename to garnet/lib/overnet/protocol/varint.cc
diff --git a/lib/overnet/protocol/varint.h b/garnet/lib/overnet/protocol/varint.h similarity index 100% rename from lib/overnet/protocol/varint.h rename to garnet/lib/overnet/protocol/varint.h
diff --git a/lib/overnet/protocol/varint_test.cc b/garnet/lib/overnet/protocol/varint_test.cc similarity index 100% rename from lib/overnet/protocol/varint_test.cc rename to garnet/lib/overnet/protocol/varint_test.cc
diff --git a/lib/overnet/routing/BUILD.gn b/garnet/lib/overnet/routing/BUILD.gn similarity index 100% rename from lib/overnet/routing/BUILD.gn rename to garnet/lib/overnet/routing/BUILD.gn
diff --git a/lib/overnet/routing/router.cc b/garnet/lib/overnet/routing/router.cc similarity index 100% rename from lib/overnet/routing/router.cc rename to garnet/lib/overnet/routing/router.cc
diff --git a/lib/overnet/routing/router.h b/garnet/lib/overnet/routing/router.h similarity index 100% rename from lib/overnet/routing/router.h rename to garnet/lib/overnet/routing/router.h
diff --git a/lib/overnet/routing/router_test.cc b/garnet/lib/overnet/routing/router_test.cc similarity index 100% rename from lib/overnet/routing/router_test.cc rename to garnet/lib/overnet/routing/router_test.cc
diff --git a/lib/overnet/routing/routing_table.cc b/garnet/lib/overnet/routing/routing_table.cc similarity index 100% rename from lib/overnet/routing/routing_table.cc rename to garnet/lib/overnet/routing/routing_table.cc
diff --git a/lib/overnet/routing/routing_table.h b/garnet/lib/overnet/routing/routing_table.h similarity index 100% rename from lib/overnet/routing/routing_table.h rename to garnet/lib/overnet/routing/routing_table.h
diff --git a/lib/overnet/routing/routing_table_fuzzer.cc b/garnet/lib/overnet/routing/routing_table_fuzzer.cc similarity index 100% rename from lib/overnet/routing/routing_table_fuzzer.cc rename to garnet/lib/overnet/routing/routing_table_fuzzer.cc
diff --git a/lib/overnet/scripts/summarize_beg_end.py b/garnet/lib/overnet/scripts/summarize_beg_end.py similarity index 100% rename from lib/overnet/scripts/summarize_beg_end.py rename to garnet/lib/overnet/scripts/summarize_beg_end.py
diff --git a/lib/overnet/scripts/trace-linearizer-speed.py b/garnet/lib/overnet/scripts/trace-linearizer-speed.py similarity index 100% rename from lib/overnet/scripts/trace-linearizer-speed.py rename to garnet/lib/overnet/scripts/trace-linearizer-speed.py
diff --git a/lib/overnet/testing/BUILD.gn b/garnet/lib/overnet/testing/BUILD.gn similarity index 100% rename from lib/overnet/testing/BUILD.gn rename to garnet/lib/overnet/testing/BUILD.gn
diff --git a/lib/overnet/testing/csv_writer.h b/garnet/lib/overnet/testing/csv_writer.h similarity index 100% rename from lib/overnet/testing/csv_writer.h rename to garnet/lib/overnet/testing/csv_writer.h
diff --git a/lib/overnet/testing/run_all_tests.cc b/garnet/lib/overnet/testing/run_all_tests.cc similarity index 100% rename from lib/overnet/testing/run_all_tests.cc rename to garnet/lib/overnet/testing/run_all_tests.cc
diff --git a/lib/overnet/testing/test_timer.cc b/garnet/lib/overnet/testing/test_timer.cc similarity index 100% rename from lib/overnet/testing/test_timer.cc rename to garnet/lib/overnet/testing/test_timer.cc
diff --git a/lib/overnet/testing/test_timer.h b/garnet/lib/overnet/testing/test_timer.h similarity index 100% rename from lib/overnet/testing/test_timer.h rename to garnet/lib/overnet/testing/test_timer.h
diff --git a/lib/overnet/testing/test_timer_test.cc b/garnet/lib/overnet/testing/test_timer_test.cc similarity index 100% rename from lib/overnet/testing/test_timer_test.cc rename to garnet/lib/overnet/testing/test_timer_test.cc
diff --git a/lib/overnet/testing/trace_cout.cc b/garnet/lib/overnet/testing/trace_cout.cc similarity index 100% rename from lib/overnet/testing/trace_cout.cc rename to garnet/lib/overnet/testing/trace_cout.cc
diff --git a/lib/overnet/testing/trace_cout.h b/garnet/lib/overnet/testing/trace_cout.h similarity index 100% rename from lib/overnet/testing/trace_cout.h rename to garnet/lib/overnet/testing/trace_cout.h
diff --git a/lib/overnet/vocabulary/BUILD.gn b/garnet/lib/overnet/vocabulary/BUILD.gn similarity index 100% rename from lib/overnet/vocabulary/BUILD.gn rename to garnet/lib/overnet/vocabulary/BUILD.gn
diff --git a/lib/overnet/vocabulary/bandwidth.h b/garnet/lib/overnet/vocabulary/bandwidth.h similarity index 100% rename from lib/overnet/vocabulary/bandwidth.h rename to garnet/lib/overnet/vocabulary/bandwidth.h
diff --git a/lib/overnet/vocabulary/callback.h b/garnet/lib/overnet/vocabulary/callback.h similarity index 100% rename from lib/overnet/vocabulary/callback.h rename to garnet/lib/overnet/vocabulary/callback.h
diff --git a/lib/overnet/vocabulary/callback_test.cc b/garnet/lib/overnet/vocabulary/callback_test.cc similarity index 100% rename from lib/overnet/vocabulary/callback_test.cc rename to garnet/lib/overnet/vocabulary/callback_test.cc
diff --git a/lib/overnet/vocabulary/closed_ptr.h b/garnet/lib/overnet/vocabulary/closed_ptr.h similarity index 100% rename from lib/overnet/vocabulary/closed_ptr.h rename to garnet/lib/overnet/vocabulary/closed_ptr.h
diff --git a/lib/overnet/vocabulary/internal_list.h b/garnet/lib/overnet/vocabulary/internal_list.h similarity index 100% rename from lib/overnet/vocabulary/internal_list.h rename to garnet/lib/overnet/vocabulary/internal_list.h
diff --git a/lib/overnet/vocabulary/internal_list_fuzzer.cc b/garnet/lib/overnet/vocabulary/internal_list_fuzzer.cc similarity index 100% rename from lib/overnet/vocabulary/internal_list_fuzzer.cc rename to garnet/lib/overnet/vocabulary/internal_list_fuzzer.cc
diff --git a/lib/overnet/vocabulary/internal_list_fuzzer_corpus_to_code.py b/garnet/lib/overnet/vocabulary/internal_list_fuzzer_corpus_to_code.py similarity index 100% rename from lib/overnet/vocabulary/internal_list_fuzzer_corpus_to_code.py rename to garnet/lib/overnet/vocabulary/internal_list_fuzzer_corpus_to_code.py
diff --git a/lib/overnet/vocabulary/internal_list_fuzzer_helpers.h b/garnet/lib/overnet/vocabulary/internal_list_fuzzer_helpers.h similarity index 100% rename from lib/overnet/vocabulary/internal_list_fuzzer_helpers.h rename to garnet/lib/overnet/vocabulary/internal_list_fuzzer_helpers.h
diff --git a/lib/overnet/vocabulary/internal_list_test.cc b/garnet/lib/overnet/vocabulary/internal_list_test.cc similarity index 100% rename from lib/overnet/vocabulary/internal_list_test.cc rename to garnet/lib/overnet/vocabulary/internal_list_test.cc
diff --git a/lib/overnet/vocabulary/lazy_slice.h b/garnet/lib/overnet/vocabulary/lazy_slice.h similarity index 100% rename from lib/overnet/vocabulary/lazy_slice.h rename to garnet/lib/overnet/vocabulary/lazy_slice.h
diff --git a/lib/overnet/vocabulary/manual_constructor.h b/garnet/lib/overnet/vocabulary/manual_constructor.h similarity index 100% rename from lib/overnet/vocabulary/manual_constructor.h rename to garnet/lib/overnet/vocabulary/manual_constructor.h
diff --git a/lib/overnet/vocabulary/once_fn.h b/garnet/lib/overnet/vocabulary/once_fn.h similarity index 100% rename from lib/overnet/vocabulary/once_fn.h rename to garnet/lib/overnet/vocabulary/once_fn.h
diff --git a/lib/overnet/vocabulary/once_fn_test.cc b/garnet/lib/overnet/vocabulary/once_fn_test.cc similarity index 100% rename from lib/overnet/vocabulary/once_fn_test.cc rename to garnet/lib/overnet/vocabulary/once_fn_test.cc
diff --git a/lib/overnet/vocabulary/optional.h b/garnet/lib/overnet/vocabulary/optional.h similarity index 100% rename from lib/overnet/vocabulary/optional.h rename to garnet/lib/overnet/vocabulary/optional.h
diff --git a/lib/overnet/vocabulary/optional_test.cc b/garnet/lib/overnet/vocabulary/optional_test.cc similarity index 100% rename from lib/overnet/vocabulary/optional_test.cc rename to garnet/lib/overnet/vocabulary/optional_test.cc
diff --git a/lib/overnet/vocabulary/slice.cc b/garnet/lib/overnet/vocabulary/slice.cc similarity index 100% rename from lib/overnet/vocabulary/slice.cc rename to garnet/lib/overnet/vocabulary/slice.cc
diff --git a/lib/overnet/vocabulary/slice.h b/garnet/lib/overnet/vocabulary/slice.h similarity index 100% rename from lib/overnet/vocabulary/slice.h rename to garnet/lib/overnet/vocabulary/slice.h
diff --git a/lib/overnet/vocabulary/slice_test.cc b/garnet/lib/overnet/vocabulary/slice_test.cc similarity index 100% rename from lib/overnet/vocabulary/slice_test.cc rename to garnet/lib/overnet/vocabulary/slice_test.cc
diff --git a/lib/overnet/vocabulary/status.cc b/garnet/lib/overnet/vocabulary/status.cc similarity index 100% rename from lib/overnet/vocabulary/status.cc rename to garnet/lib/overnet/vocabulary/status.cc
diff --git a/lib/overnet/vocabulary/status.h b/garnet/lib/overnet/vocabulary/status.h similarity index 100% rename from lib/overnet/vocabulary/status.h rename to garnet/lib/overnet/vocabulary/status.h
diff --git a/lib/overnet/vocabulary/status_test.cc b/garnet/lib/overnet/vocabulary/status_test.cc similarity index 100% rename from lib/overnet/vocabulary/status_test.cc rename to garnet/lib/overnet/vocabulary/status_test.cc
diff --git a/lib/overnet/vocabulary/time.h b/garnet/lib/overnet/vocabulary/time.h similarity index 100% rename from lib/overnet/vocabulary/time.h rename to garnet/lib/overnet/vocabulary/time.h
diff --git a/lib/process/BUILD.gn b/garnet/lib/process/BUILD.gn similarity index 100% rename from lib/process/BUILD.gn rename to garnet/lib/process/BUILD.gn
diff --git a/lib/process/MAINTAINERS b/garnet/lib/process/MAINTAINERS similarity index 100% rename from lib/process/MAINTAINERS rename to garnet/lib/process/MAINTAINERS
diff --git a/lib/process/process_builder.cc b/garnet/lib/process/process_builder.cc similarity index 100% rename from lib/process/process_builder.cc rename to garnet/lib/process/process_builder.cc
diff --git a/lib/process/process_builder.h b/garnet/lib/process/process_builder.h similarity index 100% rename from lib/process/process_builder.h rename to garnet/lib/process/process_builder.h
diff --git a/lib/process/process_builder_unittest.cc b/garnet/lib/process/process_builder_unittest.cc similarity index 100% rename from lib/process/process_builder_unittest.cc rename to garnet/lib/process/process_builder_unittest.cc
diff --git a/lib/profiler/BUILD.gn b/garnet/lib/profiler/BUILD.gn similarity index 100% rename from lib/profiler/BUILD.gn rename to garnet/lib/profiler/BUILD.gn
diff --git a/lib/profiler/README.TXT b/garnet/lib/profiler/README.TXT similarity index 100% rename from lib/profiler/README.TXT rename to garnet/lib/profiler/README.TXT
diff --git a/lib/profiler/fuchsia/profiler_log_listener.cc b/garnet/lib/profiler/fuchsia/profiler_log_listener.cc similarity index 100% rename from lib/profiler/fuchsia/profiler_log_listener.cc rename to garnet/lib/profiler/fuchsia/profiler_log_listener.cc
diff --git a/lib/profiler/fuchsia/profiler_log_listener.h b/garnet/lib/profiler/fuchsia/profiler_log_listener.h similarity index 100% rename from lib/profiler/fuchsia/profiler_log_listener.h rename to garnet/lib/profiler/fuchsia/profiler_log_listener.h
diff --git a/lib/profiler/fuchsia/thread_interrupter.cc b/garnet/lib/profiler/fuchsia/thread_interrupter.cc similarity index 100% rename from lib/profiler/fuchsia/thread_interrupter.cc rename to garnet/lib/profiler/fuchsia/thread_interrupter.cc
diff --git a/lib/profiler/fuchsia/thread_interrupter.h b/garnet/lib/profiler/fuchsia/thread_interrupter.h similarity index 100% rename from lib/profiler/fuchsia/thread_interrupter.h rename to garnet/lib/profiler/fuchsia/thread_interrupter.h
diff --git a/lib/profiler/include/config.h b/garnet/lib/profiler/include/config.h similarity index 100% rename from lib/profiler/include/config.h rename to garnet/lib/profiler/include/config.h
diff --git a/lib/profiler/tests/BUILD.gn b/garnet/lib/profiler/tests/BUILD.gn similarity index 100% rename from lib/profiler/tests/BUILD.gn rename to garnet/lib/profiler/tests/BUILD.gn
diff --git a/lib/root_ssl_certificates/.gitignore b/garnet/lib/root_ssl_certificates/.gitignore similarity index 100% rename from lib/root_ssl_certificates/.gitignore rename to garnet/lib/root_ssl_certificates/.gitignore
diff --git a/lib/root_ssl_certificates/BUILD.gn b/garnet/lib/root_ssl_certificates/BUILD.gn similarity index 100% rename from lib/root_ssl_certificates/BUILD.gn rename to garnet/lib/root_ssl_certificates/BUILD.gn
diff --git a/lib/root_ssl_certificates/README.md b/garnet/lib/root_ssl_certificates/README.md similarity index 100% rename from lib/root_ssl_certificates/README.md rename to garnet/lib/root_ssl_certificates/README.md
diff --git a/lib/root_ssl_certificates/roll_certs.go b/garnet/lib/root_ssl_certificates/roll_certs.go similarity index 100% rename from lib/root_ssl_certificates/roll_certs.go rename to garnet/lib/root_ssl_certificates/roll_certs.go
diff --git a/lib/root_ssl_certificates/third_party/cert/LICENSE.MPLv2 b/garnet/lib/root_ssl_certificates/third_party/cert/LICENSE.MPLv2 similarity index 100% rename from lib/root_ssl_certificates/third_party/cert/LICENSE.MPLv2 rename to garnet/lib/root_ssl_certificates/third_party/cert/LICENSE.MPLv2
diff --git a/lib/root_ssl_certificates/third_party/cert/README.fuchsia b/garnet/lib/root_ssl_certificates/third_party/cert/README.fuchsia similarity index 100% rename from lib/root_ssl_certificates/third_party/cert/README.fuchsia rename to garnet/lib/root_ssl_certificates/third_party/cert/README.fuchsia
diff --git a/lib/root_ssl_certificates/third_party/cert/cert.pem b/garnet/lib/root_ssl_certificates/third_party/cert/cert.pem similarity index 100% rename from lib/root_ssl_certificates/third_party/cert/cert.pem rename to garnet/lib/root_ssl_certificates/third_party/cert/cert.pem
diff --git a/lib/root_ssl_certificates/third_party/cert/cert.stamp b/garnet/lib/root_ssl_certificates/third_party/cert/cert.stamp similarity index 100% rename from lib/root_ssl_certificates/third_party/cert/cert.stamp rename to garnet/lib/root_ssl_certificates/third_party/cert/cert.stamp
diff --git a/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/LICENSE.apache b/garnet/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/LICENSE.apache similarity index 100% rename from lib/root_ssl_certificates/third_party/convert_mozilla_certdata/LICENSE.apache rename to garnet/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/LICENSE.apache
diff --git a/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/README.fuchsia b/garnet/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/README.fuchsia similarity index 100% rename from lib/root_ssl_certificates/third_party/convert_mozilla_certdata/README.fuchsia rename to garnet/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/README.fuchsia
diff --git a/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/convert_mozilla_certdata.go b/garnet/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/convert_mozilla_certdata.go similarity index 100% rename from lib/root_ssl_certificates/third_party/convert_mozilla_certdata/convert_mozilla_certdata.go rename to garnet/lib/root_ssl_certificates/third_party/convert_mozilla_certdata/convert_mozilla_certdata.go
diff --git a/lib/rust/bt-avdtp/BUILD.gn b/garnet/lib/rust/bt-avdtp/BUILD.gn similarity index 100% rename from lib/rust/bt-avdtp/BUILD.gn rename to garnet/lib/rust/bt-avdtp/BUILD.gn
diff --git a/lib/rust/bt-avdtp/src/lib.rs b/garnet/lib/rust/bt-avdtp/src/lib.rs similarity index 100% rename from lib/rust/bt-avdtp/src/lib.rs rename to garnet/lib/rust/bt-avdtp/src/lib.rs
diff --git a/lib/rust/bt-avdtp/src/stream_endpoint.rs b/garnet/lib/rust/bt-avdtp/src/stream_endpoint.rs similarity index 100% rename from lib/rust/bt-avdtp/src/stream_endpoint.rs rename to garnet/lib/rust/bt-avdtp/src/stream_endpoint.rs
diff --git a/lib/rust/bt-avdtp/src/tests.rs b/garnet/lib/rust/bt-avdtp/src/tests.rs similarity index 100% rename from lib/rust/bt-avdtp/src/tests.rs rename to garnet/lib/rust/bt-avdtp/src/tests.rs
diff --git a/lib/rust/bt-avdtp/src/types.rs b/garnet/lib/rust/bt-avdtp/src/types.rs similarity index 100% rename from lib/rust/bt-avdtp/src/types.rs rename to garnet/lib/rust/bt-avdtp/src/types.rs
diff --git a/lib/rust/cm_fidl/BUILD.gn b/garnet/lib/rust/cm_fidl/BUILD.gn similarity index 100% rename from lib/rust/cm_fidl/BUILD.gn rename to garnet/lib/rust/cm_fidl/BUILD.gn
diff --git a/lib/rust/cm_fidl/meta/cm_fidl_tests.cmx b/garnet/lib/rust/cm_fidl/meta/cm_fidl_tests.cmx similarity index 100% rename from lib/rust/cm_fidl/meta/cm_fidl_tests.cmx rename to garnet/lib/rust/cm_fidl/meta/cm_fidl_tests.cmx
diff --git a/lib/rust/cm_fidl/src/lib.rs b/garnet/lib/rust/cm_fidl/src/lib.rs similarity index 100% rename from lib/rust/cm_fidl/src/lib.rs rename to garnet/lib/rust/cm_fidl/src/lib.rs
diff --git a/lib/rust/cm_json/BUILD.gn b/garnet/lib/rust/cm_json/BUILD.gn similarity index 100% rename from lib/rust/cm_json/BUILD.gn rename to garnet/lib/rust/cm_json/BUILD.gn
diff --git a/lib/rust/cm_json/cm_schema.json b/garnet/lib/rust/cm_json/cm_schema.json similarity index 100% rename from lib/rust/cm_json/cm_schema.json rename to garnet/lib/rust/cm_json/cm_schema.json
diff --git a/lib/rust/cm_json/cml_schema.json b/garnet/lib/rust/cm_json/cml_schema.json similarity index 100% rename from lib/rust/cm_json/cml_schema.json rename to garnet/lib/rust/cm_json/cml_schema.json
diff --git a/lib/rust/cm_json/cmx_schema.json b/garnet/lib/rust/cm_json/cmx_schema.json similarity index 100% rename from lib/rust/cm_json/cmx_schema.json rename to garnet/lib/rust/cm_json/cmx_schema.json
diff --git a/lib/rust/cm_json/meta/cm_json_tests.cmx b/garnet/lib/rust/cm_json/meta/cm_json_tests.cmx similarity index 100% rename from lib/rust/cm_json/meta/cm_json_tests.cmx rename to garnet/lib/rust/cm_json/meta/cm_json_tests.cmx
diff --git a/lib/rust/cm_json/src/cm.rs b/garnet/lib/rust/cm_json/src/cm.rs similarity index 100% rename from lib/rust/cm_json/src/cm.rs rename to garnet/lib/rust/cm_json/src/cm.rs
diff --git a/lib/rust/cm_json/src/lib.rs b/garnet/lib/rust/cm_json/src/lib.rs similarity index 100% rename from lib/rust/cm_json/src/lib.rs rename to garnet/lib/rust/cm_json/src/lib.rs
diff --git a/lib/rust/connectivity-testing/BUILD.gn b/garnet/lib/rust/connectivity-testing/BUILD.gn similarity index 100% rename from lib/rust/connectivity-testing/BUILD.gn rename to garnet/lib/rust/connectivity-testing/BUILD.gn
diff --git a/lib/rust/connectivity-testing/src/lib.rs b/garnet/lib/rust/connectivity-testing/src/lib.rs similarity index 100% rename from lib/rust/connectivity-testing/src/lib.rs rename to garnet/lib/rust/connectivity-testing/src/lib.rs
diff --git a/lib/rust/connectivity-testing/src/wlan_ap_service_util.rs b/garnet/lib/rust/connectivity-testing/src/wlan_ap_service_util.rs similarity index 100% rename from lib/rust/connectivity-testing/src/wlan_ap_service_util.rs rename to garnet/lib/rust/connectivity-testing/src/wlan_ap_service_util.rs
diff --git a/lib/rust/connectivity-testing/src/wlan_service_util.rs b/garnet/lib/rust/connectivity-testing/src/wlan_service_util.rs similarity index 100% rename from lib/rust/connectivity-testing/src/wlan_service_util.rs rename to garnet/lib/rust/connectivity-testing/src/wlan_service_util.rs
diff --git a/lib/rust/dhcp/BUILD.gn b/garnet/lib/rust/dhcp/BUILD.gn similarity index 100% rename from lib/rust/dhcp/BUILD.gn rename to garnet/lib/rust/dhcp/BUILD.gn
diff --git a/lib/rust/dhcp/src/configuration.rs b/garnet/lib/rust/dhcp/src/configuration.rs similarity index 100% rename from lib/rust/dhcp/src/configuration.rs rename to garnet/lib/rust/dhcp/src/configuration.rs
diff --git a/lib/rust/dhcp/src/lib.rs b/garnet/lib/rust/dhcp/src/lib.rs similarity index 100% rename from lib/rust/dhcp/src/lib.rs rename to garnet/lib/rust/dhcp/src/lib.rs
diff --git a/lib/rust/dhcp/src/protocol.rs b/garnet/lib/rust/dhcp/src/protocol.rs similarity index 100% rename from lib/rust/dhcp/src/protocol.rs rename to garnet/lib/rust/dhcp/src/protocol.rs
diff --git a/lib/rust/dhcp/src/server.rs b/garnet/lib/rust/dhcp/src/server.rs similarity index 100% rename from lib/rust/dhcp/src/server.rs rename to garnet/lib/rust/dhcp/src/server.rs
diff --git a/lib/rust/eapol/BUILD.gn b/garnet/lib/rust/eapol/BUILD.gn similarity index 100% rename from lib/rust/eapol/BUILD.gn rename to garnet/lib/rust/eapol/BUILD.gn
diff --git a/lib/rust/eapol/src/lib.rs b/garnet/lib/rust/eapol/src/lib.rs similarity index 100% rename from lib/rust/eapol/src/lib.rs rename to garnet/lib/rust/eapol/src/lib.rs
diff --git a/lib/rust/escaped-cstring/BUILD.gn b/garnet/lib/rust/escaped-cstring/BUILD.gn similarity index 100% rename from lib/rust/escaped-cstring/BUILD.gn rename to garnet/lib/rust/escaped-cstring/BUILD.gn
diff --git a/lib/rust/escaped-cstring/meta/escaped_cstring_lib_test.cmx b/garnet/lib/rust/escaped-cstring/meta/escaped_cstring_lib_test.cmx similarity index 100% rename from lib/rust/escaped-cstring/meta/escaped_cstring_lib_test.cmx rename to garnet/lib/rust/escaped-cstring/meta/escaped_cstring_lib_test.cmx
diff --git a/lib/rust/escaped-cstring/src/lib.rs b/garnet/lib/rust/escaped-cstring/src/lib.rs similarity index 100% rename from lib/rust/escaped-cstring/src/lib.rs rename to garnet/lib/rust/escaped-cstring/src/lib.rs
diff --git a/lib/rust/ethernet/BUILD.gn b/garnet/lib/rust/ethernet/BUILD.gn similarity index 100% rename from lib/rust/ethernet/BUILD.gn rename to garnet/lib/rust/ethernet/BUILD.gn
diff --git a/lib/rust/ethernet/src/buffer.rs b/garnet/lib/rust/ethernet/src/buffer.rs similarity index 100% rename from lib/rust/ethernet/src/buffer.rs rename to garnet/lib/rust/ethernet/src/buffer.rs
diff --git a/lib/rust/ethernet/src/lib.rs b/garnet/lib/rust/ethernet/src/lib.rs similarity index 100% rename from lib/rust/ethernet/src/lib.rs rename to garnet/lib/rust/ethernet/src/lib.rs
diff --git a/lib/rust/fidl_fuchsia_hardware_ethernet_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext/BUILD.gn similarity index 100% rename from lib/rust/fidl_fuchsia_hardware_ethernet_ext/BUILD.gn rename to garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext/BUILD.gn
diff --git a/lib/rust/fidl_fuchsia_hardware_ethernet_ext/src/lib.rs b/garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext/src/lib.rs similarity index 100% rename from lib/rust/fidl_fuchsia_hardware_ethernet_ext/src/lib.rs rename to garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext/src/lib.rs
diff --git a/lib/rust/fidl_fuchsia_net_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_net_ext/BUILD.gn similarity index 100% rename from lib/rust/fidl_fuchsia_net_ext/BUILD.gn rename to garnet/lib/rust/fidl_fuchsia_net_ext/BUILD.gn
diff --git a/lib/rust/fidl_fuchsia_net_ext/src/lib.rs b/garnet/lib/rust/fidl_fuchsia_net_ext/src/lib.rs similarity index 100% rename from lib/rust/fidl_fuchsia_net_ext/src/lib.rs rename to garnet/lib/rust/fidl_fuchsia_net_ext/src/lib.rs
diff --git a/lib/rust/fidl_fuchsia_net_policy_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_net_policy_ext/BUILD.gn similarity index 100% rename from lib/rust/fidl_fuchsia_net_policy_ext/BUILD.gn rename to garnet/lib/rust/fidl_fuchsia_net_policy_ext/BUILD.gn
diff --git a/lib/rust/fidl_fuchsia_net_policy_ext/src/lib.rs b/garnet/lib/rust/fidl_fuchsia_net_policy_ext/src/lib.rs similarity index 100% rename from lib/rust/fidl_fuchsia_net_policy_ext/src/lib.rs rename to garnet/lib/rust/fidl_fuchsia_net_policy_ext/src/lib.rs
diff --git a/lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn similarity index 100% rename from lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn rename to garnet/lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn
diff --git a/lib/rust/fidl_fuchsia_net_stack_ext/src/lib.rs b/garnet/lib/rust/fidl_fuchsia_net_stack_ext/src/lib.rs similarity index 100% rename from lib/rust/fidl_fuchsia_net_stack_ext/src/lib.rs rename to garnet/lib/rust/fidl_fuchsia_net_stack_ext/src/lib.rs
diff --git a/lib/rust/fidl_fuchsia_netstack_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_netstack_ext/BUILD.gn similarity index 100% rename from lib/rust/fidl_fuchsia_netstack_ext/BUILD.gn rename to garnet/lib/rust/fidl_fuchsia_netstack_ext/BUILD.gn
diff --git a/lib/rust/fidl_fuchsia_netstack_ext/src/lib.rs b/garnet/lib/rust/fidl_fuchsia_netstack_ext/src/lib.rs similarity index 100% rename from lib/rust/fidl_fuchsia_netstack_ext/src/lib.rs rename to garnet/lib/rust/fidl_fuchsia_netstack_ext/src/lib.rs
diff --git a/lib/rust/fidl_fuchsia_pkg_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_pkg_ext/BUILD.gn similarity index 100% rename from lib/rust/fidl_fuchsia_pkg_ext/BUILD.gn rename to garnet/lib/rust/fidl_fuchsia_pkg_ext/BUILD.gn
diff --git a/lib/rust/fidl_fuchsia_pkg_ext/meta/fidl_fuchsia_pkg_ext_tests.cmx b/garnet/lib/rust/fidl_fuchsia_pkg_ext/meta/fidl_fuchsia_pkg_ext_tests.cmx similarity index 100% rename from lib/rust/fidl_fuchsia_pkg_ext/meta/fidl_fuchsia_pkg_ext_tests.cmx rename to garnet/lib/rust/fidl_fuchsia_pkg_ext/meta/fidl_fuchsia_pkg_ext_tests.cmx
diff --git a/lib/rust/fidl_fuchsia_pkg_ext/src/errors.rs b/garnet/lib/rust/fidl_fuchsia_pkg_ext/src/errors.rs similarity index 100% rename from lib/rust/fidl_fuchsia_pkg_ext/src/errors.rs rename to garnet/lib/rust/fidl_fuchsia_pkg_ext/src/errors.rs
diff --git a/lib/rust/fidl_fuchsia_pkg_ext/src/lib.rs b/garnet/lib/rust/fidl_fuchsia_pkg_ext/src/lib.rs similarity index 100% rename from lib/rust/fidl_fuchsia_pkg_ext/src/lib.rs rename to garnet/lib/rust/fidl_fuchsia_pkg_ext/src/lib.rs
diff --git a/lib/rust/fidl_fuchsia_pkg_ext/src/types.rs b/garnet/lib/rust/fidl_fuchsia_pkg_ext/src/types.rs similarity index 100% rename from lib/rust/fidl_fuchsia_pkg_ext/src/types.rs rename to garnet/lib/rust/fidl_fuchsia_pkg_ext/src/types.rs
diff --git a/lib/rust/files_async/BUILD.gn b/garnet/lib/rust/files_async/BUILD.gn similarity index 100% rename from lib/rust/files_async/BUILD.gn rename to garnet/lib/rust/files_async/BUILD.gn
diff --git a/lib/rust/files_async/src/lib.rs b/garnet/lib/rust/files_async/src/lib.rs similarity index 100% rename from lib/rust/files_async/src/lib.rs rename to garnet/lib/rust/files_async/src/lib.rs
diff --git a/lib/rust/fuchsia-bluetooth/BUILD.gn b/garnet/lib/rust/fuchsia-bluetooth/BUILD.gn similarity index 100% rename from lib/rust/fuchsia-bluetooth/BUILD.gn rename to garnet/lib/rust/fuchsia-bluetooth/BUILD.gn
diff --git a/lib/rust/fuchsia-bluetooth/meta/bluetooth-crate-unittests.cmx b/garnet/lib/rust/fuchsia-bluetooth/meta/bluetooth-crate-unittests.cmx similarity index 100% rename from lib/rust/fuchsia-bluetooth/meta/bluetooth-crate-unittests.cmx rename to garnet/lib/rust/fuchsia-bluetooth/meta/bluetooth-crate-unittests.cmx
diff --git a/lib/rust/fuchsia-bluetooth/src/assigned_numbers.rs b/garnet/lib/rust/fuchsia-bluetooth/src/assigned_numbers.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/assigned_numbers.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/assigned_numbers.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/assigned_numbers/constants.rs b/garnet/lib/rust/fuchsia-bluetooth/src/assigned_numbers/constants.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/assigned_numbers/constants.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/assigned_numbers/constants.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/error.rs b/garnet/lib/rust/fuchsia-bluetooth/src/error.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/error.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/error.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/fake_hci.rs b/garnet/lib/rust/fuchsia-bluetooth/src/fake_hci.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/fake_hci.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/fake_hci.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/hci.rs b/garnet/lib/rust/fuchsia-bluetooth/src/hci.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/hci.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/hci.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/host.rs b/garnet/lib/rust/fuchsia-bluetooth/src/host.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/host.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/host.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/lib.rs b/garnet/lib/rust/fuchsia-bluetooth/src/lib.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/lib.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/lib.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/types.rs b/garnet/lib/rust/fuchsia-bluetooth/src/types.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/types.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/types.rs
diff --git a/lib/rust/fuchsia-bluetooth/src/util.rs b/garnet/lib/rust/fuchsia-bluetooth/src/util.rs similarity index 100% rename from lib/rust/fuchsia-bluetooth/src/util.rs rename to garnet/lib/rust/fuchsia-bluetooth/src/util.rs
diff --git a/lib/rust/fuchsia-wlan-dev/BUILD.gn b/garnet/lib/rust/fuchsia-wlan-dev/BUILD.gn similarity index 100% rename from lib/rust/fuchsia-wlan-dev/BUILD.gn rename to garnet/lib/rust/fuchsia-wlan-dev/BUILD.gn
diff --git a/lib/rust/fuchsia-wlan-dev/src/lib.rs b/garnet/lib/rust/fuchsia-wlan-dev/src/lib.rs similarity index 100% rename from lib/rust/fuchsia-wlan-dev/src/lib.rs rename to garnet/lib/rust/fuchsia-wlan-dev/src/lib.rs
diff --git a/lib/rust/fuchsia-wlan-dev/src/sys.rs b/garnet/lib/rust/fuchsia-wlan-dev/src/sys.rs similarity index 100% rename from lib/rust/fuchsia-wlan-dev/src/sys.rs rename to garnet/lib/rust/fuchsia-wlan-dev/src/sys.rs
diff --git a/lib/rust/fuchsia_pkg_uri/BUILD.gn b/garnet/lib/rust/fuchsia_pkg_uri/BUILD.gn similarity index 100% rename from lib/rust/fuchsia_pkg_uri/BUILD.gn rename to garnet/lib/rust/fuchsia_pkg_uri/BUILD.gn
diff --git a/lib/rust/fuchsia_pkg_uri/meta/fuchsia_pkg_uri_tests.cmx b/garnet/lib/rust/fuchsia_pkg_uri/meta/fuchsia_pkg_uri_tests.cmx similarity index 100% rename from lib/rust/fuchsia_pkg_uri/meta/fuchsia_pkg_uri_tests.cmx rename to garnet/lib/rust/fuchsia_pkg_uri/meta/fuchsia_pkg_uri_tests.cmx
diff --git a/lib/rust/fuchsia_pkg_uri/src/errors.rs b/garnet/lib/rust/fuchsia_pkg_uri/src/errors.rs similarity index 100% rename from lib/rust/fuchsia_pkg_uri/src/errors.rs rename to garnet/lib/rust/fuchsia_pkg_uri/src/errors.rs
diff --git a/lib/rust/fuchsia_pkg_uri/src/lib.rs b/garnet/lib/rust/fuchsia_pkg_uri/src/lib.rs similarity index 100% rename from lib/rust/fuchsia_pkg_uri/src/lib.rs rename to garnet/lib/rust/fuchsia_pkg_uri/src/lib.rs
diff --git a/lib/rust/qmi/BUILD.gn b/garnet/lib/rust/qmi/BUILD.gn similarity index 100% rename from lib/rust/qmi/BUILD.gn rename to garnet/lib/rust/qmi/BUILD.gn
diff --git a/lib/rust/qmi/src/lib.rs b/garnet/lib/rust/qmi/src/lib.rs similarity index 100% rename from lib/rust/qmi/src/lib.rs rename to garnet/lib/rust/qmi/src/lib.rs
diff --git a/lib/rust/wlan-common/BUILD.gn b/garnet/lib/rust/wlan-common/BUILD.gn similarity index 100% rename from lib/rust/wlan-common/BUILD.gn rename to garnet/lib/rust/wlan-common/BUILD.gn
diff --git a/lib/rust/wlan-common/MAINTAINERS b/garnet/lib/rust/wlan-common/MAINTAINERS similarity index 100% rename from lib/rust/wlan-common/MAINTAINERS rename to garnet/lib/rust/wlan-common/MAINTAINERS
diff --git a/lib/rust/wlan-common/src/buffer_writer.rs b/garnet/lib/rust/wlan-common/src/buffer_writer.rs similarity index 100% rename from lib/rust/wlan-common/src/buffer_writer.rs rename to garnet/lib/rust/wlan-common/src/buffer_writer.rs
diff --git a/lib/rust/wlan-common/src/channel.rs b/garnet/lib/rust/wlan-common/src/channel.rs similarity index 100% rename from lib/rust/wlan-common/src/channel.rs rename to garnet/lib/rust/wlan-common/src/channel.rs
diff --git a/lib/rust/wlan-common/src/ie.rs b/garnet/lib/rust/wlan-common/src/ie.rs similarity index 100% rename from lib/rust/wlan-common/src/ie.rs rename to garnet/lib/rust/wlan-common/src/ie.rs
diff --git a/lib/rust/wlan-common/src/lib.rs b/garnet/lib/rust/wlan-common/src/lib.rs similarity index 100% rename from lib/rust/wlan-common/src/lib.rs rename to garnet/lib/rust/wlan-common/src/lib.rs
diff --git a/lib/rust/wlan-common/src/mac.rs b/garnet/lib/rust/wlan-common/src/mac.rs similarity index 100% rename from lib/rust/wlan-common/src/mac.rs rename to garnet/lib/rust/wlan-common/src/mac.rs
diff --git a/lib/rust/wlan-common/src/sequence.rs b/garnet/lib/rust/wlan-common/src/sequence.rs similarity index 100% rename from lib/rust/wlan-common/src/sequence.rs rename to garnet/lib/rust/wlan-common/src/sequence.rs
diff --git a/lib/rust/wlan-common/src/utils.rs b/garnet/lib/rust/wlan-common/src/utils.rs similarity index 100% rename from lib/rust/wlan-common/src/utils.rs rename to garnet/lib/rust/wlan-common/src/utils.rs
diff --git a/lib/rust/wlan-mlme-c/BUILD.gn b/garnet/lib/rust/wlan-mlme-c/BUILD.gn similarity index 100% rename from lib/rust/wlan-mlme-c/BUILD.gn rename to garnet/lib/rust/wlan-mlme-c/BUILD.gn
diff --git a/lib/rust/wlan-mlme-c/README.md b/garnet/lib/rust/wlan-mlme-c/README.md similarity index 100% rename from lib/rust/wlan-mlme-c/README.md rename to garnet/lib/rust/wlan-mlme-c/README.md
diff --git a/lib/rust/wlan-mlme-c/bindings.h b/garnet/lib/rust/wlan-mlme-c/bindings.h similarity index 100% rename from lib/rust/wlan-mlme-c/bindings.h rename to garnet/lib/rust/wlan-mlme-c/bindings.h
diff --git a/lib/rust/wlan-mlme-c/cbindgen.toml b/garnet/lib/rust/wlan-mlme-c/cbindgen.toml similarity index 100% rename from lib/rust/wlan-mlme-c/cbindgen.toml rename to garnet/lib/rust/wlan-mlme-c/cbindgen.toml
diff --git a/lib/rust/wlan-mlme-c/src/auth.rs b/garnet/lib/rust/wlan-mlme-c/src/auth.rs similarity index 100% rename from lib/rust/wlan-mlme-c/src/auth.rs rename to garnet/lib/rust/wlan-mlme-c/src/auth.rs
diff --git a/lib/rust/wlan-mlme-c/src/buffer.rs b/garnet/lib/rust/wlan-mlme-c/src/buffer.rs similarity index 100% rename from lib/rust/wlan-mlme-c/src/buffer.rs rename to garnet/lib/rust/wlan-mlme-c/src/buffer.rs
diff --git a/lib/rust/wlan-mlme-c/src/lib.rs b/garnet/lib/rust/wlan-mlme-c/src/lib.rs similarity index 100% rename from lib/rust/wlan-mlme-c/src/lib.rs rename to garnet/lib/rust/wlan-mlme-c/src/lib.rs
diff --git a/lib/rust/wlan-mlme/BUILD.gn b/garnet/lib/rust/wlan-mlme/BUILD.gn similarity index 100% rename from lib/rust/wlan-mlme/BUILD.gn rename to garnet/lib/rust/wlan-mlme/BUILD.gn
diff --git a/lib/rust/wlan-mlme/src/auth.rs b/garnet/lib/rust/wlan-mlme/src/auth.rs similarity index 100% rename from lib/rust/wlan-mlme/src/auth.rs rename to garnet/lib/rust/wlan-mlme/src/auth.rs
diff --git a/lib/rust/wlan-mlme/src/client.rs b/garnet/lib/rust/wlan-mlme/src/client.rs similarity index 100% rename from lib/rust/wlan-mlme/src/client.rs rename to garnet/lib/rust/wlan-mlme/src/client.rs
diff --git a/lib/rust/wlan-mlme/src/lib.rs b/garnet/lib/rust/wlan-mlme/src/lib.rs similarity index 100% rename from lib/rust/wlan-mlme/src/lib.rs rename to garnet/lib/rust/wlan-mlme/src/lib.rs
diff --git a/lib/rust/wlan-rsn/BUILD.gn b/garnet/lib/rust/wlan-rsn/BUILD.gn similarity index 100% rename from lib/rust/wlan-rsn/BUILD.gn rename to garnet/lib/rust/wlan-rsn/BUILD.gn
diff --git a/lib/rust/wlan-rsn/src/akm.rs b/garnet/lib/rust/wlan-rsn/src/akm.rs similarity index 100% rename from lib/rust/wlan-rsn/src/akm.rs rename to garnet/lib/rust/wlan-rsn/src/akm.rs
diff --git a/lib/rust/wlan-rsn/src/auth/mod.rs b/garnet/lib/rust/wlan-rsn/src/auth/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/auth/mod.rs rename to garnet/lib/rust/wlan-rsn/src/auth/mod.rs
diff --git a/lib/rust/wlan-rsn/src/auth/psk.rs b/garnet/lib/rust/wlan-rsn/src/auth/psk.rs similarity index 100% rename from lib/rust/wlan-rsn/src/auth/psk.rs rename to garnet/lib/rust/wlan-rsn/src/auth/psk.rs
diff --git a/lib/rust/wlan-rsn/src/cipher.rs b/garnet/lib/rust/wlan-rsn/src/cipher.rs similarity index 100% rename from lib/rust/wlan-rsn/src/cipher.rs rename to garnet/lib/rust/wlan-rsn/src/cipher.rs
diff --git a/lib/rust/wlan-rsn/src/crypto_utils/mod.rs b/garnet/lib/rust/wlan-rsn/src/crypto_utils/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/crypto_utils/mod.rs rename to garnet/lib/rust/wlan-rsn/src/crypto_utils/mod.rs
diff --git a/lib/rust/wlan-rsn/src/crypto_utils/nonce.rs b/garnet/lib/rust/wlan-rsn/src/crypto_utils/nonce.rs similarity index 100% rename from lib/rust/wlan-rsn/src/crypto_utils/nonce.rs rename to garnet/lib/rust/wlan-rsn/src/crypto_utils/nonce.rs
diff --git a/lib/rust/wlan-rsn/src/integrity/hmac_sha1.rs b/garnet/lib/rust/wlan-rsn/src/integrity/hmac_sha1.rs similarity index 100% rename from lib/rust/wlan-rsn/src/integrity/hmac_sha1.rs rename to garnet/lib/rust/wlan-rsn/src/integrity/hmac_sha1.rs
diff --git a/lib/rust/wlan-rsn/src/integrity/mod.rs b/garnet/lib/rust/wlan-rsn/src/integrity/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/integrity/mod.rs rename to garnet/lib/rust/wlan-rsn/src/integrity/mod.rs
diff --git a/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/authenticator.rs b/garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/authenticator.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/authenticator.rs rename to garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/authenticator.rs
diff --git a/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/mod.rs b/garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/mod.rs rename to garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/mod.rs
diff --git a/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/supplicant.rs b/garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/supplicant.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/supplicant.rs rename to garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/fourway/supplicant.rs
diff --git a/lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/mod.rs b/garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/mod.rs rename to garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/mod.rs
diff --git a/lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/supplicant.rs b/garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/supplicant.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/supplicant.rs rename to garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/group_key/supplicant.rs
diff --git a/lib/rust/wlan-rsn/src/key/exchange/handshake/mod.rs b/garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/exchange/handshake/mod.rs rename to garnet/lib/rust/wlan-rsn/src/key/exchange/handshake/mod.rs
diff --git a/lib/rust/wlan-rsn/src/key/exchange/mod.rs b/garnet/lib/rust/wlan-rsn/src/key/exchange/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/exchange/mod.rs rename to garnet/lib/rust/wlan-rsn/src/key/exchange/mod.rs
diff --git a/lib/rust/wlan-rsn/src/key/gtk.rs b/garnet/lib/rust/wlan-rsn/src/key/gtk.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/gtk.rs rename to garnet/lib/rust/wlan-rsn/src/key/gtk.rs
diff --git a/lib/rust/wlan-rsn/src/key/mod.rs b/garnet/lib/rust/wlan-rsn/src/key/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/mod.rs rename to garnet/lib/rust/wlan-rsn/src/key/mod.rs
diff --git a/lib/rust/wlan-rsn/src/key/ptk.rs b/garnet/lib/rust/wlan-rsn/src/key/ptk.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key/ptk.rs rename to garnet/lib/rust/wlan-rsn/src/key/ptk.rs
diff --git a/lib/rust/wlan-rsn/src/key_data/kde.rs b/garnet/lib/rust/wlan-rsn/src/key_data/kde.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key_data/kde.rs rename to garnet/lib/rust/wlan-rsn/src/key_data/kde.rs
diff --git a/lib/rust/wlan-rsn/src/key_data/mod.rs b/garnet/lib/rust/wlan-rsn/src/key_data/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/key_data/mod.rs rename to garnet/lib/rust/wlan-rsn/src/key_data/mod.rs
diff --git a/lib/rust/wlan-rsn/src/keywrap/aes.rs b/garnet/lib/rust/wlan-rsn/src/keywrap/aes.rs similarity index 100% rename from lib/rust/wlan-rsn/src/keywrap/aes.rs rename to garnet/lib/rust/wlan-rsn/src/keywrap/aes.rs
diff --git a/lib/rust/wlan-rsn/src/keywrap/mod.rs b/garnet/lib/rust/wlan-rsn/src/keywrap/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/keywrap/mod.rs rename to garnet/lib/rust/wlan-rsn/src/keywrap/mod.rs
diff --git a/lib/rust/wlan-rsn/src/lib.rs b/garnet/lib/rust/wlan-rsn/src/lib.rs similarity index 100% rename from lib/rust/wlan-rsn/src/lib.rs rename to garnet/lib/rust/wlan-rsn/src/lib.rs
diff --git a/lib/rust/wlan-rsn/src/pmkid.rs b/garnet/lib/rust/wlan-rsn/src/pmkid.rs similarity index 100% rename from lib/rust/wlan-rsn/src/pmkid.rs rename to garnet/lib/rust/wlan-rsn/src/pmkid.rs
diff --git a/lib/rust/wlan-rsn/src/rsna/esssa.rs b/garnet/lib/rust/wlan-rsn/src/rsna/esssa.rs similarity index 100% rename from lib/rust/wlan-rsn/src/rsna/esssa.rs rename to garnet/lib/rust/wlan-rsn/src/rsna/esssa.rs
diff --git a/lib/rust/wlan-rsn/src/rsna/mod.rs b/garnet/lib/rust/wlan-rsn/src/rsna/mod.rs similarity index 100% rename from lib/rust/wlan-rsn/src/rsna/mod.rs rename to garnet/lib/rust/wlan-rsn/src/rsna/mod.rs
diff --git a/lib/rust/wlan-rsn/src/rsna/test_util.rs b/garnet/lib/rust/wlan-rsn/src/rsna/test_util.rs similarity index 100% rename from lib/rust/wlan-rsn/src/rsna/test_util.rs rename to garnet/lib/rust/wlan-rsn/src/rsna/test_util.rs
diff --git a/lib/rust/wlan-rsn/src/rsne.rs b/garnet/lib/rust/wlan-rsn/src/rsne.rs similarity index 100% rename from lib/rust/wlan-rsn/src/rsne.rs rename to garnet/lib/rust/wlan-rsn/src/rsne.rs
diff --git a/lib/rust/wlan-rsn/src/state_machine.rs b/garnet/lib/rust/wlan-rsn/src/state_machine.rs similarity index 100% rename from lib/rust/wlan-rsn/src/state_machine.rs rename to garnet/lib/rust/wlan-rsn/src/state_machine.rs
diff --git a/lib/rust/wlan-rsn/src/suite_selector.rs b/garnet/lib/rust/wlan-rsn/src/suite_selector.rs similarity index 100% rename from lib/rust/wlan-rsn/src/suite_selector.rs rename to garnet/lib/rust/wlan-rsn/src/suite_selector.rs
diff --git a/lib/rust/wlan-sme/BUILD.gn b/garnet/lib/rust/wlan-sme/BUILD.gn similarity index 100% rename from lib/rust/wlan-sme/BUILD.gn rename to garnet/lib/rust/wlan-sme/BUILD.gn
diff --git a/lib/rust/wlan-sme/src/ap/aid.rs b/garnet/lib/rust/wlan-sme/src/ap/aid.rs similarity index 100% rename from lib/rust/wlan-sme/src/ap/aid.rs rename to garnet/lib/rust/wlan-sme/src/ap/aid.rs
diff --git a/lib/rust/wlan-sme/src/ap/authenticator.rs b/garnet/lib/rust/wlan-sme/src/ap/authenticator.rs similarity index 100% rename from lib/rust/wlan-sme/src/ap/authenticator.rs rename to garnet/lib/rust/wlan-sme/src/ap/authenticator.rs
diff --git a/lib/rust/wlan-sme/src/ap/event.rs b/garnet/lib/rust/wlan-sme/src/ap/event.rs similarity index 100% rename from lib/rust/wlan-sme/src/ap/event.rs rename to garnet/lib/rust/wlan-sme/src/ap/event.rs
diff --git a/lib/rust/wlan-sme/src/ap/mod.rs b/garnet/lib/rust/wlan-sme/src/ap/mod.rs similarity index 100% rename from lib/rust/wlan-sme/src/ap/mod.rs rename to garnet/lib/rust/wlan-sme/src/ap/mod.rs
diff --git a/lib/rust/wlan-sme/src/ap/remote_client.rs b/garnet/lib/rust/wlan-sme/src/ap/remote_client.rs similarity index 100% rename from lib/rust/wlan-sme/src/ap/remote_client.rs rename to garnet/lib/rust/wlan-sme/src/ap/remote_client.rs
diff --git a/lib/rust/wlan-sme/src/ap/rsn.rs b/garnet/lib/rust/wlan-sme/src/ap/rsn.rs similarity index 100% rename from lib/rust/wlan-sme/src/ap/rsn.rs rename to garnet/lib/rust/wlan-sme/src/ap/rsn.rs
diff --git a/lib/rust/wlan-sme/src/ap/test_utils.rs b/garnet/lib/rust/wlan-sme/src/ap/test_utils.rs similarity index 100% rename from lib/rust/wlan-sme/src/ap/test_utils.rs rename to garnet/lib/rust/wlan-sme/src/ap/test_utils.rs
diff --git a/lib/rust/wlan-sme/src/client/bss.rs b/garnet/lib/rust/wlan-sme/src/client/bss.rs similarity index 100% rename from lib/rust/wlan-sme/src/client/bss.rs rename to garnet/lib/rust/wlan-sme/src/client/bss.rs
diff --git a/lib/rust/wlan-sme/src/client/event.rs b/garnet/lib/rust/wlan-sme/src/client/event.rs similarity index 100% rename from lib/rust/wlan-sme/src/client/event.rs rename to garnet/lib/rust/wlan-sme/src/client/event.rs
diff --git a/lib/rust/wlan-sme/src/client/mod.rs b/garnet/lib/rust/wlan-sme/src/client/mod.rs similarity index 100% rename from lib/rust/wlan-sme/src/client/mod.rs rename to garnet/lib/rust/wlan-sme/src/client/mod.rs
diff --git a/lib/rust/wlan-sme/src/client/rsn.rs b/garnet/lib/rust/wlan-sme/src/client/rsn.rs similarity index 100% rename from lib/rust/wlan-sme/src/client/rsn.rs rename to garnet/lib/rust/wlan-sme/src/client/rsn.rs
diff --git a/lib/rust/wlan-sme/src/client/scan.rs b/garnet/lib/rust/wlan-sme/src/client/scan.rs similarity index 100% rename from lib/rust/wlan-sme/src/client/scan.rs rename to garnet/lib/rust/wlan-sme/src/client/scan.rs
diff --git a/lib/rust/wlan-sme/src/client/state.rs b/garnet/lib/rust/wlan-sme/src/client/state.rs similarity index 100% rename from lib/rust/wlan-sme/src/client/state.rs rename to garnet/lib/rust/wlan-sme/src/client/state.rs
diff --git a/lib/rust/wlan-sme/src/client/test_utils.rs b/garnet/lib/rust/wlan-sme/src/client/test_utils.rs similarity index 100% rename from lib/rust/wlan-sme/src/client/test_utils.rs rename to garnet/lib/rust/wlan-sme/src/client/test_utils.rs
diff --git a/lib/rust/wlan-sme/src/clone_utils.rs b/garnet/lib/rust/wlan-sme/src/clone_utils.rs similarity index 100% rename from lib/rust/wlan-sme/src/clone_utils.rs rename to garnet/lib/rust/wlan-sme/src/clone_utils.rs
diff --git a/lib/rust/wlan-sme/src/lib.rs b/garnet/lib/rust/wlan-sme/src/lib.rs similarity index 100% rename from lib/rust/wlan-sme/src/lib.rs rename to garnet/lib/rust/wlan-sme/src/lib.rs
diff --git a/lib/rust/wlan-sme/src/mesh/mod.rs b/garnet/lib/rust/wlan-sme/src/mesh/mod.rs similarity index 100% rename from lib/rust/wlan-sme/src/mesh/mod.rs rename to garnet/lib/rust/wlan-sme/src/mesh/mod.rs
diff --git a/lib/rust/wlan-sme/src/phy_selection.rs b/garnet/lib/rust/wlan-sme/src/phy_selection.rs similarity index 100% rename from lib/rust/wlan-sme/src/phy_selection.rs rename to garnet/lib/rust/wlan-sme/src/phy_selection.rs
diff --git a/lib/rust/wlan-sme/src/sink.rs b/garnet/lib/rust/wlan-sme/src/sink.rs similarity index 100% rename from lib/rust/wlan-sme/src/sink.rs rename to garnet/lib/rust/wlan-sme/src/sink.rs
diff --git a/lib/rust/wlan-sme/src/test_utils.rs b/garnet/lib/rust/wlan-sme/src/test_utils.rs similarity index 100% rename from lib/rust/wlan-sme/src/test_utils.rs rename to garnet/lib/rust/wlan-sme/src/test_utils.rs
diff --git a/lib/rust/wlan-sme/src/timer.rs b/garnet/lib/rust/wlan-sme/src/timer.rs similarity index 100% rename from lib/rust/wlan-sme/src/timer.rs rename to garnet/lib/rust/wlan-sme/src/timer.rs
diff --git a/lib/rust/wlantap-client/BUILD.gn b/garnet/lib/rust/wlantap-client/BUILD.gn similarity index 100% rename from lib/rust/wlantap-client/BUILD.gn rename to garnet/lib/rust/wlantap-client/BUILD.gn
diff --git a/lib/rust/wlantap-client/src/lib.rs b/garnet/lib/rust/wlantap-client/src/lib.rs similarity index 100% rename from lib/rust/wlantap-client/src/lib.rs rename to garnet/lib/rust/wlantap-client/src/lib.rs
diff --git a/lib/system_monitor/BUILD.gn b/garnet/lib/system_monitor/BUILD.gn similarity index 100% rename from lib/system_monitor/BUILD.gn rename to garnet/lib/system_monitor/BUILD.gn
diff --git a/lib/system_monitor/README.md b/garnet/lib/system_monitor/README.md similarity index 100% rename from lib/system_monitor/README.md rename to garnet/lib/system_monitor/README.md
diff --git a/lib/system_monitor/dockyard/BUILD.gn b/garnet/lib/system_monitor/dockyard/BUILD.gn similarity index 100% rename from lib/system_monitor/dockyard/BUILD.gn rename to garnet/lib/system_monitor/dockyard/BUILD.gn
diff --git a/lib/system_monitor/dockyard/README.md b/garnet/lib/system_monitor/dockyard/README.md similarity index 100% rename from lib/system_monitor/dockyard/README.md rename to garnet/lib/system_monitor/dockyard/README.md
diff --git a/lib/system_monitor/dockyard/dockyard.cc b/garnet/lib/system_monitor/dockyard/dockyard.cc similarity index 100% rename from lib/system_monitor/dockyard/dockyard.cc rename to garnet/lib/system_monitor/dockyard/dockyard.cc
diff --git a/lib/system_monitor/dockyard/dockyard.h b/garnet/lib/system_monitor/dockyard/dockyard.h similarity index 100% rename from lib/system_monitor/dockyard/dockyard.h rename to garnet/lib/system_monitor/dockyard/dockyard.h
diff --git a/lib/system_monitor/dockyard/dockyard_unittests.cc b/garnet/lib/system_monitor/dockyard/dockyard_unittests.cc similarity index 100% rename from lib/system_monitor/dockyard/dockyard_unittests.cc rename to garnet/lib/system_monitor/dockyard/dockyard_unittests.cc
diff --git a/lib/system_monitor/dockyard/test_sample_generator.cc b/garnet/lib/system_monitor/dockyard/test_sample_generator.cc similarity index 100% rename from lib/system_monitor/dockyard/test_sample_generator.cc rename to garnet/lib/system_monitor/dockyard/test_sample_generator.cc
diff --git a/lib/system_monitor/dockyard/test_sample_generator.h b/garnet/lib/system_monitor/dockyard/test_sample_generator.h similarity index 100% rename from lib/system_monitor/dockyard/test_sample_generator.h rename to garnet/lib/system_monitor/dockyard/test_sample_generator.h
diff --git a/lib/system_monitor/protos/dockyard.proto b/garnet/lib/system_monitor/protos/dockyard.proto similarity index 100% rename from lib/system_monitor/protos/dockyard.proto rename to garnet/lib/system_monitor/protos/dockyard.proto
diff --git a/lib/system_monitor/transport/README.md b/garnet/lib/system_monitor/transport/README.md similarity index 100% rename from lib/system_monitor/transport/README.md rename to garnet/lib/system_monitor/transport/README.md
diff --git a/lib/telephony/MAINTAINERS b/garnet/lib/telephony/MAINTAINERS similarity index 100% rename from lib/telephony/MAINTAINERS rename to garnet/lib/telephony/MAINTAINERS
diff --git a/lib/telephony/qmi-protocol/BUILD.gn b/garnet/lib/telephony/qmi-protocol/BUILD.gn similarity index 100% rename from lib/telephony/qmi-protocol/BUILD.gn rename to garnet/lib/telephony/qmi-protocol/BUILD.gn
diff --git a/lib/telephony/qmi-protocol/protocol/common.json b/garnet/lib/telephony/qmi-protocol/protocol/common.json similarity index 100% rename from lib/telephony/qmi-protocol/protocol/common.json rename to garnet/lib/telephony/qmi-protocol/protocol/common.json
diff --git a/lib/telephony/qmi-protocol/protocol/ctl.json b/garnet/lib/telephony/qmi-protocol/protocol/ctl.json similarity index 100% rename from lib/telephony/qmi-protocol/protocol/ctl.json rename to garnet/lib/telephony/qmi-protocol/protocol/ctl.json
diff --git a/lib/telephony/qmi-protocol/protocol/dms.json b/garnet/lib/telephony/qmi-protocol/protocol/dms.json similarity index 100% rename from lib/telephony/qmi-protocol/protocol/dms.json rename to garnet/lib/telephony/qmi-protocol/protocol/dms.json
diff --git a/lib/telephony/qmi-protocol/protocol/wda.json b/garnet/lib/telephony/qmi-protocol/protocol/wda.json similarity index 100% rename from lib/telephony/qmi-protocol/protocol/wda.json rename to garnet/lib/telephony/qmi-protocol/protocol/wda.json
diff --git a/lib/telephony/qmi-protocol/protocol/wds.json b/garnet/lib/telephony/qmi-protocol/protocol/wds.json similarity index 100% rename from lib/telephony/qmi-protocol/protocol/wds.json rename to garnet/lib/telephony/qmi-protocol/protocol/wds.json
diff --git a/lib/telephony/qmi-protocol/src/ast.rs b/garnet/lib/telephony/qmi-protocol/src/ast.rs similarity index 100% rename from lib/telephony/qmi-protocol/src/ast.rs rename to garnet/lib/telephony/qmi-protocol/src/ast.rs
diff --git a/lib/telephony/qmi-protocol/src/codegen.rs b/garnet/lib/telephony/qmi-protocol/src/codegen.rs similarity index 100% rename from lib/telephony/qmi-protocol/src/codegen.rs rename to garnet/lib/telephony/qmi-protocol/src/codegen.rs
diff --git a/lib/telephony/qmi-protocol/src/lib.rs b/garnet/lib/telephony/qmi-protocol/src/lib.rs similarity index 100% rename from lib/telephony/qmi-protocol/src/lib.rs rename to garnet/lib/telephony/qmi-protocol/src/lib.rs
diff --git a/lib/telephony/qmi-protocol/src/main.rs b/garnet/lib/telephony/qmi-protocol/src/main.rs similarity index 100% rename from lib/telephony/qmi-protocol/src/main.rs rename to garnet/lib/telephony/qmi-protocol/src/main.rs
diff --git a/lib/telephony/qmi-protocol/tests/codegen_tests.rs b/garnet/lib/telephony/qmi-protocol/tests/codegen_tests.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/codegen_tests.rs rename to garnet/lib/telephony/qmi-protocol/tests/codegen_tests.rs
diff --git a/lib/telephony/qmi-protocol/tests/macros.rs b/garnet/lib/telephony/qmi-protocol/tests/macros.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/macros.rs rename to garnet/lib/telephony/qmi-protocol/tests/macros.rs
diff --git a/lib/telephony/qmi-protocol/tests/optional_response.test.json b/garnet/lib/telephony/qmi-protocol/tests/optional_response.test.json similarity index 100% rename from lib/telephony/qmi-protocol/tests/optional_response.test.json rename to garnet/lib/telephony/qmi-protocol/tests/optional_response.test.json
diff --git a/lib/telephony/qmi-protocol/tests/optional_response.test.rs b/garnet/lib/telephony/qmi-protocol/tests/optional_response.test.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/optional_response.test.rs rename to garnet/lib/telephony/qmi-protocol/tests/optional_response.test.rs
diff --git a/lib/telephony/qmi-protocol/tests/simple_request.test.json b/garnet/lib/telephony/qmi-protocol/tests/simple_request.test.json similarity index 100% rename from lib/telephony/qmi-protocol/tests/simple_request.test.json rename to garnet/lib/telephony/qmi-protocol/tests/simple_request.test.json
diff --git a/lib/telephony/qmi-protocol/tests/simple_request.test.rs b/garnet/lib/telephony/qmi-protocol/tests/simple_request.test.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/simple_request.test.rs rename to garnet/lib/telephony/qmi-protocol/tests/simple_request.test.rs
diff --git a/lib/telephony/qmi-protocol/tests/simple_response.test.json b/garnet/lib/telephony/qmi-protocol/tests/simple_response.test.json similarity index 100% rename from lib/telephony/qmi-protocol/tests/simple_response.test.json rename to garnet/lib/telephony/qmi-protocol/tests/simple_response.test.json
diff --git a/lib/telephony/qmi-protocol/tests/simple_response.test.rs b/garnet/lib/telephony/qmi-protocol/tests/simple_response.test.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/simple_response.test.rs rename to garnet/lib/telephony/qmi-protocol/tests/simple_response.test.rs
diff --git a/lib/telephony/qmi-protocol/tests/string_request_decode.test.json b/garnet/lib/telephony/qmi-protocol/tests/string_request_decode.test.json similarity index 100% rename from lib/telephony/qmi-protocol/tests/string_request_decode.test.json rename to garnet/lib/telephony/qmi-protocol/tests/string_request_decode.test.json
diff --git a/lib/telephony/qmi-protocol/tests/string_request_decode.test.rs b/garnet/lib/telephony/qmi-protocol/tests/string_request_decode.test.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/string_request_decode.test.rs rename to garnet/lib/telephony/qmi-protocol/tests/string_request_decode.test.rs
diff --git a/lib/telephony/qmi-protocol/tests/subparam_request.test.json b/garnet/lib/telephony/qmi-protocol/tests/subparam_request.test.json similarity index 100% rename from lib/telephony/qmi-protocol/tests/subparam_request.test.json rename to garnet/lib/telephony/qmi-protocol/tests/subparam_request.test.json
diff --git a/lib/telephony/qmi-protocol/tests/subparam_request.test.rs b/garnet/lib/telephony/qmi-protocol/tests/subparam_request.test.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/subparam_request.test.rs rename to garnet/lib/telephony/qmi-protocol/tests/subparam_request.test.rs
diff --git a/lib/telephony/qmi-protocol/tests/subparam_response.test.json b/garnet/lib/telephony/qmi-protocol/tests/subparam_response.test.json similarity index 100% rename from lib/telephony/qmi-protocol/tests/subparam_response.test.json rename to garnet/lib/telephony/qmi-protocol/tests/subparam_response.test.json
diff --git a/lib/telephony/qmi-protocol/tests/subparam_response.test.rs b/garnet/lib/telephony/qmi-protocol/tests/subparam_response.test.rs similarity index 100% rename from lib/telephony/qmi-protocol/tests/subparam_response.test.rs rename to garnet/lib/telephony/qmi-protocol/tests/subparam_response.test.rs
diff --git a/lib/trace_converters/BUILD.gn b/garnet/lib/trace_converters/BUILD.gn similarity index 100% rename from lib/trace_converters/BUILD.gn rename to garnet/lib/trace_converters/BUILD.gn
diff --git a/lib/trace_converters/MAINTAINERS b/garnet/lib/trace_converters/MAINTAINERS similarity index 100% rename from lib/trace_converters/MAINTAINERS rename to garnet/lib/trace_converters/MAINTAINERS
diff --git a/lib/trace_converters/chromium_exporter.cc b/garnet/lib/trace_converters/chromium_exporter.cc similarity index 100% rename from lib/trace_converters/chromium_exporter.cc rename to garnet/lib/trace_converters/chromium_exporter.cc
diff --git a/lib/trace_converters/chromium_exporter.h b/garnet/lib/trace_converters/chromium_exporter.h similarity index 100% rename from lib/trace_converters/chromium_exporter.h rename to garnet/lib/trace_converters/chromium_exporter.h
diff --git a/public/lib/ui/MAINTAINERS b/garnet/lib/ui/MAINTAINERS similarity index 100% copy from public/lib/ui/MAINTAINERS copy to garnet/lib/ui/MAINTAINERS
diff --git a/lib/ui/a11y_input/BUILD.gn b/garnet/lib/ui/a11y_input/BUILD.gn similarity index 100% rename from lib/ui/a11y_input/BUILD.gn rename to garnet/lib/ui/a11y_input/BUILD.gn
diff --git a/lib/ui/a11y_input/a11y_input_system.cc b/garnet/lib/ui/a11y_input/a11y_input_system.cc similarity index 100% rename from lib/ui/a11y_input/a11y_input_system.cc rename to garnet/lib/ui/a11y_input/a11y_input_system.cc
diff --git a/lib/ui/a11y_input/a11y_input_system.h b/garnet/lib/ui/a11y_input/a11y_input_system.h similarity index 100% rename from lib/ui/a11y_input/a11y_input_system.h rename to garnet/lib/ui/a11y_input/a11y_input_system.h
diff --git a/lib/ui/gfx/BUILD.gn b/garnet/lib/ui/gfx/BUILD.gn similarity index 100% rename from lib/ui/gfx/BUILD.gn rename to garnet/lib/ui/gfx/BUILD.gn
diff --git a/lib/ui/gfx/displays/display.cc b/garnet/lib/ui/gfx/displays/display.cc similarity index 100% rename from lib/ui/gfx/displays/display.cc rename to garnet/lib/ui/gfx/displays/display.cc
diff --git a/lib/ui/gfx/displays/display.h b/garnet/lib/ui/gfx/displays/display.h similarity index 100% rename from lib/ui/gfx/displays/display.h rename to garnet/lib/ui/gfx/displays/display.h
diff --git a/lib/ui/gfx/displays/display_manager.cc b/garnet/lib/ui/gfx/displays/display_manager.cc similarity index 100% rename from lib/ui/gfx/displays/display_manager.cc rename to garnet/lib/ui/gfx/displays/display_manager.cc
diff --git a/lib/ui/gfx/displays/display_manager.h b/garnet/lib/ui/gfx/displays/display_manager.h similarity index 100% rename from lib/ui/gfx/displays/display_manager.h rename to garnet/lib/ui/gfx/displays/display_manager.h
diff --git a/lib/ui/gfx/displays/display_watcher.cc b/garnet/lib/ui/gfx/displays/display_watcher.cc similarity index 100% rename from lib/ui/gfx/displays/display_watcher.cc rename to garnet/lib/ui/gfx/displays/display_watcher.cc
diff --git a/lib/ui/gfx/displays/display_watcher.h b/garnet/lib/ui/gfx/displays/display_watcher.h similarity index 100% rename from lib/ui/gfx/displays/display_watcher.h rename to garnet/lib/ui/gfx/displays/display_watcher.h
diff --git a/lib/ui/gfx/engine/engine.cc b/garnet/lib/ui/gfx/engine/engine.cc similarity index 100% rename from lib/ui/gfx/engine/engine.cc rename to garnet/lib/ui/gfx/engine/engine.cc
diff --git a/lib/ui/gfx/engine/engine.h b/garnet/lib/ui/gfx/engine/engine.h similarity index 100% rename from lib/ui/gfx/engine/engine.h rename to garnet/lib/ui/gfx/engine/engine.h
diff --git a/lib/ui/gfx/engine/engine_renderer.cc b/garnet/lib/ui/gfx/engine/engine_renderer.cc similarity index 100% rename from lib/ui/gfx/engine/engine_renderer.cc rename to garnet/lib/ui/gfx/engine/engine_renderer.cc
diff --git a/lib/ui/gfx/engine/engine_renderer.h b/garnet/lib/ui/gfx/engine/engine_renderer.h similarity index 100% rename from lib/ui/gfx/engine/engine_renderer.h rename to garnet/lib/ui/gfx/engine/engine_renderer.h
diff --git a/lib/ui/gfx/engine/frame_scheduler.cc b/garnet/lib/ui/gfx/engine/frame_scheduler.cc similarity index 100% rename from lib/ui/gfx/engine/frame_scheduler.cc rename to garnet/lib/ui/gfx/engine/frame_scheduler.cc
diff --git a/lib/ui/gfx/engine/frame_scheduler.h b/garnet/lib/ui/gfx/engine/frame_scheduler.h similarity index 100% rename from lib/ui/gfx/engine/frame_scheduler.h rename to garnet/lib/ui/gfx/engine/frame_scheduler.h
diff --git a/lib/ui/gfx/engine/frame_timings.cc b/garnet/lib/ui/gfx/engine/frame_timings.cc similarity index 100% rename from lib/ui/gfx/engine/frame_timings.cc rename to garnet/lib/ui/gfx/engine/frame_timings.cc
diff --git a/lib/ui/gfx/engine/frame_timings.h b/garnet/lib/ui/gfx/engine/frame_timings.h similarity index 100% rename from lib/ui/gfx/engine/frame_timings.h rename to garnet/lib/ui/gfx/engine/frame_timings.h
diff --git a/lib/ui/gfx/engine/gfx_command_applier.cc b/garnet/lib/ui/gfx/engine/gfx_command_applier.cc similarity index 100% rename from lib/ui/gfx/engine/gfx_command_applier.cc rename to garnet/lib/ui/gfx/engine/gfx_command_applier.cc
diff --git a/lib/ui/gfx/engine/gfx_command_applier.h b/garnet/lib/ui/gfx/engine/gfx_command_applier.h similarity index 100% rename from lib/ui/gfx/engine/gfx_command_applier.h rename to garnet/lib/ui/gfx/engine/gfx_command_applier.h
diff --git a/lib/ui/gfx/engine/hardware_layer_assignment.cc b/garnet/lib/ui/gfx/engine/hardware_layer_assignment.cc similarity index 100% rename from lib/ui/gfx/engine/hardware_layer_assignment.cc rename to garnet/lib/ui/gfx/engine/hardware_layer_assignment.cc
diff --git a/lib/ui/gfx/engine/hardware_layer_assignment.h b/garnet/lib/ui/gfx/engine/hardware_layer_assignment.h similarity index 100% rename from lib/ui/gfx/engine/hardware_layer_assignment.h rename to garnet/lib/ui/gfx/engine/hardware_layer_assignment.h
diff --git a/lib/ui/gfx/engine/hit.h b/garnet/lib/ui/gfx/engine/hit.h similarity index 100% rename from lib/ui/gfx/engine/hit.h rename to garnet/lib/ui/gfx/engine/hit.h
diff --git a/lib/ui/gfx/engine/hit_tester.cc b/garnet/lib/ui/gfx/engine/hit_tester.cc similarity index 100% rename from lib/ui/gfx/engine/hit_tester.cc rename to garnet/lib/ui/gfx/engine/hit_tester.cc
diff --git a/lib/ui/gfx/engine/hit_tester.h b/garnet/lib/ui/gfx/engine/hit_tester.h similarity index 100% rename from lib/ui/gfx/engine/hit_tester.h rename to garnet/lib/ui/gfx/engine/hit_tester.h
diff --git a/lib/ui/gfx/engine/object_linker.cc b/garnet/lib/ui/gfx/engine/object_linker.cc similarity index 100% rename from lib/ui/gfx/engine/object_linker.cc rename to garnet/lib/ui/gfx/engine/object_linker.cc
diff --git a/lib/ui/gfx/engine/object_linker.h b/garnet/lib/ui/gfx/engine/object_linker.h similarity index 100% rename from lib/ui/gfx/engine/object_linker.h rename to garnet/lib/ui/gfx/engine/object_linker.h
diff --git a/lib/ui/gfx/engine/resource_linker.cc b/garnet/lib/ui/gfx/engine/resource_linker.cc similarity index 100% rename from lib/ui/gfx/engine/resource_linker.cc rename to garnet/lib/ui/gfx/engine/resource_linker.cc
diff --git a/lib/ui/gfx/engine/resource_linker.h b/garnet/lib/ui/gfx/engine/resource_linker.h similarity index 100% rename from lib/ui/gfx/engine/resource_linker.h rename to garnet/lib/ui/gfx/engine/resource_linker.h
diff --git a/lib/ui/gfx/engine/resource_map.cc b/garnet/lib/ui/gfx/engine/resource_map.cc similarity index 100% rename from lib/ui/gfx/engine/resource_map.cc rename to garnet/lib/ui/gfx/engine/resource_map.cc
diff --git a/lib/ui/gfx/engine/resource_map.h b/garnet/lib/ui/gfx/engine/resource_map.h similarity index 100% rename from lib/ui/gfx/engine/resource_map.h rename to garnet/lib/ui/gfx/engine/resource_map.h
diff --git a/lib/ui/gfx/engine/scene_graph.cc b/garnet/lib/ui/gfx/engine/scene_graph.cc similarity index 100% rename from lib/ui/gfx/engine/scene_graph.cc rename to garnet/lib/ui/gfx/engine/scene_graph.cc
diff --git a/lib/ui/gfx/engine/scene_graph.h b/garnet/lib/ui/gfx/engine/scene_graph.h similarity index 100% rename from lib/ui/gfx/engine/scene_graph.h rename to garnet/lib/ui/gfx/engine/scene_graph.h
diff --git a/lib/ui/gfx/engine/session.cc b/garnet/lib/ui/gfx/engine/session.cc similarity index 100% rename from lib/ui/gfx/engine/session.cc rename to garnet/lib/ui/gfx/engine/session.cc
diff --git a/lib/ui/gfx/engine/session.h b/garnet/lib/ui/gfx/engine/session.h similarity index 100% rename from lib/ui/gfx/engine/session.h rename to garnet/lib/ui/gfx/engine/session.h
diff --git a/lib/ui/gfx/engine/session_context.h b/garnet/lib/ui/gfx/engine/session_context.h similarity index 100% rename from lib/ui/gfx/engine/session_context.h rename to garnet/lib/ui/gfx/engine/session_context.h
diff --git a/lib/ui/gfx/engine/session_handler.cc b/garnet/lib/ui/gfx/engine/session_handler.cc similarity index 100% rename from lib/ui/gfx/engine/session_handler.cc rename to garnet/lib/ui/gfx/engine/session_handler.cc
diff --git a/lib/ui/gfx/engine/session_handler.h b/garnet/lib/ui/gfx/engine/session_handler.h similarity index 100% rename from lib/ui/gfx/engine/session_handler.h rename to garnet/lib/ui/gfx/engine/session_handler.h
diff --git a/lib/ui/gfx/engine/session_manager.cc b/garnet/lib/ui/gfx/engine/session_manager.cc similarity index 100% rename from lib/ui/gfx/engine/session_manager.cc rename to garnet/lib/ui/gfx/engine/session_manager.cc
diff --git a/lib/ui/gfx/engine/session_manager.h b/garnet/lib/ui/gfx/engine/session_manager.h similarity index 100% rename from lib/ui/gfx/engine/session_manager.h rename to garnet/lib/ui/gfx/engine/session_manager.h
diff --git a/lib/ui/gfx/engine/unresolved_imports.cc b/garnet/lib/ui/gfx/engine/unresolved_imports.cc similarity index 100% rename from lib/ui/gfx/engine/unresolved_imports.cc rename to garnet/lib/ui/gfx/engine/unresolved_imports.cc
diff --git a/lib/ui/gfx/engine/unresolved_imports.h b/garnet/lib/ui/gfx/engine/unresolved_imports.h similarity index 100% rename from lib/ui/gfx/engine/unresolved_imports.h rename to garnet/lib/ui/gfx/engine/unresolved_imports.h
diff --git a/lib/ui/gfx/engine/update_scheduler.h b/garnet/lib/ui/gfx/engine/update_scheduler.h similarity index 100% rename from lib/ui/gfx/engine/update_scheduler.h rename to garnet/lib/ui/gfx/engine/update_scheduler.h
diff --git a/lib/ui/gfx/gfx_system.cc b/garnet/lib/ui/gfx/gfx_system.cc similarity index 100% rename from lib/ui/gfx/gfx_system.cc rename to garnet/lib/ui/gfx/gfx_system.cc
diff --git a/lib/ui/gfx/gfx_system.h b/garnet/lib/ui/gfx/gfx_system.h similarity index 100% rename from lib/ui/gfx/gfx_system.h rename to garnet/lib/ui/gfx/gfx_system.h
diff --git a/lib/ui/gfx/id.cc b/garnet/lib/ui/gfx/id.cc similarity index 100% rename from lib/ui/gfx/id.cc rename to garnet/lib/ui/gfx/id.cc
diff --git a/lib/ui/gfx/id.h b/garnet/lib/ui/gfx/id.h similarity index 100% rename from lib/ui/gfx/id.h rename to garnet/lib/ui/gfx/id.h
diff --git a/lib/ui/gfx/resources/buffer.cc b/garnet/lib/ui/gfx/resources/buffer.cc similarity index 100% rename from lib/ui/gfx/resources/buffer.cc rename to garnet/lib/ui/gfx/resources/buffer.cc
diff --git a/lib/ui/gfx/resources/buffer.h b/garnet/lib/ui/gfx/resources/buffer.h similarity index 100% rename from lib/ui/gfx/resources/buffer.h rename to garnet/lib/ui/gfx/resources/buffer.h
diff --git a/lib/ui/gfx/resources/camera.cc b/garnet/lib/ui/gfx/resources/camera.cc similarity index 100% rename from lib/ui/gfx/resources/camera.cc rename to garnet/lib/ui/gfx/resources/camera.cc
diff --git a/lib/ui/gfx/resources/camera.h b/garnet/lib/ui/gfx/resources/camera.h similarity index 100% rename from lib/ui/gfx/resources/camera.h rename to garnet/lib/ui/gfx/resources/camera.h
diff --git a/lib/ui/gfx/resources/compositor/compositor.cc b/garnet/lib/ui/gfx/resources/compositor/compositor.cc similarity index 100% rename from lib/ui/gfx/resources/compositor/compositor.cc rename to garnet/lib/ui/gfx/resources/compositor/compositor.cc
diff --git a/lib/ui/gfx/resources/compositor/compositor.h b/garnet/lib/ui/gfx/resources/compositor/compositor.h similarity index 100% rename from lib/ui/gfx/resources/compositor/compositor.h rename to garnet/lib/ui/gfx/resources/compositor/compositor.h
diff --git a/lib/ui/gfx/resources/compositor/display_compositor.cc b/garnet/lib/ui/gfx/resources/compositor/display_compositor.cc similarity index 100% rename from lib/ui/gfx/resources/compositor/display_compositor.cc rename to garnet/lib/ui/gfx/resources/compositor/display_compositor.cc
diff --git a/lib/ui/gfx/resources/compositor/display_compositor.h b/garnet/lib/ui/gfx/resources/compositor/display_compositor.h similarity index 100% rename from lib/ui/gfx/resources/compositor/display_compositor.h rename to garnet/lib/ui/gfx/resources/compositor/display_compositor.h
diff --git a/lib/ui/gfx/resources/compositor/layer.cc b/garnet/lib/ui/gfx/resources/compositor/layer.cc similarity index 100% rename from lib/ui/gfx/resources/compositor/layer.cc rename to garnet/lib/ui/gfx/resources/compositor/layer.cc
diff --git a/lib/ui/gfx/resources/compositor/layer.h b/garnet/lib/ui/gfx/resources/compositor/layer.h similarity index 100% rename from lib/ui/gfx/resources/compositor/layer.h rename to garnet/lib/ui/gfx/resources/compositor/layer.h
diff --git a/lib/ui/gfx/resources/compositor/layer_stack.cc b/garnet/lib/ui/gfx/resources/compositor/layer_stack.cc similarity index 100% rename from lib/ui/gfx/resources/compositor/layer_stack.cc rename to garnet/lib/ui/gfx/resources/compositor/layer_stack.cc
diff --git a/lib/ui/gfx/resources/compositor/layer_stack.h b/garnet/lib/ui/gfx/resources/compositor/layer_stack.h similarity index 100% rename from lib/ui/gfx/resources/compositor/layer_stack.h rename to garnet/lib/ui/gfx/resources/compositor/layer_stack.h
diff --git a/lib/ui/gfx/resources/dump_visitor.cc b/garnet/lib/ui/gfx/resources/dump_visitor.cc similarity index 100% rename from lib/ui/gfx/resources/dump_visitor.cc rename to garnet/lib/ui/gfx/resources/dump_visitor.cc
diff --git a/lib/ui/gfx/resources/dump_visitor.h b/garnet/lib/ui/gfx/resources/dump_visitor.h similarity index 100% rename from lib/ui/gfx/resources/dump_visitor.h rename to garnet/lib/ui/gfx/resources/dump_visitor.h
diff --git a/lib/ui/gfx/resources/gpu_image.cc b/garnet/lib/ui/gfx/resources/gpu_image.cc similarity index 100% rename from lib/ui/gfx/resources/gpu_image.cc rename to garnet/lib/ui/gfx/resources/gpu_image.cc
diff --git a/lib/ui/gfx/resources/gpu_image.h b/garnet/lib/ui/gfx/resources/gpu_image.h similarity index 100% rename from lib/ui/gfx/resources/gpu_image.h rename to garnet/lib/ui/gfx/resources/gpu_image.h
diff --git a/lib/ui/gfx/resources/host_image.cc b/garnet/lib/ui/gfx/resources/host_image.cc similarity index 100% rename from lib/ui/gfx/resources/host_image.cc rename to garnet/lib/ui/gfx/resources/host_image.cc
diff --git a/lib/ui/gfx/resources/host_image.h b/garnet/lib/ui/gfx/resources/host_image.h similarity index 100% rename from lib/ui/gfx/resources/host_image.h rename to garnet/lib/ui/gfx/resources/host_image.h
diff --git a/lib/ui/gfx/resources/image.cc b/garnet/lib/ui/gfx/resources/image.cc similarity index 100% rename from lib/ui/gfx/resources/image.cc rename to garnet/lib/ui/gfx/resources/image.cc
diff --git a/lib/ui/gfx/resources/image.h b/garnet/lib/ui/gfx/resources/image.h similarity index 100% rename from lib/ui/gfx/resources/image.h rename to garnet/lib/ui/gfx/resources/image.h
diff --git a/lib/ui/gfx/resources/image_base.cc b/garnet/lib/ui/gfx/resources/image_base.cc similarity index 100% rename from lib/ui/gfx/resources/image_base.cc rename to garnet/lib/ui/gfx/resources/image_base.cc
diff --git a/lib/ui/gfx/resources/image_base.h b/garnet/lib/ui/gfx/resources/image_base.h similarity index 100% rename from lib/ui/gfx/resources/image_base.h rename to garnet/lib/ui/gfx/resources/image_base.h
diff --git a/lib/ui/gfx/resources/image_pipe.cc b/garnet/lib/ui/gfx/resources/image_pipe.cc similarity index 100% rename from lib/ui/gfx/resources/image_pipe.cc rename to garnet/lib/ui/gfx/resources/image_pipe.cc
diff --git a/lib/ui/gfx/resources/image_pipe.h b/garnet/lib/ui/gfx/resources/image_pipe.h similarity index 100% rename from lib/ui/gfx/resources/image_pipe.h rename to garnet/lib/ui/gfx/resources/image_pipe.h
diff --git a/lib/ui/gfx/resources/image_pipe_handler.cc b/garnet/lib/ui/gfx/resources/image_pipe_handler.cc similarity index 100% rename from lib/ui/gfx/resources/image_pipe_handler.cc rename to garnet/lib/ui/gfx/resources/image_pipe_handler.cc
diff --git a/lib/ui/gfx/resources/image_pipe_handler.h b/garnet/lib/ui/gfx/resources/image_pipe_handler.h similarity index 100% rename from lib/ui/gfx/resources/image_pipe_handler.h rename to garnet/lib/ui/gfx/resources/image_pipe_handler.h
diff --git a/lib/ui/gfx/resources/import.cc b/garnet/lib/ui/gfx/resources/import.cc similarity index 100% rename from lib/ui/gfx/resources/import.cc rename to garnet/lib/ui/gfx/resources/import.cc
diff --git a/lib/ui/gfx/resources/import.h b/garnet/lib/ui/gfx/resources/import.h similarity index 100% rename from lib/ui/gfx/resources/import.h rename to garnet/lib/ui/gfx/resources/import.h
diff --git a/lib/ui/gfx/resources/lights/ambient_light.cc b/garnet/lib/ui/gfx/resources/lights/ambient_light.cc similarity index 100% rename from lib/ui/gfx/resources/lights/ambient_light.cc rename to garnet/lib/ui/gfx/resources/lights/ambient_light.cc
diff --git a/lib/ui/gfx/resources/lights/ambient_light.h b/garnet/lib/ui/gfx/resources/lights/ambient_light.h similarity index 100% rename from lib/ui/gfx/resources/lights/ambient_light.h rename to garnet/lib/ui/gfx/resources/lights/ambient_light.h
diff --git a/lib/ui/gfx/resources/lights/directional_light.cc b/garnet/lib/ui/gfx/resources/lights/directional_light.cc similarity index 100% rename from lib/ui/gfx/resources/lights/directional_light.cc rename to garnet/lib/ui/gfx/resources/lights/directional_light.cc
diff --git a/lib/ui/gfx/resources/lights/directional_light.h b/garnet/lib/ui/gfx/resources/lights/directional_light.h similarity index 100% rename from lib/ui/gfx/resources/lights/directional_light.h rename to garnet/lib/ui/gfx/resources/lights/directional_light.h
diff --git a/lib/ui/gfx/resources/lights/light.cc b/garnet/lib/ui/gfx/resources/lights/light.cc similarity index 100% rename from lib/ui/gfx/resources/lights/light.cc rename to garnet/lib/ui/gfx/resources/lights/light.cc
diff --git a/lib/ui/gfx/resources/lights/light.h b/garnet/lib/ui/gfx/resources/lights/light.h similarity index 100% rename from lib/ui/gfx/resources/lights/light.h rename to garnet/lib/ui/gfx/resources/lights/light.h
diff --git a/lib/ui/gfx/resources/lights/point_light.cc b/garnet/lib/ui/gfx/resources/lights/point_light.cc similarity index 100% rename from lib/ui/gfx/resources/lights/point_light.cc rename to garnet/lib/ui/gfx/resources/lights/point_light.cc
diff --git a/lib/ui/gfx/resources/lights/point_light.h b/garnet/lib/ui/gfx/resources/lights/point_light.h similarity index 100% rename from lib/ui/gfx/resources/lights/point_light.h rename to garnet/lib/ui/gfx/resources/lights/point_light.h
diff --git a/lib/ui/gfx/resources/material.cc b/garnet/lib/ui/gfx/resources/material.cc similarity index 100% rename from lib/ui/gfx/resources/material.cc rename to garnet/lib/ui/gfx/resources/material.cc
diff --git a/lib/ui/gfx/resources/material.h b/garnet/lib/ui/gfx/resources/material.h similarity index 100% rename from lib/ui/gfx/resources/material.h rename to garnet/lib/ui/gfx/resources/material.h
diff --git a/lib/ui/gfx/resources/memory.cc b/garnet/lib/ui/gfx/resources/memory.cc similarity index 100% rename from lib/ui/gfx/resources/memory.cc rename to garnet/lib/ui/gfx/resources/memory.cc
diff --git a/lib/ui/gfx/resources/memory.h b/garnet/lib/ui/gfx/resources/memory.h similarity index 100% rename from lib/ui/gfx/resources/memory.h rename to garnet/lib/ui/gfx/resources/memory.h
diff --git a/lib/ui/gfx/resources/nodes/entity_node.cc b/garnet/lib/ui/gfx/resources/nodes/entity_node.cc similarity index 100% rename from lib/ui/gfx/resources/nodes/entity_node.cc rename to garnet/lib/ui/gfx/resources/nodes/entity_node.cc
diff --git a/lib/ui/gfx/resources/nodes/entity_node.h b/garnet/lib/ui/gfx/resources/nodes/entity_node.h similarity index 100% rename from lib/ui/gfx/resources/nodes/entity_node.h rename to garnet/lib/ui/gfx/resources/nodes/entity_node.h
diff --git a/lib/ui/gfx/resources/nodes/node.cc b/garnet/lib/ui/gfx/resources/nodes/node.cc similarity index 100% rename from lib/ui/gfx/resources/nodes/node.cc rename to garnet/lib/ui/gfx/resources/nodes/node.cc
diff --git a/lib/ui/gfx/resources/nodes/node.h b/garnet/lib/ui/gfx/resources/nodes/node.h similarity index 100% rename from lib/ui/gfx/resources/nodes/node.h rename to garnet/lib/ui/gfx/resources/nodes/node.h
diff --git a/lib/ui/gfx/resources/nodes/opacity_node.cc b/garnet/lib/ui/gfx/resources/nodes/opacity_node.cc similarity index 100% rename from lib/ui/gfx/resources/nodes/opacity_node.cc rename to garnet/lib/ui/gfx/resources/nodes/opacity_node.cc
diff --git a/lib/ui/gfx/resources/nodes/opacity_node.h b/garnet/lib/ui/gfx/resources/nodes/opacity_node.h similarity index 100% rename from lib/ui/gfx/resources/nodes/opacity_node.h rename to garnet/lib/ui/gfx/resources/nodes/opacity_node.h
diff --git a/lib/ui/gfx/resources/nodes/scene.cc b/garnet/lib/ui/gfx/resources/nodes/scene.cc similarity index 100% rename from lib/ui/gfx/resources/nodes/scene.cc rename to garnet/lib/ui/gfx/resources/nodes/scene.cc
diff --git a/lib/ui/gfx/resources/nodes/scene.h b/garnet/lib/ui/gfx/resources/nodes/scene.h similarity index 100% rename from lib/ui/gfx/resources/nodes/scene.h rename to garnet/lib/ui/gfx/resources/nodes/scene.h
diff --git a/lib/ui/gfx/resources/nodes/shape_node.cc b/garnet/lib/ui/gfx/resources/nodes/shape_node.cc similarity index 100% rename from lib/ui/gfx/resources/nodes/shape_node.cc rename to garnet/lib/ui/gfx/resources/nodes/shape_node.cc
diff --git a/lib/ui/gfx/resources/nodes/shape_node.h b/garnet/lib/ui/gfx/resources/nodes/shape_node.h similarity index 100% rename from lib/ui/gfx/resources/nodes/shape_node.h rename to garnet/lib/ui/gfx/resources/nodes/shape_node.h
diff --git a/lib/ui/gfx/resources/nodes/traversal.h b/garnet/lib/ui/gfx/resources/nodes/traversal.h similarity index 100% rename from lib/ui/gfx/resources/nodes/traversal.h rename to garnet/lib/ui/gfx/resources/nodes/traversal.h
diff --git a/lib/ui/gfx/resources/nodes/variable_binding.cc b/garnet/lib/ui/gfx/resources/nodes/variable_binding.cc similarity index 100% rename from lib/ui/gfx/resources/nodes/variable_binding.cc rename to garnet/lib/ui/gfx/resources/nodes/variable_binding.cc
diff --git a/lib/ui/gfx/resources/nodes/variable_binding.h b/garnet/lib/ui/gfx/resources/nodes/variable_binding.h similarity index 100% rename from lib/ui/gfx/resources/nodes/variable_binding.h rename to garnet/lib/ui/gfx/resources/nodes/variable_binding.h
diff --git a/lib/ui/gfx/resources/renderers/renderer.cc b/garnet/lib/ui/gfx/resources/renderers/renderer.cc similarity index 100% rename from lib/ui/gfx/resources/renderers/renderer.cc rename to garnet/lib/ui/gfx/resources/renderers/renderer.cc
diff --git a/lib/ui/gfx/resources/renderers/renderer.h b/garnet/lib/ui/gfx/resources/renderers/renderer.h similarity index 100% rename from lib/ui/gfx/resources/renderers/renderer.h rename to garnet/lib/ui/gfx/resources/renderers/renderer.h
diff --git a/lib/ui/gfx/resources/resource.cc b/garnet/lib/ui/gfx/resources/resource.cc similarity index 100% rename from lib/ui/gfx/resources/resource.cc rename to garnet/lib/ui/gfx/resources/resource.cc
diff --git a/lib/ui/gfx/resources/resource.h b/garnet/lib/ui/gfx/resources/resource.h similarity index 100% rename from lib/ui/gfx/resources/resource.h rename to garnet/lib/ui/gfx/resources/resource.h
diff --git a/lib/ui/gfx/resources/resource_context.h b/garnet/lib/ui/gfx/resources/resource_context.h similarity index 100% rename from lib/ui/gfx/resources/resource_context.h rename to garnet/lib/ui/gfx/resources/resource_context.h
diff --git a/lib/ui/gfx/resources/resource_type_info.h b/garnet/lib/ui/gfx/resources/resource_type_info.h similarity index 100% rename from lib/ui/gfx/resources/resource_type_info.h rename to garnet/lib/ui/gfx/resources/resource_type_info.h
diff --git a/lib/ui/gfx/resources/resource_visitor.cc b/garnet/lib/ui/gfx/resources/resource_visitor.cc similarity index 100% rename from lib/ui/gfx/resources/resource_visitor.cc rename to garnet/lib/ui/gfx/resources/resource_visitor.cc
diff --git a/lib/ui/gfx/resources/resource_visitor.h b/garnet/lib/ui/gfx/resources/resource_visitor.h similarity index 100% rename from lib/ui/gfx/resources/resource_visitor.h rename to garnet/lib/ui/gfx/resources/resource_visitor.h
diff --git a/lib/ui/gfx/resources/shapes/circle_shape.cc b/garnet/lib/ui/gfx/resources/shapes/circle_shape.cc similarity index 100% rename from lib/ui/gfx/resources/shapes/circle_shape.cc rename to garnet/lib/ui/gfx/resources/shapes/circle_shape.cc
diff --git a/lib/ui/gfx/resources/shapes/circle_shape.h b/garnet/lib/ui/gfx/resources/shapes/circle_shape.h similarity index 100% rename from lib/ui/gfx/resources/shapes/circle_shape.h rename to garnet/lib/ui/gfx/resources/shapes/circle_shape.h
diff --git a/lib/ui/gfx/resources/shapes/mesh_shape.cc b/garnet/lib/ui/gfx/resources/shapes/mesh_shape.cc similarity index 100% rename from lib/ui/gfx/resources/shapes/mesh_shape.cc rename to garnet/lib/ui/gfx/resources/shapes/mesh_shape.cc
diff --git a/lib/ui/gfx/resources/shapes/mesh_shape.h b/garnet/lib/ui/gfx/resources/shapes/mesh_shape.h similarity index 100% rename from lib/ui/gfx/resources/shapes/mesh_shape.h rename to garnet/lib/ui/gfx/resources/shapes/mesh_shape.h
diff --git a/lib/ui/gfx/resources/shapes/planar_shape.cc b/garnet/lib/ui/gfx/resources/shapes/planar_shape.cc similarity index 100% rename from lib/ui/gfx/resources/shapes/planar_shape.cc rename to garnet/lib/ui/gfx/resources/shapes/planar_shape.cc
diff --git a/lib/ui/gfx/resources/shapes/planar_shape.h b/garnet/lib/ui/gfx/resources/shapes/planar_shape.h similarity index 100% rename from lib/ui/gfx/resources/shapes/planar_shape.h rename to garnet/lib/ui/gfx/resources/shapes/planar_shape.h
diff --git a/lib/ui/gfx/resources/shapes/rectangle_shape.cc b/garnet/lib/ui/gfx/resources/shapes/rectangle_shape.cc similarity index 100% rename from lib/ui/gfx/resources/shapes/rectangle_shape.cc rename to garnet/lib/ui/gfx/resources/shapes/rectangle_shape.cc
diff --git a/lib/ui/gfx/resources/shapes/rectangle_shape.h b/garnet/lib/ui/gfx/resources/shapes/rectangle_shape.h similarity index 100% rename from lib/ui/gfx/resources/shapes/rectangle_shape.h rename to garnet/lib/ui/gfx/resources/shapes/rectangle_shape.h
diff --git a/lib/ui/gfx/resources/shapes/rounded_rectangle_shape.cc b/garnet/lib/ui/gfx/resources/shapes/rounded_rectangle_shape.cc similarity index 100% rename from lib/ui/gfx/resources/shapes/rounded_rectangle_shape.cc rename to garnet/lib/ui/gfx/resources/shapes/rounded_rectangle_shape.cc
diff --git a/lib/ui/gfx/resources/shapes/rounded_rectangle_shape.h b/garnet/lib/ui/gfx/resources/shapes/rounded_rectangle_shape.h similarity index 100% rename from lib/ui/gfx/resources/shapes/rounded_rectangle_shape.h rename to garnet/lib/ui/gfx/resources/shapes/rounded_rectangle_shape.h
diff --git a/lib/ui/gfx/resources/shapes/shape.cc b/garnet/lib/ui/gfx/resources/shapes/shape.cc similarity index 100% rename from lib/ui/gfx/resources/shapes/shape.cc rename to garnet/lib/ui/gfx/resources/shapes/shape.cc
diff --git a/lib/ui/gfx/resources/shapes/shape.h b/garnet/lib/ui/gfx/resources/shapes/shape.h similarity index 100% rename from lib/ui/gfx/resources/shapes/shape.h rename to garnet/lib/ui/gfx/resources/shapes/shape.h
diff --git a/lib/ui/gfx/resources/snapshot/serializer.h b/garnet/lib/ui/gfx/resources/snapshot/serializer.h similarity index 100% rename from lib/ui/gfx/resources/snapshot/serializer.h rename to garnet/lib/ui/gfx/resources/snapshot/serializer.h
diff --git a/lib/ui/gfx/resources/snapshot/snapshot.fbs b/garnet/lib/ui/gfx/resources/snapshot/snapshot.fbs similarity index 100% rename from lib/ui/gfx/resources/snapshot/snapshot.fbs rename to garnet/lib/ui/gfx/resources/snapshot/snapshot.fbs
diff --git a/lib/ui/gfx/resources/snapshot/snapshotter.cc b/garnet/lib/ui/gfx/resources/snapshot/snapshotter.cc similarity index 100% rename from lib/ui/gfx/resources/snapshot/snapshotter.cc rename to garnet/lib/ui/gfx/resources/snapshot/snapshotter.cc
diff --git a/lib/ui/gfx/resources/snapshot/snapshotter.h b/garnet/lib/ui/gfx/resources/snapshot/snapshotter.h similarity index 100% rename from lib/ui/gfx/resources/snapshot/snapshotter.h rename to garnet/lib/ui/gfx/resources/snapshot/snapshotter.h
diff --git a/lib/ui/gfx/resources/snapshot/version.h b/garnet/lib/ui/gfx/resources/snapshot/version.h similarity index 100% rename from lib/ui/gfx/resources/snapshot/version.h rename to garnet/lib/ui/gfx/resources/snapshot/version.h
diff --git a/lib/ui/gfx/resources/stereo_camera.cc b/garnet/lib/ui/gfx/resources/stereo_camera.cc similarity index 100% rename from lib/ui/gfx/resources/stereo_camera.cc rename to garnet/lib/ui/gfx/resources/stereo_camera.cc
diff --git a/lib/ui/gfx/resources/stereo_camera.h b/garnet/lib/ui/gfx/resources/stereo_camera.h similarity index 100% rename from lib/ui/gfx/resources/stereo_camera.h rename to garnet/lib/ui/gfx/resources/stereo_camera.h
diff --git a/lib/ui/gfx/resources/variable.cc b/garnet/lib/ui/gfx/resources/variable.cc similarity index 100% rename from lib/ui/gfx/resources/variable.cc rename to garnet/lib/ui/gfx/resources/variable.cc
diff --git a/lib/ui/gfx/resources/variable.h b/garnet/lib/ui/gfx/resources/variable.h similarity index 100% rename from lib/ui/gfx/resources/variable.h rename to garnet/lib/ui/gfx/resources/variable.h
diff --git a/lib/ui/gfx/resources/view.cc b/garnet/lib/ui/gfx/resources/view.cc similarity index 100% rename from lib/ui/gfx/resources/view.cc rename to garnet/lib/ui/gfx/resources/view.cc
diff --git a/lib/ui/gfx/resources/view.h b/garnet/lib/ui/gfx/resources/view.h similarity index 100% rename from lib/ui/gfx/resources/view.h rename to garnet/lib/ui/gfx/resources/view.h
diff --git a/lib/ui/gfx/resources/view_holder.cc b/garnet/lib/ui/gfx/resources/view_holder.cc similarity index 100% rename from lib/ui/gfx/resources/view_holder.cc rename to garnet/lib/ui/gfx/resources/view_holder.cc
diff --git a/lib/ui/gfx/resources/view_holder.h b/garnet/lib/ui/gfx/resources/view_holder.h similarity index 100% rename from lib/ui/gfx/resources/view_holder.h rename to garnet/lib/ui/gfx/resources/view_holder.h
diff --git a/lib/ui/gfx/screenshotter.cc b/garnet/lib/ui/gfx/screenshotter.cc similarity index 100% rename from lib/ui/gfx/screenshotter.cc rename to garnet/lib/ui/gfx/screenshotter.cc
diff --git a/lib/ui/gfx/screenshotter.h b/garnet/lib/ui/gfx/screenshotter.h similarity index 100% rename from lib/ui/gfx/screenshotter.h rename to garnet/lib/ui/gfx/screenshotter.h
diff --git a/lib/ui/gfx/swapchain/display_swapchain.cc b/garnet/lib/ui/gfx/swapchain/display_swapchain.cc similarity index 100% rename from lib/ui/gfx/swapchain/display_swapchain.cc rename to garnet/lib/ui/gfx/swapchain/display_swapchain.cc
diff --git a/lib/ui/gfx/swapchain/display_swapchain.h b/garnet/lib/ui/gfx/swapchain/display_swapchain.h similarity index 100% rename from lib/ui/gfx/swapchain/display_swapchain.h rename to garnet/lib/ui/gfx/swapchain/display_swapchain.h
diff --git a/lib/ui/gfx/swapchain/swapchain.h b/garnet/lib/ui/gfx/swapchain/swapchain.h similarity index 100% rename from lib/ui/gfx/swapchain/swapchain.h rename to garnet/lib/ui/gfx/swapchain/swapchain.h
diff --git a/lib/ui/gfx/swapchain/swapchain_factory.cc b/garnet/lib/ui/gfx/swapchain/swapchain_factory.cc similarity index 100% rename from lib/ui/gfx/swapchain/swapchain_factory.cc rename to garnet/lib/ui/gfx/swapchain/swapchain_factory.cc
diff --git a/lib/ui/gfx/swapchain/swapchain_factory.h b/garnet/lib/ui/gfx/swapchain/swapchain_factory.h similarity index 100% rename from lib/ui/gfx/swapchain/swapchain_factory.h rename to garnet/lib/ui/gfx/swapchain/swapchain_factory.h
diff --git a/lib/ui/gfx/swapchain/vulkan_display_swapchain.cc b/garnet/lib/ui/gfx/swapchain/vulkan_display_swapchain.cc similarity index 100% rename from lib/ui/gfx/swapchain/vulkan_display_swapchain.cc rename to garnet/lib/ui/gfx/swapchain/vulkan_display_swapchain.cc
diff --git a/lib/ui/gfx/swapchain/vulkan_display_swapchain.h b/garnet/lib/ui/gfx/swapchain/vulkan_display_swapchain.h similarity index 100% rename from lib/ui/gfx/swapchain/vulkan_display_swapchain.h rename to garnet/lib/ui/gfx/swapchain/vulkan_display_swapchain.h
diff --git a/lib/ui/gfx/tests/BUILD.gn b/garnet/lib/ui/gfx/tests/BUILD.gn similarity index 100% rename from lib/ui/gfx/tests/BUILD.gn rename to garnet/lib/ui/gfx/tests/BUILD.gn
diff --git a/lib/ui/gfx/tests/error_reporting_test.cc b/garnet/lib/ui/gfx/tests/error_reporting_test.cc similarity index 100% rename from lib/ui/gfx/tests/error_reporting_test.cc rename to garnet/lib/ui/gfx/tests/error_reporting_test.cc
diff --git a/lib/ui/gfx/tests/error_reporting_test.h b/garnet/lib/ui/gfx/tests/error_reporting_test.h similarity index 100% rename from lib/ui/gfx/tests/error_reporting_test.h rename to garnet/lib/ui/gfx/tests/error_reporting_test.h
diff --git a/lib/ui/gfx/tests/escher_vulkan_smoke_test.cc b/garnet/lib/ui/gfx/tests/escher_vulkan_smoke_test.cc similarity index 100% rename from lib/ui/gfx/tests/escher_vulkan_smoke_test.cc rename to garnet/lib/ui/gfx/tests/escher_vulkan_smoke_test.cc
diff --git a/lib/ui/gfx/tests/event_timestamper_unittest.cc b/garnet/lib/ui/gfx/tests/event_timestamper_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/event_timestamper_unittest.cc rename to garnet/lib/ui/gfx/tests/event_timestamper_unittest.cc
diff --git a/lib/ui/gfx/tests/gfx_apptest.cc b/garnet/lib/ui/gfx/tests/gfx_apptest.cc similarity index 100% rename from lib/ui/gfx/tests/gfx_apptest.cc rename to garnet/lib/ui/gfx/tests/gfx_apptest.cc
diff --git a/lib/ui/gfx/tests/gfx_command_applier_unittest.cc b/garnet/lib/ui/gfx/tests/gfx_command_applier_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/gfx_command_applier_unittest.cc rename to garnet/lib/ui/gfx/tests/gfx_command_applier_unittest.cc
diff --git a/lib/ui/gfx/tests/gfx_test.h b/garnet/lib/ui/gfx/tests/gfx_test.h similarity index 100% rename from lib/ui/gfx/tests/gfx_test.h rename to garnet/lib/ui/gfx/tests/gfx_test.h
diff --git a/lib/ui/gfx/tests/hardware_layer_assignment_unittest.cc b/garnet/lib/ui/gfx/tests/hardware_layer_assignment_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/hardware_layer_assignment_unittest.cc rename to garnet/lib/ui/gfx/tests/hardware_layer_assignment_unittest.cc
diff --git a/lib/ui/gfx/tests/hittest_global_unittest.cc b/garnet/lib/ui/gfx/tests/hittest_global_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/hittest_global_unittest.cc rename to garnet/lib/ui/gfx/tests/hittest_global_unittest.cc
diff --git a/lib/ui/gfx/tests/hittest_unittest.cc b/garnet/lib/ui/gfx/tests/hittest_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/hittest_unittest.cc rename to garnet/lib/ui/gfx/tests/hittest_unittest.cc
diff --git a/lib/ui/gfx/tests/image_pipe_unittest.cc b/garnet/lib/ui/gfx/tests/image_pipe_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/image_pipe_unittest.cc rename to garnet/lib/ui/gfx/tests/image_pipe_unittest.cc
diff --git a/lib/ui/gfx/tests/import_unittest.cc b/garnet/lib/ui/gfx/tests/import_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/import_unittest.cc rename to garnet/lib/ui/gfx/tests/import_unittest.cc
diff --git a/lib/ui/gfx/tests/memory_unittest.cc b/garnet/lib/ui/gfx/tests/memory_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/memory_unittest.cc rename to garnet/lib/ui/gfx/tests/memory_unittest.cc
diff --git a/lib/ui/gfx/tests/meta/mock_pose_buffer_provider.cmx b/garnet/lib/ui/gfx/tests/meta/mock_pose_buffer_provider.cmx similarity index 100% rename from lib/ui/gfx/tests/meta/mock_pose_buffer_provider.cmx rename to garnet/lib/ui/gfx/tests/meta/mock_pose_buffer_provider.cmx
diff --git a/lib/ui/gfx/tests/mock_pose_buffer_provider.cc b/garnet/lib/ui/gfx/tests/mock_pose_buffer_provider.cc similarity index 100% rename from lib/ui/gfx/tests/mock_pose_buffer_provider.cc rename to garnet/lib/ui/gfx/tests/mock_pose_buffer_provider.cc
diff --git a/lib/ui/gfx/tests/mock_pose_buffer_provider.h b/garnet/lib/ui/gfx/tests/mock_pose_buffer_provider.h similarity index 100% rename from lib/ui/gfx/tests/mock_pose_buffer_provider.h rename to garnet/lib/ui/gfx/tests/mock_pose_buffer_provider.h
diff --git a/lib/ui/gfx/tests/mocks.cc b/garnet/lib/ui/gfx/tests/mocks.cc similarity index 100% rename from lib/ui/gfx/tests/mocks.cc rename to garnet/lib/ui/gfx/tests/mocks.cc
diff --git a/lib/ui/gfx/tests/mocks.h b/garnet/lib/ui/gfx/tests/mocks.h similarity index 100% rename from lib/ui/gfx/tests/mocks.h rename to garnet/lib/ui/gfx/tests/mocks.h
diff --git a/lib/ui/gfx/tests/node_unittest.cc b/garnet/lib/ui/gfx/tests/node_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/node_unittest.cc rename to garnet/lib/ui/gfx/tests/node_unittest.cc
diff --git a/lib/ui/gfx/tests/object_linker_unittest.cc b/garnet/lib/ui/gfx/tests/object_linker_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/object_linker_unittest.cc rename to garnet/lib/ui/gfx/tests/object_linker_unittest.cc
diff --git a/lib/ui/gfx/tests/pose_buffer_unit_test.cc b/garnet/lib/ui/gfx/tests/pose_buffer_unit_test.cc similarity index 100% rename from lib/ui/gfx/tests/pose_buffer_unit_test.cc rename to garnet/lib/ui/gfx/tests/pose_buffer_unit_test.cc
diff --git a/lib/ui/gfx/tests/resource_linker_unittest.cc b/garnet/lib/ui/gfx/tests/resource_linker_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/resource_linker_unittest.cc rename to garnet/lib/ui/gfx/tests/resource_linker_unittest.cc
diff --git a/lib/ui/gfx/tests/run_all_unittests.cc b/garnet/lib/ui/gfx/tests/run_all_unittests.cc similarity index 100% rename from lib/ui/gfx/tests/run_all_unittests.cc rename to garnet/lib/ui/gfx/tests/run_all_unittests.cc
diff --git a/lib/ui/gfx/tests/scene_graph_unittest.cc b/garnet/lib/ui/gfx/tests/scene_graph_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/scene_graph_unittest.cc rename to garnet/lib/ui/gfx/tests/scene_graph_unittest.cc
diff --git a/lib/ui/gfx/tests/scene_unittest.cc b/garnet/lib/ui/gfx/tests/scene_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/scene_unittest.cc rename to garnet/lib/ui/gfx/tests/scene_unittest.cc
diff --git a/lib/ui/gfx/tests/scenic_pixel_test.cc b/garnet/lib/ui/gfx/tests/scenic_pixel_test.cc similarity index 100% rename from lib/ui/gfx/tests/scenic_pixel_test.cc rename to garnet/lib/ui/gfx/tests/scenic_pixel_test.cc
diff --git a/lib/ui/gfx/tests/session_handler_test.cc b/garnet/lib/ui/gfx/tests/session_handler_test.cc similarity index 100% rename from lib/ui/gfx/tests/session_handler_test.cc rename to garnet/lib/ui/gfx/tests/session_handler_test.cc
diff --git a/lib/ui/gfx/tests/session_handler_test.h b/garnet/lib/ui/gfx/tests/session_handler_test.h similarity index 100% rename from lib/ui/gfx/tests/session_handler_test.h rename to garnet/lib/ui/gfx/tests/session_handler_test.h
diff --git a/lib/ui/gfx/tests/session_handler_unittest.cc b/garnet/lib/ui/gfx/tests/session_handler_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/session_handler_unittest.cc rename to garnet/lib/ui/gfx/tests/session_handler_unittest.cc
diff --git a/lib/ui/gfx/tests/session_test.cc b/garnet/lib/ui/gfx/tests/session_test.cc similarity index 100% rename from lib/ui/gfx/tests/session_test.cc rename to garnet/lib/ui/gfx/tests/session_test.cc
diff --git a/lib/ui/gfx/tests/session_test.h b/garnet/lib/ui/gfx/tests/session_test.h similarity index 100% rename from lib/ui/gfx/tests/session_test.h rename to garnet/lib/ui/gfx/tests/session_test.h
diff --git a/lib/ui/gfx/tests/session_unittest.cc b/garnet/lib/ui/gfx/tests/session_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/session_unittest.cc rename to garnet/lib/ui/gfx/tests/session_unittest.cc
diff --git a/lib/ui/gfx/tests/shape_unittest.cc b/garnet/lib/ui/gfx/tests/shape_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/shape_unittest.cc rename to garnet/lib/ui/gfx/tests/shape_unittest.cc
diff --git a/lib/ui/gfx/tests/size_change_hint_unittest.cc b/garnet/lib/ui/gfx/tests/size_change_hint_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/size_change_hint_unittest.cc rename to garnet/lib/ui/gfx/tests/size_change_hint_unittest.cc
diff --git a/lib/ui/gfx/tests/snapshotter_unittest.cc b/garnet/lib/ui/gfx/tests/snapshotter_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/snapshotter_unittest.cc rename to garnet/lib/ui/gfx/tests/snapshotter_unittest.cc
diff --git a/lib/ui/gfx/tests/stereo_camera_unittest.cc b/garnet/lib/ui/gfx/tests/stereo_camera_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/stereo_camera_unittest.cc rename to garnet/lib/ui/gfx/tests/stereo_camera_unittest.cc
diff --git a/lib/ui/gfx/tests/util.cc b/garnet/lib/ui/gfx/tests/util.cc similarity index 100% rename from lib/ui/gfx/tests/util.cc rename to garnet/lib/ui/gfx/tests/util.cc
diff --git a/lib/ui/gfx/tests/util.h b/garnet/lib/ui/gfx/tests/util.h similarity index 100% rename from lib/ui/gfx/tests/util.h rename to garnet/lib/ui/gfx/tests/util.h
diff --git a/lib/ui/gfx/tests/view_unittest.cc b/garnet/lib/ui/gfx/tests/view_unittest.cc similarity index 100% rename from lib/ui/gfx/tests/view_unittest.cc rename to garnet/lib/ui/gfx/tests/view_unittest.cc
diff --git a/lib/ui/gfx/tests/vk_session_test.cc b/garnet/lib/ui/gfx/tests/vk_session_test.cc similarity index 100% rename from lib/ui/gfx/tests/vk_session_test.cc rename to garnet/lib/ui/gfx/tests/vk_session_test.cc
diff --git a/lib/ui/gfx/tests/vk_session_test.h b/garnet/lib/ui/gfx/tests/vk_session_test.h similarity index 100% rename from lib/ui/gfx/tests/vk_session_test.h rename to garnet/lib/ui/gfx/tests/vk_session_test.h
diff --git a/lib/ui/gfx/util/event_timestamper.cc b/garnet/lib/ui/gfx/util/event_timestamper.cc similarity index 100% rename from lib/ui/gfx/util/event_timestamper.cc rename to garnet/lib/ui/gfx/util/event_timestamper.cc
diff --git a/lib/ui/gfx/util/event_timestamper.h b/garnet/lib/ui/gfx/util/event_timestamper.h similarity index 100% rename from lib/ui/gfx/util/event_timestamper.h rename to garnet/lib/ui/gfx/util/event_timestamper.h
diff --git a/lib/ui/gfx/util/image_formats.cc b/garnet/lib/ui/gfx/util/image_formats.cc similarity index 100% rename from lib/ui/gfx/util/image_formats.cc rename to garnet/lib/ui/gfx/util/image_formats.cc
diff --git a/lib/ui/gfx/util/image_formats.h b/garnet/lib/ui/gfx/util/image_formats.h similarity index 100% rename from lib/ui/gfx/util/image_formats.h rename to garnet/lib/ui/gfx/util/image_formats.h
diff --git a/lib/ui/gfx/util/time.h b/garnet/lib/ui/gfx/util/time.h similarity index 100% rename from lib/ui/gfx/util/time.h rename to garnet/lib/ui/gfx/util/time.h
diff --git a/lib/ui/gfx/util/unwrap.h b/garnet/lib/ui/gfx/util/unwrap.h similarity index 100% rename from lib/ui/gfx/util/unwrap.h rename to garnet/lib/ui/gfx/util/unwrap.h
diff --git a/lib/ui/gfx/util/vulkan_utils.cc b/garnet/lib/ui/gfx/util/vulkan_utils.cc similarity index 100% rename from lib/ui/gfx/util/vulkan_utils.cc rename to garnet/lib/ui/gfx/util/vulkan_utils.cc
diff --git a/lib/ui/gfx/util/vulkan_utils.h b/garnet/lib/ui/gfx/util/vulkan_utils.h similarity index 100% rename from lib/ui/gfx/util/vulkan_utils.h rename to garnet/lib/ui/gfx/util/vulkan_utils.h
diff --git a/lib/ui/gfx/util/wrap.h b/garnet/lib/ui/gfx/util/wrap.h similarity index 100% rename from lib/ui/gfx/util/wrap.h rename to garnet/lib/ui/gfx/util/wrap.h
diff --git a/lib/ui/input/BUILD.gn b/garnet/lib/ui/input/BUILD.gn similarity index 100% rename from lib/ui/input/BUILD.gn rename to garnet/lib/ui/input/BUILD.gn
diff --git a/lib/ui/input/input_system.cc b/garnet/lib/ui/input/input_system.cc similarity index 100% rename from lib/ui/input/input_system.cc rename to garnet/lib/ui/input/input_system.cc
diff --git a/lib/ui/input/input_system.h b/garnet/lib/ui/input/input_system.h similarity index 100% rename from lib/ui/input/input_system.h rename to garnet/lib/ui/input/input_system.h
diff --git a/lib/ui/input/tests/BUILD.gn b/garnet/lib/ui/input/tests/BUILD.gn similarity index 100% rename from lib/ui/input/tests/BUILD.gn rename to garnet/lib/ui/input/tests/BUILD.gn
diff --git a/lib/ui/input/tests/coordinate_transform_test.cc b/garnet/lib/ui/input/tests/coordinate_transform_test.cc similarity index 100% rename from lib/ui/input/tests/coordinate_transform_test.cc rename to garnet/lib/ui/input/tests/coordinate_transform_test.cc
diff --git a/lib/ui/input/tests/focus_avoidance_test.cc b/garnet/lib/ui/input/tests/focus_avoidance_test.cc similarity index 100% rename from lib/ui/input/tests/focus_avoidance_test.cc rename to garnet/lib/ui/input/tests/focus_avoidance_test.cc
diff --git a/lib/ui/input/tests/hard_keyboard_delivery_test.cc b/garnet/lib/ui/input/tests/hard_keyboard_delivery_test.cc similarity index 100% rename from lib/ui/input/tests/hard_keyboard_delivery_test.cc rename to garnet/lib/ui/input/tests/hard_keyboard_delivery_test.cc
diff --git a/lib/ui/input/tests/import_node_test.cc b/garnet/lib/ui/input/tests/import_node_test.cc similarity index 100% rename from lib/ui/input/tests/import_node_test.cc rename to garnet/lib/ui/input/tests/import_node_test.cc
diff --git a/lib/ui/input/tests/mouse_delivery_test.cc b/garnet/lib/ui/input/tests/mouse_delivery_test.cc similarity index 100% rename from lib/ui/input/tests/mouse_delivery_test.cc rename to garnet/lib/ui/input/tests/mouse_delivery_test.cc
diff --git a/lib/ui/input/tests/util.cc b/garnet/lib/ui/input/tests/util.cc similarity index 100% rename from lib/ui/input/tests/util.cc rename to garnet/lib/ui/input/tests/util.cc
diff --git a/lib/ui/input/tests/util.h b/garnet/lib/ui/input/tests/util.h similarity index 100% rename from lib/ui/input/tests/util.h rename to garnet/lib/ui/input/tests/util.h
diff --git a/lib/ui/input/view_id.cc b/garnet/lib/ui/input/view_id.cc similarity index 100% rename from lib/ui/input/view_id.cc rename to garnet/lib/ui/input/view_id.cc
diff --git a/lib/ui/input/view_id.h b/garnet/lib/ui/input/view_id.h similarity index 100% rename from lib/ui/input/view_id.h rename to garnet/lib/ui/input/view_id.h
diff --git a/lib/ui/scenic/BUILD.gn b/garnet/lib/ui/scenic/BUILD.gn similarity index 100% rename from lib/ui/scenic/BUILD.gn rename to garnet/lib/ui/scenic/BUILD.gn
diff --git a/lib/ui/scenic/command_dispatcher.cc b/garnet/lib/ui/scenic/command_dispatcher.cc similarity index 100% rename from lib/ui/scenic/command_dispatcher.cc rename to garnet/lib/ui/scenic/command_dispatcher.cc
diff --git a/lib/ui/scenic/command_dispatcher.h b/garnet/lib/ui/scenic/command_dispatcher.h similarity index 100% rename from lib/ui/scenic/command_dispatcher.h rename to garnet/lib/ui/scenic/command_dispatcher.h
diff --git a/lib/ui/scenic/event_reporter.cc b/garnet/lib/ui/scenic/event_reporter.cc similarity index 100% rename from lib/ui/scenic/event_reporter.cc rename to garnet/lib/ui/scenic/event_reporter.cc
diff --git a/lib/ui/scenic/event_reporter.h b/garnet/lib/ui/scenic/event_reporter.h similarity index 100% rename from lib/ui/scenic/event_reporter.h rename to garnet/lib/ui/scenic/event_reporter.h
diff --git a/lib/ui/scenic/forward_declarations.h b/garnet/lib/ui/scenic/forward_declarations.h similarity index 100% rename from lib/ui/scenic/forward_declarations.h rename to garnet/lib/ui/scenic/forward_declarations.h
diff --git a/lib/ui/scenic/scenic.cc b/garnet/lib/ui/scenic/scenic.cc similarity index 100% rename from lib/ui/scenic/scenic.cc rename to garnet/lib/ui/scenic/scenic.cc
diff --git a/lib/ui/scenic/scenic.h b/garnet/lib/ui/scenic/scenic.h similarity index 100% rename from lib/ui/scenic/scenic.h rename to garnet/lib/ui/scenic/scenic.h
diff --git a/lib/ui/scenic/session.cc b/garnet/lib/ui/scenic/session.cc similarity index 100% rename from lib/ui/scenic/session.cc rename to garnet/lib/ui/scenic/session.cc
diff --git a/lib/ui/scenic/session.h b/garnet/lib/ui/scenic/session.h similarity index 100% rename from lib/ui/scenic/session.h rename to garnet/lib/ui/scenic/session.h
diff --git a/lib/ui/scenic/system.cc b/garnet/lib/ui/scenic/system.cc similarity index 100% rename from lib/ui/scenic/system.cc rename to garnet/lib/ui/scenic/system.cc
diff --git a/lib/ui/scenic/system.h b/garnet/lib/ui/scenic/system.h similarity index 100% rename from lib/ui/scenic/system.h rename to garnet/lib/ui/scenic/system.h
diff --git a/lib/ui/scenic/tests/BUILD.gn b/garnet/lib/ui/scenic/tests/BUILD.gn similarity index 100% rename from lib/ui/scenic/tests/BUILD.gn rename to garnet/lib/ui/scenic/tests/BUILD.gn
diff --git a/lib/ui/scenic/tests/dummy_system.cc b/garnet/lib/ui/scenic/tests/dummy_system.cc similarity index 100% rename from lib/ui/scenic/tests/dummy_system.cc rename to garnet/lib/ui/scenic/tests/dummy_system.cc
diff --git a/lib/ui/scenic/tests/dummy_system.h b/garnet/lib/ui/scenic/tests/dummy_system.h similarity index 100% rename from lib/ui/scenic/tests/dummy_system.h rename to garnet/lib/ui/scenic/tests/dummy_system.h
diff --git a/lib/ui/scenic/tests/mocks.cc b/garnet/lib/ui/scenic/tests/mocks.cc similarity index 100% rename from lib/ui/scenic/tests/mocks.cc rename to garnet/lib/ui/scenic/tests/mocks.cc
diff --git a/lib/ui/scenic/tests/mocks.h b/garnet/lib/ui/scenic/tests/mocks.h similarity index 100% rename from lib/ui/scenic/tests/mocks.h rename to garnet/lib/ui/scenic/tests/mocks.h
diff --git a/lib/ui/scenic/tests/scenic_gfx_test.cc b/garnet/lib/ui/scenic/tests/scenic_gfx_test.cc similarity index 100% rename from lib/ui/scenic/tests/scenic_gfx_test.cc rename to garnet/lib/ui/scenic/tests/scenic_gfx_test.cc
diff --git a/lib/ui/scenic/tests/scenic_gfx_test.h b/garnet/lib/ui/scenic/tests/scenic_gfx_test.h similarity index 100% rename from lib/ui/scenic/tests/scenic_gfx_test.h rename to garnet/lib/ui/scenic/tests/scenic_gfx_test.h
diff --git a/lib/ui/scenic/tests/scenic_test.cc b/garnet/lib/ui/scenic/tests/scenic_test.cc similarity index 100% rename from lib/ui/scenic/tests/scenic_test.cc rename to garnet/lib/ui/scenic/tests/scenic_test.cc
diff --git a/lib/ui/scenic/tests/scenic_test.h b/garnet/lib/ui/scenic/tests/scenic_test.h similarity index 100% rename from lib/ui/scenic/tests/scenic_test.h rename to garnet/lib/ui/scenic/tests/scenic_test.h
diff --git a/lib/ui/scenic/tests/scenic_unittest.cc b/garnet/lib/ui/scenic/tests/scenic_unittest.cc similarity index 100% rename from lib/ui/scenic/tests/scenic_unittest.cc rename to garnet/lib/ui/scenic/tests/scenic_unittest.cc
diff --git a/lib/ui/scenic/util/BUILD.gn b/garnet/lib/ui/scenic/util/BUILD.gn similarity index 100% rename from lib/ui/scenic/util/BUILD.gn rename to garnet/lib/ui/scenic/util/BUILD.gn
diff --git a/lib/ui/scenic/util/error_reporter.cc b/garnet/lib/ui/scenic/util/error_reporter.cc similarity index 100% rename from lib/ui/scenic/util/error_reporter.cc rename to garnet/lib/ui/scenic/util/error_reporter.cc
diff --git a/lib/ui/scenic/util/error_reporter.h b/garnet/lib/ui/scenic/util/error_reporter.h similarity index 100% rename from lib/ui/scenic/util/error_reporter.h rename to garnet/lib/ui/scenic/util/error_reporter.h
diff --git a/lib/ui/scenic/util/print_command.cc b/garnet/lib/ui/scenic/util/print_command.cc similarity index 100% rename from lib/ui/scenic/util/print_command.cc rename to garnet/lib/ui/scenic/util/print_command.cc
diff --git a/lib/ui/scenic/util/print_command.h b/garnet/lib/ui/scenic/util/print_command.h similarity index 100% rename from lib/ui/scenic/util/print_command.h rename to garnet/lib/ui/scenic/util/print_command.h
diff --git a/lib/ui/scenic/util/print_event.cc b/garnet/lib/ui/scenic/util/print_event.cc similarity index 100% rename from lib/ui/scenic/util/print_event.cc rename to garnet/lib/ui/scenic/util/print_event.cc
diff --git a/lib/ui/scenic/util/print_event.h b/garnet/lib/ui/scenic/util/print_event.h similarity index 100% rename from lib/ui/scenic/util/print_event.h rename to garnet/lib/ui/scenic/util/print_event.h
diff --git a/lib/ui/scenic/util/rk4_spring_simulation.cc b/garnet/lib/ui/scenic/util/rk4_spring_simulation.cc similarity index 100% rename from lib/ui/scenic/util/rk4_spring_simulation.cc rename to garnet/lib/ui/scenic/util/rk4_spring_simulation.cc
diff --git a/lib/ui/scenic/util/rk4_spring_simulation.h b/garnet/lib/ui/scenic/util/rk4_spring_simulation.h similarity index 100% rename from lib/ui/scenic/util/rk4_spring_simulation.h rename to garnet/lib/ui/scenic/util/rk4_spring_simulation.h
diff --git a/lib/ui/sketchy/BUILD.gn b/garnet/lib/ui/sketchy/BUILD.gn similarity index 100% rename from lib/ui/sketchy/BUILD.gn rename to garnet/lib/ui/sketchy/BUILD.gn
diff --git a/lib/ui/sketchy/sketchy_system.cc b/garnet/lib/ui/sketchy/sketchy_system.cc similarity index 100% rename from lib/ui/sketchy/sketchy_system.cc rename to garnet/lib/ui/sketchy/sketchy_system.cc
diff --git a/lib/ui/sketchy/sketchy_system.h b/garnet/lib/ui/sketchy/sketchy_system.h similarity index 100% rename from lib/ui/sketchy/sketchy_system.h rename to garnet/lib/ui/sketchy/sketchy_system.h
diff --git a/lib/ui/yuv/BUILD.gn b/garnet/lib/ui/yuv/BUILD.gn similarity index 100% rename from lib/ui/yuv/BUILD.gn rename to garnet/lib/ui/yuv/BUILD.gn
diff --git a/lib/ui/yuv/yuv.cc b/garnet/lib/ui/yuv/yuv.cc similarity index 100% rename from lib/ui/yuv/yuv.cc rename to garnet/lib/ui/yuv/yuv.cc
diff --git a/lib/ui/yuv/yuv.h b/garnet/lib/ui/yuv/yuv.h similarity index 100% rename from lib/ui/yuv/yuv.h rename to garnet/lib/ui/yuv/yuv.h
diff --git a/lib/vulkan/BUILD.gn b/garnet/lib/vulkan/BUILD.gn similarity index 100% rename from lib/vulkan/BUILD.gn rename to garnet/lib/vulkan/BUILD.gn
diff --git a/lib/vulkan/MAINTAINERS b/garnet/lib/vulkan/MAINTAINERS similarity index 100% rename from lib/vulkan/MAINTAINERS rename to garnet/lib/vulkan/MAINTAINERS
diff --git a/lib/vulkan/image_pipe_swapchain.gni b/garnet/lib/vulkan/image_pipe_swapchain.gni similarity index 100% rename from lib/vulkan/image_pipe_swapchain.gni rename to garnet/lib/vulkan/image_pipe_swapchain.gni
diff --git a/lib/vulkan/meta/image-pipe-swapchain-tests.cmx b/garnet/lib/vulkan/meta/image-pipe-swapchain-tests.cmx similarity index 100% rename from lib/vulkan/meta/image-pipe-swapchain-tests.cmx rename to garnet/lib/vulkan/meta/image-pipe-swapchain-tests.cmx
diff --git a/lib/vulkan/meta/vkcube_on_fb.cmx b/garnet/lib/vulkan/meta/vkcube_on_fb.cmx similarity index 100% rename from lib/vulkan/meta/vkcube_on_fb.cmx rename to garnet/lib/vulkan/meta/vkcube_on_fb.cmx
diff --git a/lib/vulkan/meta/vkcube_on_scenic.cmx b/garnet/lib/vulkan/meta/vkcube_on_scenic.cmx similarity index 100% rename from lib/vulkan/meta/vkcube_on_scenic.cmx rename to garnet/lib/vulkan/meta/vkcube_on_scenic.cmx
diff --git a/lib/vulkan/src/rfb_server/BUILD.gn b/garnet/lib/vulkan/src/rfb_server/BUILD.gn similarity index 100% rename from lib/vulkan/src/rfb_server/BUILD.gn rename to garnet/lib/vulkan/src/rfb_server/BUILD.gn
diff --git a/lib/vulkan/src/rfb_server/rfb_server.cc b/garnet/lib/vulkan/src/rfb_server/rfb_server.cc similarity index 100% rename from lib/vulkan/src/rfb_server/rfb_server.cc rename to garnet/lib/vulkan/src/rfb_server/rfb_server.cc
diff --git a/lib/vulkan/src/rfb_server/rfb_server.h b/garnet/lib/vulkan/src/rfb_server/rfb_server.h similarity index 100% rename from lib/vulkan/src/rfb_server/rfb_server.h rename to garnet/lib/vulkan/src/rfb_server/rfb_server.h
diff --git a/lib/vulkan/src/swapchain/BUILD.gn b/garnet/lib/vulkan/src/swapchain/BUILD.gn similarity index 100% rename from lib/vulkan/src/swapchain/BUILD.gn rename to garnet/lib/vulkan/src/swapchain/BUILD.gn
diff --git a/lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain.json b/garnet/lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain.json similarity index 100% rename from lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain.json rename to garnet/lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain.json
diff --git a/lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain_fb.json b/garnet/lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain_fb.json similarity index 100% rename from lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain_fb.json rename to garnet/lib/vulkan/src/swapchain/VkLayer_image_pipe_swapchain_fb.json
diff --git a/lib/vulkan/src/swapchain/image_pipe_surface.h b/garnet/lib/vulkan/src/swapchain/image_pipe_surface.h similarity index 100% rename from lib/vulkan/src/swapchain/image_pipe_surface.h rename to garnet/lib/vulkan/src/swapchain/image_pipe_surface.h
diff --git a/lib/vulkan/src/swapchain/image_pipe_surface_async.cc b/garnet/lib/vulkan/src/swapchain/image_pipe_surface_async.cc similarity index 100% rename from lib/vulkan/src/swapchain/image_pipe_surface_async.cc rename to garnet/lib/vulkan/src/swapchain/image_pipe_surface_async.cc
diff --git a/lib/vulkan/src/swapchain/image_pipe_surface_async.h b/garnet/lib/vulkan/src/swapchain/image_pipe_surface_async.h similarity index 100% rename from lib/vulkan/src/swapchain/image_pipe_surface_async.h rename to garnet/lib/vulkan/src/swapchain/image_pipe_surface_async.h
diff --git a/lib/vulkan/src/swapchain/image_pipe_surface_fb.cc b/garnet/lib/vulkan/src/swapchain/image_pipe_surface_fb.cc similarity index 100% rename from lib/vulkan/src/swapchain/image_pipe_surface_fb.cc rename to garnet/lib/vulkan/src/swapchain/image_pipe_surface_fb.cc
diff --git a/lib/vulkan/src/swapchain/image_pipe_surface_fb.h b/garnet/lib/vulkan/src/swapchain/image_pipe_surface_fb.h similarity index 100% rename from lib/vulkan/src/swapchain/image_pipe_surface_fb.h rename to garnet/lib/vulkan/src/swapchain/image_pipe_surface_fb.h
diff --git a/lib/vulkan/src/swapchain/image_pipe_swapchain_layer.cc b/garnet/lib/vulkan/src/swapchain/image_pipe_swapchain_layer.cc similarity index 100% rename from lib/vulkan/src/swapchain/image_pipe_swapchain_layer.cc rename to garnet/lib/vulkan/src/swapchain/image_pipe_swapchain_layer.cc
diff --git a/lib/vulkan/tests/unit/BUILD.gn b/garnet/lib/vulkan/tests/unit/BUILD.gn similarity index 100% rename from lib/vulkan/tests/unit/BUILD.gn rename to garnet/lib/vulkan/tests/unit/BUILD.gn
diff --git a/lib/vulkan/tests/unit/test_extensions.cc b/garnet/lib/vulkan/tests/unit/test_extensions.cc similarity index 100% rename from lib/vulkan/tests/unit/test_extensions.cc rename to garnet/lib/vulkan/tests/unit/test_extensions.cc
diff --git a/lib/vulkan/tests/unit/test_main.cc b/garnet/lib/vulkan/tests/unit/test_main.cc similarity index 100% rename from lib/vulkan/tests/unit/test_main.cc rename to garnet/lib/vulkan/tests/unit/test_main.cc
diff --git a/lib/vulkan/tests/unit/test_surface.cc b/garnet/lib/vulkan/tests/unit/test_surface.cc similarity index 100% rename from lib/vulkan/tests/unit/test_surface.cc rename to garnet/lib/vulkan/tests/unit/test_surface.cc
diff --git a/lib/vulkan/tests/unit/test_swapchain.cc b/garnet/lib/vulkan/tests/unit/test_swapchain.cc similarity index 100% rename from lib/vulkan/tests/unit/test_swapchain.cc rename to garnet/lib/vulkan/tests/unit/test_swapchain.cc
diff --git a/lib/vulkan/tests/vkcube/BUILD.gn b/garnet/lib/vulkan/tests/vkcube/BUILD.gn similarity index 100% rename from lib/vulkan/tests/vkcube/BUILD.gn rename to garnet/lib/vulkan/tests/vkcube/BUILD.gn
diff --git a/lib/vulkan/tests/vkcube/bbb_frame.yuv b/garnet/lib/vulkan/tests/vkcube/bbb_frame.yuv similarity index 100% rename from lib/vulkan/tests/vkcube/bbb_frame.yuv rename to garnet/lib/vulkan/tests/vkcube/bbb_frame.yuv
diff --git a/lib/vulkan/tests/vkcube/magma.ppm.h b/garnet/lib/vulkan/tests/vkcube/magma.ppm.h similarity index 100% rename from lib/vulkan/tests/vkcube/magma.ppm.h rename to garnet/lib/vulkan/tests/vkcube/magma.ppm.h
diff --git a/lib/vulkan/tests/vkcube/main.cc b/garnet/lib/vulkan/tests/vkcube/main.cc similarity index 100% rename from lib/vulkan/tests/vkcube/main.cc rename to garnet/lib/vulkan/tests/vkcube/main.cc
diff --git a/lib/vulkan/tests/vkcube/test_vk_cube.h b/garnet/lib/vulkan/tests/vkcube/test_vk_cube.h similarity index 100% rename from lib/vulkan/tests/vkcube/test_vk_cube.h rename to garnet/lib/vulkan/tests/vkcube/test_vk_cube.h
diff --git a/lib/vulkan/tests/vkcube/vkcube_view.cc b/garnet/lib/vulkan/tests/vkcube/vkcube_view.cc similarity index 100% rename from lib/vulkan/tests/vkcube/vkcube_view.cc rename to garnet/lib/vulkan/tests/vkcube/vkcube_view.cc
diff --git a/lib/vulkan/tests/vkcube/vkcube_view.h b/garnet/lib/vulkan/tests/vkcube/vkcube_view.h similarity index 100% rename from lib/vulkan/tests/vkcube/vkcube_view.h rename to garnet/lib/vulkan/tests/vkcube/vkcube_view.h
diff --git a/lib/vulkan/third_party/layers/BUILD.gn b/garnet/lib/vulkan/third_party/layers/BUILD.gn similarity index 100% rename from lib/vulkan/third_party/layers/BUILD.gn rename to garnet/lib/vulkan/third_party/layers/BUILD.gn
diff --git a/lib/vulkan/third_party/layers/LICENSE.txt b/garnet/lib/vulkan/third_party/layers/LICENSE.txt similarity index 100% rename from lib/vulkan/third_party/layers/LICENSE.txt rename to garnet/lib/vulkan/third_party/layers/LICENSE.txt
diff --git a/lib/vulkan/third_party/layers/README.fuchsia b/garnet/lib/vulkan/third_party/layers/README.fuchsia similarity index 100% rename from lib/vulkan/third_party/layers/README.fuchsia rename to garnet/lib/vulkan/third_party/layers/README.fuchsia
diff --git a/lib/vulkan/third_party/layers/VkLayer_rfb.json b/garnet/lib/vulkan/third_party/layers/VkLayer_rfb.json similarity index 100% rename from lib/vulkan/third_party/layers/VkLayer_rfb.json rename to garnet/lib/vulkan/third_party/layers/VkLayer_rfb.json
diff --git a/lib/vulkan/third_party/layers/VkLayer_screenshot.json b/garnet/lib/vulkan/third_party/layers/VkLayer_screenshot.json similarity index 100% rename from lib/vulkan/third_party/layers/VkLayer_screenshot.json rename to garnet/lib/vulkan/third_party/layers/VkLayer_screenshot.json
diff --git a/lib/vulkan/third_party/layers/rfb.cpp b/garnet/lib/vulkan/third_party/layers/rfb.cpp similarity index 100% rename from lib/vulkan/third_party/layers/rfb.cpp rename to garnet/lib/vulkan/third_party/layers/rfb.cpp
diff --git a/lib/vulkan/third_party/layers/screenshot.cpp b/garnet/lib/vulkan/third_party/layers/screenshot.cpp similarity index 100% rename from lib/vulkan/third_party/layers/screenshot.cpp rename to garnet/lib/vulkan/third_party/layers/screenshot.cpp
diff --git a/lib/vulkan/third_party/layers/screenshot_parsing.cpp b/garnet/lib/vulkan/third_party/layers/screenshot_parsing.cpp similarity index 100% rename from lib/vulkan/third_party/layers/screenshot_parsing.cpp rename to garnet/lib/vulkan/third_party/layers/screenshot_parsing.cpp
diff --git a/lib/vulkan/third_party/layers/screenshot_parsing.h b/garnet/lib/vulkan/third_party/layers/screenshot_parsing.h similarity index 100% rename from lib/vulkan/third_party/layers/screenshot_parsing.h rename to garnet/lib/vulkan/third_party/layers/screenshot_parsing.h
diff --git a/lib/vulkan/third_party/vkcube/cube.cc b/garnet/lib/vulkan/third_party/vkcube/cube.cc similarity index 100% rename from lib/vulkan/third_party/vkcube/cube.cc rename to garnet/lib/vulkan/third_party/vkcube/cube.cc
diff --git a/lib/vulkan/third_party/vkcube/cube.frag.h b/garnet/lib/vulkan/third_party/vkcube/cube.frag.h similarity index 100% rename from lib/vulkan/third_party/vkcube/cube.frag.h rename to garnet/lib/vulkan/third_party/vkcube/cube.frag.h
diff --git a/lib/vulkan/third_party/vkcube/cube.h b/garnet/lib/vulkan/third_party/vkcube/cube.h similarity index 100% rename from lib/vulkan/third_party/vkcube/cube.h rename to garnet/lib/vulkan/third_party/vkcube/cube.h
diff --git a/lib/vulkan/third_party/vkcube/cube.vert.h b/garnet/lib/vulkan/third_party/vkcube/cube.vert.h similarity index 100% rename from lib/vulkan/third_party/vkcube/cube.vert.h rename to garnet/lib/vulkan/third_party/vkcube/cube.vert.h
diff --git a/lib/vulkan/third_party/vkcube/linmath.h b/garnet/lib/vulkan/third_party/vkcube/linmath.h similarity index 100% rename from lib/vulkan/third_party/vkcube/linmath.h rename to garnet/lib/vulkan/third_party/vkcube/linmath.h
diff --git a/lib/vulkan/third_party/vkcube/lunarg.ppm.h b/garnet/lib/vulkan/third_party/vkcube/lunarg.ppm.h similarity index 100% rename from lib/vulkan/third_party/vkcube/lunarg.ppm.h rename to garnet/lib/vulkan/third_party/vkcube/lunarg.ppm.h
diff --git a/lib/wlan/.clang-format b/garnet/lib/wlan/.clang-format similarity index 100% rename from lib/wlan/.clang-format rename to garnet/lib/wlan/.clang-format
diff --git a/lib/wlan/MAINTAINERS b/garnet/lib/wlan/MAINTAINERS similarity index 100% rename from lib/wlan/MAINTAINERS rename to garnet/lib/wlan/MAINTAINERS
diff --git a/lib/wlan/common/BUILD.gn b/garnet/lib/wlan/common/BUILD.gn similarity index 100% rename from lib/wlan/common/BUILD.gn rename to garnet/lib/wlan/common/BUILD.gn
diff --git a/lib/wlan/common/band.cpp b/garnet/lib/wlan/common/band.cpp similarity index 100% rename from lib/wlan/common/band.cpp rename to garnet/lib/wlan/common/band.cpp
diff --git a/lib/wlan/common/channel.cpp b/garnet/lib/wlan/common/channel.cpp similarity index 100% rename from lib/wlan/common/channel.cpp rename to garnet/lib/wlan/common/channel.cpp
diff --git a/lib/wlan/common/element.cpp b/garnet/lib/wlan/common/element.cpp similarity index 100% rename from lib/wlan/common/element.cpp rename to garnet/lib/wlan/common/element.cpp
diff --git a/lib/wlan/common/element_splitter.cpp b/garnet/lib/wlan/common/element_splitter.cpp similarity index 100% rename from lib/wlan/common/element_splitter.cpp rename to garnet/lib/wlan/common/element_splitter.cpp
diff --git a/lib/wlan/common/energy.cpp b/garnet/lib/wlan/common/energy.cpp similarity index 100% rename from lib/wlan/common/energy.cpp rename to garnet/lib/wlan/common/energy.cpp
diff --git a/lib/wlan/common/include/wlan/common/action_frame.h b/garnet/lib/wlan/common/include/wlan/common/action_frame.h similarity index 100% rename from lib/wlan/common/include/wlan/common/action_frame.h rename to garnet/lib/wlan/common/include/wlan/common/action_frame.h
diff --git a/lib/wlan/common/include/wlan/common/band.h b/garnet/lib/wlan/common/include/wlan/common/band.h similarity index 100% rename from lib/wlan/common/include/wlan/common/band.h rename to garnet/lib/wlan/common/include/wlan/common/band.h
diff --git a/lib/wlan/common/include/wlan/common/bitfield.h b/garnet/lib/wlan/common/include/wlan/common/bitfield.h similarity index 100% rename from lib/wlan/common/include/wlan/common/bitfield.h rename to garnet/lib/wlan/common/include/wlan/common/bitfield.h
diff --git a/lib/wlan/common/include/wlan/common/buffer_reader.h b/garnet/lib/wlan/common/include/wlan/common/buffer_reader.h similarity index 100% rename from lib/wlan/common/include/wlan/common/buffer_reader.h rename to garnet/lib/wlan/common/include/wlan/common/buffer_reader.h
diff --git a/lib/wlan/common/include/wlan/common/buffer_writer.h b/garnet/lib/wlan/common/include/wlan/common/buffer_writer.h similarity index 100% rename from lib/wlan/common/include/wlan/common/buffer_writer.h rename to garnet/lib/wlan/common/include/wlan/common/buffer_writer.h
diff --git a/lib/wlan/common/include/wlan/common/channel.h b/garnet/lib/wlan/common/include/wlan/common/channel.h similarity index 100% rename from lib/wlan/common/include/wlan/common/channel.h rename to garnet/lib/wlan/common/include/wlan/common/channel.h
diff --git a/lib/wlan/common/include/wlan/common/cipher.h b/garnet/lib/wlan/common/include/wlan/common/cipher.h similarity index 100% rename from lib/wlan/common/include/wlan/common/cipher.h rename to garnet/lib/wlan/common/include/wlan/common/cipher.h
diff --git a/lib/wlan/common/include/wlan/common/element.h b/garnet/lib/wlan/common/include/wlan/common/element.h similarity index 100% rename from lib/wlan/common/include/wlan/common/element.h rename to garnet/lib/wlan/common/include/wlan/common/element.h
diff --git a/lib/wlan/common/include/wlan/common/element_id.h b/garnet/lib/wlan/common/include/wlan/common/element_id.h similarity index 100% rename from lib/wlan/common/include/wlan/common/element_id.h rename to garnet/lib/wlan/common/include/wlan/common/element_id.h
diff --git a/lib/wlan/common/include/wlan/common/element_splitter.h b/garnet/lib/wlan/common/include/wlan/common/element_splitter.h similarity index 100% rename from lib/wlan/common/include/wlan/common/element_splitter.h rename to garnet/lib/wlan/common/include/wlan/common/element_splitter.h
diff --git a/lib/wlan/common/include/wlan/common/energy.h b/garnet/lib/wlan/common/include/wlan/common/energy.h similarity index 100% rename from lib/wlan/common/include/wlan/common/energy.h rename to garnet/lib/wlan/common/include/wlan/common/energy.h
diff --git a/lib/wlan/common/include/wlan/common/from_bytes.h b/garnet/lib/wlan/common/include/wlan/common/from_bytes.h similarity index 100% rename from lib/wlan/common/include/wlan/common/from_bytes.h rename to garnet/lib/wlan/common/include/wlan/common/from_bytes.h
diff --git a/lib/wlan/common/include/wlan/common/logging.h b/garnet/lib/wlan/common/include/wlan/common/logging.h similarity index 100% rename from lib/wlan/common/include/wlan/common/logging.h rename to garnet/lib/wlan/common/include/wlan/common/logging.h
diff --git a/lib/wlan/common/include/wlan/common/mac_frame.h b/garnet/lib/wlan/common/include/wlan/common/mac_frame.h similarity index 100% rename from lib/wlan/common/include/wlan/common/mac_frame.h rename to garnet/lib/wlan/common/include/wlan/common/mac_frame.h
diff --git a/lib/wlan/common/include/wlan/common/macaddr.h b/garnet/lib/wlan/common/include/wlan/common/macaddr.h similarity index 100% rename from lib/wlan/common/include/wlan/common/macaddr.h rename to garnet/lib/wlan/common/include/wlan/common/macaddr.h
diff --git a/lib/wlan/common/include/wlan/common/moving_average.h b/garnet/lib/wlan/common/include/wlan/common/moving_average.h similarity index 100% rename from lib/wlan/common/include/wlan/common/moving_average.h rename to garnet/lib/wlan/common/include/wlan/common/moving_average.h
diff --git a/lib/wlan/common/include/wlan/common/parse_element.h b/garnet/lib/wlan/common/include/wlan/common/parse_element.h similarity index 100% rename from lib/wlan/common/include/wlan/common/parse_element.h rename to garnet/lib/wlan/common/include/wlan/common/parse_element.h
diff --git a/lib/wlan/common/include/wlan/common/parse_mac_header.h b/garnet/lib/wlan/common/include/wlan/common/parse_mac_header.h similarity index 100% rename from lib/wlan/common/include/wlan/common/parse_mac_header.h rename to garnet/lib/wlan/common/include/wlan/common/parse_mac_header.h
diff --git a/lib/wlan/common/include/wlan/common/span.h b/garnet/lib/wlan/common/include/wlan/common/span.h similarity index 100% rename from lib/wlan/common/include/wlan/common/span.h rename to garnet/lib/wlan/common/include/wlan/common/span.h
diff --git a/lib/wlan/common/include/wlan/common/stats.h b/garnet/lib/wlan/common/include/wlan/common/stats.h similarity index 100% rename from lib/wlan/common/include/wlan/common/stats.h rename to garnet/lib/wlan/common/include/wlan/common/stats.h
diff --git a/lib/wlan/common/include/wlan/common/tim_element.h b/garnet/lib/wlan/common/include/wlan/common/tim_element.h similarity index 100% rename from lib/wlan/common/include/wlan/common/tim_element.h rename to garnet/lib/wlan/common/include/wlan/common/tim_element.h
diff --git a/lib/wlan/common/include/wlan/common/tx_vector.h b/garnet/lib/wlan/common/include/wlan/common/tx_vector.h similarity index 100% rename from lib/wlan/common/include/wlan/common/tx_vector.h rename to garnet/lib/wlan/common/include/wlan/common/tx_vector.h
diff --git a/lib/wlan/common/include/wlan/common/write_element.h b/garnet/lib/wlan/common/include/wlan/common/write_element.h similarity index 100% rename from lib/wlan/common/include/wlan/common/write_element.h rename to garnet/lib/wlan/common/include/wlan/common/write_element.h
diff --git a/lib/wlan/common/mac_frame.cpp b/garnet/lib/wlan/common/mac_frame.cpp similarity index 100% rename from lib/wlan/common/mac_frame.cpp rename to garnet/lib/wlan/common/mac_frame.cpp
diff --git a/lib/wlan/common/macaddr.cpp b/garnet/lib/wlan/common/macaddr.cpp similarity index 100% rename from lib/wlan/common/macaddr.cpp rename to garnet/lib/wlan/common/macaddr.cpp
diff --git a/lib/wlan/common/parse_element.cpp b/garnet/lib/wlan/common/parse_element.cpp similarity index 100% rename from lib/wlan/common/parse_element.cpp rename to garnet/lib/wlan/common/parse_element.cpp
diff --git a/lib/wlan/common/parse_mac_header.cpp b/garnet/lib/wlan/common/parse_mac_header.cpp similarity index 100% rename from lib/wlan/common/parse_mac_header.cpp rename to garnet/lib/wlan/common/parse_mac_header.cpp
diff --git a/lib/wlan/common/tim_element.cpp b/garnet/lib/wlan/common/tim_element.cpp similarity index 100% rename from lib/wlan/common/tim_element.cpp rename to garnet/lib/wlan/common/tim_element.cpp
diff --git a/lib/wlan/common/tx_vector.cpp b/garnet/lib/wlan/common/tx_vector.cpp similarity index 100% rename from lib/wlan/common/tx_vector.cpp rename to garnet/lib/wlan/common/tx_vector.cpp
diff --git a/lib/wlan/common/write_element.cpp b/garnet/lib/wlan/common/write_element.cpp similarity index 100% rename from lib/wlan/common/write_element.cpp rename to garnet/lib/wlan/common/write_element.cpp
diff --git a/lib/wlan/fidl/BUILD.gn b/garnet/lib/wlan/fidl/BUILD.gn similarity index 100% rename from lib/wlan/fidl/BUILD.gn rename to garnet/lib/wlan/fidl/BUILD.gn
diff --git a/lib/wlan/fidl/phy.fidl b/garnet/lib/wlan/fidl/phy.fidl similarity index 100% rename from lib/wlan/fidl/phy.fidl rename to garnet/lib/wlan/fidl/phy.fidl
diff --git a/lib/wlan/fidl/service.fidl b/garnet/lib/wlan/fidl/service.fidl similarity index 100% rename from lib/wlan/fidl/service.fidl rename to garnet/lib/wlan/fidl/service.fidl
diff --git a/lib/wlan/fidl/sme.fidl b/garnet/lib/wlan/fidl/sme.fidl similarity index 100% rename from lib/wlan/fidl/sme.fidl rename to garnet/lib/wlan/fidl/sme.fidl
diff --git a/lib/wlan/fidl/wlantap.fidl b/garnet/lib/wlan/fidl/wlantap.fidl similarity index 100% rename from lib/wlan/fidl/wlantap.fidl rename to garnet/lib/wlan/fidl/wlantap.fidl
diff --git a/lib/wlan/mlme/BUILD.gn b/garnet/lib/wlan/mlme/BUILD.gn similarity index 100% rename from lib/wlan/mlme/BUILD.gn rename to garnet/lib/wlan/mlme/BUILD.gn
diff --git a/lib/wlan/mlme/ap/ap_mlme.cpp b/garnet/lib/wlan/mlme/ap/ap_mlme.cpp similarity index 100% rename from lib/wlan/mlme/ap/ap_mlme.cpp rename to garnet/lib/wlan/mlme/ap/ap_mlme.cpp
diff --git a/lib/wlan/mlme/ap/beacon_sender.cpp b/garnet/lib/wlan/mlme/ap/beacon_sender.cpp similarity index 100% rename from lib/wlan/mlme/ap/beacon_sender.cpp rename to garnet/lib/wlan/mlme/ap/beacon_sender.cpp
diff --git a/lib/wlan/mlme/ap/infra_bss.cpp b/garnet/lib/wlan/mlme/ap/infra_bss.cpp similarity index 100% rename from lib/wlan/mlme/ap/infra_bss.cpp rename to garnet/lib/wlan/mlme/ap/infra_bss.cpp
diff --git a/lib/wlan/mlme/ap/remote_client.cpp b/garnet/lib/wlan/mlme/ap/remote_client.cpp similarity index 100% rename from lib/wlan/mlme/ap/remote_client.cpp rename to garnet/lib/wlan/mlme/ap/remote_client.cpp
diff --git a/lib/wlan/mlme/ap/tim.cpp b/garnet/lib/wlan/mlme/ap/tim.cpp similarity index 100% rename from lib/wlan/mlme/ap/tim.cpp rename to garnet/lib/wlan/mlme/ap/tim.cpp
diff --git a/lib/wlan/mlme/assoc_context.cpp b/garnet/lib/wlan/mlme/assoc_context.cpp similarity index 100% rename from lib/wlan/mlme/assoc_context.cpp rename to garnet/lib/wlan/mlme/assoc_context.cpp
diff --git a/lib/wlan/mlme/beacon.cpp b/garnet/lib/wlan/mlme/beacon.cpp similarity index 100% rename from lib/wlan/mlme/beacon.cpp rename to garnet/lib/wlan/mlme/beacon.cpp
diff --git a/lib/wlan/mlme/client/bss.cpp b/garnet/lib/wlan/mlme/client/bss.cpp similarity index 100% rename from lib/wlan/mlme/client/bss.cpp rename to garnet/lib/wlan/mlme/client/bss.cpp
diff --git a/lib/wlan/mlme/client/channel_scheduler.cpp b/garnet/lib/wlan/mlme/client/channel_scheduler.cpp similarity index 100% rename from lib/wlan/mlme/client/channel_scheduler.cpp rename to garnet/lib/wlan/mlme/client/channel_scheduler.cpp
diff --git a/lib/wlan/mlme/client/client_factory.cpp b/garnet/lib/wlan/mlme/client/client_factory.cpp similarity index 100% rename from lib/wlan/mlme/client/client_factory.cpp rename to garnet/lib/wlan/mlme/client/client_factory.cpp
diff --git a/lib/wlan/mlme/client/client_mlme.cpp b/garnet/lib/wlan/mlme/client/client_mlme.cpp similarity index 100% rename from lib/wlan/mlme/client/client_mlme.cpp rename to garnet/lib/wlan/mlme/client/client_mlme.cpp
diff --git a/lib/wlan/mlme/client/join_context.cpp b/garnet/lib/wlan/mlme/client/join_context.cpp similarity index 100% rename from lib/wlan/mlme/client/join_context.cpp rename to garnet/lib/wlan/mlme/client/join_context.cpp
diff --git a/lib/wlan/mlme/client/scanner.cpp b/garnet/lib/wlan/mlme/client/scanner.cpp similarity index 100% rename from lib/wlan/mlme/client/scanner.cpp rename to garnet/lib/wlan/mlme/client/scanner.cpp
diff --git a/lib/wlan/mlme/client/station.cpp b/garnet/lib/wlan/mlme/client/station.cpp similarity index 100% rename from lib/wlan/mlme/client/station.cpp rename to garnet/lib/wlan/mlme/client/station.cpp
diff --git a/lib/wlan/mlme/convert.cpp b/garnet/lib/wlan/mlme/convert.cpp similarity index 100% rename from lib/wlan/mlme/convert.cpp rename to garnet/lib/wlan/mlme/convert.cpp
diff --git a/lib/wlan/mlme/debug.cpp b/garnet/lib/wlan/mlme/debug.cpp similarity index 100% rename from lib/wlan/mlme/debug.cpp rename to garnet/lib/wlan/mlme/debug.cpp
diff --git a/lib/wlan/mlme/device_caps.cpp b/garnet/lib/wlan/mlme/device_caps.cpp similarity index 100% rename from lib/wlan/mlme/device_caps.cpp rename to garnet/lib/wlan/mlme/device_caps.cpp
diff --git a/lib/wlan/mlme/device_interface.cpp b/garnet/lib/wlan/mlme/device_interface.cpp similarity index 100% rename from lib/wlan/mlme/device_interface.cpp rename to garnet/lib/wlan/mlme/device_interface.cpp
diff --git a/lib/wlan/mlme/dispatcher.cpp b/garnet/lib/wlan/mlme/dispatcher.cpp similarity index 100% rename from lib/wlan/mlme/dispatcher.cpp rename to garnet/lib/wlan/mlme/dispatcher.cpp
diff --git a/lib/wlan/mlme/ht.cpp b/garnet/lib/wlan/mlme/ht.cpp similarity index 100% rename from lib/wlan/mlme/ht.cpp rename to garnet/lib/wlan/mlme/ht.cpp
diff --git a/lib/wlan/mlme/include/wlan/mlme/ap/ap_mlme.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ap/ap_mlme.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ap/ap_mlme.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ap/ap_mlme.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ap/beacon_sender.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ap/beacon_sender.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ap/beacon_sender.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ap/beacon_sender.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ap/bss_interface.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ap/bss_interface.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ap/bss_interface.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ap/bss_interface.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ap/infra_bss.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ap/infra_bss.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ap/infra_bss.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ap/infra_bss.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ap/remote_client.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ap/remote_client.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ap/remote_client.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ap/remote_client.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ap/remote_client_interface.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ap/remote_client_interface.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ap/remote_client_interface.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ap/remote_client_interface.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ap/tim.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ap/tim.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ap/tim.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ap/tim.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/assoc_context.h b/garnet/lib/wlan/mlme/include/wlan/mlme/assoc_context.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/assoc_context.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/assoc_context.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/beacon.h b/garnet/lib/wlan/mlme/include/wlan/mlme/beacon.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/beacon.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/beacon.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/bss.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/bss.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/bss.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/bss.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/channel_scheduler.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/channel_scheduler.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/channel_scheduler.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/channel_scheduler.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/client_factory.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/client_factory.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/client_factory.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/client_factory.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/client_interface.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/client_interface.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/client_interface.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/client_interface.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/client_mlme.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/client_mlme.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/client_mlme.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/client_mlme.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/join_context.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/join_context.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/join_context.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/join_context.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/scanner.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/scanner.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/scanner.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/scanner.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/client/station.h b/garnet/lib/wlan/mlme/include/wlan/mlme/client/station.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/client/station.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/client/station.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/convert.h b/garnet/lib/wlan/mlme/include/wlan/mlme/convert.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/convert.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/convert.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/debug.h b/garnet/lib/wlan/mlme/include/wlan/mlme/debug.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/debug.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/debug.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/device_caps.h b/garnet/lib/wlan/mlme/include/wlan/mlme/device_caps.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/device_caps.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/device_caps.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/device_interface.h b/garnet/lib/wlan/mlme/include/wlan/mlme/device_interface.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/device_interface.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/device_interface.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/dispatcher.h b/garnet/lib/wlan/mlme/include/wlan/mlme/dispatcher.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/dispatcher.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/dispatcher.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/eapol.h b/garnet/lib/wlan/mlme/include/wlan/mlme/eapol.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/eapol.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/eapol.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/frame_validation.h b/garnet/lib/wlan/mlme/include/wlan/mlme/frame_validation.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/frame_validation.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/frame_validation.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ht.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ht.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ht.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ht.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/key.h b/garnet/lib/wlan/mlme/include/wlan/mlme/key.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/key.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/key.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mac_frame.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mac_frame.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mac_frame.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mac_frame.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mac_header_writer.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mac_header_writer.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mac_header_writer.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mac_header_writer.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/macaddr_map.h b/garnet/lib/wlan/mlme/include/wlan/mlme/macaddr_map.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/macaddr_map.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/macaddr_map.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mcs.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mcs.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mcs.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mcs.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mesh/deduplicator.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mesh/deduplicator.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mesh/deduplicator.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mesh/deduplicator.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mesh/hwmp.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mesh/hwmp.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mesh/hwmp.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mesh/hwmp.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mesh/mesh_mlme.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mesh/mesh_mlme.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mesh/mesh_mlme.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mesh/mesh_mlme.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mesh/parse_mp_action.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mesh/parse_mp_action.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mesh/parse_mp_action.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mesh/parse_mp_action.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mesh/path_table.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mesh/path_table.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mesh/path_table.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mesh/path_table.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mesh/write_mp_action.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mesh/write_mp_action.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mesh/write_mp_action.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mesh/write_mp_action.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/mlme.h b/garnet/lib/wlan/mlme/include/wlan/mlme/mlme.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/mlme.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/mlme.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/packet.h b/garnet/lib/wlan/mlme/include/wlan/mlme/packet.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/packet.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/packet.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/parse_beacon.h b/garnet/lib/wlan/mlme/include/wlan/mlme/parse_beacon.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/parse_beacon.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/parse_beacon.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/ps_cfg.h b/garnet/lib/wlan/mlme/include/wlan/mlme/ps_cfg.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/ps_cfg.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/ps_cfg.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/rates_elements.h b/garnet/lib/wlan/mlme/include/wlan/mlme/rates_elements.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/rates_elements.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/rates_elements.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/sequence.h b/garnet/lib/wlan/mlme/include/wlan/mlme/sequence.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/sequence.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/sequence.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/service.h b/garnet/lib/wlan/mlme/include/wlan/mlme/service.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/service.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/service.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/timer.h b/garnet/lib/wlan/mlme/include/wlan/mlme/timer.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/timer.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/timer.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/timer_manager.h b/garnet/lib/wlan/mlme/include/wlan/mlme/timer_manager.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/timer_manager.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/timer_manager.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/validate_frame.h b/garnet/lib/wlan/mlme/include/wlan/mlme/validate_frame.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/validate_frame.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/validate_frame.h
diff --git a/lib/wlan/mlme/include/wlan/mlme/wlan.h b/garnet/lib/wlan/mlme/include/wlan/mlme/wlan.h similarity index 100% rename from lib/wlan/mlme/include/wlan/mlme/wlan.h rename to garnet/lib/wlan/mlme/include/wlan/mlme/wlan.h
diff --git a/lib/wlan/mlme/key.cpp b/garnet/lib/wlan/mlme/key.cpp similarity index 100% rename from lib/wlan/mlme/key.cpp rename to garnet/lib/wlan/mlme/key.cpp
diff --git a/lib/wlan/mlme/mac_frame.cpp b/garnet/lib/wlan/mlme/mac_frame.cpp similarity index 100% rename from lib/wlan/mlme/mac_frame.cpp rename to garnet/lib/wlan/mlme/mac_frame.cpp
diff --git a/lib/wlan/mlme/mac_header_writer.cpp b/garnet/lib/wlan/mlme/mac_header_writer.cpp similarity index 100% rename from lib/wlan/mlme/mac_header_writer.cpp rename to garnet/lib/wlan/mlme/mac_header_writer.cpp
diff --git a/lib/wlan/mlme/mcs.cpp b/garnet/lib/wlan/mlme/mcs.cpp similarity index 100% rename from lib/wlan/mlme/mcs.cpp rename to garnet/lib/wlan/mlme/mcs.cpp
diff --git a/lib/wlan/mlme/mesh/deduplicator.cpp b/garnet/lib/wlan/mlme/mesh/deduplicator.cpp similarity index 100% rename from lib/wlan/mlme/mesh/deduplicator.cpp rename to garnet/lib/wlan/mlme/mesh/deduplicator.cpp
diff --git a/lib/wlan/mlme/mesh/hwmp.cpp b/garnet/lib/wlan/mlme/mesh/hwmp.cpp similarity index 100% rename from lib/wlan/mlme/mesh/hwmp.cpp rename to garnet/lib/wlan/mlme/mesh/hwmp.cpp
diff --git a/lib/wlan/mlme/mesh/mesh_mlme.cpp b/garnet/lib/wlan/mlme/mesh/mesh_mlme.cpp similarity index 100% rename from lib/wlan/mlme/mesh/mesh_mlme.cpp rename to garnet/lib/wlan/mlme/mesh/mesh_mlme.cpp
diff --git a/lib/wlan/mlme/mesh/parse_mp_action.cpp b/garnet/lib/wlan/mlme/mesh/parse_mp_action.cpp similarity index 100% rename from lib/wlan/mlme/mesh/parse_mp_action.cpp rename to garnet/lib/wlan/mlme/mesh/parse_mp_action.cpp
diff --git a/lib/wlan/mlme/mesh/path_table.cpp b/garnet/lib/wlan/mlme/mesh/path_table.cpp similarity index 100% rename from lib/wlan/mlme/mesh/path_table.cpp rename to garnet/lib/wlan/mlme/mesh/path_table.cpp
diff --git a/lib/wlan/mlme/mesh/write_mp_action.cpp b/garnet/lib/wlan/mlme/mesh/write_mp_action.cpp similarity index 100% rename from lib/wlan/mlme/mesh/write_mp_action.cpp rename to garnet/lib/wlan/mlme/mesh/write_mp_action.cpp
diff --git a/lib/wlan/mlme/packet.cpp b/garnet/lib/wlan/mlme/packet.cpp similarity index 100% rename from lib/wlan/mlme/packet.cpp rename to garnet/lib/wlan/mlme/packet.cpp
diff --git a/lib/wlan/mlme/parse_beacon.cpp b/garnet/lib/wlan/mlme/parse_beacon.cpp similarity index 100% rename from lib/wlan/mlme/parse_beacon.cpp rename to garnet/lib/wlan/mlme/parse_beacon.cpp
diff --git a/lib/wlan/mlme/rates_elements.cpp b/garnet/lib/wlan/mlme/rates_elements.cpp similarity index 100% rename from lib/wlan/mlme/rates_elements.cpp rename to garnet/lib/wlan/mlme/rates_elements.cpp
diff --git a/lib/wlan/mlme/service.cpp b/garnet/lib/wlan/mlme/service.cpp similarity index 100% rename from lib/wlan/mlme/service.cpp rename to garnet/lib/wlan/mlme/service.cpp
diff --git a/lib/wlan/mlme/tests/BUILD.gn b/garnet/lib/wlan/mlme/tests/BUILD.gn similarity index 100% rename from lib/wlan/mlme/tests/BUILD.gn rename to garnet/lib/wlan/mlme/tests/BUILD.gn
diff --git a/lib/wlan/mlme/tests/ap_mlme_unittest.cpp b/garnet/lib/wlan/mlme/tests/ap_mlme_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/ap_mlme_unittest.cpp rename to garnet/lib/wlan/mlme/tests/ap_mlme_unittest.cpp
diff --git a/lib/wlan/mlme/tests/assoc_ctx_unittest.cpp b/garnet/lib/wlan/mlme/tests/assoc_ctx_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/assoc_ctx_unittest.cpp rename to garnet/lib/wlan/mlme/tests/assoc_ctx_unittest.cpp
diff --git a/lib/wlan/mlme/tests/beacon_sender_unittest.cpp b/garnet/lib/wlan/mlme/tests/beacon_sender_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/beacon_sender_unittest.cpp rename to garnet/lib/wlan/mlme/tests/beacon_sender_unittest.cpp
diff --git a/lib/wlan/mlme/tests/buffer_utils_unittest.cpp b/garnet/lib/wlan/mlme/tests/buffer_utils_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/buffer_utils_unittest.cpp rename to garnet/lib/wlan/mlme/tests/buffer_utils_unittest.cpp
diff --git a/lib/wlan/mlme/tests/channel_scheduler_unittest.cpp b/garnet/lib/wlan/mlme/tests/channel_scheduler_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/channel_scheduler_unittest.cpp rename to garnet/lib/wlan/mlme/tests/channel_scheduler_unittest.cpp
diff --git a/lib/wlan/mlme/tests/channel_unittest.cpp b/garnet/lib/wlan/mlme/tests/channel_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/channel_unittest.cpp rename to garnet/lib/wlan/mlme/tests/channel_unittest.cpp
diff --git a/lib/wlan/mlme/tests/client_mlme_unittest.cpp b/garnet/lib/wlan/mlme/tests/client_mlme_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/client_mlme_unittest.cpp rename to garnet/lib/wlan/mlme/tests/client_mlme_unittest.cpp
diff --git a/lib/wlan/mlme/tests/device_caps_unittest.cpp b/garnet/lib/wlan/mlme/tests/device_caps_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/device_caps_unittest.cpp rename to garnet/lib/wlan/mlme/tests/device_caps_unittest.cpp
diff --git a/lib/wlan/mlme/tests/element_fidl_unittest.cpp b/garnet/lib/wlan/mlme/tests/element_fidl_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/element_fidl_unittest.cpp rename to garnet/lib/wlan/mlme/tests/element_fidl_unittest.cpp
diff --git a/lib/wlan/mlme/tests/element_splitter_unittest.cpp b/garnet/lib/wlan/mlme/tests/element_splitter_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/element_splitter_unittest.cpp rename to garnet/lib/wlan/mlme/tests/element_splitter_unittest.cpp
diff --git a/lib/wlan/mlme/tests/element_unittest.cpp b/garnet/lib/wlan/mlme/tests/element_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/element_unittest.cpp rename to garnet/lib/wlan/mlme/tests/element_unittest.cpp
diff --git a/lib/wlan/mlme/tests/energy_unittest.cpp b/garnet/lib/wlan/mlme/tests/energy_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/energy_unittest.cpp rename to garnet/lib/wlan/mlme/tests/energy_unittest.cpp
diff --git a/lib/wlan/mlme/tests/frame_validation_unittest.cpp b/garnet/lib/wlan/mlme/tests/frame_validation_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/frame_validation_unittest.cpp rename to garnet/lib/wlan/mlme/tests/frame_validation_unittest.cpp
diff --git a/lib/wlan/mlme/tests/hwmp_unittest.cpp b/garnet/lib/wlan/mlme/tests/hwmp_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/hwmp_unittest.cpp rename to garnet/lib/wlan/mlme/tests/hwmp_unittest.cpp
diff --git a/lib/wlan/mlme/tests/join_context_unittest.cpp b/garnet/lib/wlan/mlme/tests/join_context_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/join_context_unittest.cpp rename to garnet/lib/wlan/mlme/tests/join_context_unittest.cpp
diff --git a/lib/wlan/mlme/tests/mac_frame_unittest.cpp b/garnet/lib/wlan/mlme/tests/mac_frame_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/mac_frame_unittest.cpp rename to garnet/lib/wlan/mlme/tests/mac_frame_unittest.cpp
diff --git a/lib/wlan/mlme/tests/macaddr_unittest.cpp b/garnet/lib/wlan/mlme/tests/macaddr_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/macaddr_unittest.cpp rename to garnet/lib/wlan/mlme/tests/macaddr_unittest.cpp
diff --git a/lib/wlan/mlme/tests/mcs_unittest.cpp b/garnet/lib/wlan/mlme/tests/mcs_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/mcs_unittest.cpp rename to garnet/lib/wlan/mlme/tests/mcs_unittest.cpp
diff --git a/lib/wlan/mlme/tests/mesh_deduplicator_unittest.cpp b/garnet/lib/wlan/mlme/tests/mesh_deduplicator_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/mesh_deduplicator_unittest.cpp rename to garnet/lib/wlan/mlme/tests/mesh_deduplicator_unittest.cpp
diff --git a/lib/wlan/mlme/tests/mesh_mlme_unittest.cpp b/garnet/lib/wlan/mlme/tests/mesh_mlme_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/mesh_mlme_unittest.cpp rename to garnet/lib/wlan/mlme/tests/mesh_mlme_unittest.cpp
diff --git a/lib/wlan/mlme/tests/mock_device.h b/garnet/lib/wlan/mlme/tests/mock_device.h similarity index 100% rename from lib/wlan/mlme/tests/mock_device.h rename to garnet/lib/wlan/mlme/tests/mock_device.h
diff --git a/lib/wlan/mlme/tests/moving_average_unittest.cpp b/garnet/lib/wlan/mlme/tests/moving_average_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/moving_average_unittest.cpp rename to garnet/lib/wlan/mlme/tests/moving_average_unittest.cpp
diff --git a/lib/wlan/mlme/tests/packet_unittest.cpp b/garnet/lib/wlan/mlme/tests/packet_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/packet_unittest.cpp rename to garnet/lib/wlan/mlme/tests/packet_unittest.cpp
diff --git a/lib/wlan/mlme/tests/parse_beacon_unittest.cpp b/garnet/lib/wlan/mlme/tests/parse_beacon_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/parse_beacon_unittest.cpp rename to garnet/lib/wlan/mlme/tests/parse_beacon_unittest.cpp
diff --git a/lib/wlan/mlme/tests/parse_element_unittest.cpp b/garnet/lib/wlan/mlme/tests/parse_element_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/parse_element_unittest.cpp rename to garnet/lib/wlan/mlme/tests/parse_element_unittest.cpp
diff --git a/lib/wlan/mlme/tests/parse_mac_header_unittest.cpp b/garnet/lib/wlan/mlme/tests/parse_mac_header_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/parse_mac_header_unittest.cpp rename to garnet/lib/wlan/mlme/tests/parse_mac_header_unittest.cpp
diff --git a/lib/wlan/mlme/tests/parse_mp_action_unittest.cpp b/garnet/lib/wlan/mlme/tests/parse_mp_action_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/parse_mp_action_unittest.cpp rename to garnet/lib/wlan/mlme/tests/parse_mp_action_unittest.cpp
diff --git a/lib/wlan/mlme/tests/rates_elements_unittest.cpp b/garnet/lib/wlan/mlme/tests/rates_elements_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/rates_elements_unittest.cpp rename to garnet/lib/wlan/mlme/tests/rates_elements_unittest.cpp
diff --git a/lib/wlan/mlme/tests/scanner_unittest.cpp b/garnet/lib/wlan/mlme/tests/scanner_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/scanner_unittest.cpp rename to garnet/lib/wlan/mlme/tests/scanner_unittest.cpp
diff --git a/lib/wlan/mlme/tests/sequence_unittest.cpp b/garnet/lib/wlan/mlme/tests/sequence_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/sequence_unittest.cpp rename to garnet/lib/wlan/mlme/tests/sequence_unittest.cpp
diff --git a/lib/wlan/mlme/tests/service_unittest.cpp b/garnet/lib/wlan/mlme/tests/service_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/service_unittest.cpp rename to garnet/lib/wlan/mlme/tests/service_unittest.cpp
diff --git a/lib/wlan/mlme/tests/span_unittest.cpp b/garnet/lib/wlan/mlme/tests/span_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/span_unittest.cpp rename to garnet/lib/wlan/mlme/tests/span_unittest.cpp
diff --git a/lib/wlan/mlme/tests/stats_unittest.cpp b/garnet/lib/wlan/mlme/tests/stats_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/stats_unittest.cpp rename to garnet/lib/wlan/mlme/tests/stats_unittest.cpp
diff --git a/lib/wlan/mlme/tests/test_bss.cpp b/garnet/lib/wlan/mlme/tests/test_bss.cpp similarity index 100% rename from lib/wlan/mlme/tests/test_bss.cpp rename to garnet/lib/wlan/mlme/tests/test_bss.cpp
diff --git a/lib/wlan/mlme/tests/test_bss.h b/garnet/lib/wlan/mlme/tests/test_bss.h similarity index 100% rename from lib/wlan/mlme/tests/test_bss.h rename to garnet/lib/wlan/mlme/tests/test_bss.h
diff --git a/lib/wlan/mlme/tests/test_data.cpp b/garnet/lib/wlan/mlme/tests/test_data.cpp similarity index 100% rename from lib/wlan/mlme/tests/test_data.cpp rename to garnet/lib/wlan/mlme/tests/test_data.cpp
diff --git a/lib/wlan/mlme/tests/test_data.h b/garnet/lib/wlan/mlme/tests/test_data.h similarity index 100% rename from lib/wlan/mlme/tests/test_data.h rename to garnet/lib/wlan/mlme/tests/test_data.h
diff --git a/lib/wlan/mlme/tests/test_main.cpp b/garnet/lib/wlan/mlme/tests/test_main.cpp similarity index 100% rename from lib/wlan/mlme/tests/test_main.cpp rename to garnet/lib/wlan/mlme/tests/test_main.cpp
diff --git a/lib/wlan/mlme/tests/test_timer.cpp b/garnet/lib/wlan/mlme/tests/test_timer.cpp similarity index 100% rename from lib/wlan/mlme/tests/test_timer.cpp rename to garnet/lib/wlan/mlme/tests/test_timer.cpp
diff --git a/lib/wlan/mlme/tests/test_timer.h b/garnet/lib/wlan/mlme/tests/test_timer.h similarity index 100% rename from lib/wlan/mlme/tests/test_timer.h rename to garnet/lib/wlan/mlme/tests/test_timer.h
diff --git a/lib/wlan/mlme/tests/test_utils.cpp b/garnet/lib/wlan/mlme/tests/test_utils.cpp similarity index 100% rename from lib/wlan/mlme/tests/test_utils.cpp rename to garnet/lib/wlan/mlme/tests/test_utils.cpp
diff --git a/lib/wlan/mlme/tests/test_utils.h b/garnet/lib/wlan/mlme/tests/test_utils.h similarity index 100% rename from lib/wlan/mlme/tests/test_utils.h rename to garnet/lib/wlan/mlme/tests/test_utils.h
diff --git a/lib/wlan/mlme/tests/tim_element_unittest.cpp b/garnet/lib/wlan/mlme/tests/tim_element_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/tim_element_unittest.cpp rename to garnet/lib/wlan/mlme/tests/tim_element_unittest.cpp
diff --git a/lib/wlan/mlme/tests/tim_unittest.cpp b/garnet/lib/wlan/mlme/tests/tim_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/tim_unittest.cpp rename to garnet/lib/wlan/mlme/tests/tim_unittest.cpp
diff --git a/lib/wlan/mlme/tests/timer_manager_unittest.cpp b/garnet/lib/wlan/mlme/tests/timer_manager_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/timer_manager_unittest.cpp rename to garnet/lib/wlan/mlme/tests/timer_manager_unittest.cpp
diff --git a/lib/wlan/mlme/tests/tx_vector_unittest.cpp b/garnet/lib/wlan/mlme/tests/tx_vector_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/tx_vector_unittest.cpp rename to garnet/lib/wlan/mlme/tests/tx_vector_unittest.cpp
diff --git a/lib/wlan/mlme/tests/write_element_unittest.cpp b/garnet/lib/wlan/mlme/tests/write_element_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/write_element_unittest.cpp rename to garnet/lib/wlan/mlme/tests/write_element_unittest.cpp
diff --git a/lib/wlan/mlme/tests/write_mp_action_unittest.cpp b/garnet/lib/wlan/mlme/tests/write_mp_action_unittest.cpp similarity index 100% rename from lib/wlan/mlme/tests/write_mp_action_unittest.cpp rename to garnet/lib/wlan/mlme/tests/write_mp_action_unittest.cpp
diff --git a/lib/wlan/mlme/timer.cpp b/garnet/lib/wlan/mlme/timer.cpp similarity index 100% rename from lib/wlan/mlme/timer.cpp rename to garnet/lib/wlan/mlme/timer.cpp
diff --git a/lib/wlan/mlme/validate_frame.cpp b/garnet/lib/wlan/mlme/validate_frame.cpp similarity index 100% rename from lib/wlan/mlme/validate_frame.cpp rename to garnet/lib/wlan/mlme/validate_frame.cpp
diff --git a/lib/wlan/protocol/BUILD.gn b/garnet/lib/wlan/protocol/BUILD.gn similarity index 100% rename from lib/wlan/protocol/BUILD.gn rename to garnet/lib/wlan/protocol/BUILD.gn
diff --git a/lib/wlan/protocol/include/wlan/protocol/if-impl.h b/garnet/lib/wlan/protocol/include/wlan/protocol/if-impl.h similarity index 100% rename from lib/wlan/protocol/include/wlan/protocol/if-impl.h rename to garnet/lib/wlan/protocol/include/wlan/protocol/if-impl.h
diff --git a/lib/wlan/protocol/include/wlan/protocol/info.h b/garnet/lib/wlan/protocol/include/wlan/protocol/info.h similarity index 100% rename from lib/wlan/protocol/include/wlan/protocol/info.h rename to garnet/lib/wlan/protocol/include/wlan/protocol/info.h
diff --git a/lib/wlan/protocol/include/wlan/protocol/ioctl.h b/garnet/lib/wlan/protocol/include/wlan/protocol/ioctl.h similarity index 100% rename from lib/wlan/protocol/include/wlan/protocol/ioctl.h rename to garnet/lib/wlan/protocol/include/wlan/protocol/ioctl.h
diff --git a/lib/wlan/protocol/include/wlan/protocol/mac.h b/garnet/lib/wlan/protocol/include/wlan/protocol/mac.h similarity index 100% rename from lib/wlan/protocol/include/wlan/protocol/mac.h rename to garnet/lib/wlan/protocol/include/wlan/protocol/mac.h
diff --git a/lib/wlan/protocol/include/wlan/protocol/phy-impl.h b/garnet/lib/wlan/protocol/include/wlan/protocol/phy-impl.h similarity index 100% rename from lib/wlan/protocol/include/wlan/protocol/phy-impl.h rename to garnet/lib/wlan/protocol/include/wlan/protocol/phy-impl.h
diff --git a/lib/wlan/protocol/include/wlan/protocol/phy.h b/garnet/lib/wlan/protocol/include/wlan/protocol/phy.h similarity index 100% rename from lib/wlan/protocol/include/wlan/protocol/phy.h rename to garnet/lib/wlan/protocol/include/wlan/protocol/phy.h
diff --git a/lib/wlan/protocol/include/wlan/protocol/wlantap.h b/garnet/lib/wlan/protocol/include/wlan/protocol/wlantap.h similarity index 100% rename from lib/wlan/protocol/include/wlan/protocol/wlantap.h rename to garnet/lib/wlan/protocol/include/wlan/protocol/wlantap.h
diff --git a/packages/README.md b/garnet/packages/README.md similarity index 100% rename from packages/README.md rename to garnet/packages/README.md
diff --git a/packages/all b/garnet/packages/all similarity index 100% rename from packages/all rename to garnet/packages/all
diff --git a/packages/benchmarks/all b/garnet/packages/benchmarks/all similarity index 100% rename from packages/benchmarks/all rename to garnet/packages/benchmarks/all
diff --git a/packages/benchmarks/buildbot b/garnet/packages/benchmarks/buildbot similarity index 100% rename from packages/benchmarks/buildbot rename to garnet/packages/benchmarks/buildbot
diff --git a/packages/benchmarks/garnet b/garnet/packages/benchmarks/garnet similarity index 100% rename from packages/benchmarks/garnet rename to garnet/packages/benchmarks/garnet
diff --git a/packages/benchmarks/instrumentation b/garnet/packages/benchmarks/instrumentation similarity index 100% rename from packages/benchmarks/instrumentation rename to garnet/packages/benchmarks/instrumentation
diff --git a/packages/benchmarks/zircon b/garnet/packages/benchmarks/zircon similarity index 100% rename from packages/benchmarks/zircon rename to garnet/packages/benchmarks/zircon
diff --git a/packages/buildbot b/garnet/packages/buildbot similarity index 100% rename from packages/buildbot rename to garnet/packages/buildbot
diff --git a/packages/config/amber b/garnet/packages/config/amber similarity index 100% rename from packages/config/amber rename to garnet/packages/config/amber
diff --git a/packages/config/amber_auto_ota b/garnet/packages/config/amber_auto_ota similarity index 100% rename from packages/config/amber_auto_ota rename to garnet/packages/config/amber_auto_ota
diff --git a/packages/config/crashpad_upload_to_prod_server b/garnet/packages/config/crashpad_upload_to_prod_server similarity index 100% rename from packages/config/crashpad_upload_to_prod_server rename to garnet/packages/config/crashpad_upload_to_prod_server
diff --git a/packages/config/frank_media_config b/garnet/packages/config/frank_media_config similarity index 100% rename from packages/config/frank_media_config rename to garnet/packages/config/frank_media_config
diff --git a/packages/config/kernel_crash_checker b/garnet/packages/config/kernel_crash_checker similarity index 100% rename from packages/config/kernel_crash_checker rename to garnet/packages/config/kernel_crash_checker
diff --git a/packages/config/mdns b/garnet/packages/config/mdns similarity index 100% rename from packages/config/mdns rename to garnet/packages/config/mdns
diff --git a/packages/config/netconnector b/garnet/packages/config/netconnector similarity index 100% rename from packages/config/netconnector rename to garnet/packages/config/netconnector
diff --git a/packages/config/network b/garnet/packages/config/network similarity index 100% rename from packages/config/network rename to garnet/packages/config/network
diff --git a/packages/config/openssh_keys b/garnet/packages/config/openssh_keys similarity index 100% rename from packages/config/openssh_keys rename to garnet/packages/config/openssh_keys
diff --git a/packages/config/router b/garnet/packages/config/router similarity index 100% rename from packages/config/router rename to garnet/packages/config/router
diff --git a/packages/config/services b/garnet/packages/config/services similarity index 100% rename from packages/config/services rename to garnet/packages/config/services
diff --git a/packages/config/terminal b/garnet/packages/config/terminal similarity index 100% rename from packages/config/terminal rename to garnet/packages/config/terminal
diff --git a/packages/config/thermd b/garnet/packages/config/thermd similarity index 100% rename from packages/config/thermd rename to garnet/packages/config/thermd
diff --git a/packages/config/wlan b/garnet/packages/config/wlan similarity index 100% rename from packages/config/wlan rename to garnet/packages/config/wlan
diff --git a/packages/default b/garnet/packages/default similarity index 100% rename from packages/default rename to garnet/packages/default
diff --git a/packages/examples/all b/garnet/packages/examples/all similarity index 100% rename from packages/examples/all rename to garnet/packages/examples/all
diff --git a/packages/examples/benchmark b/garnet/packages/examples/benchmark similarity index 100% rename from packages/examples/benchmark rename to garnet/packages/examples/benchmark
diff --git a/packages/examples/bluetooth b/garnet/packages/examples/bluetooth similarity index 100% rename from packages/examples/bluetooth rename to garnet/packages/examples/bluetooth
diff --git a/packages/examples/components b/garnet/packages/examples/components similarity index 100% rename from packages/examples/components rename to garnet/packages/examples/components
diff --git a/packages/examples/crust b/garnet/packages/examples/crust similarity index 100% rename from packages/examples/crust rename to garnet/packages/examples/crust
diff --git a/packages/examples/escher b/garnet/packages/examples/escher similarity index 100% rename from packages/examples/escher rename to garnet/packages/examples/escher
diff --git a/packages/examples/eth-rs b/garnet/packages/examples/eth-rs similarity index 100% rename from packages/examples/eth-rs rename to garnet/packages/examples/eth-rs
diff --git a/packages/examples/fidl b/garnet/packages/examples/fidl similarity index 100% rename from packages/examples/fidl rename to garnet/packages/examples/fidl
diff --git a/packages/examples/http b/garnet/packages/examples/http similarity index 100% rename from packages/examples/http rename to garnet/packages/examples/http
diff --git a/packages/examples/intl b/garnet/packages/examples/intl similarity index 100% rename from packages/examples/intl rename to garnet/packages/examples/intl
diff --git a/packages/examples/media b/garnet/packages/examples/media similarity index 100% rename from packages/examples/media rename to garnet/packages/examples/media
diff --git a/packages/examples/mediaplayer b/garnet/packages/examples/mediaplayer similarity index 100% rename from packages/examples/mediaplayer rename to garnet/packages/examples/mediaplayer
diff --git a/packages/examples/netstack b/garnet/packages/examples/netstack similarity index 100% rename from packages/examples/netstack rename to garnet/packages/examples/netstack
diff --git a/packages/examples/overnet b/garnet/packages/examples/overnet similarity index 100% rename from packages/examples/overnet rename to garnet/packages/examples/overnet
diff --git a/packages/examples/rust b/garnet/packages/examples/rust similarity index 100% rename from packages/examples/rust rename to garnet/packages/examples/rust
diff --git a/packages/examples/scenic b/garnet/packages/examples/scenic similarity index 100% rename from packages/examples/scenic rename to garnet/packages/examples/scenic
diff --git a/packages/examples/tcp b/garnet/packages/examples/tcp similarity index 100% rename from packages/examples/tcp rename to garnet/packages/examples/tcp
diff --git a/packages/examples/vkcube b/garnet/packages/examples/vkcube similarity index 100% rename from packages/examples/vkcube rename to garnet/packages/examples/vkcube
diff --git a/packages/examples/vkcube_on_fb b/garnet/packages/examples/vkcube_on_fb similarity index 100% rename from packages/examples/vkcube_on_fb rename to garnet/packages/examples/vkcube_on_fb
diff --git a/packages/examples/vkcube_on_scenic b/garnet/packages/examples/vkcube_on_scenic similarity index 100% rename from packages/examples/vkcube_on_scenic rename to garnet/packages/examples/vkcube_on_scenic
diff --git a/packages/examples/vulkaninfo b/garnet/packages/examples/vulkaninfo similarity index 100% rename from packages/examples/vulkaninfo rename to garnet/packages/examples/vulkaninfo
diff --git a/packages/experimental/a11y b/garnet/packages/experimental/a11y similarity index 100% rename from packages/experimental/a11y rename to garnet/packages/experimental/a11y
diff --git a/packages/experimental/all b/garnet/packages/experimental/all similarity index 100% rename from packages/experimental/all rename to garnet/packages/experimental/all
diff --git a/packages/experimental/auth b/garnet/packages/experimental/auth similarity index 100% rename from packages/experimental/auth rename to garnet/packages/experimental/auth
diff --git a/packages/experimental/biscotti b/garnet/packages/experimental/biscotti similarity index 100% rename from packages/experimental/biscotti rename to garnet/packages/experimental/biscotti
diff --git a/packages/experimental/disabled/biscotti_guest b/garnet/packages/experimental/disabled/biscotti_guest similarity index 100% rename from packages/experimental/disabled/biscotti_guest rename to garnet/packages/experimental/disabled/biscotti_guest
diff --git a/packages/experimental/disabled/debian_guest b/garnet/packages/experimental/disabled/debian_guest similarity index 100% rename from packages/experimental/disabled/debian_guest rename to garnet/packages/experimental/disabled/debian_guest
diff --git a/packages/experimental/disabled/dev_escher_linux b/garnet/packages/experimental/disabled/dev_escher_linux similarity index 100% rename from packages/experimental/disabled/dev_escher_linux rename to garnet/packages/experimental/disabled/dev_escher_linux
diff --git a/packages/experimental/disabled/examples_escher_linux b/garnet/packages/experimental/disabled/examples_escher_linux similarity index 100% rename from packages/experimental/disabled/examples_escher_linux rename to garnet/packages/experimental/disabled/examples_escher_linux
diff --git a/packages/experimental/disabled/fidl_fuzz b/garnet/packages/experimental/disabled/fidl_fuzz similarity index 100% rename from packages/experimental/disabled/fidl_fuzz rename to garnet/packages/experimental/disabled/fidl_fuzz
diff --git a/packages/experimental/disabled/rfb_layer b/garnet/packages/experimental/disabled/rfb_layer similarity index 100% rename from packages/experimental/disabled/rfb_layer rename to garnet/packages/experimental/disabled/rfb_layer
diff --git a/packages/experimental/disabled/screenshot_layer b/garnet/packages/experimental/disabled/screenshot_layer similarity index 100% rename from packages/experimental/disabled/screenshot_layer rename to garnet/packages/experimental/disabled/screenshot_layer
diff --git a/packages/experimental/disabled/tennis b/garnet/packages/experimental/disabled/tennis similarity index 100% rename from packages/experimental/disabled/tennis rename to garnet/packages/experimental/disabled/tennis
diff --git a/packages/experimental/disabled/test_amlogic_video b/garnet/packages/experimental/disabled/test_amlogic_video similarity index 100% rename from packages/experimental/disabled/test_amlogic_video rename to garnet/packages/experimental/disabled/test_amlogic_video
diff --git a/packages/experimental/disabled/tests_escher_linux b/garnet/packages/experimental/disabled/tests_escher_linux similarity index 100% rename from packages/experimental/disabled/tests_escher_linux rename to garnet/packages/experimental/disabled/tests_escher_linux
diff --git a/packages/experimental/disabled/tests_magma b/garnet/packages/experimental/disabled/tests_magma similarity index 100% rename from packages/experimental/disabled/tests_magma rename to garnet/packages/experimental/disabled/tests_magma
diff --git a/packages/experimental/disabled/zircon_rust b/garnet/packages/experimental/disabled/zircon_rust similarity index 100% rename from packages/experimental/disabled/zircon_rust rename to garnet/packages/experimental/disabled/zircon_rust
diff --git a/packages/experimental/linux_guest b/garnet/packages/experimental/linux_guest similarity index 100% rename from packages/experimental/linux_guest rename to garnet/packages/experimental/linux_guest
diff --git a/packages/experimental/network_settings_server b/garnet/packages/experimental/network_settings_server similarity index 100% rename from packages/experimental/network_settings_server rename to garnet/packages/experimental/network_settings_server
diff --git a/packages/experimental/sys b/garnet/packages/experimental/sys similarity index 100% rename from packages/experimental/sys rename to garnet/packages/experimental/sys
diff --git a/packages/experimental/wayland_bridge b/garnet/packages/experimental/wayland_bridge similarity index 100% rename from packages/experimental/wayland_bridge rename to garnet/packages/experimental/wayland_bridge
diff --git a/packages/experimental/zircon_guest b/garnet/packages/experimental/zircon_guest similarity index 100% rename from packages/experimental/zircon_guest rename to garnet/packages/experimental/zircon_guest
diff --git a/packages/garnet b/garnet/packages/garnet similarity index 100% rename from packages/garnet rename to garnet/packages/garnet
diff --git a/packages/kitchen_sink b/garnet/packages/kitchen_sink similarity index 100% rename from packages/kitchen_sink rename to garnet/packages/kitchen_sink
diff --git a/packages/prod/all b/garnet/packages/prod/all similarity index 100% rename from packages/prod/all rename to garnet/packages/prod/all
diff --git a/packages/prod/amber b/garnet/packages/prod/amber similarity index 100% rename from packages/prod/amber rename to garnet/packages/prod/amber
diff --git a/packages/prod/amlogic_video_decoder b/garnet/packages/prod/amlogic_video_decoder similarity index 100% rename from packages/prod/amlogic_video_decoder rename to garnet/packages/prod/amlogic_video_decoder
diff --git a/packages/prod/appmgr b/garnet/packages/prod/appmgr similarity index 100% rename from packages/prod/appmgr rename to garnet/packages/prod/appmgr
diff --git a/packages/prod/atheros b/garnet/packages/prod/atheros similarity index 100% rename from packages/prod/atheros rename to garnet/packages/prod/atheros
diff --git a/packages/prod/auth b/garnet/packages/prod/auth similarity index 100% rename from packages/prod/auth rename to garnet/packages/prod/auth
diff --git a/packages/prod/banjo b/garnet/packages/prod/banjo similarity index 100% rename from packages/prod/banjo rename to garnet/packages/prod/banjo
diff --git a/packages/prod/bindc b/garnet/packages/prod/bindc similarity index 100% rename from packages/prod/bindc rename to garnet/packages/prod/bindc
diff --git a/packages/prod/bluetooth b/garnet/packages/prod/bluetooth similarity index 100% rename from packages/prod/bluetooth rename to garnet/packages/prod/bluetooth
diff --git a/packages/prod/bluetooth_drivers b/garnet/packages/prod/bluetooth_drivers similarity index 100% rename from packages/prod/bluetooth_drivers rename to garnet/packages/prod/bluetooth_drivers
diff --git a/packages/prod/boringssl_tool b/garnet/packages/prod/boringssl_tool similarity index 100% rename from packages/prod/boringssl_tool rename to garnet/packages/prod/boringssl_tool
diff --git a/packages/prod/broadcom b/garnet/packages/prod/broadcom similarity index 100% rename from packages/prod/broadcom rename to garnet/packages/prod/broadcom
diff --git a/packages/prod/build_info b/garnet/packages/prod/build_info similarity index 100% rename from packages/prod/build_info rename to garnet/packages/prod/build_info
diff --git a/packages/prod/chrealm b/garnet/packages/prod/chrealm similarity index 100% rename from packages/prod/chrealm rename to garnet/packages/prod/chrealm
diff --git a/packages/prod/cmdutils b/garnet/packages/prod/cmdutils similarity index 100% rename from packages/prod/cmdutils rename to garnet/packages/prod/cmdutils
diff --git a/packages/prod/cobalt_client b/garnet/packages/prod/cobalt_client similarity index 100% rename from packages/prod/cobalt_client rename to garnet/packages/prod/cobalt_client
diff --git a/packages/prod/cpuperf b/garnet/packages/prod/cpuperf similarity index 100% rename from packages/prod/cpuperf rename to garnet/packages/prod/cpuperf
diff --git a/packages/prod/crashpad b/garnet/packages/prod/crashpad similarity index 100% rename from packages/prod/crashpad rename to garnet/packages/prod/crashpad
diff --git a/packages/prod/cs b/garnet/packages/prod/cs similarity index 100% rename from packages/prod/cs rename to garnet/packages/prod/cs
diff --git a/packages/prod/debug_agent b/garnet/packages/prod/debug_agent similarity index 100% rename from packages/prod/debug_agent rename to garnet/packages/prod/debug_agent
diff --git a/packages/prod/debugserver b/garnet/packages/prod/debugserver similarity index 100% rename from packages/prod/debugserver rename to garnet/packages/prod/debugserver
diff --git a/packages/prod/device_settings b/garnet/packages/prod/device_settings similarity index 100% rename from packages/prod/device_settings rename to garnet/packages/prod/device_settings
diff --git a/packages/prod/dhcpd b/garnet/packages/prod/dhcpd similarity index 100% rename from packages/prod/dhcpd rename to garnet/packages/prod/dhcpd
diff --git a/packages/prod/dhcpd_test_client b/garnet/packages/prod/dhcpd_test_client similarity index 100% rename from packages/prod/dhcpd_test_client rename to garnet/packages/prod/dhcpd_test_client
diff --git a/packages/prod/display_manager b/garnet/packages/prod/display_manager similarity index 100% rename from packages/prod/display_manager rename to garnet/packages/prod/display_manager
diff --git a/packages/prod/drivers b/garnet/packages/prod/drivers similarity index 100% rename from packages/prod/drivers rename to garnet/packages/prod/drivers
diff --git a/packages/prod/far b/garnet/packages/prod/far similarity index 100% rename from packages/prod/far rename to garnet/packages/prod/far
diff --git a/packages/prod/fonts b/garnet/packages/prod/fonts similarity index 100% rename from packages/prod/fonts rename to garnet/packages/prod/fonts
diff --git a/packages/prod/fonts_minimal b/garnet/packages/prod/fonts_minimal similarity index 100% rename from packages/prod/fonts_minimal rename to garnet/packages/prod/fonts_minimal
diff --git a/packages/prod/fortune b/garnet/packages/prod/fortune similarity index 100% rename from packages/prod/fortune rename to garnet/packages/prod/fortune
diff --git a/packages/prod/guest_runner b/garnet/packages/prod/guest_runner similarity index 100% rename from packages/prod/guest_runner rename to garnet/packages/prod/guest_runner
diff --git a/packages/prod/insntrace b/garnet/packages/prod/insntrace similarity index 100% rename from packages/prod/insntrace rename to garnet/packages/prod/insntrace
diff --git a/packages/prod/installblob b/garnet/packages/prod/installblob similarity index 100% rename from packages/prod/installblob rename to garnet/packages/prod/installblob
diff --git a/packages/prod/iquery b/garnet/packages/prod/iquery similarity index 100% rename from packages/prod/iquery rename to garnet/packages/prod/iquery
diff --git a/packages/prod/kernel_crash_checker b/garnet/packages/prod/kernel_crash_checker similarity index 100% rename from packages/prod/kernel_crash_checker rename to garnet/packages/prod/kernel_crash_checker
diff --git a/packages/prod/log_listener b/garnet/packages/prod/log_listener similarity index 100% rename from packages/prod/log_listener rename to garnet/packages/prod/log_listener
diff --git a/packages/prod/logger b/garnet/packages/prod/logger similarity index 100% rename from packages/prod/logger rename to garnet/packages/prod/logger
diff --git a/packages/prod/magma b/garnet/packages/prod/magma similarity index 100% rename from packages/prod/magma rename to garnet/packages/prod/magma
diff --git a/packages/prod/magma-vsl-gc b/garnet/packages/prod/magma-vsl-gc similarity index 100% rename from packages/prod/magma-vsl-gc rename to garnet/packages/prod/magma-vsl-gc
diff --git a/packages/prod/magma_tools b/garnet/packages/prod/magma_tools similarity index 100% rename from packages/prod/magma_tools rename to garnet/packages/prod/magma_tools
diff --git a/packages/prod/mdns b/garnet/packages/prod/mdns similarity index 100% rename from packages/prod/mdns rename to garnet/packages/prod/mdns
diff --git a/packages/prod/mdns-util b/garnet/packages/prod/mdns-util similarity index 100% rename from packages/prod/mdns-util rename to garnet/packages/prod/mdns-util
diff --git a/packages/prod/media b/garnet/packages/prod/media similarity index 100% rename from packages/prod/media rename to garnet/packages/prod/media
diff --git a/packages/prod/media_audio b/garnet/packages/prod/media_audio similarity index 100% rename from packages/prod/media_audio rename to garnet/packages/prod/media_audio
diff --git a/packages/prod/media_codec b/garnet/packages/prod/media_codec similarity index 100% rename from packages/prod/media_codec rename to garnet/packages/prod/media_codec
diff --git a/packages/prod/mediaplayer b/garnet/packages/prod/mediaplayer similarity index 100% rename from packages/prod/mediaplayer rename to garnet/packages/prod/mediaplayer
diff --git a/packages/prod/mediasession b/garnet/packages/prod/mediasession similarity index 100% rename from packages/prod/mediasession rename to garnet/packages/prod/mediasession
diff --git a/packages/prod/memory_monitor b/garnet/packages/prod/memory_monitor similarity index 100% rename from packages/prod/memory_monitor rename to garnet/packages/prod/memory_monitor
diff --git a/packages/prod/net-cli b/garnet/packages/prod/net-cli similarity index 100% rename from packages/prod/net-cli rename to garnet/packages/prod/net-cli
diff --git a/packages/prod/net_ctl b/garnet/packages/prod/net_ctl similarity index 100% rename from packages/prod/net_ctl rename to garnet/packages/prod/net_ctl
diff --git a/packages/prod/netcfg b/garnet/packages/prod/netcfg similarity index 100% rename from packages/prod/netcfg rename to garnet/packages/prod/netcfg
diff --git a/packages/prod/netconnector b/garnet/packages/prod/netconnector similarity index 100% rename from packages/prod/netconnector rename to garnet/packages/prod/netconnector
diff --git a/packages/prod/netstack b/garnet/packages/prod/netstack similarity index 100% rename from packages/prod/netstack rename to garnet/packages/prod/netstack
diff --git a/packages/prod/netstack_tools b/garnet/packages/prod/netstack_tools similarity index 100% rename from packages/prod/netstack_tools rename to garnet/packages/prod/netstack_tools
diff --git a/packages/prod/network b/garnet/packages/prod/network similarity index 100% rename from packages/prod/network rename to garnet/packages/prod/network
diff --git a/packages/prod/network-speed-test b/garnet/packages/prod/network-speed-test similarity index 100% rename from packages/prod/network-speed-test rename to garnet/packages/prod/network-speed-test
diff --git a/packages/prod/network_loader b/garnet/packages/prod/network_loader similarity index 100% rename from packages/prod/network_loader rename to garnet/packages/prod/network_loader
diff --git a/packages/prod/network_time b/garnet/packages/prod/network_time similarity index 100% rename from packages/prod/network_time rename to garnet/packages/prod/network_time
diff --git a/packages/prod/openssh b/garnet/packages/prod/openssh similarity index 100% rename from packages/prod/openssh rename to garnet/packages/prod/openssh
diff --git a/packages/prod/overnetstack b/garnet/packages/prod/overnetstack similarity index 100% rename from packages/prod/overnetstack rename to garnet/packages/prod/overnetstack
diff --git a/packages/prod/pkg_cache b/garnet/packages/prod/pkg_cache similarity index 100% rename from packages/prod/pkg_cache rename to garnet/packages/prod/pkg_cache
diff --git a/packages/prod/pkg_ctl b/garnet/packages/prod/pkg_ctl similarity index 100% rename from packages/prod/pkg_ctl rename to garnet/packages/prod/pkg_ctl
diff --git a/packages/prod/pkg_resolver b/garnet/packages/prod/pkg_resolver similarity index 100% rename from packages/prod/pkg_resolver rename to garnet/packages/prod/pkg_resolver
diff --git a/packages/prod/pm b/garnet/packages/prod/pm similarity index 100% rename from packages/prod/pm rename to garnet/packages/prod/pm
diff --git a/packages/prod/power_manager b/garnet/packages/prod/power_manager similarity index 100% rename from packages/prod/power_manager rename to garnet/packages/prod/power_manager
diff --git a/packages/prod/ralink b/garnet/packages/prod/ralink similarity index 100% rename from packages/prod/ralink rename to garnet/packages/prod/ralink
diff --git a/packages/prod/realtek b/garnet/packages/prod/realtek similarity index 100% rename from packages/prod/realtek rename to garnet/packages/prod/realtek
diff --git a/packages/prod/recovery_netstack b/garnet/packages/prod/recovery_netstack similarity index 100% rename from packages/prod/recovery_netstack rename to garnet/packages/prod/recovery_netstack
diff --git a/packages/prod/recovery_ui b/garnet/packages/prod/recovery_ui similarity index 100% rename from packages/prod/recovery_ui rename to garnet/packages/prod/recovery_ui
diff --git a/packages/prod/rolldice b/garnet/packages/prod/rolldice similarity index 100% rename from packages/prod/rolldice rename to garnet/packages/prod/rolldice
diff --git a/packages/prod/root_ssl_certificates b/garnet/packages/prod/root_ssl_certificates similarity index 100% rename from packages/prod/root_ssl_certificates rename to garnet/packages/prod/root_ssl_certificates
diff --git a/packages/prod/run b/garnet/packages/prod/run similarity index 100% rename from packages/prod/run rename to garnet/packages/prod/run
diff --git a/packages/prod/runtime b/garnet/packages/prod/runtime similarity index 100% rename from packages/prod/runtime rename to garnet/packages/prod/runtime
diff --git a/packages/prod/sbase b/garnet/packages/prod/sbase similarity index 100% rename from packages/prod/sbase rename to garnet/packages/prod/sbase
diff --git a/packages/prod/scenic b/garnet/packages/prod/scenic similarity index 100% rename from packages/prod/scenic rename to garnet/packages/prod/scenic
diff --git a/packages/prod/scenic_tools b/garnet/packages/prod/scenic_tools similarity index 100% rename from packages/prod/scenic_tools rename to garnet/packages/prod/scenic_tools
diff --git a/packages/prod/scpi b/garnet/packages/prod/scpi similarity index 100% rename from packages/prod/scpi rename to garnet/packages/prod/scpi
diff --git a/packages/prod/ssh b/garnet/packages/prod/ssh similarity index 100% rename from packages/prod/ssh rename to garnet/packages/prod/ssh
diff --git a/packages/prod/stash b/garnet/packages/prod/stash similarity index 100% rename from packages/prod/stash rename to garnet/packages/prod/stash
diff --git a/packages/prod/sysmgr b/garnet/packages/prod/sysmgr similarity index 100% rename from packages/prod/sysmgr rename to garnet/packages/prod/sysmgr
diff --git a/packages/prod/telephony b/garnet/packages/prod/telephony similarity index 100% rename from packages/prod/telephony rename to garnet/packages/prod/telephony
diff --git a/packages/prod/terminal b/garnet/packages/prod/terminal similarity index 100% rename from packages/prod/terminal rename to garnet/packages/prod/terminal
diff --git a/packages/prod/test_runner b/garnet/packages/prod/test_runner similarity index 100% rename from packages/prod/test_runner rename to garnet/packages/prod/test_runner
diff --git a/packages/prod/thermd b/garnet/packages/prod/thermd similarity index 100% rename from packages/prod/thermd rename to garnet/packages/prod/thermd
diff --git a/packages/prod/thinfs b/garnet/packages/prod/thinfs similarity index 100% rename from packages/prod/thinfs rename to garnet/packages/prod/thinfs
diff --git a/packages/prod/timezone b/garnet/packages/prod/timezone similarity index 100% rename from packages/prod/timezone rename to garnet/packages/prod/timezone
diff --git a/packages/prod/tracing b/garnet/packages/prod/tracing similarity index 100% rename from packages/prod/tracing rename to garnet/packages/prod/tracing
diff --git a/packages/prod/tz-util b/garnet/packages/prod/tz-util similarity index 100% rename from packages/prod/tz-util rename to garnet/packages/prod/tz-util
diff --git a/packages/prod/usb_video b/garnet/packages/prod/usb_video similarity index 100% rename from packages/prod/usb_video rename to garnet/packages/prod/usb_video
diff --git a/packages/prod/vboot_reference b/garnet/packages/prod/vboot_reference similarity index 100% rename from packages/prod/vboot_reference rename to garnet/packages/prod/vboot_reference
diff --git a/packages/prod/vim b/garnet/packages/prod/vim similarity index 100% rename from packages/prod/vim rename to garnet/packages/prod/vim
diff --git a/packages/prod/vulkan b/garnet/packages/prod/vulkan similarity index 100% rename from packages/prod/vulkan rename to garnet/packages/prod/vulkan
diff --git a/packages/prod/wlan b/garnet/packages/prod/wlan similarity index 100% rename from packages/prod/wlan rename to garnet/packages/prod/wlan
diff --git a/packages/prod/wlan-ap-smoke-test b/garnet/packages/prod/wlan-ap-smoke-test similarity index 100% rename from packages/prod/wlan-ap-smoke-test rename to garnet/packages/prod/wlan-ap-smoke-test
diff --git a/packages/prod/wlan-hw-sim b/garnet/packages/prod/wlan-hw-sim similarity index 100% rename from packages/prod/wlan-hw-sim rename to garnet/packages/prod/wlan-hw-sim
diff --git a/packages/prod/wlan-smoke-test b/garnet/packages/prod/wlan-smoke-test similarity index 100% rename from packages/prod/wlan-smoke-test rename to garnet/packages/prod/wlan-smoke-test
diff --git a/packages/prod/wlan-stress-test b/garnet/packages/prod/wlan-stress-test similarity index 100% rename from packages/prod/wlan-stress-test rename to garnet/packages/prod/wlan-stress-test
diff --git a/packages/prod/wlan_drivers b/garnet/packages/prod/wlan_drivers similarity index 100% rename from packages/prod/wlan_drivers rename to garnet/packages/prod/wlan_drivers
diff --git a/packages/prod/wlan_tools b/garnet/packages/prod/wlan_tools similarity index 100% rename from packages/prod/wlan_tools rename to garnet/packages/prod/wlan_tools
diff --git a/packages/prod/wlancfg b/garnet/packages/prod/wlancfg similarity index 100% rename from packages/prod/wlancfg rename to garnet/packages/prod/wlancfg
diff --git a/packages/prod/wlanif b/garnet/packages/prod/wlanif similarity index 100% rename from packages/prod/wlanif rename to garnet/packages/prod/wlanif
diff --git a/packages/prod/wlanphy b/garnet/packages/prod/wlanphy similarity index 100% rename from packages/prod/wlanphy rename to garnet/packages/prod/wlanphy
diff --git a/packages/prod/wlanstack b/garnet/packages/prod/wlanstack similarity index 100% rename from packages/prod/wlanstack rename to garnet/packages/prod/wlanstack
diff --git a/packages/prod/wlantap b/garnet/packages/prod/wlantap similarity index 100% rename from packages/prod/wlantap rename to garnet/packages/prod/wlantap
diff --git a/packages/prod/xi_core b/garnet/packages/prod/xi_core similarity index 100% rename from packages/prod/xi_core rename to garnet/packages/prod/xi_core
diff --git a/packages/products/base b/garnet/packages/products/base similarity index 100% rename from packages/products/base rename to garnet/packages/products/base
diff --git a/packages/products/devtools b/garnet/packages/products/devtools similarity index 100% rename from packages/products/devtools rename to garnet/packages/products/devtools
diff --git a/packages/products/graphical b/garnet/packages/products/graphical similarity index 100% rename from packages/products/graphical rename to garnet/packages/products/graphical
diff --git a/packages/products/graphics-dev b/garnet/packages/products/graphics-dev similarity index 100% rename from packages/products/graphics-dev rename to garnet/packages/products/graphics-dev
diff --git a/packages/products/interactive b/garnet/packages/products/interactive similarity index 100% rename from packages/products/interactive rename to garnet/packages/products/interactive
diff --git a/packages/products/interactive_base b/garnet/packages/products/interactive_base similarity index 100% rename from packages/products/interactive_base rename to garnet/packages/products/interactive_base
diff --git a/packages/products/interactive_minimal b/garnet/packages/products/interactive_minimal similarity index 100% rename from packages/products/interactive_minimal rename to garnet/packages/products/interactive_minimal
diff --git a/packages/products/network_wifi b/garnet/packages/products/network_wifi similarity index 100% rename from packages/products/network_wifi rename to garnet/packages/products/network_wifi
diff --git a/packages/products/network_wifi_devtools b/garnet/packages/products/network_wifi_devtools similarity index 100% rename from packages/products/network_wifi_devtools rename to garnet/packages/products/network_wifi_devtools
diff --git a/packages/products/sshd b/garnet/packages/products/sshd similarity index 100% rename from packages/products/sshd rename to garnet/packages/products/sshd
diff --git a/packages/products/test_runner_dev b/garnet/packages/products/test_runner_dev similarity index 100% rename from packages/products/test_runner_dev rename to garnet/packages/products/test_runner_dev
diff --git a/packages/products/toulouse b/garnet/packages/products/toulouse similarity index 100% rename from packages/products/toulouse rename to garnet/packages/products/toulouse
diff --git a/packages/sdk/all b/garnet/packages/sdk/all similarity index 100% rename from packages/sdk/all rename to garnet/packages/sdk/all
diff --git a/packages/sdk/ddk b/garnet/packages/sdk/ddk similarity index 100% rename from packages/sdk/ddk rename to garnet/packages/sdk/ddk
diff --git a/packages/sdk/garnet b/garnet/packages/sdk/garnet similarity index 100% rename from packages/sdk/garnet rename to garnet/packages/sdk/garnet
diff --git a/packages/testing/all b/garnet/packages/testing/all similarity index 100% rename from packages/testing/all rename to garnet/packages/testing/all
diff --git a/packages/testing/netemul_runner b/garnet/packages/testing/netemul_runner similarity index 100% rename from packages/testing/netemul_runner rename to garnet/packages/testing/netemul_runner
diff --git a/packages/testing/run_test_component b/garnet/packages/testing/run_test_component similarity index 100% rename from packages/testing/run_test_component rename to garnet/packages/testing/run_test_component
diff --git a/packages/tests/all b/garnet/packages/tests/all similarity index 100% rename from packages/tests/all rename to garnet/packages/tests/all
diff --git a/packages/tests/amber b/garnet/packages/tests/amber similarity index 100% rename from packages/tests/amber rename to garnet/packages/tests/amber
diff --git a/packages/tests/asio b/garnet/packages/tests/asio similarity index 100% rename from packages/tests/asio rename to garnet/packages/tests/asio
diff --git a/packages/tests/async_promise b/garnet/packages/tests/async_promise similarity index 100% rename from packages/tests/async_promise rename to garnet/packages/tests/async_promise
diff --git a/packages/tests/ath10k b/garnet/packages/tests/ath10k similarity index 100% rename from packages/tests/ath10k rename to garnet/packages/tests/ath10k
diff --git a/packages/tests/auth b/garnet/packages/tests/auth similarity index 100% rename from packages/tests/auth rename to garnet/packages/tests/auth
diff --git a/packages/tests/bluetooth b/garnet/packages/tests/bluetooth similarity index 100% rename from packages/tests/bluetooth rename to garnet/packages/tests/bluetooth
diff --git a/packages/tests/boringssl b/garnet/packages/tests/boringssl similarity index 100% rename from packages/tests/boringssl rename to garnet/packages/tests/boringssl
diff --git a/packages/tests/broadcom b/garnet/packages/tests/broadcom similarity index 100% rename from packages/tests/broadcom rename to garnet/packages/tests/broadcom
diff --git a/packages/tests/camera_client b/garnet/packages/tests/camera_client similarity index 100% rename from packages/tests/camera_client rename to garnet/packages/tests/camera_client
diff --git a/packages/tests/chrealm b/garnet/packages/tests/chrealm similarity index 100% rename from packages/tests/chrealm rename to garnet/packages/tests/chrealm
diff --git a/packages/tests/cmx b/garnet/packages/tests/cmx similarity index 100% rename from packages/tests/cmx rename to garnet/packages/tests/cmx
diff --git a/packages/tests/cobalt_client b/garnet/packages/tests/cobalt_client similarity index 100% rename from packages/tests/cobalt_client rename to garnet/packages/tests/cobalt_client
diff --git a/packages/tests/components_binary_test b/garnet/packages/tests/components_binary_test similarity index 100% rename from packages/tests/components_binary_test rename to garnet/packages/tests/components_binary_test
diff --git a/packages/tests/cpuperf b/garnet/packages/tests/cpuperf similarity index 100% rename from packages/tests/cpuperf rename to garnet/packages/tests/cpuperf
diff --git a/packages/tests/crashpad b/garnet/packages/tests/crashpad similarity index 100% rename from packages/tests/crashpad rename to garnet/packages/tests/crashpad
diff --git a/packages/tests/debug_agent b/garnet/packages/tests/debug_agent similarity index 100% rename from packages/tests/debug_agent rename to garnet/packages/tests/debug_agent
diff --git a/packages/tests/debugserver b/garnet/packages/tests/debugserver similarity index 100% rename from packages/tests/debugserver rename to garnet/packages/tests/debugserver
diff --git a/packages/tests/device_settings b/garnet/packages/tests/device_settings similarity index 100% rename from packages/tests/device_settings rename to garnet/packages/tests/device_settings
diff --git a/packages/tests/dhcp_tests b/garnet/packages/tests/dhcp_tests similarity index 100% rename from packages/tests/dhcp_tests rename to garnet/packages/tests/dhcp_tests
diff --git a/packages/tests/display_capture_test b/garnet/packages/tests/display_capture_test similarity index 100% rename from packages/tests/display_capture_test rename to garnet/packages/tests/display_capture_test
diff --git a/packages/tests/elflib b/garnet/packages/tests/elflib similarity index 100% rename from packages/tests/elflib rename to garnet/packages/tests/elflib
diff --git a/packages/tests/escher b/garnet/packages/tests/escher similarity index 100% rename from packages/tests/escher rename to garnet/packages/tests/escher
diff --git a/packages/tests/examples b/garnet/packages/tests/examples similarity index 100% rename from packages/tests/examples rename to garnet/packages/tests/examples
diff --git a/packages/tests/fidl b/garnet/packages/tests/fidl similarity index 100% rename from packages/tests/fidl rename to garnet/packages/tests/fidl
diff --git a/packages/tests/fidl_compatibility_test b/garnet/packages/tests/fidl_compatibility_test similarity index 100% rename from packages/tests/fidl_compatibility_test rename to garnet/packages/tests/fidl_compatibility_test
diff --git a/packages/tests/fidl_compatibility_test_bin b/garnet/packages/tests/fidl_compatibility_test_bin similarity index 100% rename from packages/tests/fidl_compatibility_test_bin rename to garnet/packages/tests/fidl_compatibility_test_bin
diff --git a/packages/tests/fidl_compatibility_test_server_cpp b/garnet/packages/tests/fidl_compatibility_test_server_cpp similarity index 100% rename from packages/tests/fidl_compatibility_test_server_cpp rename to garnet/packages/tests/fidl_compatibility_test_server_cpp
diff --git a/packages/tests/fidl_compatibility_test_server_go b/garnet/packages/tests/fidl_compatibility_test_server_go similarity index 100% rename from packages/tests/fidl_compatibility_test_server_go rename to garnet/packages/tests/fidl_compatibility_test_server_go
diff --git a/packages/tests/fidl_compatibility_test_server_rust b/garnet/packages/tests/fidl_compatibility_test_server_rust similarity index 100% rename from packages/tests/fidl_compatibility_test_server_rust rename to garnet/packages/tests/fidl_compatibility_test_server_rust
diff --git a/packages/tests/fidlext_tests b/garnet/packages/tests/fidlext_tests similarity index 100% rename from packages/tests/fidlext_tests rename to garnet/packages/tests/fidlext_tests
diff --git a/packages/tests/fonts b/garnet/packages/tests/fonts similarity index 100% rename from packages/tests/fonts rename to garnet/packages/tests/fonts
diff --git a/packages/tests/fostr b/garnet/packages/tests/fostr similarity index 100% rename from packages/tests/fostr rename to garnet/packages/tests/fostr
diff --git a/packages/tests/fsl b/garnet/packages/tests/fsl similarity index 100% rename from packages/tests/fsl rename to garnet/packages/tests/fsl
diff --git a/packages/tests/fuchsia_app_component_test b/garnet/packages/tests/fuchsia_app_component_test similarity index 100% rename from packages/tests/fuchsia_app_component_test rename to garnet/packages/tests/fuchsia_app_component_test
diff --git a/packages/tests/fuchsia_app_test_inner_component b/garnet/packages/tests/fuchsia_app_test_inner_component similarity index 100% rename from packages/tests/fuchsia_app_test_inner_component rename to garnet/packages/tests/fuchsia_app_test_inner_component
diff --git a/packages/tests/fuchsia_app_test_middle_component b/garnet/packages/tests/fuchsia_app_test_middle_component similarity index 100% rename from packages/tests/fuchsia_app_test_middle_component rename to garnet/packages/tests/fuchsia_app_test_middle_component
diff --git a/packages/tests/fxl b/garnet/packages/tests/fxl similarity index 100% rename from packages/tests/fxl rename to garnet/packages/tests/fxl
diff --git a/packages/tests/go_benchmarking_tests b/garnet/packages/tests/go_benchmarking_tests similarity index 100% rename from packages/tests/go_benchmarking_tests rename to garnet/packages/tests/go_benchmarking_tests
diff --git a/packages/tests/go_far_tests b/garnet/packages/tests/go_far_tests similarity index 100% rename from packages/tests/go_far_tests rename to garnet/packages/tests/go_far_tests
diff --git a/packages/tests/go_merkle_tests b/garnet/packages/tests/go_merkle_tests similarity index 100% rename from packages/tests/go_merkle_tests rename to garnet/packages/tests/go_merkle_tests
diff --git a/packages/tests/go_stdlib_tests b/garnet/packages/tests/go_stdlib_tests similarity index 100% rename from packages/tests/go_stdlib_tests rename to garnet/packages/tests/go_stdlib_tests
diff --git a/packages/tests/guest b/garnet/packages/tests/guest similarity index 100% rename from packages/tests/guest rename to garnet/packages/tests/guest
diff --git a/packages/tests/image_pipe_swapchain b/garnet/packages/tests/image_pipe_swapchain similarity index 100% rename from packages/tests/image_pipe_swapchain rename to garnet/packages/tests/image_pipe_swapchain
diff --git a/packages/tests/inspect_unittests b/garnet/packages/tests/inspect_unittests similarity index 100% rename from packages/tests/inspect_unittests rename to garnet/packages/tests/inspect_unittests
diff --git a/packages/tests/iquery_golden_test b/garnet/packages/tests/iquery_golden_test similarity index 100% rename from packages/tests/iquery_golden_test rename to garnet/packages/tests/iquery_golden_test
diff --git a/packages/tests/iquery_test b/garnet/packages/tests/iquery_test similarity index 100% rename from packages/tests/iquery_test rename to garnet/packages/tests/iquery_test
diff --git a/packages/tests/json b/garnet/packages/tests/json similarity index 100% rename from packages/tests/json rename to garnet/packages/tests/json
diff --git a/packages/tests/lib b/garnet/packages/tests/lib similarity index 100% rename from packages/tests/lib rename to garnet/packages/tests/lib
diff --git a/packages/tests/lib_component b/garnet/packages/tests/lib_component similarity index 100% rename from packages/tests/lib_component rename to garnet/packages/tests/lib_component
diff --git a/packages/tests/libc b/garnet/packages/tests/libc similarity index 100% rename from packages/tests/libc rename to garnet/packages/tests/libc
diff --git a/packages/tests/log_listener b/garnet/packages/tests/log_listener similarity index 100% rename from packages/tests/log_listener rename to garnet/packages/tests/log_listener
diff --git a/packages/tests/logger b/garnet/packages/tests/logger similarity index 100% rename from packages/tests/logger rename to garnet/packages/tests/logger
diff --git a/packages/tests/magma b/garnet/packages/tests/magma similarity index 100% rename from packages/tests/magma rename to garnet/packages/tests/magma
diff --git a/packages/tests/mdns b/garnet/packages/tests/mdns similarity index 100% rename from packages/tests/mdns rename to garnet/packages/tests/mdns
diff --git a/packages/tests/media b/garnet/packages/tests/media similarity index 100% rename from packages/tests/media rename to garnet/packages/tests/media
diff --git a/packages/tests/mediaplayer b/garnet/packages/tests/mediaplayer similarity index 100% rename from packages/tests/mediaplayer rename to garnet/packages/tests/mediaplayer
diff --git a/packages/tests/mediasession b/garnet/packages/tests/mediasession similarity index 100% rename from packages/tests/mediasession rename to garnet/packages/tests/mediasession
diff --git a/packages/tests/memory_monitor b/garnet/packages/tests/memory_monitor similarity index 100% rename from packages/tests/memory_monitor rename to garnet/packages/tests/memory_monitor
diff --git a/packages/tests/mime_sniffer b/garnet/packages/tests/mime_sniffer similarity index 100% rename from packages/tests/mime_sniffer rename to garnet/packages/tests/mime_sniffer
diff --git a/packages/tests/netcfg_tests b/garnet/packages/tests/netcfg_tests similarity index 100% rename from packages/tests/netcfg_tests rename to garnet/packages/tests/netcfg_tests
diff --git a/packages/tests/netemul b/garnet/packages/tests/netemul similarity index 100% rename from packages/tests/netemul rename to garnet/packages/tests/netemul
diff --git a/packages/tests/netstack b/garnet/packages/tests/netstack similarity index 100% rename from packages/tests/netstack rename to garnet/packages/tests/netstack
diff --git a/packages/tests/network b/garnet/packages/tests/network similarity index 100% rename from packages/tests/network rename to garnet/packages/tests/network
diff --git a/packages/tests/network_time b/garnet/packages/tests/network_time similarity index 100% rename from packages/tests/network_time rename to garnet/packages/tests/network_time
diff --git a/packages/tests/overnet b/garnet/packages/tests/overnet similarity index 100% rename from packages/tests/overnet rename to garnet/packages/tests/overnet
diff --git a/packages/tests/pkg_cache b/garnet/packages/tests/pkg_cache similarity index 100% rename from packages/tests/pkg_cache rename to garnet/packages/tests/pkg_cache
diff --git a/packages/tests/pkg_ctl b/garnet/packages/tests/pkg_ctl similarity index 100% rename from packages/tests/pkg_ctl rename to garnet/packages/tests/pkg_ctl
diff --git a/packages/tests/pkg_resolver b/garnet/packages/tests/pkg_resolver similarity index 100% rename from packages/tests/pkg_resolver rename to garnet/packages/tests/pkg_resolver
diff --git a/packages/tests/pkg_url b/garnet/packages/tests/pkg_url similarity index 100% rename from packages/tests/pkg_url rename to garnet/packages/tests/pkg_url
diff --git a/packages/tests/pm b/garnet/packages/tests/pm similarity index 100% rename from packages/tests/pm rename to garnet/packages/tests/pm
diff --git a/packages/tests/pmd b/garnet/packages/tests/pmd similarity index 100% rename from packages/tests/pmd rename to garnet/packages/tests/pmd
diff --git a/packages/tests/power_manager b/garnet/packages/tests/power_manager similarity index 100% rename from packages/tests/power_manager rename to garnet/packages/tests/power_manager
diff --git a/packages/tests/process b/garnet/packages/tests/process similarity index 100% rename from packages/tests/process rename to garnet/packages/tests/process
diff --git a/packages/tests/profiler b/garnet/packages/tests/profiler similarity index 100% rename from packages/tests/profiler rename to garnet/packages/tests/profiler
diff --git a/packages/tests/recovery_netstack b/garnet/packages/tests/recovery_netstack similarity index 100% rename from packages/tests/recovery_netstack rename to garnet/packages/tests/recovery_netstack
diff --git a/packages/tests/run_test_component b/garnet/packages/tests/run_test_component similarity index 100% rename from packages/tests/run_test_component rename to garnet/packages/tests/run_test_component
diff --git a/packages/tests/run_tests b/garnet/packages/tests/run_tests similarity index 100% rename from packages/tests/run_tests rename to garnet/packages/tests/run_tests
diff --git a/packages/tests/runtime b/garnet/packages/tests/runtime similarity index 100% rename from packages/tests/runtime rename to garnet/packages/tests/runtime
diff --git a/packages/tests/rust_crates b/garnet/packages/tests/rust_crates similarity index 100% rename from packages/tests/rust_crates rename to garnet/packages/tests/rust_crates
diff --git a/packages/tests/scenic b/garnet/packages/tests/scenic similarity index 100% rename from packages/tests/scenic rename to garnet/packages/tests/scenic
diff --git a/packages/tests/scpi b/garnet/packages/tests/scpi similarity index 100% rename from packages/tests/scpi rename to garnet/packages/tests/scpi
diff --git a/packages/tests/sse b/garnet/packages/tests/sse similarity index 100% rename from packages/tests/sse rename to garnet/packages/tests/sse
diff --git a/packages/tests/stash b/garnet/packages/tests/stash similarity index 100% rename from packages/tests/stash rename to garnet/packages/tests/stash
diff --git a/packages/tests/svc b/garnet/packages/tests/svc similarity index 100% rename from packages/tests/svc rename to garnet/packages/tests/svc
diff --git a/packages/tests/syslog b/garnet/packages/tests/syslog similarity index 100% rename from packages/tests/syslog rename to garnet/packages/tests/syslog
diff --git a/packages/tests/sysmgr b/garnet/packages/tests/sysmgr similarity index 100% rename from packages/tests/sysmgr rename to garnet/packages/tests/sysmgr
diff --git a/packages/tests/sysmgr_tests b/garnet/packages/tests/sysmgr_tests similarity index 100% rename from packages/tests/sysmgr_tests rename to garnet/packages/tests/sysmgr_tests
diff --git a/packages/tests/system_monitor b/garnet/packages/tests/system_monitor similarity index 100% rename from packages/tests/system_monitor rename to garnet/packages/tests/system_monitor
diff --git a/packages/tests/telephony b/garnet/packages/tests/telephony similarity index 100% rename from packages/tests/telephony rename to garnet/packages/tests/telephony
diff --git a/packages/tests/tiles b/garnet/packages/tests/tiles similarity index 100% rename from packages/tests/tiles rename to garnet/packages/tests/tiles
diff --git a/packages/tests/timezone b/garnet/packages/tests/timezone similarity index 100% rename from packages/tests/timezone rename to garnet/packages/tests/timezone
diff --git a/packages/tests/tracing b/garnet/packages/tests/tracing similarity index 100% rename from packages/tests/tracing rename to garnet/packages/tests/tracing
diff --git a/packages/tests/url b/garnet/packages/tests/url similarity index 100% rename from packages/tests/url rename to garnet/packages/tests/url
diff --git a/packages/tests/vfs_cpp b/garnet/packages/tests/vfs_cpp similarity index 100% rename from packages/tests/vfs_cpp rename to garnet/packages/tests/vfs_cpp
diff --git a/packages/tests/vulkan b/garnet/packages/tests/vulkan similarity index 100% rename from packages/tests/vulkan rename to garnet/packages/tests/vulkan
diff --git a/packages/tests/wayland b/garnet/packages/tests/wayland similarity index 100% rename from packages/tests/wayland rename to garnet/packages/tests/wayland
diff --git a/packages/tests/wlan b/garnet/packages/tests/wlan similarity index 100% rename from packages/tests/wlan rename to garnet/packages/tests/wlan
diff --git a/packages/tests/wlan-hw-sim b/garnet/packages/tests/wlan-hw-sim similarity index 100% rename from packages/tests/wlan-hw-sim rename to garnet/packages/tests/wlan-hw-sim
diff --git a/packages/tests/zircon b/garnet/packages/tests/zircon similarity index 100% rename from packages/tests/zircon rename to garnet/packages/tests/zircon
diff --git a/packages/tests/zxdb b/garnet/packages/tests/zxdb similarity index 100% rename from packages/tests/zxdb rename to garnet/packages/tests/zxdb
diff --git a/packages/tools/all b/garnet/packages/tools/all similarity index 100% rename from packages/tools/all rename to garnet/packages/tools/all
diff --git a/packages/tools/audio b/garnet/packages/tools/audio similarity index 100% rename from packages/tools/audio rename to garnet/packages/tools/audio
diff --git a/packages/tools/bluetooth b/garnet/packages/tools/bluetooth similarity index 100% rename from packages/tools/bluetooth rename to garnet/packages/tools/bluetooth
diff --git a/packages/tools/curl b/garnet/packages/tools/curl similarity index 100% rename from packages/tools/curl rename to garnet/packages/tools/curl
diff --git a/packages/tools/disabled/system_monitor b/garnet/packages/tools/disabled/system_monitor similarity index 100% rename from packages/tools/disabled/system_monitor rename to garnet/packages/tools/disabled/system_monitor
diff --git a/packages/tools/dockyard_host b/garnet/packages/tools/dockyard_host similarity index 100% rename from packages/tools/dockyard_host rename to garnet/packages/tools/dockyard_host
diff --git a/packages/tools/fidlmerge b/garnet/packages/tools/fidlmerge similarity index 100% rename from packages/tools/fidlmerge rename to garnet/packages/tools/fidlmerge
diff --git a/packages/tools/iperf b/garnet/packages/tools/iperf similarity index 100% rename from packages/tools/iperf rename to garnet/packages/tools/iperf
diff --git a/packages/tools/make-efi b/garnet/packages/tools/make-efi similarity index 100% rename from packages/tools/make-efi rename to garnet/packages/tools/make-efi
diff --git a/packages/tools/make-fuchsia-vol b/garnet/packages/tools/make-fuchsia-vol similarity index 100% rename from packages/tools/make-fuchsia-vol rename to garnet/packages/tools/make-fuchsia-vol
diff --git a/packages/tools/runmany b/garnet/packages/tools/runmany similarity index 100% rename from packages/tools/runmany rename to garnet/packages/tools/runmany
diff --git a/packages/tools/scenic b/garnet/packages/tools/scenic similarity index 100% rename from packages/tools/scenic rename to garnet/packages/tools/scenic
diff --git a/packages/tools/sl4f b/garnet/packages/tools/sl4f similarity index 100% rename from packages/tools/sl4f rename to garnet/packages/tools/sl4f
diff --git a/packages/tools/tiles b/garnet/packages/tools/tiles similarity index 100% rename from packages/tools/tiles rename to garnet/packages/tools/tiles
diff --git a/packages/tools/zxdb b/garnet/packages/tools/zxdb similarity index 100% rename from packages/tools/zxdb rename to garnet/packages/tools/zxdb
diff --git a/products/README.md b/garnet/products/README.md similarity index 100% rename from products/README.md rename to garnet/products/README.md
diff --git a/products/base.gni b/garnet/products/base.gni similarity index 100% rename from products/base.gni rename to garnet/products/base.gni
diff --git a/products/default.gni b/garnet/products/default.gni similarity index 100% rename from products/default.gni rename to garnet/products/default.gni
diff --git a/products/devtools.gni b/garnet/products/devtools.gni similarity index 100% rename from products/devtools.gni rename to garnet/products/devtools.gni
diff --git a/products/graphical.gni b/garnet/products/graphical.gni similarity index 100% rename from products/graphical.gni rename to garnet/products/graphical.gni
diff --git a/products/graphics-dev.gni b/garnet/products/graphics-dev.gni similarity index 100% rename from products/graphics-dev.gni rename to garnet/products/graphics-dev.gni
diff --git a/products/interactive.gni b/garnet/products/interactive.gni similarity index 100% rename from products/interactive.gni rename to garnet/products/interactive.gni
diff --git a/products/kitchen_sink.gni b/garnet/products/kitchen_sink.gni similarity index 100% rename from products/kitchen_sink.gni rename to garnet/products/kitchen_sink.gni
diff --git a/products/sshd.gni b/garnet/products/sshd.gni similarity index 100% rename from products/sshd.gni rename to garnet/products/sshd.gni
diff --git a/products/terminal.gni b/garnet/products/terminal.gni similarity index 100% rename from products/terminal.gni rename to garnet/products/terminal.gni
diff --git a/products/toulouse.gni b/garnet/products/toulouse.gni similarity index 100% rename from products/toulouse.gni rename to garnet/products/toulouse.gni
diff --git a/public/BUILD.gn b/garnet/public/BUILD.gn similarity index 100% rename from public/BUILD.gn rename to garnet/public/BUILD.gn
diff --git a/public/build/fostr/fostr.fidlmerge b/garnet/public/build/fostr/fostr.fidlmerge similarity index 100% rename from public/build/fostr/fostr.fidlmerge rename to garnet/public/build/fostr/fostr.fidlmerge
diff --git a/public/build/fostr/fostr_fidl.gni b/garnet/public/build/fostr/fostr_fidl.gni similarity index 100% rename from public/build/fostr/fostr_fidl.gni rename to garnet/public/build/fostr/fostr_fidl.gni
diff --git a/public/fidl/fuchsia.accessibility/BUILD.gn b/garnet/public/fidl/fuchsia.accessibility/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.accessibility/BUILD.gn rename to garnet/public/fidl/fuchsia.accessibility/BUILD.gn
diff --git a/public/fidl/fuchsia.accessibility/data.fidl b/garnet/public/fidl/fuchsia.accessibility/data.fidl similarity index 100% rename from public/fidl/fuchsia.accessibility/data.fidl rename to garnet/public/fidl/fuchsia.accessibility/data.fidl
diff --git a/public/fidl/fuchsia.accessibility/manager.fidl b/garnet/public/fidl/fuchsia.accessibility/manager.fidl similarity index 100% rename from public/fidl/fuchsia.accessibility/manager.fidl rename to garnet/public/fidl/fuchsia.accessibility/manager.fidl
diff --git a/public/fidl/fuchsia.accessibility/semantics_root.fidl b/garnet/public/fidl/fuchsia.accessibility/semantics_root.fidl similarity index 100% rename from public/fidl/fuchsia.accessibility/semantics_root.fidl rename to garnet/public/fidl/fuchsia.accessibility/semantics_root.fidl
diff --git a/public/fidl/fuchsia.accessibility/toggler.fidl b/garnet/public/fidl/fuchsia.accessibility/toggler.fidl similarity index 100% rename from public/fidl/fuchsia.accessibility/toggler.fidl rename to garnet/public/fidl/fuchsia.accessibility/toggler.fidl
diff --git a/public/fidl/fuchsia.accessibility/touch_dispatcher.fidl b/garnet/public/fidl/fuchsia.accessibility/touch_dispatcher.fidl similarity index 100% rename from public/fidl/fuchsia.accessibility/touch_dispatcher.fidl rename to garnet/public/fidl/fuchsia.accessibility/touch_dispatcher.fidl
diff --git a/public/fidl/fuchsia.amber/BUILD.gn b/garnet/public/fidl/fuchsia.amber/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.amber/BUILD.gn rename to garnet/public/fidl/fuchsia.amber/BUILD.gn
diff --git a/public/fidl/fuchsia.amber/MAINTAINERS b/garnet/public/fidl/fuchsia.amber/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.amber/MAINTAINERS rename to garnet/public/fidl/fuchsia.amber/MAINTAINERS
diff --git a/public/fidl/fuchsia.amber/amber.fidl b/garnet/public/fidl/fuchsia.amber/amber.fidl similarity index 100% rename from public/fidl/fuchsia.amber/amber.fidl rename to garnet/public/fidl/fuchsia.amber/amber.fidl
diff --git a/public/fidl/fuchsia.auth.account/BUILD.gn b/garnet/public/fidl/fuchsia.auth.account/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.auth.account/BUILD.gn rename to garnet/public/fidl/fuchsia.auth.account/BUILD.gn
diff --git a/public/fidl/fuchsia.auth.account/account_manager.fidl b/garnet/public/fidl/fuchsia.auth.account/account_manager.fidl similarity index 100% rename from public/fidl/fuchsia.auth.account/account_manager.fidl rename to garnet/public/fidl/fuchsia.auth.account/account_manager.fidl
diff --git a/public/fidl/fuchsia.auth/BUILD.gn b/garnet/public/fidl/fuchsia.auth/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.auth/BUILD.gn rename to garnet/public/fidl/fuchsia.auth/BUILD.gn
diff --git a/public/fidl/fuchsia.auth/MAINTAINERS b/garnet/public/fidl/fuchsia.auth/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.auth/MAINTAINERS rename to garnet/public/fidl/fuchsia.auth/MAINTAINERS
diff --git a/public/fidl/fuchsia.auth/attestation_signer.fidl b/garnet/public/fidl/fuchsia.auth/attestation_signer.fidl similarity index 100% rename from public/fidl/fuchsia.auth/attestation_signer.fidl rename to garnet/public/fidl/fuchsia.auth/attestation_signer.fidl
diff --git a/public/fidl/fuchsia.auth/auth_provider.fidl b/garnet/public/fidl/fuchsia.auth/auth_provider.fidl similarity index 100% rename from public/fidl/fuchsia.auth/auth_provider.fidl rename to garnet/public/fidl/fuchsia.auth/auth_provider.fidl
diff --git a/public/fidl/fuchsia.auth/auth_provider_factory.fidl b/garnet/public/fidl/fuchsia.auth/auth_provider_factory.fidl similarity index 100% rename from public/fidl/fuchsia.auth/auth_provider_factory.fidl rename to garnet/public/fidl/fuchsia.auth/auth_provider_factory.fidl
diff --git a/public/fidl/fuchsia.auth/common.fidl b/garnet/public/fidl/fuchsia.auth/common.fidl similarity index 100% rename from public/fidl/fuchsia.auth/common.fidl rename to garnet/public/fidl/fuchsia.auth/common.fidl
diff --git a/public/fidl/fuchsia.auth/token_manager.fidl b/garnet/public/fidl/fuchsia.auth/token_manager.fidl similarity index 100% rename from public/fidl/fuchsia.auth/token_manager.fidl rename to garnet/public/fidl/fuchsia.auth/token_manager.fidl
diff --git a/public/fidl/fuchsia.bluetooth.bredr/BUILD.gn b/garnet/public/fidl/fuchsia.bluetooth.bredr/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.bluetooth.bredr/BUILD.gn rename to garnet/public/fidl/fuchsia.bluetooth.bredr/BUILD.gn
diff --git a/public/fidl/fuchsia.bluetooth.bredr/profile.fidl b/garnet/public/fidl/fuchsia.bluetooth.bredr/profile.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.bredr/profile.fidl rename to garnet/public/fidl/fuchsia.bluetooth.bredr/profile.fidl
diff --git a/public/fidl/fuchsia.bluetooth.bredr/service.fidl b/garnet/public/fidl/fuchsia.bluetooth.bredr/service.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.bredr/service.fidl rename to garnet/public/fidl/fuchsia.bluetooth.bredr/service.fidl
diff --git a/public/fidl/fuchsia.bluetooth.control/BUILD.gn b/garnet/public/fidl/fuchsia.bluetooth.control/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.bluetooth.control/BUILD.gn rename to garnet/public/fidl/fuchsia.bluetooth.control/BUILD.gn
diff --git a/public/fidl/fuchsia.bluetooth.control/MAINTAINERS b/garnet/public/fidl/fuchsia.bluetooth.control/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.bluetooth.control/MAINTAINERS rename to garnet/public/fidl/fuchsia.bluetooth.control/MAINTAINERS
diff --git a/public/fidl/fuchsia.bluetooth.control/control.fidl b/garnet/public/fidl/fuchsia.bluetooth.control/control.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.control/control.fidl rename to garnet/public/fidl/fuchsia.bluetooth.control/control.fidl
diff --git a/public/fidl/fuchsia.bluetooth.control/pairing_delegate.fidl b/garnet/public/fidl/fuchsia.bluetooth.control/pairing_delegate.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.control/pairing_delegate.fidl rename to garnet/public/fidl/fuchsia.bluetooth.control/pairing_delegate.fidl
diff --git a/public/fidl/fuchsia.bluetooth.control/remote_device.fidl b/garnet/public/fidl/fuchsia.bluetooth.control/remote_device.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.control/remote_device.fidl rename to garnet/public/fidl/fuchsia.bluetooth.control/remote_device.fidl
diff --git a/public/fidl/fuchsia.bluetooth.gatt/BUILD.gn b/garnet/public/fidl/fuchsia.bluetooth.gatt/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.bluetooth.gatt/BUILD.gn rename to garnet/public/fidl/fuchsia.bluetooth.gatt/BUILD.gn
diff --git a/public/fidl/fuchsia.bluetooth.gatt/MAINTAINERS b/garnet/public/fidl/fuchsia.bluetooth.gatt/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.bluetooth.gatt/MAINTAINERS rename to garnet/public/fidl/fuchsia.bluetooth.gatt/MAINTAINERS
diff --git a/public/fidl/fuchsia.bluetooth.gatt/client.fidl b/garnet/public/fidl/fuchsia.bluetooth.gatt/client.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.gatt/client.fidl rename to garnet/public/fidl/fuchsia.bluetooth.gatt/client.fidl
diff --git a/public/fidl/fuchsia.bluetooth.gatt/server.fidl b/garnet/public/fidl/fuchsia.bluetooth.gatt/server.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.gatt/server.fidl rename to garnet/public/fidl/fuchsia.bluetooth.gatt/server.fidl
diff --git a/public/fidl/fuchsia.bluetooth.gatt/types.fidl b/garnet/public/fidl/fuchsia.bluetooth.gatt/types.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.gatt/types.fidl rename to garnet/public/fidl/fuchsia.bluetooth.gatt/types.fidl
diff --git a/public/fidl/fuchsia.bluetooth.le/BUILD.gn b/garnet/public/fidl/fuchsia.bluetooth.le/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.bluetooth.le/BUILD.gn rename to garnet/public/fidl/fuchsia.bluetooth.le/BUILD.gn
diff --git a/public/fidl/fuchsia.bluetooth.le/MAINTAINERS b/garnet/public/fidl/fuchsia.bluetooth.le/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.bluetooth.le/MAINTAINERS rename to garnet/public/fidl/fuchsia.bluetooth.le/MAINTAINERS
diff --git a/public/fidl/fuchsia.bluetooth.le/central.fidl b/garnet/public/fidl/fuchsia.bluetooth.le/central.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.le/central.fidl rename to garnet/public/fidl/fuchsia.bluetooth.le/central.fidl
diff --git a/public/fidl/fuchsia.bluetooth.le/peripheral.fidl b/garnet/public/fidl/fuchsia.bluetooth.le/peripheral.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.le/peripheral.fidl rename to garnet/public/fidl/fuchsia.bluetooth.le/peripheral.fidl
diff --git a/public/fidl/fuchsia.bluetooth.le/types.fidl b/garnet/public/fidl/fuchsia.bluetooth.le/types.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.le/types.fidl rename to garnet/public/fidl/fuchsia.bluetooth.le/types.fidl
diff --git a/public/fidl/fuchsia.bluetooth.snoop/BUILD.gn b/garnet/public/fidl/fuchsia.bluetooth.snoop/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.bluetooth.snoop/BUILD.gn rename to garnet/public/fidl/fuchsia.bluetooth.snoop/BUILD.gn
diff --git a/public/fidl/fuchsia.bluetooth.snoop/snooper.fidl b/garnet/public/fidl/fuchsia.bluetooth.snoop/snooper.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth.snoop/snooper.fidl rename to garnet/public/fidl/fuchsia.bluetooth.snoop/snooper.fidl
diff --git a/public/fidl/fuchsia.bluetooth/BUILD.gn b/garnet/public/fidl/fuchsia.bluetooth/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.bluetooth/BUILD.gn rename to garnet/public/fidl/fuchsia.bluetooth/BUILD.gn
diff --git a/public/fidl/fuchsia.bluetooth/MAINTAINERS b/garnet/public/fidl/fuchsia.bluetooth/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.bluetooth/MAINTAINERS rename to garnet/public/fidl/fuchsia.bluetooth/MAINTAINERS
diff --git a/public/fidl/fuchsia.bluetooth/nullables.fidl b/garnet/public/fidl/fuchsia.bluetooth/nullables.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth/nullables.fidl rename to garnet/public/fidl/fuchsia.bluetooth/nullables.fidl
diff --git a/public/fidl/fuchsia.bluetooth/status.fidl b/garnet/public/fidl/fuchsia.bluetooth/status.fidl similarity index 100% rename from public/fidl/fuchsia.bluetooth/status.fidl rename to garnet/public/fidl/fuchsia.bluetooth/status.fidl
diff --git a/public/fidl/fuchsia.camera/BUILD.gn b/garnet/public/fidl/fuchsia.camera/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.camera/BUILD.gn rename to garnet/public/fidl/fuchsia.camera/BUILD.gn
diff --git a/public/fidl/fuchsia.camera/camera.fidl b/garnet/public/fidl/fuchsia.camera/camera.fidl similarity index 100% rename from public/fidl/fuchsia.camera/camera.fidl rename to garnet/public/fidl/fuchsia.camera/camera.fidl
diff --git a/public/fidl/fuchsia.camera/manager.fidl b/garnet/public/fidl/fuchsia.camera/manager.fidl similarity index 100% rename from public/fidl/fuchsia.camera/manager.fidl rename to garnet/public/fidl/fuchsia.camera/manager.fidl
diff --git a/public/fidl/fuchsia.data/BUILD.gn b/garnet/public/fidl/fuchsia.data/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.data/BUILD.gn rename to garnet/public/fidl/fuchsia.data/BUILD.gn
diff --git a/public/fidl/fuchsia.data/data.fidl b/garnet/public/fidl/fuchsia.data/data.fidl similarity index 100% rename from public/fidl/fuchsia.data/data.fidl rename to garnet/public/fidl/fuchsia.data/data.fidl
diff --git a/public/fidl/fuchsia.developer.tiles/BUILD.gn b/garnet/public/fidl/fuchsia.developer.tiles/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.developer.tiles/BUILD.gn rename to garnet/public/fidl/fuchsia.developer.tiles/BUILD.gn
diff --git a/public/fidl/fuchsia.developer.tiles/tiles.fidl b/garnet/public/fidl/fuchsia.developer.tiles/tiles.fidl similarity index 100% rename from public/fidl/fuchsia.developer.tiles/tiles.fidl rename to garnet/public/fidl/fuchsia.developer.tiles/tiles.fidl
diff --git a/public/fidl/fuchsia.device.display/BUILD.gn b/garnet/public/fidl/fuchsia.device.display/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.device.display/BUILD.gn rename to garnet/public/fidl/fuchsia.device.display/BUILD.gn
diff --git a/public/fidl/fuchsia.device.display/display.fidl b/garnet/public/fidl/fuchsia.device.display/display.fidl similarity index 100% rename from public/fidl/fuchsia.device.display/display.fidl rename to garnet/public/fidl/fuchsia.device.display/display.fidl
diff --git a/public/fidl/fuchsia.devicesettings/BUILD.gn b/garnet/public/fidl/fuchsia.devicesettings/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.devicesettings/BUILD.gn rename to garnet/public/fidl/fuchsia.devicesettings/BUILD.gn
diff --git a/public/fidl/fuchsia.devicesettings/devicesettings.fidl b/garnet/public/fidl/fuchsia.devicesettings/devicesettings.fidl similarity index 100% rename from public/fidl/fuchsia.devicesettings/devicesettings.fidl rename to garnet/public/fidl/fuchsia.devicesettings/devicesettings.fidl
diff --git a/public/fidl/fuchsia.fonts/BUILD.gn b/garnet/public/fidl/fuchsia.fonts/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.fonts/BUILD.gn rename to garnet/public/fidl/fuchsia.fonts/BUILD.gn
diff --git a/public/fidl/fuchsia.fonts/font_provider.fidl b/garnet/public/fidl/fuchsia.fonts/font_provider.fidl similarity index 100% rename from public/fidl/fuchsia.fonts/font_provider.fidl rename to garnet/public/fidl/fuchsia.fonts/font_provider.fidl
diff --git a/public/fidl/fuchsia.game.tennis/BUILD.gn b/garnet/public/fidl/fuchsia.game.tennis/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.game.tennis/BUILD.gn rename to garnet/public/fidl/fuchsia.game.tennis/BUILD.gn
diff --git a/public/fidl/fuchsia.game.tennis/tennis.fidl b/garnet/public/fidl/fuchsia.game.tennis/tennis.fidl similarity index 100% rename from public/fidl/fuchsia.game.tennis/tennis.fidl rename to garnet/public/fidl/fuchsia.game.tennis/tennis.fidl
diff --git a/public/fidl/fuchsia.guest/BUILD.gn b/garnet/public/fidl/fuchsia.guest/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.guest/BUILD.gn rename to garnet/public/fidl/fuchsia.guest/BUILD.gn
diff --git a/public/fidl/fuchsia.guest/balloon_controller.fidl b/garnet/public/fidl/fuchsia.guest/balloon_controller.fidl similarity index 100% rename from public/fidl/fuchsia.guest/balloon_controller.fidl rename to garnet/public/fidl/fuchsia.guest/balloon_controller.fidl
diff --git a/public/fidl/fuchsia.guest/environment_controller.fidl b/garnet/public/fidl/fuchsia.guest/environment_controller.fidl similarity index 100% rename from public/fidl/fuchsia.guest/environment_controller.fidl rename to garnet/public/fidl/fuchsia.guest/environment_controller.fidl
diff --git a/public/fidl/fuchsia.guest/environment_manager.fidl b/garnet/public/fidl/fuchsia.guest/environment_manager.fidl similarity index 100% rename from public/fidl/fuchsia.guest/environment_manager.fidl rename to garnet/public/fidl/fuchsia.guest/environment_manager.fidl
diff --git a/public/fidl/fuchsia.guest/instance_controller.fidl b/garnet/public/fidl/fuchsia.guest/instance_controller.fidl similarity index 100% rename from public/fidl/fuchsia.guest/instance_controller.fidl rename to garnet/public/fidl/fuchsia.guest/instance_controller.fidl
diff --git a/public/fidl/fuchsia.guest/vsock.fidl b/garnet/public/fidl/fuchsia.guest/vsock.fidl similarity index 100% rename from public/fidl/fuchsia.guest/vsock.fidl rename to garnet/public/fidl/fuchsia.guest/vsock.fidl
diff --git a/public/fidl/fuchsia.images/BUILD.gn b/garnet/public/fidl/fuchsia.images/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.images/BUILD.gn rename to garnet/public/fidl/fuchsia.images/BUILD.gn
diff --git a/public/fidl/fuchsia.images/encoded_image.fidl b/garnet/public/fidl/fuchsia.images/encoded_image.fidl similarity index 100% rename from public/fidl/fuchsia.images/encoded_image.fidl rename to garnet/public/fidl/fuchsia.images/encoded_image.fidl
diff --git a/public/fidl/fuchsia.images/image_info.fidl b/garnet/public/fidl/fuchsia.images/image_info.fidl similarity index 100% rename from public/fidl/fuchsia.images/image_info.fidl rename to garnet/public/fidl/fuchsia.images/image_info.fidl
diff --git a/public/fidl/fuchsia.images/image_pipe.fidl b/garnet/public/fidl/fuchsia.images/image_pipe.fidl similarity index 100% rename from public/fidl/fuchsia.images/image_pipe.fidl rename to garnet/public/fidl/fuchsia.images/image_pipe.fidl
diff --git a/public/fidl/fuchsia.images/memory_type.fidl b/garnet/public/fidl/fuchsia.images/memory_type.fidl similarity index 100% rename from public/fidl/fuchsia.images/memory_type.fidl rename to garnet/public/fidl/fuchsia.images/memory_type.fidl
diff --git a/public/fidl/fuchsia.images/presentation_info.fidl b/garnet/public/fidl/fuchsia.images/presentation_info.fidl similarity index 100% rename from public/fidl/fuchsia.images/presentation_info.fidl rename to garnet/public/fidl/fuchsia.images/presentation_info.fidl
diff --git a/public/fidl/fuchsia.intl/BUILD.gn b/garnet/public/fidl/fuchsia.intl/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.intl/BUILD.gn rename to garnet/public/fidl/fuchsia.intl/BUILD.gn
diff --git a/public/fidl/fuchsia.intl/intl.fidl b/garnet/public/fidl/fuchsia.intl/intl.fidl similarity index 100% rename from public/fidl/fuchsia.intl/intl.fidl rename to garnet/public/fidl/fuchsia.intl/intl.fidl
diff --git a/public/fidl/fuchsia.math/BUILD.gn b/garnet/public/fidl/fuchsia.math/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.math/BUILD.gn rename to garnet/public/fidl/fuchsia.math/BUILD.gn
diff --git a/public/fidl/fuchsia.math/math.fidl b/garnet/public/fidl/fuchsia.math/math.fidl similarity index 100% rename from public/fidl/fuchsia.math/math.fidl rename to garnet/public/fidl/fuchsia.math/math.fidl
diff --git a/public/fidl/fuchsia.mdns/BUILD.gn b/garnet/public/fidl/fuchsia.mdns/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.mdns/BUILD.gn rename to garnet/public/fidl/fuchsia.mdns/BUILD.gn
diff --git a/public/fidl/fuchsia.mdns/mdns.fidl b/garnet/public/fidl/fuchsia.mdns/mdns.fidl similarity index 100% rename from public/fidl/fuchsia.mdns/mdns.fidl rename to garnet/public/fidl/fuchsia.mdns/mdns.fidl
diff --git a/public/fidl/fuchsia.media/BUILD.gn b/garnet/public/fidl/fuchsia.media/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.media/BUILD.gn rename to garnet/public/fidl/fuchsia.media/BUILD.gn
diff --git a/public/fidl/fuchsia.media/audio.fidl b/garnet/public/fidl/fuchsia.media/audio.fidl similarity index 100% rename from public/fidl/fuchsia.media/audio.fidl rename to garnet/public/fidl/fuchsia.media/audio.fidl
diff --git a/public/fidl/fuchsia.media/audio_capturer.fidl b/garnet/public/fidl/fuchsia.media/audio_capturer.fidl similarity index 100% rename from public/fidl/fuchsia.media/audio_capturer.fidl rename to garnet/public/fidl/fuchsia.media/audio_capturer.fidl
diff --git a/public/fidl/fuchsia.media/audio_core.fidl b/garnet/public/fidl/fuchsia.media/audio_core.fidl similarity index 100% rename from public/fidl/fuchsia.media/audio_core.fidl rename to garnet/public/fidl/fuchsia.media/audio_core.fidl
diff --git a/public/fidl/fuchsia.media/audio_device_enumerator.fidl b/garnet/public/fidl/fuchsia.media/audio_device_enumerator.fidl similarity index 100% rename from public/fidl/fuchsia.media/audio_device_enumerator.fidl rename to garnet/public/fidl/fuchsia.media/audio_device_enumerator.fidl
diff --git a/public/fidl/fuchsia.media/audio_renderer.fidl b/garnet/public/fidl/fuchsia.media/audio_renderer.fidl similarity index 100% rename from public/fidl/fuchsia.media/audio_renderer.fidl rename to garnet/public/fidl/fuchsia.media/audio_renderer.fidl
diff --git a/public/fidl/fuchsia.media/content_decryption.fidl b/garnet/public/fidl/fuchsia.media/content_decryption.fidl similarity index 100% rename from public/fidl/fuchsia.media/content_decryption.fidl rename to garnet/public/fidl/fuchsia.media/content_decryption.fidl
diff --git a/public/fidl/fuchsia.media/gain_control.fidl b/garnet/public/fidl/fuchsia.media/gain_control.fidl similarity index 100% rename from public/fidl/fuchsia.media/gain_control.fidl rename to garnet/public/fidl/fuchsia.media/gain_control.fidl
diff --git a/public/fidl/fuchsia.media/stream.fidl b/garnet/public/fidl/fuchsia.media/stream.fidl similarity index 100% rename from public/fidl/fuchsia.media/stream.fidl rename to garnet/public/fidl/fuchsia.media/stream.fidl
diff --git a/public/fidl/fuchsia.media/stream_common.fidl b/garnet/public/fidl/fuchsia.media/stream_common.fidl similarity index 100% rename from public/fidl/fuchsia.media/stream_common.fidl rename to garnet/public/fidl/fuchsia.media/stream_common.fidl
diff --git a/public/fidl/fuchsia.media/stream_processor.fidl b/garnet/public/fidl/fuchsia.media/stream_processor.fidl similarity index 100% rename from public/fidl/fuchsia.media/stream_processor.fidl rename to garnet/public/fidl/fuchsia.media/stream_processor.fidl
diff --git a/public/fidl/fuchsia.media/stream_type.fidl b/garnet/public/fidl/fuchsia.media/stream_type.fidl similarity index 100% rename from public/fidl/fuchsia.media/stream_type.fidl rename to garnet/public/fidl/fuchsia.media/stream_type.fidl
diff --git a/public/fidl/fuchsia.mediacodec/BUILD.gn b/garnet/public/fidl/fuchsia.mediacodec/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.mediacodec/BUILD.gn rename to garnet/public/fidl/fuchsia.mediacodec/BUILD.gn
diff --git a/public/fidl/fuchsia.mediacodec/codec.fidl b/garnet/public/fidl/fuchsia.mediacodec/codec.fidl similarity index 100% rename from public/fidl/fuchsia.mediacodec/codec.fidl rename to garnet/public/fidl/fuchsia.mediacodec/codec.fidl
diff --git a/public/fidl/fuchsia.mediacodec/codec_common.fidl b/garnet/public/fidl/fuchsia.mediacodec/codec_common.fidl similarity index 100% rename from public/fidl/fuchsia.mediacodec/codec_common.fidl rename to garnet/public/fidl/fuchsia.mediacodec/codec_common.fidl
diff --git a/public/fidl/fuchsia.mediacodec/codec_factory.fidl b/garnet/public/fidl/fuchsia.mediacodec/codec_factory.fidl similarity index 100% rename from public/fidl/fuchsia.mediacodec/codec_factory.fidl rename to garnet/public/fidl/fuchsia.mediacodec/codec_factory.fidl
diff --git a/public/fidl/fuchsia.mediaplayer/BUILD.gn b/garnet/public/fidl/fuchsia.mediaplayer/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.mediaplayer/BUILD.gn rename to garnet/public/fidl/fuchsia.mediaplayer/BUILD.gn
diff --git a/public/fidl/fuchsia.mediaplayer/metadata.fidl b/garnet/public/fidl/fuchsia.mediaplayer/metadata.fidl similarity index 100% rename from public/fidl/fuchsia.mediaplayer/metadata.fidl rename to garnet/public/fidl/fuchsia.mediaplayer/metadata.fidl
diff --git a/public/fidl/fuchsia.mediaplayer/player.fidl b/garnet/public/fidl/fuchsia.mediaplayer/player.fidl similarity index 100% rename from public/fidl/fuchsia.mediaplayer/player.fidl rename to garnet/public/fidl/fuchsia.mediaplayer/player.fidl
diff --git a/public/fidl/fuchsia.mediaplayer/problem.fidl b/garnet/public/fidl/fuchsia.mediaplayer/problem.fidl similarity index 100% rename from public/fidl/fuchsia.mediaplayer/problem.fidl rename to garnet/public/fidl/fuchsia.mediaplayer/problem.fidl
diff --git a/public/fidl/fuchsia.mediaplayer/seeking_reader.fidl b/garnet/public/fidl/fuchsia.mediaplayer/seeking_reader.fidl similarity index 100% rename from public/fidl/fuchsia.mediaplayer/seeking_reader.fidl rename to garnet/public/fidl/fuchsia.mediaplayer/seeking_reader.fidl
diff --git a/public/fidl/fuchsia.mediaplayer/sink_manager.fidl b/garnet/public/fidl/fuchsia.mediaplayer/sink_manager.fidl similarity index 100% rename from public/fidl/fuchsia.mediaplayer/sink_manager.fidl rename to garnet/public/fidl/fuchsia.mediaplayer/sink_manager.fidl
diff --git a/public/fidl/fuchsia.mediaplayer/source_manager.fidl b/garnet/public/fidl/fuchsia.mediaplayer/source_manager.fidl similarity index 100% rename from public/fidl/fuchsia.mediaplayer/source_manager.fidl rename to garnet/public/fidl/fuchsia.mediaplayer/source_manager.fidl
diff --git a/public/fidl/fuchsia.mediaplayer/timeline_function.fidl b/garnet/public/fidl/fuchsia.mediaplayer/timeline_function.fidl similarity index 100% rename from public/fidl/fuchsia.mediaplayer/timeline_function.fidl rename to garnet/public/fidl/fuchsia.mediaplayer/timeline_function.fidl
diff --git a/public/fidl/fuchsia.mediasession/BUILD.gn b/garnet/public/fidl/fuchsia.mediasession/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.mediasession/BUILD.gn rename to garnet/public/fidl/fuchsia.mediasession/BUILD.gn
diff --git a/public/fidl/fuchsia.mediasession/controller.fidl b/garnet/public/fidl/fuchsia.mediasession/controller.fidl similarity index 100% rename from public/fidl/fuchsia.mediasession/controller.fidl rename to garnet/public/fidl/fuchsia.mediasession/controller.fidl
diff --git a/public/fidl/fuchsia.mediasession/observer.fidl b/garnet/public/fidl/fuchsia.mediasession/observer.fidl similarity index 100% rename from public/fidl/fuchsia.mediasession/observer.fidl rename to garnet/public/fidl/fuchsia.mediasession/observer.fidl
diff --git a/public/fidl/fuchsia.mediasession/playback_capabilities.fidl b/garnet/public/fidl/fuchsia.mediasession/playback_capabilities.fidl similarity index 100% rename from public/fidl/fuchsia.mediasession/playback_capabilities.fidl rename to garnet/public/fidl/fuchsia.mediasession/playback_capabilities.fidl
diff --git a/public/fidl/fuchsia.mediasession/playback_status.fidl b/garnet/public/fidl/fuchsia.mediasession/playback_status.fidl similarity index 100% rename from public/fidl/fuchsia.mediasession/playback_status.fidl rename to garnet/public/fidl/fuchsia.mediasession/playback_status.fidl
diff --git a/public/fidl/fuchsia.mediasession/service.fidl b/garnet/public/fidl/fuchsia.mediasession/service.fidl similarity index 100% rename from public/fidl/fuchsia.mediasession/service.fidl rename to garnet/public/fidl/fuchsia.mediasession/service.fidl
diff --git a/public/fidl/fuchsia.memory/BUILD.gn b/garnet/public/fidl/fuchsia.memory/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.memory/BUILD.gn rename to garnet/public/fidl/fuchsia.memory/BUILD.gn
diff --git a/public/fidl/fuchsia.memory/monitor.fidl b/garnet/public/fidl/fuchsia.memory/monitor.fidl similarity index 100% rename from public/fidl/fuchsia.memory/monitor.fidl rename to garnet/public/fidl/fuchsia.memory/monitor.fidl
diff --git a/public/fidl/fuchsia.net.dns/BUILD.gn b/garnet/public/fidl/fuchsia.net.dns/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.net.dns/BUILD.gn rename to garnet/public/fidl/fuchsia.net.dns/BUILD.gn
diff --git a/public/fidl/fuchsia.net.dns/dns.fidl b/garnet/public/fidl/fuchsia.net.dns/dns.fidl similarity index 100% rename from public/fidl/fuchsia.net.dns/dns.fidl rename to garnet/public/fidl/fuchsia.net.dns/dns.fidl
diff --git a/public/fidl/fuchsia.net.filter/BUILD.gn b/garnet/public/fidl/fuchsia.net.filter/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.net.filter/BUILD.gn rename to garnet/public/fidl/fuchsia.net.filter/BUILD.gn
diff --git a/public/fidl/fuchsia.net.filter/commands.fidl b/garnet/public/fidl/fuchsia.net.filter/commands.fidl similarity index 100% rename from public/fidl/fuchsia.net.filter/commands.fidl rename to garnet/public/fidl/fuchsia.net.filter/commands.fidl
diff --git a/public/fidl/fuchsia.net.filter/ruleset.fidl b/garnet/public/fidl/fuchsia.net.filter/ruleset.fidl similarity index 100% rename from public/fidl/fuchsia.net.filter/ruleset.fidl rename to garnet/public/fidl/fuchsia.net.filter/ruleset.fidl
diff --git a/public/fidl/fuchsia.net.http/BUILD.gn b/garnet/public/fidl/fuchsia.net.http/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.net.http/BUILD.gn rename to garnet/public/fidl/fuchsia.net.http/BUILD.gn
diff --git a/public/fidl/fuchsia.net.http/client.fidl b/garnet/public/fidl/fuchsia.net.http/client.fidl similarity index 100% rename from public/fidl/fuchsia.net.http/client.fidl rename to garnet/public/fidl/fuchsia.net.http/client.fidl
diff --git a/public/fidl/fuchsia.net.oldhttp/BUILD.gn b/garnet/public/fidl/fuchsia.net.oldhttp/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/BUILD.gn rename to garnet/public/fidl/fuchsia.net.oldhttp/BUILD.gn
diff --git a/public/fidl/fuchsia.net.oldhttp/http_error.fidl b/garnet/public/fidl/fuchsia.net.oldhttp/http_error.fidl similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/http_error.fidl rename to garnet/public/fidl/fuchsia.net.oldhttp/http_error.fidl
diff --git a/public/fidl/fuchsia.net.oldhttp/http_header.fidl b/garnet/public/fidl/fuchsia.net.oldhttp/http_header.fidl similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/http_header.fidl rename to garnet/public/fidl/fuchsia.net.oldhttp/http_header.fidl
diff --git a/public/fidl/fuchsia.net.oldhttp/http_service.fidl b/garnet/public/fidl/fuchsia.net.oldhttp/http_service.fidl similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/http_service.fidl rename to garnet/public/fidl/fuchsia.net.oldhttp/http_service.fidl
diff --git a/public/fidl/fuchsia.net.oldhttp/url_body.fidl b/garnet/public/fidl/fuchsia.net.oldhttp/url_body.fidl similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/url_body.fidl rename to garnet/public/fidl/fuchsia.net.oldhttp/url_body.fidl
diff --git a/public/fidl/fuchsia.net.oldhttp/url_loader.fidl b/garnet/public/fidl/fuchsia.net.oldhttp/url_loader.fidl similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/url_loader.fidl rename to garnet/public/fidl/fuchsia.net.oldhttp/url_loader.fidl
diff --git a/public/fidl/fuchsia.net.oldhttp/url_request.fidl b/garnet/public/fidl/fuchsia.net.oldhttp/url_request.fidl similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/url_request.fidl rename to garnet/public/fidl/fuchsia.net.oldhttp/url_request.fidl
diff --git a/public/fidl/fuchsia.net.oldhttp/url_response.fidl b/garnet/public/fidl/fuchsia.net.oldhttp/url_response.fidl similarity index 100% rename from public/fidl/fuchsia.net.oldhttp/url_response.fidl rename to garnet/public/fidl/fuchsia.net.oldhttp/url_response.fidl
diff --git a/public/fidl/fuchsia.net.policy/BUILD.gn b/garnet/public/fidl/fuchsia.net.policy/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.net.policy/BUILD.gn rename to garnet/public/fidl/fuchsia.net.policy/BUILD.gn
diff --git a/public/fidl/fuchsia.net.policy/policy.fidl b/garnet/public/fidl/fuchsia.net.policy/policy.fidl similarity index 100% rename from public/fidl/fuchsia.net.policy/policy.fidl rename to garnet/public/fidl/fuchsia.net.policy/policy.fidl
diff --git a/public/fidl/fuchsia.netconnector/BUILD.gn b/garnet/public/fidl/fuchsia.netconnector/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.netconnector/BUILD.gn rename to garnet/public/fidl/fuchsia.netconnector/BUILD.gn
diff --git a/public/fidl/fuchsia.netconnector/netconnector.fidl b/garnet/public/fidl/fuchsia.netconnector/netconnector.fidl similarity index 100% rename from public/fidl/fuchsia.netconnector/netconnector.fidl rename to garnet/public/fidl/fuchsia.netconnector/netconnector.fidl
diff --git a/public/fidl/fuchsia.netstack/BUILD.gn b/garnet/public/fidl/fuchsia.netstack/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.netstack/BUILD.gn rename to garnet/public/fidl/fuchsia.netstack/BUILD.gn
diff --git a/public/fidl/fuchsia.netstack/netstack.fidl b/garnet/public/fidl/fuchsia.netstack/netstack.fidl similarity index 100% rename from public/fidl/fuchsia.netstack/netstack.fidl rename to garnet/public/fidl/fuchsia.netstack/netstack.fidl
diff --git a/public/fidl/fuchsia.overnet.protocol/BUILD.gn b/garnet/public/fidl/fuchsia.overnet.protocol/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.overnet.protocol/BUILD.gn rename to garnet/public/fidl/fuchsia.overnet.protocol/BUILD.gn
diff --git a/public/fidl/fuchsia.overnet.protocol/forking.fidl b/garnet/public/fidl/fuchsia.overnet.protocol/forking.fidl similarity index 100% rename from public/fidl/fuchsia.overnet.protocol/forking.fidl rename to garnet/public/fidl/fuchsia.overnet.protocol/forking.fidl
diff --git a/public/fidl/fuchsia.overnet.protocol/labels.fidl b/garnet/public/fidl/fuchsia.overnet.protocol/labels.fidl similarity index 100% rename from public/fidl/fuchsia.overnet.protocol/labels.fidl rename to garnet/public/fidl/fuchsia.overnet.protocol/labels.fidl
diff --git a/public/fidl/fuchsia.overnet.protocol/routing.fidl b/garnet/public/fidl/fuchsia.overnet.protocol/routing.fidl similarity index 100% rename from public/fidl/fuchsia.overnet.protocol/routing.fidl rename to garnet/public/fidl/fuchsia.overnet.protocol/routing.fidl
diff --git a/public/fidl/fuchsia.overnet/BUILD.gn b/garnet/public/fidl/fuchsia.overnet/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.overnet/BUILD.gn rename to garnet/public/fidl/fuchsia.overnet/BUILD.gn
diff --git a/public/fidl/fuchsia.overnet/overnet.fidl b/garnet/public/fidl/fuchsia.overnet/overnet.fidl similarity index 100% rename from public/fidl/fuchsia.overnet/overnet.fidl rename to garnet/public/fidl/fuchsia.overnet/overnet.fidl
diff --git a/public/fidl/fuchsia.pkg/BUILD.gn b/garnet/public/fidl/fuchsia.pkg/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.pkg/BUILD.gn rename to garnet/public/fidl/fuchsia.pkg/BUILD.gn
diff --git a/public/fidl/fuchsia.pkg/MAINTAINERS b/garnet/public/fidl/fuchsia.pkg/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.pkg/MAINTAINERS rename to garnet/public/fidl/fuchsia.pkg/MAINTAINERS
diff --git a/public/fidl/fuchsia.pkg/cache.fidl b/garnet/public/fidl/fuchsia.pkg/cache.fidl similarity index 100% rename from public/fidl/fuchsia.pkg/cache.fidl rename to garnet/public/fidl/fuchsia.pkg/cache.fidl
diff --git a/public/fidl/fuchsia.pkg/common.fidl b/garnet/public/fidl/fuchsia.pkg/common.fidl similarity index 100% rename from public/fidl/fuchsia.pkg/common.fidl rename to garnet/public/fidl/fuchsia.pkg/common.fidl
diff --git a/public/fidl/fuchsia.pkg/repo.fidl b/garnet/public/fidl/fuchsia.pkg/repo.fidl similarity index 100% rename from public/fidl/fuchsia.pkg/repo.fidl rename to garnet/public/fidl/fuchsia.pkg/repo.fidl
diff --git a/public/fidl/fuchsia.pkg/resolver.fidl b/garnet/public/fidl/fuchsia.pkg/resolver.fidl similarity index 100% rename from public/fidl/fuchsia.pkg/resolver.fidl rename to garnet/public/fidl/fuchsia.pkg/resolver.fidl
diff --git a/public/fidl/fuchsia.pkg/system_blob_admin.fidl b/garnet/public/fidl/fuchsia.pkg/system_blob_admin.fidl similarity index 100% rename from public/fidl/fuchsia.pkg/system_blob_admin.fidl rename to garnet/public/fidl/fuchsia.pkg/system_blob_admin.fidl
diff --git a/public/fidl/fuchsia.power/BUILD.gn b/garnet/public/fidl/fuchsia.power/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.power/BUILD.gn rename to garnet/public/fidl/fuchsia.power/BUILD.gn
diff --git a/public/fidl/fuchsia.power/power.fidl b/garnet/public/fidl/fuchsia.power/power.fidl similarity index 100% rename from public/fidl/fuchsia.power/power.fidl rename to garnet/public/fidl/fuchsia.power/power.fidl
diff --git a/public/fidl/fuchsia.scpi/BUILD.gn b/garnet/public/fidl/fuchsia.scpi/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.scpi/BUILD.gn rename to garnet/public/fidl/fuchsia.scpi/BUILD.gn
diff --git a/public/fidl/fuchsia.scpi/scpi.fidl b/garnet/public/fidl/fuchsia.scpi/scpi.fidl similarity index 100% rename from public/fidl/fuchsia.scpi/scpi.fidl rename to garnet/public/fidl/fuchsia.scpi/scpi.fidl
diff --git a/public/fidl/fuchsia.setui/BUILD.gn b/garnet/public/fidl/fuchsia.setui/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.setui/BUILD.gn rename to garnet/public/fidl/fuchsia.setui/BUILD.gn
diff --git a/public/fidl/fuchsia.setui/MAINTAINERS b/garnet/public/fidl/fuchsia.setui/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.setui/MAINTAINERS rename to garnet/public/fidl/fuchsia.setui/MAINTAINERS
diff --git a/public/fidl/fuchsia.setui/mutations.fidl b/garnet/public/fidl/fuchsia.setui/mutations.fidl similarity index 100% rename from public/fidl/fuchsia.setui/mutations.fidl rename to garnet/public/fidl/fuchsia.setui/mutations.fidl
diff --git a/public/fidl/fuchsia.setui/service.fidl b/garnet/public/fidl/fuchsia.setui/service.fidl similarity index 100% rename from public/fidl/fuchsia.setui/service.fidl rename to garnet/public/fidl/fuchsia.setui/service.fidl
diff --git a/public/fidl/fuchsia.setui/types.fidl b/garnet/public/fidl/fuchsia.setui/types.fidl similarity index 100% rename from public/fidl/fuchsia.setui/types.fidl rename to garnet/public/fidl/fuchsia.setui/types.fidl
diff --git a/public/fidl/fuchsia.simplecamera/BUILD.gn b/garnet/public/fidl/fuchsia.simplecamera/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.simplecamera/BUILD.gn rename to garnet/public/fidl/fuchsia.simplecamera/BUILD.gn
diff --git a/public/fidl/fuchsia.simplecamera/simple_camera.fidl b/garnet/public/fidl/fuchsia.simplecamera/simple_camera.fidl similarity index 100% rename from public/fidl/fuchsia.simplecamera/simple_camera.fidl rename to garnet/public/fidl/fuchsia.simplecamera/simple_camera.fidl
diff --git a/public/fidl/fuchsia.stash/BUILD.gn b/garnet/public/fidl/fuchsia.stash/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.stash/BUILD.gn rename to garnet/public/fidl/fuchsia.stash/BUILD.gn
diff --git a/public/fidl/fuchsia.stash/stash.fidl b/garnet/public/fidl/fuchsia.stash/stash.fidl similarity index 100% rename from public/fidl/fuchsia.stash/stash.fidl rename to garnet/public/fidl/fuchsia.stash/stash.fidl
diff --git a/public/fidl/fuchsia.sys/BUILD.gn b/garnet/public/fidl/fuchsia.sys/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.sys/BUILD.gn rename to garnet/public/fidl/fuchsia.sys/BUILD.gn
diff --git a/public/fidl/fuchsia.sys/component_controller.fidl b/garnet/public/fidl/fuchsia.sys/component_controller.fidl similarity index 100% rename from public/fidl/fuchsia.sys/component_controller.fidl rename to garnet/public/fidl/fuchsia.sys/component_controller.fidl
diff --git a/public/fidl/fuchsia.sys/environment.fidl b/garnet/public/fidl/fuchsia.sys/environment.fidl similarity index 100% rename from public/fidl/fuchsia.sys/environment.fidl rename to garnet/public/fidl/fuchsia.sys/environment.fidl
diff --git a/public/fidl/fuchsia.sys/environment_controller.fidl b/garnet/public/fidl/fuchsia.sys/environment_controller.fidl similarity index 100% rename from public/fidl/fuchsia.sys/environment_controller.fidl rename to garnet/public/fidl/fuchsia.sys/environment_controller.fidl
diff --git a/public/fidl/fuchsia.sys/flat_namespace.fidl b/garnet/public/fidl/fuchsia.sys/flat_namespace.fidl similarity index 100% rename from public/fidl/fuchsia.sys/flat_namespace.fidl rename to garnet/public/fidl/fuchsia.sys/flat_namespace.fidl
diff --git a/public/fidl/fuchsia.sys/job_provider.fidl b/garnet/public/fidl/fuchsia.sys/job_provider.fidl similarity index 100% rename from public/fidl/fuchsia.sys/job_provider.fidl rename to garnet/public/fidl/fuchsia.sys/job_provider.fidl
diff --git a/public/fidl/fuchsia.sys/launcher.fidl b/garnet/public/fidl/fuchsia.sys/launcher.fidl similarity index 100% rename from public/fidl/fuchsia.sys/launcher.fidl rename to garnet/public/fidl/fuchsia.sys/launcher.fidl
diff --git a/public/fidl/fuchsia.sys/loader.fidl b/garnet/public/fidl/fuchsia.sys/loader.fidl similarity index 100% rename from public/fidl/fuchsia.sys/loader.fidl rename to garnet/public/fidl/fuchsia.sys/loader.fidl
diff --git a/public/fidl/fuchsia.sys/runner.fidl b/garnet/public/fidl/fuchsia.sys/runner.fidl similarity index 100% rename from public/fidl/fuchsia.sys/runner.fidl rename to garnet/public/fidl/fuchsia.sys/runner.fidl
diff --git a/public/fidl/fuchsia.sys/service_provider.fidl b/garnet/public/fidl/fuchsia.sys/service_provider.fidl similarity index 100% rename from public/fidl/fuchsia.sys/service_provider.fidl rename to garnet/public/fidl/fuchsia.sys/service_provider.fidl
diff --git a/public/fidl/fuchsia.sys2/BUILD.gn b/garnet/public/fidl/fuchsia.sys2/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.sys2/BUILD.gn rename to garnet/public/fidl/fuchsia.sys2/BUILD.gn
diff --git a/public/fidl/fuchsia.sys2/constants.fidl b/garnet/public/fidl/fuchsia.sys2/constants.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/constants.fidl rename to garnet/public/fidl/fuchsia.sys2/constants.fidl
diff --git a/public/fidl/fuchsia.sys2/decls/capability.fidl b/garnet/public/fidl/fuchsia.sys2/decls/capability.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/decls/capability.fidl rename to garnet/public/fidl/fuchsia.sys2/decls/capability.fidl
diff --git a/public/fidl/fuchsia.sys2/decls/child_decl.fidl b/garnet/public/fidl/fuchsia.sys2/decls/child_decl.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/decls/child_decl.fidl rename to garnet/public/fidl/fuchsia.sys2/decls/child_decl.fidl
diff --git a/public/fidl/fuchsia.sys2/decls/component_decl.fidl b/garnet/public/fidl/fuchsia.sys2/decls/component_decl.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/decls/component_decl.fidl rename to garnet/public/fidl/fuchsia.sys2/decls/component_decl.fidl
diff --git a/public/fidl/fuchsia.sys2/decls/expose_decl.fidl b/garnet/public/fidl/fuchsia.sys2/decls/expose_decl.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/decls/expose_decl.fidl rename to garnet/public/fidl/fuchsia.sys2/decls/expose_decl.fidl
diff --git a/public/fidl/fuchsia.sys2/decls/offer_decl.fidl b/garnet/public/fidl/fuchsia.sys2/decls/offer_decl.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/decls/offer_decl.fidl rename to garnet/public/fidl/fuchsia.sys2/decls/offer_decl.fidl
diff --git a/public/fidl/fuchsia.sys2/decls/relative_id.fidl b/garnet/public/fidl/fuchsia.sys2/decls/relative_id.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/decls/relative_id.fidl rename to garnet/public/fidl/fuchsia.sys2/decls/relative_id.fidl
diff --git a/public/fidl/fuchsia.sys2/decls/use_decl.fidl b/garnet/public/fidl/fuchsia.sys2/decls/use_decl.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/decls/use_decl.fidl rename to garnet/public/fidl/fuchsia.sys2/decls/use_decl.fidl
diff --git a/public/fidl/fuchsia.sys2/lifecycle_handler.fidl b/garnet/public/fidl/fuchsia.sys2/lifecycle_handler.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/lifecycle_handler.fidl rename to garnet/public/fidl/fuchsia.sys2/lifecycle_handler.fidl
diff --git a/public/fidl/fuchsia.sys2/moniker.fidl b/garnet/public/fidl/fuchsia.sys2/moniker.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/moniker.fidl rename to garnet/public/fidl/fuchsia.sys2/moniker.fidl
diff --git a/public/fidl/fuchsia.sys2/realm.fidl b/garnet/public/fidl/fuchsia.sys2/realm.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/realm.fidl rename to garnet/public/fidl/fuchsia.sys2/realm.fidl
diff --git a/public/fidl/fuchsia.sys2/runtime/component.fidl b/garnet/public/fidl/fuchsia.sys2/runtime/component.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/runtime/component.fidl rename to garnet/public/fidl/fuchsia.sys2/runtime/component.fidl
diff --git a/public/fidl/fuchsia.sys2/runtime/component_namespace.fidl b/garnet/public/fidl/fuchsia.sys2/runtime/component_namespace.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/runtime/component_namespace.fidl rename to garnet/public/fidl/fuchsia.sys2/runtime/component_namespace.fidl
diff --git a/public/fidl/fuchsia.sys2/runtime/component_resolver.fidl b/garnet/public/fidl/fuchsia.sys2/runtime/component_resolver.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/runtime/component_resolver.fidl rename to garnet/public/fidl/fuchsia.sys2/runtime/component_resolver.fidl
diff --git a/public/fidl/fuchsia.sys2/runtime/component_runner.fidl b/garnet/public/fidl/fuchsia.sys2/runtime/component_runner.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/runtime/component_runner.fidl rename to garnet/public/fidl/fuchsia.sys2/runtime/component_runner.fidl
diff --git a/public/fidl/fuchsia.sys2/runtime/package.fidl b/garnet/public/fidl/fuchsia.sys2/runtime/package.fidl similarity index 100% rename from public/fidl/fuchsia.sys2/runtime/package.fidl rename to garnet/public/fidl/fuchsia.sys2/runtime/package.fidl
diff --git a/public/fidl/fuchsia.telephony.manager/BUILD.gn b/garnet/public/fidl/fuchsia.telephony.manager/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.telephony.manager/BUILD.gn rename to garnet/public/fidl/fuchsia.telephony.manager/BUILD.gn
diff --git a/public/fidl/fuchsia.telephony.manager/MAINTAINERS b/garnet/public/fidl/fuchsia.telephony.manager/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.telephony.manager/MAINTAINERS rename to garnet/public/fidl/fuchsia.telephony.manager/MAINTAINERS
diff --git a/public/fidl/fuchsia.telephony.manager/manager.fidl b/garnet/public/fidl/fuchsia.telephony.manager/manager.fidl similarity index 100% rename from public/fidl/fuchsia.telephony.manager/manager.fidl rename to garnet/public/fidl/fuchsia.telephony.manager/manager.fidl
diff --git a/public/fidl/fuchsia.telephony.ril/BUILD.gn b/garnet/public/fidl/fuchsia.telephony.ril/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.telephony.ril/BUILD.gn rename to garnet/public/fidl/fuchsia.telephony.ril/BUILD.gn
diff --git a/public/fidl/fuchsia.telephony.ril/MAINTAINERS b/garnet/public/fidl/fuchsia.telephony.ril/MAINTAINERS similarity index 100% rename from public/fidl/fuchsia.telephony.ril/MAINTAINERS rename to garnet/public/fidl/fuchsia.telephony.ril/MAINTAINERS
diff --git a/public/fidl/fuchsia.telephony.ril/ril.fidl b/garnet/public/fidl/fuchsia.telephony.ril/ril.fidl similarity index 100% rename from public/fidl/fuchsia.telephony.ril/ril.fidl rename to garnet/public/fidl/fuchsia.telephony.ril/ril.fidl
diff --git a/public/fidl/fuchsia.testing.runner/BUILD.gn b/garnet/public/fidl/fuchsia.testing.runner/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.testing.runner/BUILD.gn rename to garnet/public/fidl/fuchsia.testing.runner/BUILD.gn
diff --git a/public/fidl/fuchsia.testing.runner/test_runner.fidl b/garnet/public/fidl/fuchsia.testing.runner/test_runner.fidl similarity index 100% rename from public/fidl/fuchsia.testing.runner/test_runner.fidl rename to garnet/public/fidl/fuchsia.testing.runner/test_runner.fidl
diff --git a/public/fidl/fuchsia.timezone/BUILD.gn b/garnet/public/fidl/fuchsia.timezone/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.timezone/BUILD.gn rename to garnet/public/fidl/fuchsia.timezone/BUILD.gn
diff --git a/public/fidl/fuchsia.timezone/time_service.fidl b/garnet/public/fidl/fuchsia.timezone/time_service.fidl similarity index 100% rename from public/fidl/fuchsia.timezone/time_service.fidl rename to garnet/public/fidl/fuchsia.timezone/time_service.fidl
diff --git a/public/fidl/fuchsia.timezone/time_zone.fidl b/garnet/public/fidl/fuchsia.timezone/time_zone.fidl similarity index 100% rename from public/fidl/fuchsia.timezone/time_zone.fidl rename to garnet/public/fidl/fuchsia.timezone/time_zone.fidl
diff --git a/public/fidl/fuchsia.tracing/BUILD.gn b/garnet/public/fidl/fuchsia.tracing/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.tracing/BUILD.gn rename to garnet/public/fidl/fuchsia.tracing/BUILD.gn
diff --git a/public/fidl/fuchsia.tracing/trace_controller.fidl b/garnet/public/fidl/fuchsia.tracing/trace_controller.fidl similarity index 100% rename from public/fidl/fuchsia.tracing/trace_controller.fidl rename to garnet/public/fidl/fuchsia.tracing/trace_controller.fidl
diff --git a/public/fidl/fuchsia.tts/BUILD.gn b/garnet/public/fidl/fuchsia.tts/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.tts/BUILD.gn rename to garnet/public/fidl/fuchsia.tts/BUILD.gn
diff --git a/public/fidl/fuchsia.tts/tts.fidl b/garnet/public/fidl/fuchsia.tts/tts.fidl similarity index 100% rename from public/fidl/fuchsia.tts/tts.fidl rename to garnet/public/fidl/fuchsia.tts/tts.fidl
diff --git a/public/fidl/fuchsia.ui.app/BUILD.gn b/garnet/public/fidl/fuchsia.ui.app/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.app/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.app/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.app/view.fidl b/garnet/public/fidl/fuchsia.ui.app/view.fidl similarity index 100% rename from public/fidl/fuchsia.ui.app/view.fidl rename to garnet/public/fidl/fuchsia.ui.app/view.fidl
diff --git a/public/fidl/fuchsia.ui.app/view_config.fidl b/garnet/public/fidl/fuchsia.ui.app/view_config.fidl similarity index 100% rename from public/fidl/fuchsia.ui.app/view_config.fidl rename to garnet/public/fidl/fuchsia.ui.app/view_config.fidl
diff --git a/public/fidl/fuchsia.ui.app/view_provider.fidl b/garnet/public/fidl/fuchsia.ui.app/view_provider.fidl similarity index 100% rename from public/fidl/fuchsia.ui.app/view_provider.fidl rename to garnet/public/fidl/fuchsia.ui.app/view_provider.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/BUILD.gn b/garnet/public/fidl/fuchsia.ui.gfx/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.gfx/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.gfx/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.gfx/commands.fidl b/garnet/public/fidl/fuchsia.ui.gfx/commands.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/commands.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/commands.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/display_info.fidl b/garnet/public/fidl/fuchsia.ui.gfx/display_info.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/display_info.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/display_info.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/events.fidl b/garnet/public/fidl/fuchsia.ui.gfx/events.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/events.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/events.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/hit.fidl b/garnet/public/fidl/fuchsia.ui.gfx/hit.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/hit.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/hit.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/nodes.fidl b/garnet/public/fidl/fuchsia.ui.gfx/nodes.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/nodes.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/nodes.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/pose_buffer_provider.fidl b/garnet/public/fidl/fuchsia.ui.gfx/pose_buffer_provider.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/pose_buffer_provider.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/pose_buffer_provider.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/renderer.fidl b/garnet/public/fidl/fuchsia.ui.gfx/renderer.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/renderer.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/renderer.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/resources.fidl b/garnet/public/fidl/fuchsia.ui.gfx/resources.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/resources.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/resources.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/shapes.fidl b/garnet/public/fidl/fuchsia.ui.gfx/shapes.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/shapes.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/shapes.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/tokens.fidl b/garnet/public/fidl/fuchsia.ui.gfx/tokens.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/tokens.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/tokens.fidl
diff --git a/public/fidl/fuchsia.ui.gfx/types.fidl b/garnet/public/fidl/fuchsia.ui.gfx/types.fidl similarity index 100% rename from public/fidl/fuchsia.ui.gfx/types.fidl rename to garnet/public/fidl/fuchsia.ui.gfx/types.fidl
diff --git a/public/fidl/fuchsia.ui.input/BUILD.gn b/garnet/public/fidl/fuchsia.ui.input/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.input/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.input/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.input/commands.fidl b/garnet/public/fidl/fuchsia.ui.input/commands.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/commands.fidl rename to garnet/public/fidl/fuchsia.ui.input/commands.fidl
diff --git a/public/fidl/fuchsia.ui.input/ime_service.fidl b/garnet/public/fidl/fuchsia.ui.input/ime_service.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/ime_service.fidl rename to garnet/public/fidl/fuchsia.ui.input/ime_service.fidl
diff --git a/public/fidl/fuchsia.ui.input/input_device_registry.fidl b/garnet/public/fidl/fuchsia.ui.input/input_device_registry.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/input_device_registry.fidl rename to garnet/public/fidl/fuchsia.ui.input/input_device_registry.fidl
diff --git a/public/fidl/fuchsia.ui.input/input_event_constants.fidl b/garnet/public/fidl/fuchsia.ui.input/input_event_constants.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/input_event_constants.fidl rename to garnet/public/fidl/fuchsia.ui.input/input_event_constants.fidl
diff --git a/public/fidl/fuchsia.ui.input/input_events.fidl b/garnet/public/fidl/fuchsia.ui.input/input_events.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/input_events.fidl rename to garnet/public/fidl/fuchsia.ui.input/input_events.fidl
diff --git a/public/fidl/fuchsia.ui.input/input_reports.fidl b/garnet/public/fidl/fuchsia.ui.input/input_reports.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/input_reports.fidl rename to garnet/public/fidl/fuchsia.ui.input/input_reports.fidl
diff --git a/public/fidl/fuchsia.ui.input/text_editing.fidl b/garnet/public/fidl/fuchsia.ui.input/text_editing.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/text_editing.fidl rename to garnet/public/fidl/fuchsia.ui.input/text_editing.fidl
diff --git a/public/fidl/fuchsia.ui.input/text_input.fidl b/garnet/public/fidl/fuchsia.ui.input/text_input.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/text_input.fidl rename to garnet/public/fidl/fuchsia.ui.input/text_input.fidl
diff --git a/public/fidl/fuchsia.ui.input/usages.fidl b/garnet/public/fidl/fuchsia.ui.input/usages.fidl similarity index 100% rename from public/fidl/fuchsia.ui.input/usages.fidl rename to garnet/public/fidl/fuchsia.ui.input/usages.fidl
diff --git a/public/fidl/fuchsia.ui.policy/BUILD.gn b/garnet/public/fidl/fuchsia.ui.policy/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.policy/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.policy/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.policy/display_usage.fidl b/garnet/public/fidl/fuchsia.ui.policy/display_usage.fidl similarity index 100% rename from public/fidl/fuchsia.ui.policy/display_usage.fidl rename to garnet/public/fidl/fuchsia.ui.policy/display_usage.fidl
diff --git a/public/fidl/fuchsia.ui.policy/presentation.fidl b/garnet/public/fidl/fuchsia.ui.policy/presentation.fidl similarity index 100% rename from public/fidl/fuchsia.ui.policy/presentation.fidl rename to garnet/public/fidl/fuchsia.ui.policy/presentation.fidl
diff --git a/public/fidl/fuchsia.ui.policy/presenter.fidl b/garnet/public/fidl/fuchsia.ui.policy/presenter.fidl similarity index 100% rename from public/fidl/fuchsia.ui.policy/presenter.fidl rename to garnet/public/fidl/fuchsia.ui.policy/presenter.fidl
diff --git a/public/fidl/fuchsia.ui.scenic/BUILD.gn b/garnet/public/fidl/fuchsia.ui.scenic/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.scenic/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.scenic/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.scenic/commands.fidl b/garnet/public/fidl/fuchsia.ui.scenic/commands.fidl similarity index 100% rename from public/fidl/fuchsia.ui.scenic/commands.fidl rename to garnet/public/fidl/fuchsia.ui.scenic/commands.fidl
diff --git a/public/fidl/fuchsia.ui.scenic/events.fidl b/garnet/public/fidl/fuchsia.ui.scenic/events.fidl similarity index 100% rename from public/fidl/fuchsia.ui.scenic/events.fidl rename to garnet/public/fidl/fuchsia.ui.scenic/events.fidl
diff --git a/public/fidl/fuchsia.ui.scenic/scenic.fidl b/garnet/public/fidl/fuchsia.ui.scenic/scenic.fidl similarity index 100% rename from public/fidl/fuchsia.ui.scenic/scenic.fidl rename to garnet/public/fidl/fuchsia.ui.scenic/scenic.fidl
diff --git a/public/fidl/fuchsia.ui.scenic/session.fidl b/garnet/public/fidl/fuchsia.ui.scenic/session.fidl similarity index 100% rename from public/fidl/fuchsia.ui.scenic/session.fidl rename to garnet/public/fidl/fuchsia.ui.scenic/session.fidl
diff --git a/public/fidl/fuchsia.ui.sketchy/BUILD.gn b/garnet/public/fidl/fuchsia.ui.sketchy/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.sketchy/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.sketchy/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.sketchy/README.md b/garnet/public/fidl/fuchsia.ui.sketchy/README.md similarity index 100% rename from public/fidl/fuchsia.ui.sketchy/README.md rename to garnet/public/fidl/fuchsia.ui.sketchy/README.md
diff --git a/public/fidl/fuchsia.ui.sketchy/canvas.fidl b/garnet/public/fidl/fuchsia.ui.sketchy/canvas.fidl similarity index 100% rename from public/fidl/fuchsia.ui.sketchy/canvas.fidl rename to garnet/public/fidl/fuchsia.ui.sketchy/canvas.fidl
diff --git a/public/fidl/fuchsia.ui.sketchy/commands.fidl b/garnet/public/fidl/fuchsia.ui.sketchy/commands.fidl similarity index 100% rename from public/fidl/fuchsia.ui.sketchy/commands.fidl rename to garnet/public/fidl/fuchsia.ui.sketchy/commands.fidl
diff --git a/public/fidl/fuchsia.ui.sketchy/resources.fidl b/garnet/public/fidl/fuchsia.ui.sketchy/resources.fidl similarity index 100% rename from public/fidl/fuchsia.ui.sketchy/resources.fidl rename to garnet/public/fidl/fuchsia.ui.sketchy/resources.fidl
diff --git a/public/fidl/fuchsia.ui.sketchy/types.fidl b/garnet/public/fidl/fuchsia.ui.sketchy/types.fidl similarity index 100% rename from public/fidl/fuchsia.ui.sketchy/types.fidl rename to garnet/public/fidl/fuchsia.ui.sketchy/types.fidl
diff --git a/public/fidl/fuchsia.ui.text/BUILD.gn b/garnet/public/fidl/fuchsia.ui.text/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.text/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.text/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.text/primitives.fidl b/garnet/public/fidl/fuchsia.ui.text/primitives.fidl similarity index 100% rename from public/fidl/fuchsia.ui.text/primitives.fidl rename to garnet/public/fidl/fuchsia.ui.text/primitives.fidl
diff --git a/public/fidl/fuchsia.ui.text/text_field.fidl b/garnet/public/fidl/fuchsia.ui.text/text_field.fidl similarity index 100% rename from public/fidl/fuchsia.ui.text/text_field.fidl rename to garnet/public/fidl/fuchsia.ui.text/text_field.fidl
diff --git a/public/fidl/fuchsia.ui.text/text_manager.fidl b/garnet/public/fidl/fuchsia.ui.text/text_manager.fidl similarity index 100% rename from public/fidl/fuchsia.ui.text/text_manager.fidl rename to garnet/public/fidl/fuchsia.ui.text/text_manager.fidl
diff --git a/public/fidl/fuchsia.ui.vectorial/BUILD.gn b/garnet/public/fidl/fuchsia.ui.vectorial/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.vectorial/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.vectorial/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.vectorial/commands.fidl b/garnet/public/fidl/fuchsia.ui.vectorial/commands.fidl similarity index 100% rename from public/fidl/fuchsia.ui.vectorial/commands.fidl rename to garnet/public/fidl/fuchsia.ui.vectorial/commands.fidl
diff --git a/public/fidl/fuchsia.ui.vectorial/events.fidl b/garnet/public/fidl/fuchsia.ui.vectorial/events.fidl similarity index 100% rename from public/fidl/fuchsia.ui.vectorial/events.fidl rename to garnet/public/fidl/fuchsia.ui.vectorial/events.fidl
diff --git a/public/fidl/fuchsia.ui.views/BUILD.gn b/garnet/public/fidl/fuchsia.ui.views/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.views/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.views/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.views/commands.fidl b/garnet/public/fidl/fuchsia.ui.views/commands.fidl similarity index 100% rename from public/fidl/fuchsia.ui.views/commands.fidl rename to garnet/public/fidl/fuchsia.ui.views/commands.fidl
diff --git a/public/fidl/fuchsia.ui.views/events.fidl b/garnet/public/fidl/fuchsia.ui.views/events.fidl similarity index 100% rename from public/fidl/fuchsia.ui.views/events.fidl rename to garnet/public/fidl/fuchsia.ui.views/events.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/BUILD.gn b/garnet/public/fidl/fuchsia.ui.viewsv1/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.viewsv1/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.viewsv1/view_containers.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/view_containers.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/view_containers.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/view_containers.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/view_manager.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/view_manager.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/view_manager.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/view_manager.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/view_properties.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/view_properties.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/view_properties.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/view_properties.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/view_provider.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/view_provider.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/view_provider.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/view_provider.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/view_snapshot.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/view_snapshot.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/view_snapshot.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/view_snapshot.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/view_tree_token.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/view_tree_token.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/view_tree_token.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/view_tree_token.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/view_trees.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/view_trees.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/view_trees.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/view_trees.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1/views.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1/views.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1/views.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1/views.fidl
diff --git a/public/fidl/fuchsia.ui.viewsv1token/BUILD.gn b/garnet/public/fidl/fuchsia.ui.viewsv1token/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1token/BUILD.gn rename to garnet/public/fidl/fuchsia.ui.viewsv1token/BUILD.gn
diff --git a/public/fidl/fuchsia.ui.viewsv1token/view_token.fidl b/garnet/public/fidl/fuchsia.ui.viewsv1token/view_token.fidl similarity index 100% rename from public/fidl/fuchsia.ui.viewsv1token/view_token.fidl rename to garnet/public/fidl/fuchsia.ui.viewsv1token/view_token.fidl
diff --git a/public/fidl/fuchsia.vsock/BUILD.gn b/garnet/public/fidl/fuchsia.vsock/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.vsock/BUILD.gn rename to garnet/public/fidl/fuchsia.vsock/BUILD.gn
diff --git a/public/fidl/fuchsia.vsock/connector.fidl b/garnet/public/fidl/fuchsia.vsock/connector.fidl similarity index 100% rename from public/fidl/fuchsia.vsock/connector.fidl rename to garnet/public/fidl/fuchsia.vsock/connector.fidl
diff --git a/public/fidl/fuchsia.vulkan.loader/BUILD.gn b/garnet/public/fidl/fuchsia.vulkan.loader/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.vulkan.loader/BUILD.gn rename to garnet/public/fidl/fuchsia.vulkan.loader/BUILD.gn
diff --git a/public/fidl/fuchsia.vulkan.loader/loader.fidl b/garnet/public/fidl/fuchsia.vulkan.loader/loader.fidl similarity index 100% rename from public/fidl/fuchsia.vulkan.loader/loader.fidl rename to garnet/public/fidl/fuchsia.vulkan.loader/loader.fidl
diff --git a/public/fidl/fuchsia.wlan.ap/BUILD.gn b/garnet/public/fidl/fuchsia.wlan.ap/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.wlan.ap/BUILD.gn rename to garnet/public/fidl/fuchsia.wlan.ap/BUILD.gn
diff --git a/public/fidl/fuchsia.wlan.ap/wlan_ap.fidl b/garnet/public/fidl/fuchsia.wlan.ap/wlan_ap.fidl similarity index 100% rename from public/fidl/fuchsia.wlan.ap/wlan_ap.fidl rename to garnet/public/fidl/fuchsia.wlan.ap/wlan_ap.fidl
diff --git a/public/fidl/fuchsia.wlan.common/BUILD.gn b/garnet/public/fidl/fuchsia.wlan.common/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.wlan.common/BUILD.gn rename to garnet/public/fidl/fuchsia.wlan.common/BUILD.gn
diff --git a/public/fidl/fuchsia.wlan.common/wlan_common.fidl b/garnet/public/fidl/fuchsia.wlan.common/wlan_common.fidl similarity index 100% rename from public/fidl/fuchsia.wlan.common/wlan_common.fidl rename to garnet/public/fidl/fuchsia.wlan.common/wlan_common.fidl
diff --git a/public/fidl/fuchsia.wlan.minstrel/BUILD.gn b/garnet/public/fidl/fuchsia.wlan.minstrel/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.wlan.minstrel/BUILD.gn rename to garnet/public/fidl/fuchsia.wlan.minstrel/BUILD.gn
diff --git a/public/fidl/fuchsia.wlan.minstrel/wlan_minstrel.fidl b/garnet/public/fidl/fuchsia.wlan.minstrel/wlan_minstrel.fidl similarity index 100% rename from public/fidl/fuchsia.wlan.minstrel/wlan_minstrel.fidl rename to garnet/public/fidl/fuchsia.wlan.minstrel/wlan_minstrel.fidl
diff --git a/public/fidl/fuchsia.wlan.mlme/BUILD.gn b/garnet/public/fidl/fuchsia.wlan.mlme/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.wlan.mlme/BUILD.gn rename to garnet/public/fidl/fuchsia.wlan.mlme/BUILD.gn
diff --git a/public/fidl/fuchsia.wlan.mlme/wlan_mlme.fidl b/garnet/public/fidl/fuchsia.wlan.mlme/wlan_mlme.fidl similarity index 100% rename from public/fidl/fuchsia.wlan.mlme/wlan_mlme.fidl rename to garnet/public/fidl/fuchsia.wlan.mlme/wlan_mlme.fidl
diff --git a/public/fidl/fuchsia.wlan.mlme/wlan_mlme_ext.fidl b/garnet/public/fidl/fuchsia.wlan.mlme/wlan_mlme_ext.fidl similarity index 100% rename from public/fidl/fuchsia.wlan.mlme/wlan_mlme_ext.fidl rename to garnet/public/fidl/fuchsia.wlan.mlme/wlan_mlme_ext.fidl
diff --git a/public/fidl/fuchsia.wlan.service/BUILD.gn b/garnet/public/fidl/fuchsia.wlan.service/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.wlan.service/BUILD.gn rename to garnet/public/fidl/fuchsia.wlan.service/BUILD.gn
diff --git a/public/fidl/fuchsia.wlan.service/wlan_service.fidl b/garnet/public/fidl/fuchsia.wlan.service/wlan_service.fidl similarity index 100% rename from public/fidl/fuchsia.wlan.service/wlan_service.fidl rename to garnet/public/fidl/fuchsia.wlan.service/wlan_service.fidl
diff --git a/public/fidl/fuchsia.wlan.stats/BUILD.gn b/garnet/public/fidl/fuchsia.wlan.stats/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.wlan.stats/BUILD.gn rename to garnet/public/fidl/fuchsia.wlan.stats/BUILD.gn
diff --git a/public/fidl/fuchsia.wlan.stats/wlan_stats.fidl b/garnet/public/fidl/fuchsia.wlan.stats/wlan_stats.fidl similarity index 100% rename from public/fidl/fuchsia.wlan.stats/wlan_stats.fidl rename to garnet/public/fidl/fuchsia.wlan.stats/wlan_stats.fidl
diff --git a/public/fidl/fuchsia.xi/BUILD.gn b/garnet/public/fidl/fuchsia.xi/BUILD.gn similarity index 100% rename from public/fidl/fuchsia.xi/BUILD.gn rename to garnet/public/fidl/fuchsia.xi/BUILD.gn
diff --git a/public/fidl/fuchsia.xi/xi.fidl b/garnet/public/fidl/fuchsia.xi/xi.fidl similarity index 100% rename from public/fidl/fuchsia.xi/xi.fidl rename to garnet/public/fidl/fuchsia.xi/xi.fidl
diff --git a/public/go/third_party/BUILD.gn b/garnet/public/go/third_party/BUILD.gn similarity index 100% rename from public/go/third_party/BUILD.gn rename to garnet/public/go/third_party/BUILD.gn
diff --git a/public/lib/async_promise/.clang-format b/garnet/public/lib/async_promise/.clang-format similarity index 100% rename from public/lib/async_promise/.clang-format rename to garnet/public/lib/async_promise/.clang-format
diff --git a/public/lib/async_promise/BUILD.gn b/garnet/public/lib/async_promise/BUILD.gn similarity index 100% rename from public/lib/async_promise/BUILD.gn rename to garnet/public/lib/async_promise/BUILD.gn
diff --git a/public/lib/async_promise/MAINTAINERS b/garnet/public/lib/async_promise/MAINTAINERS similarity index 100% rename from public/lib/async_promise/MAINTAINERS rename to garnet/public/lib/async_promise/MAINTAINERS
diff --git a/public/lib/async_promise/README.md b/garnet/public/lib/async_promise/README.md similarity index 100% rename from public/lib/async_promise/README.md rename to garnet/public/lib/async_promise/README.md
diff --git a/public/lib/async_promise/executor.cc b/garnet/public/lib/async_promise/executor.cc similarity index 100% rename from public/lib/async_promise/executor.cc rename to garnet/public/lib/async_promise/executor.cc
diff --git a/public/lib/async_promise/executor.h b/garnet/public/lib/async_promise/executor.h similarity index 100% rename from public/lib/async_promise/executor.h rename to garnet/public/lib/async_promise/executor.h
diff --git a/public/lib/async_promise/tests/executor_tests.cc b/garnet/public/lib/async_promise/tests/executor_tests.cc similarity index 100% rename from public/lib/async_promise/tests/executor_tests.cc rename to garnet/public/lib/async_promise/tests/executor_tests.cc
diff --git a/public/lib/async_promise/tests/main.c b/garnet/public/lib/async_promise/tests/main.c similarity index 100% rename from public/lib/async_promise/tests/main.c rename to garnet/public/lib/async_promise/tests/main.c
diff --git a/public/lib/backoff/BUILD.gn b/garnet/public/lib/backoff/BUILD.gn similarity index 100% rename from public/lib/backoff/BUILD.gn rename to garnet/public/lib/backoff/BUILD.gn
diff --git a/public/lib/backoff/MAINTAINERS b/garnet/public/lib/backoff/MAINTAINERS similarity index 100% rename from public/lib/backoff/MAINTAINERS rename to garnet/public/lib/backoff/MAINTAINERS
diff --git a/public/lib/backoff/backoff.h b/garnet/public/lib/backoff/backoff.h similarity index 100% rename from public/lib/backoff/backoff.h rename to garnet/public/lib/backoff/backoff.h
diff --git a/public/lib/backoff/exponential_backoff.cc b/garnet/public/lib/backoff/exponential_backoff.cc similarity index 100% rename from public/lib/backoff/exponential_backoff.cc rename to garnet/public/lib/backoff/exponential_backoff.cc
diff --git a/public/lib/backoff/exponential_backoff.h b/garnet/public/lib/backoff/exponential_backoff.h similarity index 100% rename from public/lib/backoff/exponential_backoff.h rename to garnet/public/lib/backoff/exponential_backoff.h
diff --git a/public/lib/backoff/exponential_backoff_unittest.cc b/garnet/public/lib/backoff/exponential_backoff_unittest.cc similarity index 100% rename from public/lib/backoff/exponential_backoff_unittest.cc rename to garnet/public/lib/backoff/exponential_backoff_unittest.cc
diff --git a/public/lib/backoff/testing/BUILD.gn b/garnet/public/lib/backoff/testing/BUILD.gn similarity index 100% rename from public/lib/backoff/testing/BUILD.gn rename to garnet/public/lib/backoff/testing/BUILD.gn
diff --git a/public/lib/backoff/testing/test_backoff.cc b/garnet/public/lib/backoff/testing/test_backoff.cc similarity index 100% rename from public/lib/backoff/testing/test_backoff.cc rename to garnet/public/lib/backoff/testing/test_backoff.cc
diff --git a/public/lib/backoff/testing/test_backoff.h b/garnet/public/lib/backoff/testing/test_backoff.h similarity index 100% rename from public/lib/backoff/testing/test_backoff.h rename to garnet/public/lib/backoff/testing/test_backoff.h
diff --git a/public/lib/callback/BUILD.gn b/garnet/public/lib/callback/BUILD.gn similarity index 100% rename from public/lib/callback/BUILD.gn rename to garnet/public/lib/callback/BUILD.gn
diff --git a/public/lib/callback/MAINTAINERS b/garnet/public/lib/callback/MAINTAINERS similarity index 100% rename from public/lib/callback/MAINTAINERS rename to garnet/public/lib/callback/MAINTAINERS
diff --git a/public/lib/callback/auto_cleanable.h b/garnet/public/lib/callback/auto_cleanable.h similarity index 100% rename from public/lib/callback/auto_cleanable.h rename to garnet/public/lib/callback/auto_cleanable.h
diff --git a/public/lib/callback/auto_cleanable_unittest.cc b/garnet/public/lib/callback/auto_cleanable_unittest.cc similarity index 100% rename from public/lib/callback/auto_cleanable_unittest.cc rename to garnet/public/lib/callback/auto_cleanable_unittest.cc
diff --git a/public/lib/callback/cancellable.cc b/garnet/public/lib/callback/cancellable.cc similarity index 100% rename from public/lib/callback/cancellable.cc rename to garnet/public/lib/callback/cancellable.cc
diff --git a/public/lib/callback/cancellable.h b/garnet/public/lib/callback/cancellable.h similarity index 100% rename from public/lib/callback/cancellable.h rename to garnet/public/lib/callback/cancellable.h
diff --git a/public/lib/callback/cancellable_helper.cc b/garnet/public/lib/callback/cancellable_helper.cc similarity index 100% rename from public/lib/callback/cancellable_helper.cc rename to garnet/public/lib/callback/cancellable_helper.cc
diff --git a/public/lib/callback/cancellable_helper.h b/garnet/public/lib/callback/cancellable_helper.h similarity index 100% rename from public/lib/callback/cancellable_helper.h rename to garnet/public/lib/callback/cancellable_helper.h
diff --git a/public/lib/callback/cancellable_helper_unittest.cc b/garnet/public/lib/callback/cancellable_helper_unittest.cc similarity index 100% rename from public/lib/callback/cancellable_helper_unittest.cc rename to garnet/public/lib/callback/cancellable_helper_unittest.cc
diff --git a/public/lib/callback/cancellable_unittest.cc b/garnet/public/lib/callback/cancellable_unittest.cc similarity index 100% rename from public/lib/callback/cancellable_unittest.cc rename to garnet/public/lib/callback/cancellable_unittest.cc
diff --git a/public/lib/callback/capture.h b/garnet/public/lib/callback/capture.h similarity index 100% rename from public/lib/callback/capture.h rename to garnet/public/lib/callback/capture.h
diff --git a/public/lib/callback/capture_unittest.cc b/garnet/public/lib/callback/capture_unittest.cc similarity index 100% rename from public/lib/callback/capture_unittest.cc rename to garnet/public/lib/callback/capture_unittest.cc
diff --git a/public/lib/callback/destruction_sentinel.cc b/garnet/public/lib/callback/destruction_sentinel.cc similarity index 100% rename from public/lib/callback/destruction_sentinel.cc rename to garnet/public/lib/callback/destruction_sentinel.cc
diff --git a/public/lib/callback/destruction_sentinel.h b/garnet/public/lib/callback/destruction_sentinel.h similarity index 100% rename from public/lib/callback/destruction_sentinel.h rename to garnet/public/lib/callback/destruction_sentinel.h
diff --git a/public/lib/callback/destruction_sentinel_unittest.cc b/garnet/public/lib/callback/destruction_sentinel_unittest.cc similarity index 100% rename from public/lib/callback/destruction_sentinel_unittest.cc rename to garnet/public/lib/callback/destruction_sentinel_unittest.cc
diff --git a/public/lib/callback/managed_container.cc b/garnet/public/lib/callback/managed_container.cc similarity index 100% rename from public/lib/callback/managed_container.cc rename to garnet/public/lib/callback/managed_container.cc
diff --git a/public/lib/callback/managed_container.h b/garnet/public/lib/callback/managed_container.h similarity index 100% rename from public/lib/callback/managed_container.h rename to garnet/public/lib/callback/managed_container.h
diff --git a/public/lib/callback/managed_container_unittest.cc b/garnet/public/lib/callback/managed_container_unittest.cc similarity index 100% rename from public/lib/callback/managed_container_unittest.cc rename to garnet/public/lib/callback/managed_container_unittest.cc
diff --git a/public/lib/callback/operation_serializer.h b/garnet/public/lib/callback/operation_serializer.h similarity index 100% rename from public/lib/callback/operation_serializer.h rename to garnet/public/lib/callback/operation_serializer.h
diff --git a/public/lib/callback/operation_serializer_unittest.cc b/garnet/public/lib/callback/operation_serializer_unittest.cc similarity index 100% rename from public/lib/callback/operation_serializer_unittest.cc rename to garnet/public/lib/callback/operation_serializer_unittest.cc
diff --git a/public/lib/callback/scoped_callback.h b/garnet/public/lib/callback/scoped_callback.h similarity index 100% rename from public/lib/callback/scoped_callback.h rename to garnet/public/lib/callback/scoped_callback.h
diff --git a/public/lib/callback/scoped_callback_unittest.cc b/garnet/public/lib/callback/scoped_callback_unittest.cc similarity index 100% rename from public/lib/callback/scoped_callback_unittest.cc rename to garnet/public/lib/callback/scoped_callback_unittest.cc
diff --git a/public/lib/callback/scoped_task_runner.cc b/garnet/public/lib/callback/scoped_task_runner.cc similarity index 100% rename from public/lib/callback/scoped_task_runner.cc rename to garnet/public/lib/callback/scoped_task_runner.cc
diff --git a/public/lib/callback/scoped_task_runner.h b/garnet/public/lib/callback/scoped_task_runner.h similarity index 100% rename from public/lib/callback/scoped_task_runner.h rename to garnet/public/lib/callback/scoped_task_runner.h
diff --git a/public/lib/callback/scoped_task_runner_unittest.cc b/garnet/public/lib/callback/scoped_task_runner_unittest.cc similarity index 100% rename from public/lib/callback/scoped_task_runner_unittest.cc rename to garnet/public/lib/callback/scoped_task_runner_unittest.cc
diff --git a/public/lib/callback/set_when_called.cc b/garnet/public/lib/callback/set_when_called.cc similarity index 100% rename from public/lib/callback/set_when_called.cc rename to garnet/public/lib/callback/set_when_called.cc
diff --git a/public/lib/callback/set_when_called.h b/garnet/public/lib/callback/set_when_called.h similarity index 100% rename from public/lib/callback/set_when_called.h rename to garnet/public/lib/callback/set_when_called.h
diff --git a/public/lib/callback/set_when_called_unittest.cc b/garnet/public/lib/callback/set_when_called_unittest.cc similarity index 100% rename from public/lib/callback/set_when_called_unittest.cc rename to garnet/public/lib/callback/set_when_called_unittest.cc
diff --git a/public/lib/callback/trace_callback.h b/garnet/public/lib/callback/trace_callback.h similarity index 100% rename from public/lib/callback/trace_callback.h rename to garnet/public/lib/callback/trace_callback.h
diff --git a/public/lib/callback/waiter.h b/garnet/public/lib/callback/waiter.h similarity index 100% rename from public/lib/callback/waiter.h rename to garnet/public/lib/callback/waiter.h
diff --git a/public/lib/callback/waiter_unittest.cc b/garnet/public/lib/callback/waiter_unittest.cc similarity index 100% rename from public/lib/callback/waiter_unittest.cc rename to garnet/public/lib/callback/waiter_unittest.cc
diff --git a/public/lib/cmx_facet_parser/BUILD.gn b/garnet/public/lib/cmx_facet_parser/BUILD.gn similarity index 100% rename from public/lib/cmx_facet_parser/BUILD.gn rename to garnet/public/lib/cmx_facet_parser/BUILD.gn
diff --git a/public/lib/cmx_facet_parser/cmx_facet_parser.cc b/garnet/public/lib/cmx_facet_parser/cmx_facet_parser.cc similarity index 100% rename from public/lib/cmx_facet_parser/cmx_facet_parser.cc rename to garnet/public/lib/cmx_facet_parser/cmx_facet_parser.cc
diff --git a/public/lib/cmx_facet_parser/cmx_facet_parser.h b/garnet/public/lib/cmx_facet_parser/cmx_facet_parser.h similarity index 100% rename from public/lib/cmx_facet_parser/cmx_facet_parser.h rename to garnet/public/lib/cmx_facet_parser/cmx_facet_parser.h
diff --git a/public/lib/cmx_facet_parser/cmx_facet_parser_unittest.cc b/garnet/public/lib/cmx_facet_parser/cmx_facet_parser_unittest.cc similarity index 100% rename from public/lib/cmx_facet_parser/cmx_facet_parser_unittest.cc rename to garnet/public/lib/cmx_facet_parser/cmx_facet_parser_unittest.cc
diff --git a/public/lib/cobalt/cpp/BUILD.gn b/garnet/public/lib/cobalt/cpp/BUILD.gn similarity index 100% rename from public/lib/cobalt/cpp/BUILD.gn rename to garnet/public/lib/cobalt/cpp/BUILD.gn
diff --git a/public/lib/cobalt/cpp/cobalt_logger.cc b/garnet/public/lib/cobalt/cpp/cobalt_logger.cc similarity index 100% rename from public/lib/cobalt/cpp/cobalt_logger.cc rename to garnet/public/lib/cobalt/cpp/cobalt_logger.cc
diff --git a/public/lib/cobalt/cpp/cobalt_logger.h b/garnet/public/lib/cobalt/cpp/cobalt_logger.h similarity index 100% rename from public/lib/cobalt/cpp/cobalt_logger.h rename to garnet/public/lib/cobalt/cpp/cobalt_logger.h
diff --git a/public/lib/cobalt/cpp/cobalt_logger_impl.cc b/garnet/public/lib/cobalt/cpp/cobalt_logger_impl.cc similarity index 100% rename from public/lib/cobalt/cpp/cobalt_logger_impl.cc rename to garnet/public/lib/cobalt/cpp/cobalt_logger_impl.cc
diff --git a/public/lib/cobalt/cpp/cobalt_logger_impl.h b/garnet/public/lib/cobalt/cpp/cobalt_logger_impl.h similarity index 100% rename from public/lib/cobalt/cpp/cobalt_logger_impl.h rename to garnet/public/lib/cobalt/cpp/cobalt_logger_impl.h
diff --git a/public/lib/cobalt/cpp/cobalt_logger_unittest.cc b/garnet/public/lib/cobalt/cpp/cobalt_logger_unittest.cc similarity index 100% rename from public/lib/cobalt/cpp/cobalt_logger_unittest.cc rename to garnet/public/lib/cobalt/cpp/cobalt_logger_unittest.cc
diff --git a/public/lib/cobalt/cpp/observation.h b/garnet/public/lib/cobalt/cpp/observation.h similarity index 100% rename from public/lib/cobalt/cpp/observation.h rename to garnet/public/lib/cobalt/cpp/observation.h
diff --git a/public/lib/cobalt/cpp/observations_collector.cc b/garnet/public/lib/cobalt/cpp/observations_collector.cc similarity index 100% rename from public/lib/cobalt/cpp/observations_collector.cc rename to garnet/public/lib/cobalt/cpp/observations_collector.cc
diff --git a/public/lib/cobalt/cpp/observations_collector.h b/garnet/public/lib/cobalt/cpp/observations_collector.h similarity index 100% rename from public/lib/cobalt/cpp/observations_collector.h rename to garnet/public/lib/cobalt/cpp/observations_collector.h
diff --git a/public/lib/cobalt/cpp/observations_collector_test.cc b/garnet/public/lib/cobalt/cpp/observations_collector_test.cc similarity index 100% rename from public/lib/cobalt/cpp/observations_collector_test.cc rename to garnet/public/lib/cobalt/cpp/observations_collector_test.cc
diff --git a/public/lib/cobalt/cpp/project_profile.cc b/garnet/public/lib/cobalt/cpp/project_profile.cc similarity index 100% rename from public/lib/cobalt/cpp/project_profile.cc rename to garnet/public/lib/cobalt/cpp/project_profile.cc
diff --git a/public/lib/cobalt/cpp/project_profile.h b/garnet/public/lib/cobalt/cpp/project_profile.h similarity index 100% rename from public/lib/cobalt/cpp/project_profile.h rename to garnet/public/lib/cobalt/cpp/project_profile.h
diff --git a/public/lib/cobalt/cpp/project_profile_unittest.cc b/garnet/public/lib/cobalt/cpp/project_profile_unittest.cc similarity index 100% rename from public/lib/cobalt/cpp/project_profile_unittest.cc rename to garnet/public/lib/cobalt/cpp/project_profile_unittest.cc
diff --git a/public/lib/component/MAINTAINERS b/garnet/public/lib/component/MAINTAINERS similarity index 100% rename from public/lib/component/MAINTAINERS rename to garnet/public/lib/component/MAINTAINERS
diff --git a/public/lib/component/cpp/BUILD.gn b/garnet/public/lib/component/cpp/BUILD.gn similarity index 100% rename from public/lib/component/cpp/BUILD.gn rename to garnet/public/lib/component/cpp/BUILD.gn
diff --git a/public/lib/component/cpp/connect.h b/garnet/public/lib/component/cpp/connect.h similarity index 100% rename from public/lib/component/cpp/connect.h rename to garnet/public/lib/component/cpp/connect.h
diff --git a/public/lib/component/cpp/environment_services_helper.cc b/garnet/public/lib/component/cpp/environment_services_helper.cc similarity index 100% rename from public/lib/component/cpp/environment_services_helper.cc rename to garnet/public/lib/component/cpp/environment_services_helper.cc
diff --git a/public/lib/component/cpp/environment_services_helper.h b/garnet/public/lib/component/cpp/environment_services_helper.h similarity index 100% rename from public/lib/component/cpp/environment_services_helper.h rename to garnet/public/lib/component/cpp/environment_services_helper.h
diff --git a/public/lib/component/cpp/expose.cc b/garnet/public/lib/component/cpp/expose.cc similarity index 100% rename from public/lib/component/cpp/expose.cc rename to garnet/public/lib/component/cpp/expose.cc
diff --git a/public/lib/component/cpp/expose.h b/garnet/public/lib/component/cpp/expose.h similarity index 100% rename from public/lib/component/cpp/expose.h rename to garnet/public/lib/component/cpp/expose.h
diff --git a/public/lib/component/cpp/exposed_object.cc b/garnet/public/lib/component/cpp/exposed_object.cc similarity index 100% rename from public/lib/component/cpp/exposed_object.cc rename to garnet/public/lib/component/cpp/exposed_object.cc
diff --git a/public/lib/component/cpp/exposed_object.h b/garnet/public/lib/component/cpp/exposed_object.h similarity index 100% rename from public/lib/component/cpp/exposed_object.h rename to garnet/public/lib/component/cpp/exposed_object.h
diff --git a/public/lib/component/cpp/object_dir.cc b/garnet/public/lib/component/cpp/object_dir.cc similarity index 100% rename from public/lib/component/cpp/object_dir.cc rename to garnet/public/lib/component/cpp/object_dir.cc
diff --git a/public/lib/component/cpp/object_dir.h b/garnet/public/lib/component/cpp/object_dir.h similarity index 100% rename from public/lib/component/cpp/object_dir.h rename to garnet/public/lib/component/cpp/object_dir.h
diff --git a/public/lib/component/cpp/outgoing.cc b/garnet/public/lib/component/cpp/outgoing.cc similarity index 100% rename from public/lib/component/cpp/outgoing.cc rename to garnet/public/lib/component/cpp/outgoing.cc
diff --git a/public/lib/component/cpp/outgoing.h b/garnet/public/lib/component/cpp/outgoing.h similarity index 100% rename from public/lib/component/cpp/outgoing.h rename to garnet/public/lib/component/cpp/outgoing.h
diff --git a/public/lib/component/cpp/service_provider_impl.cc b/garnet/public/lib/component/cpp/service_provider_impl.cc similarity index 100% rename from public/lib/component/cpp/service_provider_impl.cc rename to garnet/public/lib/component/cpp/service_provider_impl.cc
diff --git a/public/lib/component/cpp/service_provider_impl.h b/garnet/public/lib/component/cpp/service_provider_impl.h similarity index 100% rename from public/lib/component/cpp/service_provider_impl.h rename to garnet/public/lib/component/cpp/service_provider_impl.h
diff --git a/public/lib/component/cpp/startup_context.cc b/garnet/public/lib/component/cpp/startup_context.cc similarity index 100% rename from public/lib/component/cpp/startup_context.cc rename to garnet/public/lib/component/cpp/startup_context.cc
diff --git a/public/lib/component/cpp/startup_context.h b/garnet/public/lib/component/cpp/startup_context.h similarity index 100% rename from public/lib/component/cpp/startup_context.h rename to garnet/public/lib/component/cpp/startup_context.h
diff --git a/public/lib/component/cpp/termination_reason.cc b/garnet/public/lib/component/cpp/termination_reason.cc similarity index 100% rename from public/lib/component/cpp/termination_reason.cc rename to garnet/public/lib/component/cpp/termination_reason.cc
diff --git a/public/lib/component/cpp/termination_reason.h b/garnet/public/lib/component/cpp/termination_reason.h similarity index 100% rename from public/lib/component/cpp/termination_reason.h rename to garnet/public/lib/component/cpp/termination_reason.h
diff --git a/public/lib/component/cpp/test/BUILD.gn b/garnet/public/lib/component/cpp/test/BUILD.gn similarity index 100% rename from public/lib/component/cpp/test/BUILD.gn rename to garnet/public/lib/component/cpp/test/BUILD.gn
diff --git a/public/lib/component/cpp/test/enclosing_environment_test.cc b/garnet/public/lib/component/cpp/test/enclosing_environment_test.cc similarity index 100% rename from public/lib/component/cpp/test/enclosing_environment_test.cc rename to garnet/public/lib/component/cpp/test/enclosing_environment_test.cc
diff --git a/public/lib/component/cpp/test/helper.cc b/garnet/public/lib/component/cpp/test/helper.cc similarity index 100% rename from public/lib/component/cpp/test/helper.cc rename to garnet/public/lib/component/cpp/test/helper.cc
diff --git a/public/lib/component/cpp/test/meta/helper_proc.cmx b/garnet/public/lib/component/cpp/test/meta/helper_proc.cmx similarity index 100% rename from public/lib/component/cpp/test/meta/helper_proc.cmx rename to garnet/public/lib/component/cpp/test/meta/helper_proc.cmx
diff --git a/public/lib/component/cpp/test/meta/lib_component_unittest.cmx b/garnet/public/lib/component/cpp/test/meta/lib_component_unittest.cmx similarity index 100% rename from public/lib/component/cpp/test/meta/lib_component_unittest.cmx rename to garnet/public/lib/component/cpp/test/meta/lib_component_unittest.cmx
diff --git a/public/lib/component/cpp/testing/BUILD.gn b/garnet/public/lib/component/cpp/testing/BUILD.gn similarity index 100% rename from public/lib/component/cpp/testing/BUILD.gn rename to garnet/public/lib/component/cpp/testing/BUILD.gn
diff --git a/public/lib/component/cpp/testing/enclosing_environment.cc b/garnet/public/lib/component/cpp/testing/enclosing_environment.cc similarity index 100% rename from public/lib/component/cpp/testing/enclosing_environment.cc rename to garnet/public/lib/component/cpp/testing/enclosing_environment.cc
diff --git a/public/lib/component/cpp/testing/enclosing_environment.h b/garnet/public/lib/component/cpp/testing/enclosing_environment.h similarity index 100% rename from public/lib/component/cpp/testing/enclosing_environment.h rename to garnet/public/lib/component/cpp/testing/enclosing_environment.h
diff --git a/public/lib/component/cpp/testing/fake_component.cc b/garnet/public/lib/component/cpp/testing/fake_component.cc similarity index 100% rename from public/lib/component/cpp/testing/fake_component.cc rename to garnet/public/lib/component/cpp/testing/fake_component.cc
diff --git a/public/lib/component/cpp/testing/fake_component.h b/garnet/public/lib/component/cpp/testing/fake_component.h similarity index 100% rename from public/lib/component/cpp/testing/fake_component.h rename to garnet/public/lib/component/cpp/testing/fake_component.h
diff --git a/public/lib/component/cpp/testing/fake_launcher.cc b/garnet/public/lib/component/cpp/testing/fake_launcher.cc similarity index 100% rename from public/lib/component/cpp/testing/fake_launcher.cc rename to garnet/public/lib/component/cpp/testing/fake_launcher.cc
diff --git a/public/lib/component/cpp/testing/fake_launcher.h b/garnet/public/lib/component/cpp/testing/fake_launcher.h similarity index 100% rename from public/lib/component/cpp/testing/fake_launcher.h rename to garnet/public/lib/component/cpp/testing/fake_launcher.h
diff --git a/public/lib/component/cpp/testing/launcher_impl.cc b/garnet/public/lib/component/cpp/testing/launcher_impl.cc similarity index 100% rename from public/lib/component/cpp/testing/launcher_impl.cc rename to garnet/public/lib/component/cpp/testing/launcher_impl.cc
diff --git a/public/lib/component/cpp/testing/launcher_impl.h b/garnet/public/lib/component/cpp/testing/launcher_impl.h similarity index 100% rename from public/lib/component/cpp/testing/launcher_impl.h rename to garnet/public/lib/component/cpp/testing/launcher_impl.h
diff --git a/public/lib/component/cpp/testing/startup_context_for_test.cc b/garnet/public/lib/component/cpp/testing/startup_context_for_test.cc similarity index 100% rename from public/lib/component/cpp/testing/startup_context_for_test.cc rename to garnet/public/lib/component/cpp/testing/startup_context_for_test.cc
diff --git a/public/lib/component/cpp/testing/startup_context_for_test.h b/garnet/public/lib/component/cpp/testing/startup_context_for_test.h similarity index 100% rename from public/lib/component/cpp/testing/startup_context_for_test.h rename to garnet/public/lib/component/cpp/testing/startup_context_for_test.h
diff --git a/public/lib/component/cpp/testing/termination_result.h b/garnet/public/lib/component/cpp/testing/termination_result.h similarity index 100% rename from public/lib/component/cpp/testing/termination_result.h rename to garnet/public/lib/component/cpp/testing/termination_result.h
diff --git a/public/lib/component/cpp/testing/test_util.cc b/garnet/public/lib/component/cpp/testing/test_util.cc similarity index 100% rename from public/lib/component/cpp/testing/test_util.cc rename to garnet/public/lib/component/cpp/testing/test_util.cc
diff --git a/public/lib/component/cpp/testing/test_util.h b/garnet/public/lib/component/cpp/testing/test_util.h similarity index 100% rename from public/lib/component/cpp/testing/test_util.h rename to garnet/public/lib/component/cpp/testing/test_util.h
diff --git a/public/lib/component/cpp/testing/test_with_context.cc b/garnet/public/lib/component/cpp/testing/test_with_context.cc similarity index 100% rename from public/lib/component/cpp/testing/test_with_context.cc rename to garnet/public/lib/component/cpp/testing/test_with_context.cc
diff --git a/public/lib/component/cpp/testing/test_with_context.h b/garnet/public/lib/component/cpp/testing/test_with_context.h similarity index 100% rename from public/lib/component/cpp/testing/test_with_context.h rename to garnet/public/lib/component/cpp/testing/test_with_context.h
diff --git a/public/lib/component/cpp/testing/test_with_environment.cc b/garnet/public/lib/component/cpp/testing/test_with_environment.cc similarity index 100% rename from public/lib/component/cpp/testing/test_with_environment.cc rename to garnet/public/lib/component/cpp/testing/test_with_environment.cc
diff --git a/public/lib/component/cpp/testing/test_with_environment.h b/garnet/public/lib/component/cpp/testing/test_with_environment.h similarity index 100% rename from public/lib/component/cpp/testing/test_with_environment.h rename to garnet/public/lib/component/cpp/testing/test_with_environment.h
diff --git a/public/lib/component/go/src/app/BUILD.gn b/garnet/public/lib/component/go/src/app/BUILD.gn similarity index 100% rename from public/lib/component/go/src/app/BUILD.gn rename to garnet/public/lib/component/go/src/app/BUILD.gn
diff --git a/public/lib/component/go/src/app/context/context.go b/garnet/public/lib/component/go/src/app/context/context.go similarity index 100% rename from public/lib/component/go/src/app/context/context.go rename to garnet/public/lib/component/go/src/app/context/context.go
diff --git a/public/lib/component/go/src/app/service_provider_impl/service_provider_impl.go b/garnet/public/lib/component/go/src/app/service_provider_impl/service_provider_impl.go similarity index 100% rename from public/lib/component/go/src/app/service_provider_impl/service_provider_impl.go rename to garnet/public/lib/component/go/src/app/service_provider_impl/service_provider_impl.go
diff --git a/public/lib/escher/BUILD.gn b/garnet/public/lib/escher/BUILD.gn similarity index 100% rename from public/lib/escher/BUILD.gn rename to garnet/public/lib/escher/BUILD.gn
diff --git a/public/lib/escher/MAINTAINERS b/garnet/public/lib/escher/MAINTAINERS similarity index 100% rename from public/lib/escher/MAINTAINERS rename to garnet/public/lib/escher/MAINTAINERS
diff --git a/public/lib/escher/README.md b/garnet/public/lib/escher/README.md similarity index 100% rename from public/lib/escher/README.md rename to garnet/public/lib/escher/README.md
diff --git a/public/lib/escher/base/BUILD.gn b/garnet/public/lib/escher/base/BUILD.gn similarity index 100% rename from public/lib/escher/base/BUILD.gn rename to garnet/public/lib/escher/base/BUILD.gn
diff --git a/public/lib/escher/base/make.h b/garnet/public/lib/escher/base/make.h similarity index 100% rename from public/lib/escher/base/make.h rename to garnet/public/lib/escher/base/make.h
diff --git a/public/lib/escher/base/ownable.h b/garnet/public/lib/escher/base/ownable.h similarity index 100% rename from public/lib/escher/base/ownable.h rename to garnet/public/lib/escher/base/ownable.h
diff --git a/public/lib/escher/base/owner.h b/garnet/public/lib/escher/base/owner.h similarity index 100% rename from public/lib/escher/base/owner.h rename to garnet/public/lib/escher/base/owner.h
diff --git a/public/lib/escher/base/reffable.cc b/garnet/public/lib/escher/base/reffable.cc similarity index 100% rename from public/lib/escher/base/reffable.cc rename to garnet/public/lib/escher/base/reffable.cc
diff --git a/public/lib/escher/base/reffable.h b/garnet/public/lib/escher/base/reffable.h similarity index 100% rename from public/lib/escher/base/reffable.h rename to garnet/public/lib/escher/base/reffable.h
diff --git a/public/lib/escher/base/trait.h b/garnet/public/lib/escher/base/trait.h similarity index 100% rename from public/lib/escher/base/trait.h rename to garnet/public/lib/escher/base/trait.h
diff --git a/public/lib/escher/base/type_info.h b/garnet/public/lib/escher/base/type_info.h similarity index 100% rename from public/lib/escher/base/type_info.h rename to garnet/public/lib/escher/base/type_info.h
diff --git a/public/lib/escher/base/typed_reffable.h b/garnet/public/lib/escher/base/typed_reffable.h similarity index 100% rename from public/lib/escher/base/typed_reffable.h rename to garnet/public/lib/escher/base/typed_reffable.h
diff --git a/public/lib/escher/build_linux/BUILD.gn b/garnet/public/lib/escher/build_linux/BUILD.gn similarity index 100% rename from public/lib/escher/build_linux/BUILD.gn rename to garnet/public/lib/escher/build_linux/BUILD.gn
diff --git a/public/lib/escher/defaults/README.md b/garnet/public/lib/escher/defaults/README.md similarity index 100% rename from public/lib/escher/defaults/README.md rename to garnet/public/lib/escher/defaults/README.md
diff --git a/public/lib/escher/defaults/default_shader_program_factory.cc b/garnet/public/lib/escher/defaults/default_shader_program_factory.cc similarity index 100% rename from public/lib/escher/defaults/default_shader_program_factory.cc rename to garnet/public/lib/escher/defaults/default_shader_program_factory.cc
diff --git a/public/lib/escher/defaults/default_shader_program_factory.h b/garnet/public/lib/escher/defaults/default_shader_program_factory.h similarity index 100% rename from public/lib/escher/defaults/default_shader_program_factory.h rename to garnet/public/lib/escher/defaults/default_shader_program_factory.h
diff --git a/public/lib/escher/escher.cc b/garnet/public/lib/escher/escher.cc similarity index 100% rename from public/lib/escher/escher.cc rename to garnet/public/lib/escher/escher.cc
diff --git a/public/lib/escher/escher.h b/garnet/public/lib/escher/escher.h similarity index 100% rename from public/lib/escher/escher.h rename to garnet/public/lib/escher/escher.h
diff --git a/public/lib/escher/escher_process_init.cc b/garnet/public/lib/escher/escher_process_init.cc similarity index 100% rename from public/lib/escher/escher_process_init.cc rename to garnet/public/lib/escher/escher_process_init.cc
diff --git a/public/lib/escher/escher_process_init.h b/garnet/public/lib/escher/escher_process_init.h similarity index 100% rename from public/lib/escher/escher_process_init.h rename to garnet/public/lib/escher/escher_process_init.h
diff --git a/public/lib/escher/flib/fence.h b/garnet/public/lib/escher/flib/fence.h similarity index 100% rename from public/lib/escher/flib/fence.h rename to garnet/public/lib/escher/flib/fence.h
diff --git a/public/lib/escher/flib/fence_listener.cc b/garnet/public/lib/escher/flib/fence_listener.cc similarity index 100% rename from public/lib/escher/flib/fence_listener.cc rename to garnet/public/lib/escher/flib/fence_listener.cc
diff --git a/public/lib/escher/flib/fence_listener.h b/garnet/public/lib/escher/flib/fence_listener.h similarity index 100% rename from public/lib/escher/flib/fence_listener.h rename to garnet/public/lib/escher/flib/fence_listener.h
diff --git a/public/lib/escher/flib/fence_set_listener.cc b/garnet/public/lib/escher/flib/fence_set_listener.cc similarity index 100% rename from public/lib/escher/flib/fence_set_listener.cc rename to garnet/public/lib/escher/flib/fence_set_listener.cc
diff --git a/public/lib/escher/flib/fence_set_listener.h b/garnet/public/lib/escher/flib/fence_set_listener.h similarity index 100% rename from public/lib/escher/flib/fence_set_listener.h rename to garnet/public/lib/escher/flib/fence_set_listener.h
diff --git a/public/lib/escher/flib/release_fence_signaller.cc b/garnet/public/lib/escher/flib/release_fence_signaller.cc similarity index 100% rename from public/lib/escher/flib/release_fence_signaller.cc rename to garnet/public/lib/escher/flib/release_fence_signaller.cc
diff --git a/public/lib/escher/flib/release_fence_signaller.h b/garnet/public/lib/escher/flib/release_fence_signaller.h similarity index 100% rename from public/lib/escher/flib/release_fence_signaller.h rename to garnet/public/lib/escher/flib/release_fence_signaller.h
diff --git a/public/lib/escher/forward_declarations.h b/garnet/public/lib/escher/forward_declarations.h similarity index 100% rename from public/lib/escher/forward_declarations.h rename to garnet/public/lib/escher/forward_declarations.h
diff --git a/public/lib/escher/fs/fuchsia_data_source.cc b/garnet/public/lib/escher/fs/fuchsia_data_source.cc similarity index 100% rename from public/lib/escher/fs/fuchsia_data_source.cc rename to garnet/public/lib/escher/fs/fuchsia_data_source.cc
diff --git a/public/lib/escher/fs/fuchsia_data_source.h b/garnet/public/lib/escher/fs/fuchsia_data_source.h similarity index 100% rename from public/lib/escher/fs/fuchsia_data_source.h rename to garnet/public/lib/escher/fs/fuchsia_data_source.h
diff --git a/public/lib/escher/fs/hack_filesystem.cc b/garnet/public/lib/escher/fs/hack_filesystem.cc similarity index 100% rename from public/lib/escher/fs/hack_filesystem.cc rename to garnet/public/lib/escher/fs/hack_filesystem.cc
diff --git a/public/lib/escher/fs/hack_filesystem.h b/garnet/public/lib/escher/fs/hack_filesystem.h similarity index 100% rename from public/lib/escher/fs/hack_filesystem.h rename to garnet/public/lib/escher/fs/hack_filesystem.h
diff --git a/public/lib/escher/fs/linux_data_source.cc b/garnet/public/lib/escher/fs/linux_data_source.cc similarity index 100% rename from public/lib/escher/fs/linux_data_source.cc rename to garnet/public/lib/escher/fs/linux_data_source.cc
diff --git a/public/lib/escher/fs/linux_data_source.h b/garnet/public/lib/escher/fs/linux_data_source.h similarity index 100% rename from public/lib/escher/fs/linux_data_source.h rename to garnet/public/lib/escher/fs/linux_data_source.h
diff --git a/public/lib/escher/geometry/bounding_box.cc b/garnet/public/lib/escher/geometry/bounding_box.cc similarity index 100% rename from public/lib/escher/geometry/bounding_box.cc rename to garnet/public/lib/escher/geometry/bounding_box.cc
diff --git a/public/lib/escher/geometry/bounding_box.h b/garnet/public/lib/escher/geometry/bounding_box.h similarity index 100% rename from public/lib/escher/geometry/bounding_box.h rename to garnet/public/lib/escher/geometry/bounding_box.h
diff --git a/public/lib/escher/geometry/clip_planes.cc b/garnet/public/lib/escher/geometry/clip_planes.cc similarity index 100% rename from public/lib/escher/geometry/clip_planes.cc rename to garnet/public/lib/escher/geometry/clip_planes.cc
diff --git a/public/lib/escher/geometry/clip_planes.h b/garnet/public/lib/escher/geometry/clip_planes.h similarity index 100% rename from public/lib/escher/geometry/clip_planes.h rename to garnet/public/lib/escher/geometry/clip_planes.h
diff --git a/public/lib/escher/geometry/indexed_triangle_mesh.h b/garnet/public/lib/escher/geometry/indexed_triangle_mesh.h similarity index 100% rename from public/lib/escher/geometry/indexed_triangle_mesh.h rename to garnet/public/lib/escher/geometry/indexed_triangle_mesh.h
diff --git a/public/lib/escher/geometry/indexed_triangle_mesh_clip.h b/garnet/public/lib/escher/geometry/indexed_triangle_mesh_clip.h similarity index 100% rename from public/lib/escher/geometry/indexed_triangle_mesh_clip.h rename to garnet/public/lib/escher/geometry/indexed_triangle_mesh_clip.h
diff --git a/public/lib/escher/geometry/indexed_triangle_mesh_upload.h b/garnet/public/lib/escher/geometry/indexed_triangle_mesh_upload.h similarity index 100% rename from public/lib/escher/geometry/indexed_triangle_mesh_upload.h rename to garnet/public/lib/escher/geometry/indexed_triangle_mesh_upload.h
diff --git a/public/lib/escher/geometry/intersection.cc b/garnet/public/lib/escher/geometry/intersection.cc similarity index 100% rename from public/lib/escher/geometry/intersection.cc rename to garnet/public/lib/escher/geometry/intersection.cc
diff --git a/public/lib/escher/geometry/intersection.h b/garnet/public/lib/escher/geometry/intersection.h similarity index 100% rename from public/lib/escher/geometry/intersection.h rename to garnet/public/lib/escher/geometry/intersection.h
diff --git a/public/lib/escher/geometry/plane_ops.h b/garnet/public/lib/escher/geometry/plane_ops.h similarity index 100% rename from public/lib/escher/geometry/plane_ops.h rename to garnet/public/lib/escher/geometry/plane_ops.h
diff --git a/public/lib/escher/geometry/quad.cc b/garnet/public/lib/escher/geometry/quad.cc similarity index 100% rename from public/lib/escher/geometry/quad.cc rename to garnet/public/lib/escher/geometry/quad.cc
diff --git a/public/lib/escher/geometry/quad.h b/garnet/public/lib/escher/geometry/quad.h similarity index 100% rename from public/lib/escher/geometry/quad.h rename to garnet/public/lib/escher/geometry/quad.h
diff --git a/public/lib/escher/geometry/tessellation.cc b/garnet/public/lib/escher/geometry/tessellation.cc similarity index 100% rename from public/lib/escher/geometry/tessellation.cc rename to garnet/public/lib/escher/geometry/tessellation.cc
diff --git a/public/lib/escher/geometry/tessellation.h b/garnet/public/lib/escher/geometry/tessellation.h similarity index 100% rename from public/lib/escher/geometry/tessellation.h rename to garnet/public/lib/escher/geometry/tessellation.h
diff --git a/public/lib/escher/geometry/transform.cc b/garnet/public/lib/escher/geometry/transform.cc similarity index 100% rename from public/lib/escher/geometry/transform.cc rename to garnet/public/lib/escher/geometry/transform.cc
diff --git a/public/lib/escher/geometry/transform.h b/garnet/public/lib/escher/geometry/transform.h similarity index 100% rename from public/lib/escher/geometry/transform.h rename to garnet/public/lib/escher/geometry/transform.h
diff --git a/public/lib/escher/geometry/type_utils.h b/garnet/public/lib/escher/geometry/type_utils.h similarity index 100% rename from public/lib/escher/geometry/type_utils.h rename to garnet/public/lib/escher/geometry/type_utils.h
diff --git a/public/lib/escher/geometry/types.h b/garnet/public/lib/escher/geometry/types.h similarity index 100% rename from public/lib/escher/geometry/types.h rename to garnet/public/lib/escher/geometry/types.h
diff --git a/public/lib/escher/hmd/pose_buffer.h b/garnet/public/lib/escher/hmd/pose_buffer.h similarity index 100% rename from public/lib/escher/hmd/pose_buffer.h rename to garnet/public/lib/escher/hmd/pose_buffer.h
diff --git a/public/lib/escher/hmd/pose_buffer_latching_shader.cc b/garnet/public/lib/escher/hmd/pose_buffer_latching_shader.cc similarity index 100% rename from public/lib/escher/hmd/pose_buffer_latching_shader.cc rename to garnet/public/lib/escher/hmd/pose_buffer_latching_shader.cc
diff --git a/public/lib/escher/hmd/pose_buffer_latching_shader.h b/garnet/public/lib/escher/hmd/pose_buffer_latching_shader.h similarity index 100% rename from public/lib/escher/hmd/pose_buffer_latching_shader.h rename to garnet/public/lib/escher/hmd/pose_buffer_latching_shader.h
diff --git a/public/lib/escher/impl/command_buffer.cc b/garnet/public/lib/escher/impl/command_buffer.cc similarity index 100% rename from public/lib/escher/impl/command_buffer.cc rename to garnet/public/lib/escher/impl/command_buffer.cc
diff --git a/public/lib/escher/impl/command_buffer.h b/garnet/public/lib/escher/impl/command_buffer.h similarity index 100% rename from public/lib/escher/impl/command_buffer.h rename to garnet/public/lib/escher/impl/command_buffer.h
diff --git a/public/lib/escher/impl/command_buffer_pool.cc b/garnet/public/lib/escher/impl/command_buffer_pool.cc similarity index 100% rename from public/lib/escher/impl/command_buffer_pool.cc rename to garnet/public/lib/escher/impl/command_buffer_pool.cc
diff --git a/public/lib/escher/impl/command_buffer_pool.h b/garnet/public/lib/escher/impl/command_buffer_pool.h similarity index 100% rename from public/lib/escher/impl/command_buffer_pool.h rename to garnet/public/lib/escher/impl/command_buffer_pool.h
diff --git a/public/lib/escher/impl/command_buffer_sequencer.cc b/garnet/public/lib/escher/impl/command_buffer_sequencer.cc similarity index 100% rename from public/lib/escher/impl/command_buffer_sequencer.cc rename to garnet/public/lib/escher/impl/command_buffer_sequencer.cc
diff --git a/public/lib/escher/impl/command_buffer_sequencer.h b/garnet/public/lib/escher/impl/command_buffer_sequencer.h similarity index 100% rename from public/lib/escher/impl/command_buffer_sequencer.h rename to garnet/public/lib/escher/impl/command_buffer_sequencer.h
diff --git a/public/lib/escher/impl/compute_shader.cc b/garnet/public/lib/escher/impl/compute_shader.cc similarity index 100% rename from public/lib/escher/impl/compute_shader.cc rename to garnet/public/lib/escher/impl/compute_shader.cc
diff --git a/public/lib/escher/impl/compute_shader.h b/garnet/public/lib/escher/impl/compute_shader.h similarity index 100% rename from public/lib/escher/impl/compute_shader.h rename to garnet/public/lib/escher/impl/compute_shader.h
diff --git a/public/lib/escher/impl/debug_print.cc b/garnet/public/lib/escher/impl/debug_print.cc similarity index 100% rename from public/lib/escher/impl/debug_print.cc rename to garnet/public/lib/escher/impl/debug_print.cc
diff --git a/public/lib/escher/impl/descriptor_set_pool.cc b/garnet/public/lib/escher/impl/descriptor_set_pool.cc similarity index 100% rename from public/lib/escher/impl/descriptor_set_pool.cc rename to garnet/public/lib/escher/impl/descriptor_set_pool.cc
diff --git a/public/lib/escher/impl/descriptor_set_pool.h b/garnet/public/lib/escher/impl/descriptor_set_pool.h similarity index 100% rename from public/lib/escher/impl/descriptor_set_pool.h rename to garnet/public/lib/escher/impl/descriptor_set_pool.h
diff --git a/public/lib/escher/impl/frame_manager.cc b/garnet/public/lib/escher/impl/frame_manager.cc similarity index 100% rename from public/lib/escher/impl/frame_manager.cc rename to garnet/public/lib/escher/impl/frame_manager.cc
diff --git a/public/lib/escher/impl/frame_manager.h b/garnet/public/lib/escher/impl/frame_manager.h similarity index 100% rename from public/lib/escher/impl/frame_manager.h rename to garnet/public/lib/escher/impl/frame_manager.h
diff --git a/public/lib/escher/impl/gaussian_3x3f.cc b/garnet/public/lib/escher/impl/gaussian_3x3f.cc similarity index 100% rename from public/lib/escher/impl/gaussian_3x3f.cc rename to garnet/public/lib/escher/impl/gaussian_3x3f.cc
diff --git a/public/lib/escher/impl/gaussian_3x3f.h b/garnet/public/lib/escher/impl/gaussian_3x3f.h similarity index 100% rename from public/lib/escher/impl/gaussian_3x3f.h rename to garnet/public/lib/escher/impl/gaussian_3x3f.h
diff --git a/public/lib/escher/impl/gaussian_3x3f16.cc b/garnet/public/lib/escher/impl/gaussian_3x3f16.cc similarity index 100% rename from public/lib/escher/impl/gaussian_3x3f16.cc rename to garnet/public/lib/escher/impl/gaussian_3x3f16.cc
diff --git a/public/lib/escher/impl/gaussian_3x3f16.h b/garnet/public/lib/escher/impl/gaussian_3x3f16.h similarity index 100% rename from public/lib/escher/impl/gaussian_3x3f16.h rename to garnet/public/lib/escher/impl/gaussian_3x3f16.h
diff --git a/public/lib/escher/impl/glsl_compiler.cc b/garnet/public/lib/escher/impl/glsl_compiler.cc similarity index 100% rename from public/lib/escher/impl/glsl_compiler.cc rename to garnet/public/lib/escher/impl/glsl_compiler.cc
diff --git a/public/lib/escher/impl/glsl_compiler.h b/garnet/public/lib/escher/impl/glsl_compiler.h similarity index 100% rename from public/lib/escher/impl/glsl_compiler.h rename to garnet/public/lib/escher/impl/glsl_compiler.h
diff --git a/public/lib/escher/impl/gpu_mem_slab.cc b/garnet/public/lib/escher/impl/gpu_mem_slab.cc similarity index 100% rename from public/lib/escher/impl/gpu_mem_slab.cc rename to garnet/public/lib/escher/impl/gpu_mem_slab.cc
diff --git a/public/lib/escher/impl/gpu_mem_slab.h b/garnet/public/lib/escher/impl/gpu_mem_slab.h similarity index 100% rename from public/lib/escher/impl/gpu_mem_slab.h rename to garnet/public/lib/escher/impl/gpu_mem_slab.h
diff --git a/public/lib/escher/impl/gpu_mem_suballocation.cc b/garnet/public/lib/escher/impl/gpu_mem_suballocation.cc similarity index 100% rename from public/lib/escher/impl/gpu_mem_suballocation.cc rename to garnet/public/lib/escher/impl/gpu_mem_suballocation.cc
diff --git a/public/lib/escher/impl/gpu_mem_suballocation.h b/garnet/public/lib/escher/impl/gpu_mem_suballocation.h similarity index 100% rename from public/lib/escher/impl/gpu_mem_suballocation.h rename to garnet/public/lib/escher/impl/gpu_mem_suballocation.h
diff --git a/public/lib/escher/impl/gpu_uploader.cc b/garnet/public/lib/escher/impl/gpu_uploader.cc similarity index 100% rename from public/lib/escher/impl/gpu_uploader.cc rename to garnet/public/lib/escher/impl/gpu_uploader.cc
diff --git a/public/lib/escher/impl/gpu_uploader.h b/garnet/public/lib/escher/impl/gpu_uploader.h similarity index 100% rename from public/lib/escher/impl/gpu_uploader.h rename to garnet/public/lib/escher/impl/gpu_uploader.h
diff --git a/public/lib/escher/impl/image_cache.cc b/garnet/public/lib/escher/impl/image_cache.cc similarity index 100% rename from public/lib/escher/impl/image_cache.cc rename to garnet/public/lib/escher/impl/image_cache.cc
diff --git a/public/lib/escher/impl/image_cache.h b/garnet/public/lib/escher/impl/image_cache.h similarity index 100% rename from public/lib/escher/impl/image_cache.h rename to garnet/public/lib/escher/impl/image_cache.h
diff --git a/public/lib/escher/impl/mesh_manager.cc b/garnet/public/lib/escher/impl/mesh_manager.cc similarity index 100% rename from public/lib/escher/impl/mesh_manager.cc rename to garnet/public/lib/escher/impl/mesh_manager.cc
diff --git a/public/lib/escher/impl/mesh_manager.h b/garnet/public/lib/escher/impl/mesh_manager.h similarity index 100% rename from public/lib/escher/impl/mesh_manager.h rename to garnet/public/lib/escher/impl/mesh_manager.h
diff --git a/public/lib/escher/impl/mesh_shader_binding.cc b/garnet/public/lib/escher/impl/mesh_shader_binding.cc similarity index 100% rename from public/lib/escher/impl/mesh_shader_binding.cc rename to garnet/public/lib/escher/impl/mesh_shader_binding.cc
diff --git a/public/lib/escher/impl/mesh_shader_binding.h b/garnet/public/lib/escher/impl/mesh_shader_binding.h similarity index 100% rename from public/lib/escher/impl/mesh_shader_binding.h rename to garnet/public/lib/escher/impl/mesh_shader_binding.h
diff --git a/public/lib/escher/impl/model_data.cc b/garnet/public/lib/escher/impl/model_data.cc similarity index 100% rename from public/lib/escher/impl/model_data.cc rename to garnet/public/lib/escher/impl/model_data.cc
diff --git a/public/lib/escher/impl/model_data.h b/garnet/public/lib/escher/impl/model_data.h similarity index 100% rename from public/lib/escher/impl/model_data.h rename to garnet/public/lib/escher/impl/model_data.h
diff --git a/public/lib/escher/impl/model_depth_pass.cc b/garnet/public/lib/escher/impl/model_depth_pass.cc similarity index 100% rename from public/lib/escher/impl/model_depth_pass.cc rename to garnet/public/lib/escher/impl/model_depth_pass.cc
diff --git a/public/lib/escher/impl/model_depth_pass.h b/garnet/public/lib/escher/impl/model_depth_pass.h similarity index 100% rename from public/lib/escher/impl/model_depth_pass.h rename to garnet/public/lib/escher/impl/model_depth_pass.h
diff --git a/public/lib/escher/impl/model_display_list.cc b/garnet/public/lib/escher/impl/model_display_list.cc similarity index 100% rename from public/lib/escher/impl/model_display_list.cc rename to garnet/public/lib/escher/impl/model_display_list.cc
diff --git a/public/lib/escher/impl/model_display_list.h b/garnet/public/lib/escher/impl/model_display_list.h similarity index 100% rename from public/lib/escher/impl/model_display_list.h rename to garnet/public/lib/escher/impl/model_display_list.h
diff --git a/public/lib/escher/impl/model_display_list_builder.cc b/garnet/public/lib/escher/impl/model_display_list_builder.cc similarity index 100% rename from public/lib/escher/impl/model_display_list_builder.cc rename to garnet/public/lib/escher/impl/model_display_list_builder.cc
diff --git a/public/lib/escher/impl/model_display_list_builder.h b/garnet/public/lib/escher/impl/model_display_list_builder.h similarity index 100% rename from public/lib/escher/impl/model_display_list_builder.h rename to garnet/public/lib/escher/impl/model_display_list_builder.h
diff --git a/public/lib/escher/impl/model_display_list_flags.h b/garnet/public/lib/escher/impl/model_display_list_flags.h similarity index 100% rename from public/lib/escher/impl/model_display_list_flags.h rename to garnet/public/lib/escher/impl/model_display_list_flags.h
diff --git a/public/lib/escher/impl/model_lighting_pass.cc b/garnet/public/lib/escher/impl/model_lighting_pass.cc similarity index 100% rename from public/lib/escher/impl/model_lighting_pass.cc rename to garnet/public/lib/escher/impl/model_lighting_pass.cc
diff --git a/public/lib/escher/impl/model_lighting_pass.h b/garnet/public/lib/escher/impl/model_lighting_pass.h similarity index 100% rename from public/lib/escher/impl/model_lighting_pass.h rename to garnet/public/lib/escher/impl/model_lighting_pass.h
diff --git a/public/lib/escher/impl/model_moment_shadow_map_lighting_pass.cc b/garnet/public/lib/escher/impl/model_moment_shadow_map_lighting_pass.cc similarity index 100% rename from public/lib/escher/impl/model_moment_shadow_map_lighting_pass.cc rename to garnet/public/lib/escher/impl/model_moment_shadow_map_lighting_pass.cc
diff --git a/public/lib/escher/impl/model_moment_shadow_map_lighting_pass.h b/garnet/public/lib/escher/impl/model_moment_shadow_map_lighting_pass.h similarity index 100% rename from public/lib/escher/impl/model_moment_shadow_map_lighting_pass.h rename to garnet/public/lib/escher/impl/model_moment_shadow_map_lighting_pass.h
diff --git a/public/lib/escher/impl/model_moment_shadow_map_pass.cc b/garnet/public/lib/escher/impl/model_moment_shadow_map_pass.cc similarity index 100% rename from public/lib/escher/impl/model_moment_shadow_map_pass.cc rename to garnet/public/lib/escher/impl/model_moment_shadow_map_pass.cc
diff --git a/public/lib/escher/impl/model_moment_shadow_map_pass.h b/garnet/public/lib/escher/impl/model_moment_shadow_map_pass.h similarity index 100% rename from public/lib/escher/impl/model_moment_shadow_map_pass.h rename to garnet/public/lib/escher/impl/model_moment_shadow_map_pass.h
diff --git a/public/lib/escher/impl/model_pipeline.cc b/garnet/public/lib/escher/impl/model_pipeline.cc similarity index 100% rename from public/lib/escher/impl/model_pipeline.cc rename to garnet/public/lib/escher/impl/model_pipeline.cc
diff --git a/public/lib/escher/impl/model_pipeline.h b/garnet/public/lib/escher/impl/model_pipeline.h similarity index 100% rename from public/lib/escher/impl/model_pipeline.h rename to garnet/public/lib/escher/impl/model_pipeline.h
diff --git a/public/lib/escher/impl/model_pipeline_cache.cc b/garnet/public/lib/escher/impl/model_pipeline_cache.cc similarity index 100% rename from public/lib/escher/impl/model_pipeline_cache.cc rename to garnet/public/lib/escher/impl/model_pipeline_cache.cc
diff --git a/public/lib/escher/impl/model_pipeline_cache.h b/garnet/public/lib/escher/impl/model_pipeline_cache.h similarity index 100% rename from public/lib/escher/impl/model_pipeline_cache.h rename to garnet/public/lib/escher/impl/model_pipeline_cache.h
diff --git a/public/lib/escher/impl/model_pipeline_spec.h b/garnet/public/lib/escher/impl/model_pipeline_spec.h similarity index 100% rename from public/lib/escher/impl/model_pipeline_spec.h rename to garnet/public/lib/escher/impl/model_pipeline_spec.h
diff --git a/public/lib/escher/impl/model_render_pass.cc b/garnet/public/lib/escher/impl/model_render_pass.cc similarity index 100% rename from public/lib/escher/impl/model_render_pass.cc rename to garnet/public/lib/escher/impl/model_render_pass.cc
diff --git a/public/lib/escher/impl/model_render_pass.h b/garnet/public/lib/escher/impl/model_render_pass.h similarity index 100% rename from public/lib/escher/impl/model_render_pass.h rename to garnet/public/lib/escher/impl/model_render_pass.h
diff --git a/public/lib/escher/impl/model_renderer.cc b/garnet/public/lib/escher/impl/model_renderer.cc similarity index 100% rename from public/lib/escher/impl/model_renderer.cc rename to garnet/public/lib/escher/impl/model_renderer.cc
diff --git a/public/lib/escher/impl/model_renderer.h b/garnet/public/lib/escher/impl/model_renderer.h similarity index 100% rename from public/lib/escher/impl/model_renderer.h rename to garnet/public/lib/escher/impl/model_renderer.h
diff --git a/public/lib/escher/impl/model_shadow_map_lighting_pass.cc b/garnet/public/lib/escher/impl/model_shadow_map_lighting_pass.cc similarity index 100% rename from public/lib/escher/impl/model_shadow_map_lighting_pass.cc rename to garnet/public/lib/escher/impl/model_shadow_map_lighting_pass.cc
diff --git a/public/lib/escher/impl/model_shadow_map_lighting_pass.h b/garnet/public/lib/escher/impl/model_shadow_map_lighting_pass.h similarity index 100% rename from public/lib/escher/impl/model_shadow_map_lighting_pass.h rename to garnet/public/lib/escher/impl/model_shadow_map_lighting_pass.h
diff --git a/public/lib/escher/impl/model_shadow_map_pass.cc b/garnet/public/lib/escher/impl/model_shadow_map_pass.cc similarity index 100% rename from public/lib/escher/impl/model_shadow_map_pass.cc rename to garnet/public/lib/escher/impl/model_shadow_map_pass.cc
diff --git a/public/lib/escher/impl/model_shadow_map_pass.h b/garnet/public/lib/escher/impl/model_shadow_map_pass.h similarity index 100% rename from public/lib/escher/impl/model_shadow_map_pass.h rename to garnet/public/lib/escher/impl/model_shadow_map_pass.h
diff --git a/public/lib/escher/impl/naive_buffer.cc b/garnet/public/lib/escher/impl/naive_buffer.cc similarity index 100% rename from public/lib/escher/impl/naive_buffer.cc rename to garnet/public/lib/escher/impl/naive_buffer.cc
diff --git a/public/lib/escher/impl/naive_buffer.h b/garnet/public/lib/escher/impl/naive_buffer.h similarity index 100% rename from public/lib/escher/impl/naive_buffer.h rename to garnet/public/lib/escher/impl/naive_buffer.h
diff --git a/public/lib/escher/impl/naive_image.cc b/garnet/public/lib/escher/impl/naive_image.cc similarity index 100% rename from public/lib/escher/impl/naive_image.cc rename to garnet/public/lib/escher/impl/naive_image.cc
diff --git a/public/lib/escher/impl/naive_image.h b/garnet/public/lib/escher/impl/naive_image.h similarity index 100% rename from public/lib/escher/impl/naive_image.h rename to garnet/public/lib/escher/impl/naive_image.h
diff --git a/public/lib/escher/impl/ssdo_accelerator.cc b/garnet/public/lib/escher/impl/ssdo_accelerator.cc similarity index 100% rename from public/lib/escher/impl/ssdo_accelerator.cc rename to garnet/public/lib/escher/impl/ssdo_accelerator.cc
diff --git a/public/lib/escher/impl/ssdo_accelerator.h b/garnet/public/lib/escher/impl/ssdo_accelerator.h similarity index 100% rename from public/lib/escher/impl/ssdo_accelerator.h rename to garnet/public/lib/escher/impl/ssdo_accelerator.h
diff --git a/public/lib/escher/impl/ssdo_sampler.cc b/garnet/public/lib/escher/impl/ssdo_sampler.cc similarity index 100% rename from public/lib/escher/impl/ssdo_sampler.cc rename to garnet/public/lib/escher/impl/ssdo_sampler.cc
diff --git a/public/lib/escher/impl/ssdo_sampler.h b/garnet/public/lib/escher/impl/ssdo_sampler.h similarity index 100% rename from public/lib/escher/impl/ssdo_sampler.h rename to garnet/public/lib/escher/impl/ssdo_sampler.h
diff --git a/public/lib/escher/impl/uniform_buffer_pool.cc b/garnet/public/lib/escher/impl/uniform_buffer_pool.cc similarity index 100% rename from public/lib/escher/impl/uniform_buffer_pool.cc rename to garnet/public/lib/escher/impl/uniform_buffer_pool.cc
diff --git a/public/lib/escher/impl/uniform_buffer_pool.h b/garnet/public/lib/escher/impl/uniform_buffer_pool.h similarity index 100% rename from public/lib/escher/impl/uniform_buffer_pool.h rename to garnet/public/lib/escher/impl/uniform_buffer_pool.h
diff --git a/public/lib/escher/impl/vk/README.md b/garnet/public/lib/escher/impl/vk/README.md similarity index 100% rename from public/lib/escher/impl/vk/README.md rename to garnet/public/lib/escher/impl/vk/README.md
diff --git a/public/lib/escher/impl/vk/pipeline.cc b/garnet/public/lib/escher/impl/vk/pipeline.cc similarity index 100% rename from public/lib/escher/impl/vk/pipeline.cc rename to garnet/public/lib/escher/impl/vk/pipeline.cc
diff --git a/public/lib/escher/impl/vk/pipeline.h b/garnet/public/lib/escher/impl/vk/pipeline.h similarity index 100% rename from public/lib/escher/impl/vk/pipeline.h rename to garnet/public/lib/escher/impl/vk/pipeline.h
diff --git a/public/lib/escher/impl/vk/pipeline_cache.cc b/garnet/public/lib/escher/impl/vk/pipeline_cache.cc similarity index 100% rename from public/lib/escher/impl/vk/pipeline_cache.cc rename to garnet/public/lib/escher/impl/vk/pipeline_cache.cc
diff --git a/public/lib/escher/impl/vk/pipeline_cache.h b/garnet/public/lib/escher/impl/vk/pipeline_cache.h similarity index 100% rename from public/lib/escher/impl/vk/pipeline_cache.h rename to garnet/public/lib/escher/impl/vk/pipeline_cache.h
diff --git a/public/lib/escher/impl/vk/pipeline_factory.h b/garnet/public/lib/escher/impl/vk/pipeline_factory.h similarity index 100% rename from public/lib/escher/impl/vk/pipeline_factory.h rename to garnet/public/lib/escher/impl/vk/pipeline_factory.h
diff --git a/public/lib/escher/impl/vk/pipeline_layout.cc b/garnet/public/lib/escher/impl/vk/pipeline_layout.cc similarity index 100% rename from public/lib/escher/impl/vk/pipeline_layout.cc rename to garnet/public/lib/escher/impl/vk/pipeline_layout.cc
diff --git a/public/lib/escher/impl/vk/pipeline_layout.h b/garnet/public/lib/escher/impl/vk/pipeline_layout.h similarity index 100% rename from public/lib/escher/impl/vk/pipeline_layout.h rename to garnet/public/lib/escher/impl/vk/pipeline_layout.h
diff --git a/public/lib/escher/impl/vk/pipeline_spec.cc b/garnet/public/lib/escher/impl/vk/pipeline_spec.cc similarity index 100% rename from public/lib/escher/impl/vk/pipeline_spec.cc rename to garnet/public/lib/escher/impl/vk/pipeline_spec.cc
diff --git a/public/lib/escher/impl/vk/pipeline_spec.h b/garnet/public/lib/escher/impl/vk/pipeline_spec.h similarity index 100% rename from public/lib/escher/impl/vk/pipeline_spec.h rename to garnet/public/lib/escher/impl/vk/pipeline_spec.h
diff --git a/public/lib/escher/impl/vulkan_utils.cc b/garnet/public/lib/escher/impl/vulkan_utils.cc similarity index 100% rename from public/lib/escher/impl/vulkan_utils.cc rename to garnet/public/lib/escher/impl/vulkan_utils.cc
diff --git a/public/lib/escher/impl/vulkan_utils.h b/garnet/public/lib/escher/impl/vulkan_utils.h similarity index 100% rename from public/lib/escher/impl/vulkan_utils.h rename to garnet/public/lib/escher/impl/vulkan_utils.h
diff --git a/public/lib/escher/impl/wobble_modifier_absorber.cc b/garnet/public/lib/escher/impl/wobble_modifier_absorber.cc similarity index 100% rename from public/lib/escher/impl/wobble_modifier_absorber.cc rename to garnet/public/lib/escher/impl/wobble_modifier_absorber.cc
diff --git a/public/lib/escher/impl/wobble_modifier_absorber.h b/garnet/public/lib/escher/impl/wobble_modifier_absorber.h similarity index 100% rename from public/lib/escher/impl/wobble_modifier_absorber.h rename to garnet/public/lib/escher/impl/wobble_modifier_absorber.h
diff --git a/public/lib/escher/impl/z_sort.cc b/garnet/public/lib/escher/impl/z_sort.cc similarity index 100% rename from public/lib/escher/impl/z_sort.cc rename to garnet/public/lib/escher/impl/z_sort.cc
diff --git a/public/lib/escher/impl/z_sort.h b/garnet/public/lib/escher/impl/z_sort.h similarity index 100% rename from public/lib/escher/impl/z_sort.h rename to garnet/public/lib/escher/impl/z_sort.h
diff --git a/public/lib/escher/material/color_utils.cc b/garnet/public/lib/escher/material/color_utils.cc similarity index 100% rename from public/lib/escher/material/color_utils.cc rename to garnet/public/lib/escher/material/color_utils.cc
diff --git a/public/lib/escher/material/color_utils.h b/garnet/public/lib/escher/material/color_utils.h similarity index 100% rename from public/lib/escher/material/color_utils.h rename to garnet/public/lib/escher/material/color_utils.h
diff --git a/public/lib/escher/material/material.cc b/garnet/public/lib/escher/material/material.cc similarity index 100% rename from public/lib/escher/material/material.cc rename to garnet/public/lib/escher/material/material.cc
diff --git a/public/lib/escher/material/material.h b/garnet/public/lib/escher/material/material.h similarity index 100% rename from public/lib/escher/material/material.h rename to garnet/public/lib/escher/material/material.h
diff --git a/public/lib/escher/math/lerp.h b/garnet/public/lib/escher/math/lerp.h similarity index 100% rename from public/lib/escher/math/lerp.h rename to garnet/public/lib/escher/math/lerp.h
diff --git a/public/lib/escher/math/rotations.cc b/garnet/public/lib/escher/math/rotations.cc similarity index 100% rename from public/lib/escher/math/rotations.cc rename to garnet/public/lib/escher/math/rotations.cc
diff --git a/public/lib/escher/math/rotations.h b/garnet/public/lib/escher/math/rotations.h similarity index 100% rename from public/lib/escher/math/rotations.h rename to garnet/public/lib/escher/math/rotations.h
diff --git a/public/lib/escher/meta/escher_unittests.cmx b/garnet/public/lib/escher/meta/escher_unittests.cmx similarity index 100% rename from public/lib/escher/meta/escher_unittests.cmx rename to garnet/public/lib/escher/meta/escher_unittests.cmx
diff --git a/public/lib/escher/paper/paper_draw_call.h b/garnet/public/lib/escher/paper/paper_draw_call.h similarity index 100% rename from public/lib/escher/paper/paper_draw_call.h rename to garnet/public/lib/escher/paper/paper_draw_call.h
diff --git a/public/lib/escher/paper/paper_draw_call_factory.cc b/garnet/public/lib/escher/paper/paper_draw_call_factory.cc similarity index 100% rename from public/lib/escher/paper/paper_draw_call_factory.cc rename to garnet/public/lib/escher/paper/paper_draw_call_factory.cc
diff --git a/public/lib/escher/paper/paper_draw_call_factory.h b/garnet/public/lib/escher/paper/paper_draw_call_factory.h similarity index 100% rename from public/lib/escher/paper/paper_draw_call_factory.h rename to garnet/public/lib/escher/paper/paper_draw_call_factory.h
diff --git a/public/lib/escher/paper/paper_drawable.h b/garnet/public/lib/escher/paper/paper_drawable.h similarity index 100% rename from public/lib/escher/paper/paper_drawable.h rename to garnet/public/lib/escher/paper/paper_drawable.h
diff --git a/public/lib/escher/paper/paper_drawable_flags.h b/garnet/public/lib/escher/paper/paper_drawable_flags.h similarity index 100% rename from public/lib/escher/paper/paper_drawable_flags.h rename to garnet/public/lib/escher/paper/paper_drawable_flags.h
diff --git a/public/lib/escher/paper/paper_legacy_drawable.cc b/garnet/public/lib/escher/paper/paper_legacy_drawable.cc similarity index 100% rename from public/lib/escher/paper/paper_legacy_drawable.cc rename to garnet/public/lib/escher/paper/paper_legacy_drawable.cc
diff --git a/public/lib/escher/paper/paper_legacy_drawable.h b/garnet/public/lib/escher/paper/paper_legacy_drawable.h similarity index 100% rename from public/lib/escher/paper/paper_legacy_drawable.h rename to garnet/public/lib/escher/paper/paper_legacy_drawable.h
diff --git a/public/lib/escher/paper/paper_light.h b/garnet/public/lib/escher/paper/paper_light.h similarity index 100% rename from public/lib/escher/paper/paper_light.h rename to garnet/public/lib/escher/paper/paper_light.h
diff --git a/public/lib/escher/paper/paper_material.h b/garnet/public/lib/escher/paper/paper_material.h similarity index 100% rename from public/lib/escher/paper/paper_material.h rename to garnet/public/lib/escher/paper/paper_material.h
diff --git a/public/lib/escher/paper/paper_readme.h b/garnet/public/lib/escher/paper/paper_readme.h similarity index 100% rename from public/lib/escher/paper/paper_readme.h rename to garnet/public/lib/escher/paper/paper_readme.h
diff --git a/public/lib/escher/paper/paper_render_funcs.cc b/garnet/public/lib/escher/paper/paper_render_funcs.cc similarity index 100% rename from public/lib/escher/paper/paper_render_funcs.cc rename to garnet/public/lib/escher/paper/paper_render_funcs.cc
diff --git a/public/lib/escher/paper/paper_render_funcs.h b/garnet/public/lib/escher/paper/paper_render_funcs.h similarity index 100% rename from public/lib/escher/paper/paper_render_funcs.h rename to garnet/public/lib/escher/paper/paper_render_funcs.h
diff --git a/public/lib/escher/paper/paper_render_queue.cc b/garnet/public/lib/escher/paper/paper_render_queue.cc similarity index 100% rename from public/lib/escher/paper/paper_render_queue.cc rename to garnet/public/lib/escher/paper/paper_render_queue.cc
diff --git a/public/lib/escher/paper/paper_render_queue.h b/garnet/public/lib/escher/paper/paper_render_queue.h similarity index 100% rename from public/lib/escher/paper/paper_render_queue.h rename to garnet/public/lib/escher/paper/paper_render_queue.h
diff --git a/public/lib/escher/paper/paper_render_queue_context.cc b/garnet/public/lib/escher/paper/paper_render_queue_context.cc similarity index 100% rename from public/lib/escher/paper/paper_render_queue_context.cc rename to garnet/public/lib/escher/paper/paper_render_queue_context.cc
diff --git a/public/lib/escher/paper/paper_render_queue_context.h b/garnet/public/lib/escher/paper/paper_render_queue_context.h similarity index 100% rename from public/lib/escher/paper/paper_render_queue_context.h rename to garnet/public/lib/escher/paper/paper_render_queue_context.h
diff --git a/public/lib/escher/paper/paper_render_queue_flags.h b/garnet/public/lib/escher/paper/paper_render_queue_flags.h similarity index 100% rename from public/lib/escher/paper/paper_render_queue_flags.h rename to garnet/public/lib/escher/paper/paper_render_queue_flags.h
diff --git a/public/lib/escher/paper/paper_renderer2.cc b/garnet/public/lib/escher/paper/paper_renderer2.cc similarity index 100% rename from public/lib/escher/paper/paper_renderer2.cc rename to garnet/public/lib/escher/paper/paper_renderer2.cc
diff --git a/public/lib/escher/paper/paper_renderer2.h b/garnet/public/lib/escher/paper/paper_renderer2.h similarity index 100% rename from public/lib/escher/paper/paper_renderer2.h rename to garnet/public/lib/escher/paper/paper_renderer2.h
diff --git a/public/lib/escher/paper/paper_renderer_config.h b/garnet/public/lib/escher/paper/paper_renderer_config.h similarity index 100% rename from public/lib/escher/paper/paper_renderer_config.h rename to garnet/public/lib/escher/paper/paper_renderer_config.h
diff --git a/public/lib/escher/paper/paper_scene.h b/garnet/public/lib/escher/paper/paper_scene.h similarity index 100% rename from public/lib/escher/paper/paper_scene.h rename to garnet/public/lib/escher/paper/paper_scene.h
diff --git a/public/lib/escher/paper/paper_shader_structs.h b/garnet/public/lib/escher/paper/paper_shader_structs.h similarity index 100% rename from public/lib/escher/paper/paper_shader_structs.h rename to garnet/public/lib/escher/paper/paper_shader_structs.h
diff --git a/public/lib/escher/paper/paper_shape_cache.cc b/garnet/public/lib/escher/paper/paper_shape_cache.cc similarity index 100% rename from public/lib/escher/paper/paper_shape_cache.cc rename to garnet/public/lib/escher/paper/paper_shape_cache.cc
diff --git a/public/lib/escher/paper/paper_shape_cache.h b/garnet/public/lib/escher/paper/paper_shape_cache.h similarity index 100% rename from public/lib/escher/paper/paper_shape_cache.h rename to garnet/public/lib/escher/paper/paper_shape_cache.h
diff --git a/public/lib/escher/paper/paper_transform_stack.cc b/garnet/public/lib/escher/paper/paper_transform_stack.cc similarity index 100% rename from public/lib/escher/paper/paper_transform_stack.cc rename to garnet/public/lib/escher/paper/paper_transform_stack.cc
diff --git a/public/lib/escher/paper/paper_transform_stack.h b/garnet/public/lib/escher/paper/paper_transform_stack.h similarity index 100% rename from public/lib/escher/paper/paper_transform_stack.h rename to garnet/public/lib/escher/paper/paper_transform_stack.h
diff --git a/public/lib/escher/profiling/timestamp_profiler.cc b/garnet/public/lib/escher/profiling/timestamp_profiler.cc similarity index 100% rename from public/lib/escher/profiling/timestamp_profiler.cc rename to garnet/public/lib/escher/profiling/timestamp_profiler.cc
diff --git a/public/lib/escher/profiling/timestamp_profiler.h b/garnet/public/lib/escher/profiling/timestamp_profiler.h similarity index 100% rename from public/lib/escher/profiling/timestamp_profiler.h rename to garnet/public/lib/escher/profiling/timestamp_profiler.h
diff --git a/public/lib/escher/renderer/batch_gpu_uploader.cc b/garnet/public/lib/escher/renderer/batch_gpu_uploader.cc similarity index 100% rename from public/lib/escher/renderer/batch_gpu_uploader.cc rename to garnet/public/lib/escher/renderer/batch_gpu_uploader.cc
diff --git a/public/lib/escher/renderer/batch_gpu_uploader.h b/garnet/public/lib/escher/renderer/batch_gpu_uploader.h similarity index 100% rename from public/lib/escher/renderer/batch_gpu_uploader.h rename to garnet/public/lib/escher/renderer/batch_gpu_uploader.h
diff --git a/public/lib/escher/renderer/buffer_cache.cc b/garnet/public/lib/escher/renderer/buffer_cache.cc similarity index 100% rename from public/lib/escher/renderer/buffer_cache.cc rename to garnet/public/lib/escher/renderer/buffer_cache.cc
diff --git a/public/lib/escher/renderer/buffer_cache.h b/garnet/public/lib/escher/renderer/buffer_cache.h similarity index 100% rename from public/lib/escher/renderer/buffer_cache.h rename to garnet/public/lib/escher/renderer/buffer_cache.h
diff --git a/public/lib/escher/renderer/frame.cc b/garnet/public/lib/escher/renderer/frame.cc similarity index 100% rename from public/lib/escher/renderer/frame.cc rename to garnet/public/lib/escher/renderer/frame.cc
diff --git a/public/lib/escher/renderer/frame.h b/garnet/public/lib/escher/renderer/frame.h similarity index 100% rename from public/lib/escher/renderer/frame.h rename to garnet/public/lib/escher/renderer/frame.h
diff --git a/public/lib/escher/renderer/moment_shadow_map.cc b/garnet/public/lib/escher/renderer/moment_shadow_map.cc similarity index 100% rename from public/lib/escher/renderer/moment_shadow_map.cc rename to garnet/public/lib/escher/renderer/moment_shadow_map.cc
diff --git a/public/lib/escher/renderer/moment_shadow_map.h b/garnet/public/lib/escher/renderer/moment_shadow_map.h similarity index 100% rename from public/lib/escher/renderer/moment_shadow_map.h rename to garnet/public/lib/escher/renderer/moment_shadow_map.h
diff --git a/public/lib/escher/renderer/moment_shadow_map_renderer.cc b/garnet/public/lib/escher/renderer/moment_shadow_map_renderer.cc similarity index 100% rename from public/lib/escher/renderer/moment_shadow_map_renderer.cc rename to garnet/public/lib/escher/renderer/moment_shadow_map_renderer.cc
diff --git a/public/lib/escher/renderer/moment_shadow_map_renderer.h b/garnet/public/lib/escher/renderer/moment_shadow_map_renderer.h similarity index 100% rename from public/lib/escher/renderer/moment_shadow_map_renderer.h rename to garnet/public/lib/escher/renderer/moment_shadow_map_renderer.h
diff --git a/public/lib/escher/renderer/paper_renderer.cc b/garnet/public/lib/escher/renderer/paper_renderer.cc similarity index 100% rename from public/lib/escher/renderer/paper_renderer.cc rename to garnet/public/lib/escher/renderer/paper_renderer.cc
diff --git a/public/lib/escher/renderer/paper_renderer.h b/garnet/public/lib/escher/renderer/paper_renderer.h similarity index 100% rename from public/lib/escher/renderer/paper_renderer.h rename to garnet/public/lib/escher/renderer/paper_renderer.h
diff --git a/public/lib/escher/renderer/render_queue.cc b/garnet/public/lib/escher/renderer/render_queue.cc similarity index 100% rename from public/lib/escher/renderer/render_queue.cc rename to garnet/public/lib/escher/renderer/render_queue.cc
diff --git a/public/lib/escher/renderer/render_queue.h b/garnet/public/lib/escher/renderer/render_queue.h similarity index 100% rename from public/lib/escher/renderer/render_queue.h rename to garnet/public/lib/escher/renderer/render_queue.h
diff --git a/public/lib/escher/renderer/render_queue_context.h b/garnet/public/lib/escher/renderer/render_queue_context.h similarity index 100% rename from public/lib/escher/renderer/render_queue_context.h rename to garnet/public/lib/escher/renderer/render_queue_context.h
diff --git a/public/lib/escher/renderer/render_queue_item.h b/garnet/public/lib/escher/renderer/render_queue_item.h similarity index 100% rename from public/lib/escher/renderer/render_queue_item.h rename to garnet/public/lib/escher/renderer/render_queue_item.h
diff --git a/public/lib/escher/renderer/renderer.cc b/garnet/public/lib/escher/renderer/renderer.cc similarity index 100% rename from public/lib/escher/renderer/renderer.cc rename to garnet/public/lib/escher/renderer/renderer.cc
diff --git a/public/lib/escher/renderer/renderer.h b/garnet/public/lib/escher/renderer/renderer.h similarity index 100% rename from public/lib/escher/renderer/renderer.h rename to garnet/public/lib/escher/renderer/renderer.h
diff --git a/public/lib/escher/renderer/semaphore.cc b/garnet/public/lib/escher/renderer/semaphore.cc similarity index 100% rename from public/lib/escher/renderer/semaphore.cc rename to garnet/public/lib/escher/renderer/semaphore.cc
diff --git a/public/lib/escher/renderer/semaphore.h b/garnet/public/lib/escher/renderer/semaphore.h similarity index 100% rename from public/lib/escher/renderer/semaphore.h rename to garnet/public/lib/escher/renderer/semaphore.h
diff --git a/public/lib/escher/renderer/shadow_map.cc b/garnet/public/lib/escher/renderer/shadow_map.cc similarity index 100% rename from public/lib/escher/renderer/shadow_map.cc rename to garnet/public/lib/escher/renderer/shadow_map.cc
diff --git a/public/lib/escher/renderer/shadow_map.h b/garnet/public/lib/escher/renderer/shadow_map.h similarity index 100% rename from public/lib/escher/renderer/shadow_map.h rename to garnet/public/lib/escher/renderer/shadow_map.h
diff --git a/public/lib/escher/renderer/shadow_map_renderer.cc b/garnet/public/lib/escher/renderer/shadow_map_renderer.cc similarity index 100% rename from public/lib/escher/renderer/shadow_map_renderer.cc rename to garnet/public/lib/escher/renderer/shadow_map_renderer.cc
diff --git a/public/lib/escher/renderer/shadow_map_renderer.h b/garnet/public/lib/escher/renderer/shadow_map_renderer.h similarity index 100% rename from public/lib/escher/renderer/shadow_map_renderer.h rename to garnet/public/lib/escher/renderer/shadow_map_renderer.h
diff --git a/public/lib/escher/renderer/shadow_map_type_info.h b/garnet/public/lib/escher/renderer/shadow_map_type_info.h similarity index 100% rename from public/lib/escher/renderer/shadow_map_type_info.h rename to garnet/public/lib/escher/renderer/shadow_map_type_info.h
diff --git a/public/lib/escher/renderer/uniform_allocation.h b/garnet/public/lib/escher/renderer/uniform_allocation.h similarity index 100% rename from public/lib/escher/renderer/uniform_allocation.h rename to garnet/public/lib/escher/renderer/uniform_allocation.h
diff --git a/public/lib/escher/renderer/uniform_binding.h b/garnet/public/lib/escher/renderer/uniform_binding.h similarity index 100% rename from public/lib/escher/renderer/uniform_binding.h rename to garnet/public/lib/escher/renderer/uniform_binding.h
diff --git a/public/lib/escher/renderer/uniform_block_allocator.cc b/garnet/public/lib/escher/renderer/uniform_block_allocator.cc similarity index 100% rename from public/lib/escher/renderer/uniform_block_allocator.cc rename to garnet/public/lib/escher/renderer/uniform_block_allocator.cc
diff --git a/public/lib/escher/renderer/uniform_block_allocator.h b/garnet/public/lib/escher/renderer/uniform_block_allocator.h similarity index 100% rename from public/lib/escher/renderer/uniform_block_allocator.h rename to garnet/public/lib/escher/renderer/uniform_block_allocator.h
diff --git a/public/lib/escher/resources/resource.cc b/garnet/public/lib/escher/resources/resource.cc similarity index 100% rename from public/lib/escher/resources/resource.cc rename to garnet/public/lib/escher/resources/resource.cc
diff --git a/public/lib/escher/resources/resource.h b/garnet/public/lib/escher/resources/resource.h similarity index 100% rename from public/lib/escher/resources/resource.h rename to garnet/public/lib/escher/resources/resource.h
diff --git a/public/lib/escher/resources/resource_manager.cc b/garnet/public/lib/escher/resources/resource_manager.cc similarity index 100% rename from public/lib/escher/resources/resource_manager.cc rename to garnet/public/lib/escher/resources/resource_manager.cc
diff --git a/public/lib/escher/resources/resource_manager.h b/garnet/public/lib/escher/resources/resource_manager.h similarity index 100% rename from public/lib/escher/resources/resource_manager.h rename to garnet/public/lib/escher/resources/resource_manager.h
diff --git a/public/lib/escher/resources/resource_recycler.cc b/garnet/public/lib/escher/resources/resource_recycler.cc similarity index 100% rename from public/lib/escher/resources/resource_recycler.cc rename to garnet/public/lib/escher/resources/resource_recycler.cc
diff --git a/public/lib/escher/resources/resource_recycler.h b/garnet/public/lib/escher/resources/resource_recycler.h similarity index 100% rename from public/lib/escher/resources/resource_recycler.h rename to garnet/public/lib/escher/resources/resource_recycler.h
diff --git a/public/lib/escher/resources/resource_type_info.h b/garnet/public/lib/escher/resources/resource_type_info.h similarity index 100% rename from public/lib/escher/resources/resource_type_info.h rename to garnet/public/lib/escher/resources/resource_type_info.h
diff --git a/public/lib/escher/resources/waitable_resource.cc b/garnet/public/lib/escher/resources/waitable_resource.cc similarity index 100% rename from public/lib/escher/resources/waitable_resource.cc rename to garnet/public/lib/escher/resources/waitable_resource.cc
diff --git a/public/lib/escher/resources/waitable_resource.h b/garnet/public/lib/escher/resources/waitable_resource.h similarity index 100% rename from public/lib/escher/resources/waitable_resource.h rename to garnet/public/lib/escher/resources/waitable_resource.h
diff --git a/public/lib/escher/scene/ambient_light.cc b/garnet/public/lib/escher/scene/ambient_light.cc similarity index 100% rename from public/lib/escher/scene/ambient_light.cc rename to garnet/public/lib/escher/scene/ambient_light.cc
diff --git a/public/lib/escher/scene/ambient_light.h b/garnet/public/lib/escher/scene/ambient_light.h similarity index 100% rename from public/lib/escher/scene/ambient_light.h rename to garnet/public/lib/escher/scene/ambient_light.h
diff --git a/public/lib/escher/scene/binding.h b/garnet/public/lib/escher/scene/binding.h similarity index 100% rename from public/lib/escher/scene/binding.h rename to garnet/public/lib/escher/scene/binding.h
diff --git a/public/lib/escher/scene/camera.cc b/garnet/public/lib/escher/scene/camera.cc similarity index 100% rename from public/lib/escher/scene/camera.cc rename to garnet/public/lib/escher/scene/camera.cc
diff --git a/public/lib/escher/scene/camera.h b/garnet/public/lib/escher/scene/camera.h similarity index 100% rename from public/lib/escher/scene/camera.h rename to garnet/public/lib/escher/scene/camera.h
diff --git a/public/lib/escher/scene/directional_light.cc b/garnet/public/lib/escher/scene/directional_light.cc similarity index 100% rename from public/lib/escher/scene/directional_light.cc rename to garnet/public/lib/escher/scene/directional_light.cc
diff --git a/public/lib/escher/scene/directional_light.h b/garnet/public/lib/escher/scene/directional_light.h similarity index 100% rename from public/lib/escher/scene/directional_light.h rename to garnet/public/lib/escher/scene/directional_light.h
diff --git a/public/lib/escher/scene/displacement.cc b/garnet/public/lib/escher/scene/displacement.cc similarity index 100% rename from public/lib/escher/scene/displacement.cc rename to garnet/public/lib/escher/scene/displacement.cc
diff --git a/public/lib/escher/scene/displacement.h b/garnet/public/lib/escher/scene/displacement.h similarity index 100% rename from public/lib/escher/scene/displacement.h rename to garnet/public/lib/escher/scene/displacement.h
diff --git a/public/lib/escher/scene/model.cc b/garnet/public/lib/escher/scene/model.cc similarity index 100% rename from public/lib/escher/scene/model.cc rename to garnet/public/lib/escher/scene/model.cc
diff --git a/public/lib/escher/scene/model.h b/garnet/public/lib/escher/scene/model.h similarity index 100% rename from public/lib/escher/scene/model.h rename to garnet/public/lib/escher/scene/model.h
diff --git a/public/lib/escher/scene/object.cc b/garnet/public/lib/escher/scene/object.cc similarity index 100% rename from public/lib/escher/scene/object.cc rename to garnet/public/lib/escher/scene/object.cc
diff --git a/public/lib/escher/scene/object.h b/garnet/public/lib/escher/scene/object.h similarity index 100% rename from public/lib/escher/scene/object.h rename to garnet/public/lib/escher/scene/object.h
diff --git a/public/lib/escher/scene/shape.cc b/garnet/public/lib/escher/scene/shape.cc similarity index 100% rename from public/lib/escher/scene/shape.cc rename to garnet/public/lib/escher/scene/shape.cc
diff --git a/public/lib/escher/scene/shape.h b/garnet/public/lib/escher/scene/shape.h similarity index 100% rename from public/lib/escher/scene/shape.h rename to garnet/public/lib/escher/scene/shape.h
diff --git a/public/lib/escher/scene/shape_modifier.h b/garnet/public/lib/escher/scene/shape_modifier.h similarity index 100% rename from public/lib/escher/scene/shape_modifier.h rename to garnet/public/lib/escher/scene/shape_modifier.h
diff --git a/public/lib/escher/scene/stage.cc b/garnet/public/lib/escher/scene/stage.cc similarity index 100% rename from public/lib/escher/scene/stage.cc rename to garnet/public/lib/escher/scene/stage.cc
diff --git a/public/lib/escher/scene/stage.h b/garnet/public/lib/escher/scene/stage.h similarity index 100% rename from public/lib/escher/scene/stage.h rename to garnet/public/lib/escher/scene/stage.h
diff --git a/public/lib/escher/scene/viewing_volume.cc b/garnet/public/lib/escher/scene/viewing_volume.cc similarity index 100% rename from public/lib/escher/scene/viewing_volume.cc rename to garnet/public/lib/escher/scene/viewing_volume.cc
diff --git a/public/lib/escher/scene/viewing_volume.h b/garnet/public/lib/escher/scene/viewing_volume.h similarity index 100% rename from public/lib/escher/scene/viewing_volume.h rename to garnet/public/lib/escher/scene/viewing_volume.h
diff --git a/public/lib/escher/scripts/download-vulkan-sdk b/garnet/public/lib/escher/scripts/download-vulkan-sdk similarity index 100% rename from public/lib/escher/scripts/download-vulkan-sdk rename to garnet/public/lib/escher/scripts/download-vulkan-sdk
diff --git a/public/lib/escher/scripts/upload-vulkan-sdk b/garnet/public/lib/escher/scripts/upload-vulkan-sdk similarity index 100% rename from public/lib/escher/scripts/upload-vulkan-sdk rename to garnet/public/lib/escher/scripts/upload-vulkan-sdk
diff --git a/public/lib/escher/shaders/model_renderer/default_position.vert b/garnet/public/lib/escher/shaders/model_renderer/default_position.vert similarity index 100% rename from public/lib/escher/shaders/model_renderer/default_position.vert rename to garnet/public/lib/escher/shaders/model_renderer/default_position.vert
diff --git a/public/lib/escher/shaders/model_renderer/main.frag b/garnet/public/lib/escher/shaders/model_renderer/main.frag similarity index 100% rename from public/lib/escher/shaders/model_renderer/main.frag rename to garnet/public/lib/escher/shaders/model_renderer/main.frag
diff --git a/public/lib/escher/shaders/model_renderer/main.vert b/garnet/public/lib/escher/shaders/model_renderer/main.vert similarity index 100% rename from public/lib/escher/shaders/model_renderer/main.vert rename to garnet/public/lib/escher/shaders/model_renderer/main.vert
diff --git a/public/lib/escher/shaders/model_renderer/shadow_map_generation.frag b/garnet/public/lib/escher/shaders/model_renderer/shadow_map_generation.frag similarity index 100% rename from public/lib/escher/shaders/model_renderer/shadow_map_generation.frag rename to garnet/public/lib/escher/shaders/model_renderer/shadow_map_generation.frag
diff --git a/public/lib/escher/shaders/model_renderer/shadow_map_lighting.frag b/garnet/public/lib/escher/shaders/model_renderer/shadow_map_lighting.frag similarity index 100% rename from public/lib/escher/shaders/model_renderer/shadow_map_lighting.frag rename to garnet/public/lib/escher/shaders/model_renderer/shadow_map_lighting.frag
diff --git a/public/lib/escher/shaders/model_renderer/wobble_position.vert b/garnet/public/lib/escher/shaders/model_renderer/wobble_position.vert similarity index 100% rename from public/lib/escher/shaders/model_renderer/wobble_position.vert rename to garnet/public/lib/escher/shaders/model_renderer/wobble_position.vert
diff --git a/public/lib/escher/shaders/paper/common/use.glsl b/garnet/public/lib/escher/shaders/paper/common/use.glsl similarity index 100% rename from public/lib/escher/shaders/paper/common/use.glsl rename to garnet/public/lib/escher/shaders/paper/common/use.glsl
diff --git a/public/lib/escher/shaders/paper/frag/main_ambient_light.frag b/garnet/public/lib/escher/shaders/paper/frag/main_ambient_light.frag similarity index 100% rename from public/lib/escher/shaders/paper/frag/main_ambient_light.frag rename to garnet/public/lib/escher/shaders/paper/frag/main_ambient_light.frag
diff --git a/public/lib/escher/shaders/paper/frag/main_point_light.frag b/garnet/public/lib/escher/shaders/paper/frag/main_point_light.frag similarity index 100% rename from public/lib/escher/shaders/paper/frag/main_point_light.frag rename to garnet/public/lib/escher/shaders/paper/frag/main_point_light.frag
diff --git a/public/lib/escher/shaders/paper/vert/compute_model_space_position.vert b/garnet/public/lib/escher/shaders/paper/vert/compute_model_space_position.vert similarity index 100% rename from public/lib/escher/shaders/paper/vert/compute_model_space_position.vert rename to garnet/public/lib/escher/shaders/paper/vert/compute_model_space_position.vert
diff --git a/public/lib/escher/shaders/paper/vert/compute_world_space_position.vert b/garnet/public/lib/escher/shaders/paper/vert/compute_world_space_position.vert similarity index 100% rename from public/lib/escher/shaders/paper/vert/compute_world_space_position.vert rename to garnet/public/lib/escher/shaders/paper/vert/compute_world_space_position.vert
diff --git a/public/lib/escher/shaders/paper/vert/main_shadow_volume_extrude.vert b/garnet/public/lib/escher/shaders/paper/vert/main_shadow_volume_extrude.vert similarity index 100% rename from public/lib/escher/shaders/paper/vert/main_shadow_volume_extrude.vert rename to garnet/public/lib/escher/shaders/paper/vert/main_shadow_volume_extrude.vert
diff --git a/public/lib/escher/shaders/paper/vert/vertex_attributes.vert b/garnet/public/lib/escher/shaders/paper/vert/vertex_attributes.vert similarity index 100% rename from public/lib/escher/shaders/paper/vert/vertex_attributes.vert rename to garnet/public/lib/escher/shaders/paper/vert/vertex_attributes.vert
diff --git a/public/lib/escher/shape/doc/RoundedRectTessellation.JPG b/garnet/public/lib/escher/shape/doc/RoundedRectTessellation.JPG similarity index 100% rename from public/lib/escher/shape/doc/RoundedRectTessellation.JPG rename to garnet/public/lib/escher/shape/doc/RoundedRectTessellation.JPG Binary files differ
diff --git a/public/lib/escher/shape/mesh.cc b/garnet/public/lib/escher/shape/mesh.cc similarity index 100% rename from public/lib/escher/shape/mesh.cc rename to garnet/public/lib/escher/shape/mesh.cc
diff --git a/public/lib/escher/shape/mesh.h b/garnet/public/lib/escher/shape/mesh.h similarity index 100% rename from public/lib/escher/shape/mesh.h rename to garnet/public/lib/escher/shape/mesh.h
diff --git a/public/lib/escher/shape/mesh_builder.cc b/garnet/public/lib/escher/shape/mesh_builder.cc similarity index 100% rename from public/lib/escher/shape/mesh_builder.cc rename to garnet/public/lib/escher/shape/mesh_builder.cc
diff --git a/public/lib/escher/shape/mesh_builder.h b/garnet/public/lib/escher/shape/mesh_builder.h similarity index 100% rename from public/lib/escher/shape/mesh_builder.h rename to garnet/public/lib/escher/shape/mesh_builder.h
diff --git a/public/lib/escher/shape/mesh_builder_factory.h b/garnet/public/lib/escher/shape/mesh_builder_factory.h similarity index 100% rename from public/lib/escher/shape/mesh_builder_factory.h rename to garnet/public/lib/escher/shape/mesh_builder_factory.h
diff --git a/public/lib/escher/shape/mesh_spec.cc b/garnet/public/lib/escher/shape/mesh_spec.cc similarity index 100% rename from public/lib/escher/shape/mesh_spec.cc rename to garnet/public/lib/escher/shape/mesh_spec.cc
diff --git a/public/lib/escher/shape/mesh_spec.h b/garnet/public/lib/escher/shape/mesh_spec.h similarity index 100% rename from public/lib/escher/shape/mesh_spec.h rename to garnet/public/lib/escher/shape/mesh_spec.h
diff --git a/public/lib/escher/shape/modifier_wobble.cc b/garnet/public/lib/escher/shape/modifier_wobble.cc similarity index 100% rename from public/lib/escher/shape/modifier_wobble.cc rename to garnet/public/lib/escher/shape/modifier_wobble.cc
diff --git a/public/lib/escher/shape/modifier_wobble.h b/garnet/public/lib/escher/shape/modifier_wobble.h similarity index 100% rename from public/lib/escher/shape/modifier_wobble.h rename to garnet/public/lib/escher/shape/modifier_wobble.h
diff --git a/public/lib/escher/shape/rounded_rect.cc b/garnet/public/lib/escher/shape/rounded_rect.cc similarity index 100% rename from public/lib/escher/shape/rounded_rect.cc rename to garnet/public/lib/escher/shape/rounded_rect.cc
diff --git a/public/lib/escher/shape/rounded_rect.h b/garnet/public/lib/escher/shape/rounded_rect.h similarity index 100% rename from public/lib/escher/shape/rounded_rect.h rename to garnet/public/lib/escher/shape/rounded_rect.h
diff --git a/public/lib/escher/shape/rounded_rect_factory.cc b/garnet/public/lib/escher/shape/rounded_rect_factory.cc similarity index 100% rename from public/lib/escher/shape/rounded_rect_factory.cc rename to garnet/public/lib/escher/shape/rounded_rect_factory.cc
diff --git a/public/lib/escher/shape/rounded_rect_factory.h b/garnet/public/lib/escher/shape/rounded_rect_factory.h similarity index 100% rename from public/lib/escher/shape/rounded_rect_factory.h rename to garnet/public/lib/escher/shape/rounded_rect_factory.h
diff --git a/public/lib/escher/status.h b/garnet/public/lib/escher/status.h similarity index 100% rename from public/lib/escher/status.h rename to garnet/public/lib/escher/status.h
diff --git a/public/lib/escher/test/BUILD.gn b/garnet/public/lib/escher/test/BUILD.gn similarity index 100% rename from public/lib/escher/test/BUILD.gn rename to garnet/public/lib/escher/test/BUILD.gn
diff --git a/public/lib/escher/test/base/BUILD.gn b/garnet/public/lib/escher/test/base/BUILD.gn similarity index 100% rename from public/lib/escher/test/base/BUILD.gn rename to garnet/public/lib/escher/test/base/BUILD.gn
diff --git a/public/lib/escher/test/base/ownable_unittest.cc b/garnet/public/lib/escher/test/base/ownable_unittest.cc similarity index 100% rename from public/lib/escher/test/base/ownable_unittest.cc rename to garnet/public/lib/escher/test/base/ownable_unittest.cc
diff --git a/public/lib/escher/test/base/typed_reffable_unittest.cc b/garnet/public/lib/escher/test/base/typed_reffable_unittest.cc similarity index 100% rename from public/lib/escher/test/base/typed_reffable_unittest.cc rename to garnet/public/lib/escher/test/base/typed_reffable_unittest.cc
diff --git a/public/lib/escher/test/fake_gpu_allocator.cc b/garnet/public/lib/escher/test/fake_gpu_allocator.cc similarity index 100% rename from public/lib/escher/test/fake_gpu_allocator.cc rename to garnet/public/lib/escher/test/fake_gpu_allocator.cc
diff --git a/public/lib/escher/test/fake_gpu_allocator.h b/garnet/public/lib/escher/test/fake_gpu_allocator.h similarity index 100% rename from public/lib/escher/test/fake_gpu_allocator.h rename to garnet/public/lib/escher/test/fake_gpu_allocator.h
diff --git a/public/lib/escher/test/flib/fence_listener_unittest.cc b/garnet/public/lib/escher/test/flib/fence_listener_unittest.cc similarity index 100% rename from public/lib/escher/test/flib/fence_listener_unittest.cc rename to garnet/public/lib/escher/test/flib/fence_listener_unittest.cc
diff --git a/public/lib/escher/test/flib/fence_set_listener_unittest.cc b/garnet/public/lib/escher/test/flib/fence_set_listener_unittest.cc similarity index 100% rename from public/lib/escher/test/flib/fence_set_listener_unittest.cc rename to garnet/public/lib/escher/test/flib/fence_set_listener_unittest.cc
diff --git a/public/lib/escher/test/flib/release_fence_signaller_unittest.cc b/garnet/public/lib/escher/test/flib/release_fence_signaller_unittest.cc similarity index 100% rename from public/lib/escher/test/flib/release_fence_signaller_unittest.cc rename to garnet/public/lib/escher/test/flib/release_fence_signaller_unittest.cc
diff --git a/public/lib/escher/test/flib/util.cc b/garnet/public/lib/escher/test/flib/util.cc similarity index 100% rename from public/lib/escher/test/flib/util.cc rename to garnet/public/lib/escher/test/flib/util.cc
diff --git a/public/lib/escher/test/flib/util.h b/garnet/public/lib/escher/test/flib/util.h similarity index 100% rename from public/lib/escher/test/flib/util.h rename to garnet/public/lib/escher/test/flib/util.h
diff --git a/public/lib/escher/test/fs/hack_filesystem_unittest.cc b/garnet/public/lib/escher/test/fs/hack_filesystem_unittest.cc similarity index 100% rename from public/lib/escher/test/fs/hack_filesystem_unittest.cc rename to garnet/public/lib/escher/test/fs/hack_filesystem_unittest.cc
diff --git a/public/lib/escher/test/geometry/bounding_box_unittest.cc b/garnet/public/lib/escher/test/geometry/bounding_box_unittest.cc similarity index 100% rename from public/lib/escher/test/geometry/bounding_box_unittest.cc rename to garnet/public/lib/escher/test/geometry/bounding_box_unittest.cc
diff --git a/public/lib/escher/test/geometry/clip_planes_unittest.cc b/garnet/public/lib/escher/test/geometry/clip_planes_unittest.cc similarity index 100% rename from public/lib/escher/test/geometry/clip_planes_unittest.cc rename to garnet/public/lib/escher/test/geometry/clip_planes_unittest.cc
diff --git a/public/lib/escher/test/geometry/indexed_triangle_mesh_clip_unittest.cc b/garnet/public/lib/escher/test/geometry/indexed_triangle_mesh_clip_unittest.cc similarity index 100% rename from public/lib/escher/test/geometry/indexed_triangle_mesh_clip_unittest.cc rename to garnet/public/lib/escher/test/geometry/indexed_triangle_mesh_clip_unittest.cc
diff --git a/public/lib/escher/test/geometry/plane_unittest.cc b/garnet/public/lib/escher/test/geometry/plane_unittest.cc similarity index 100% rename from public/lib/escher/test/geometry/plane_unittest.cc rename to garnet/public/lib/escher/test/geometry/plane_unittest.cc
diff --git a/public/lib/escher/test/gpu_allocator_unittest.cc b/garnet/public/lib/escher/test/gpu_allocator_unittest.cc similarity index 100% rename from public/lib/escher/test/gpu_allocator_unittest.cc rename to garnet/public/lib/escher/test/gpu_allocator_unittest.cc
diff --git a/public/lib/escher/test/gpu_mem_unittest.cc b/garnet/public/lib/escher/test/gpu_mem_unittest.cc similarity index 100% rename from public/lib/escher/test/gpu_mem_unittest.cc rename to garnet/public/lib/escher/test/gpu_mem_unittest.cc
diff --git a/public/lib/escher/test/gtest_escher.cc b/garnet/public/lib/escher/test/gtest_escher.cc similarity index 100% rename from public/lib/escher/test/gtest_escher.cc rename to garnet/public/lib/escher/test/gtest_escher.cc
diff --git a/public/lib/escher/test/gtest_escher.h b/garnet/public/lib/escher/test/gtest_escher.h similarity index 100% rename from public/lib/escher/test/gtest_escher.h rename to garnet/public/lib/escher/test/gtest_escher.h
diff --git a/public/lib/escher/test/gtest_vulkan.cc b/garnet/public/lib/escher/test/gtest_vulkan.cc similarity index 100% rename from public/lib/escher/test/gtest_vulkan.cc rename to garnet/public/lib/escher/test/gtest_vulkan.cc
diff --git a/public/lib/escher/test/gtest_vulkan.h b/garnet/public/lib/escher/test/gtest_vulkan.h similarity index 100% rename from public/lib/escher/test/gtest_vulkan.h rename to garnet/public/lib/escher/test/gtest_vulkan.h
diff --git a/public/lib/escher/test/gtest_vulkan_internal.h b/garnet/public/lib/escher/test/gtest_vulkan_internal.h similarity index 100% rename from public/lib/escher/test/gtest_vulkan_internal.h rename to garnet/public/lib/escher/test/gtest_vulkan_internal.h
diff --git a/public/lib/escher/test/impl/glsl_compiler_unittest.cc b/garnet/public/lib/escher/test/impl/glsl_compiler_unittest.cc similarity index 100% rename from public/lib/escher/test/impl/glsl_compiler_unittest.cc rename to garnet/public/lib/escher/test/impl/glsl_compiler_unittest.cc
diff --git a/public/lib/escher/test/impl/image_cache_unittest.cc b/garnet/public/lib/escher/test/impl/image_cache_unittest.cc similarity index 100% rename from public/lib/escher/test/impl/image_cache_unittest.cc rename to garnet/public/lib/escher/test/impl/image_cache_unittest.cc
diff --git a/public/lib/escher/test/impl/pipeline_cache_unittest.cc b/garnet/public/lib/escher/test/impl/pipeline_cache_unittest.cc similarity index 100% rename from public/lib/escher/test/impl/pipeline_cache_unittest.cc rename to garnet/public/lib/escher/test/impl/pipeline_cache_unittest.cc
diff --git a/public/lib/escher/test/math/rotations_unittest.cc b/garnet/public/lib/escher/test/math/rotations_unittest.cc similarity index 100% rename from public/lib/escher/test/math/rotations_unittest.cc rename to garnet/public/lib/escher/test/math/rotations_unittest.cc
diff --git a/public/lib/escher/test/mesh_spec_unittest.cc b/garnet/public/lib/escher/test/mesh_spec_unittest.cc similarity index 100% rename from public/lib/escher/test/mesh_spec_unittest.cc rename to garnet/public/lib/escher/test/mesh_spec_unittest.cc
diff --git a/public/lib/escher/test/no_op_mac_unittest.cc b/garnet/public/lib/escher/test/no_op_mac_unittest.cc similarity index 100% rename from public/lib/escher/test/no_op_mac_unittest.cc rename to garnet/public/lib/escher/test/no_op_mac_unittest.cc
diff --git a/public/lib/escher/test/object_unittest.cc b/garnet/public/lib/escher/test/object_unittest.cc similarity index 100% rename from public/lib/escher/test/object_unittest.cc rename to garnet/public/lib/escher/test/object_unittest.cc
diff --git a/public/lib/escher/test/paper/paper_draw_call_factory_unittest.cc b/garnet/public/lib/escher/test/paper/paper_draw_call_factory_unittest.cc similarity index 100% rename from public/lib/escher/test/paper/paper_draw_call_factory_unittest.cc rename to garnet/public/lib/escher/test/paper/paper_draw_call_factory_unittest.cc
diff --git a/public/lib/escher/test/paper/paper_shape_cache_unittest.cc b/garnet/public/lib/escher/test/paper/paper_shape_cache_unittest.cc similarity index 100% rename from public/lib/escher/test/paper/paper_shape_cache_unittest.cc rename to garnet/public/lib/escher/test/paper/paper_shape_cache_unittest.cc
diff --git a/public/lib/escher/test/paper/paper_transform_stack_unittest.cc b/garnet/public/lib/escher/test/paper/paper_transform_stack_unittest.cc similarity index 100% rename from public/lib/escher/test/paper/paper_transform_stack_unittest.cc rename to garnet/public/lib/escher/test/paper/paper_transform_stack_unittest.cc
diff --git a/public/lib/escher/test/pose_buffer_latching_test.cc b/garnet/public/lib/escher/test/pose_buffer_latching_test.cc similarity index 100% rename from public/lib/escher/test/pose_buffer_latching_test.cc rename to garnet/public/lib/escher/test/pose_buffer_latching_test.cc
diff --git a/public/lib/escher/test/profiling/timestamp_profiler_unittest.cc b/garnet/public/lib/escher/test/profiling/timestamp_profiler_unittest.cc similarity index 100% rename from public/lib/escher/test/profiling/timestamp_profiler_unittest.cc rename to garnet/public/lib/escher/test/profiling/timestamp_profiler_unittest.cc
diff --git a/public/lib/escher/test/renderer/batch_gpu_uploader_unittest.cc b/garnet/public/lib/escher/test/renderer/batch_gpu_uploader_unittest.cc similarity index 100% rename from public/lib/escher/test/renderer/batch_gpu_uploader_unittest.cc rename to garnet/public/lib/escher/test/renderer/batch_gpu_uploader_unittest.cc
diff --git a/public/lib/escher/test/renderer/buffer_cache_unittest.cc b/garnet/public/lib/escher/test/renderer/buffer_cache_unittest.cc similarity index 100% rename from public/lib/escher/test/renderer/buffer_cache_unittest.cc rename to garnet/public/lib/escher/test/renderer/buffer_cache_unittest.cc
diff --git a/public/lib/escher/test/renderer/frame_unittest.cc b/garnet/public/lib/escher/test/renderer/frame_unittest.cc similarity index 100% rename from public/lib/escher/test/renderer/frame_unittest.cc rename to garnet/public/lib/escher/test/renderer/frame_unittest.cc
diff --git a/public/lib/escher/test/renderer/render_queue_unittest.cc b/garnet/public/lib/escher/test/renderer/render_queue_unittest.cc similarity index 100% rename from public/lib/escher/test/renderer/render_queue_unittest.cc rename to garnet/public/lib/escher/test/renderer/render_queue_unittest.cc
diff --git a/public/lib/escher/test/run_all_unittests.cc b/garnet/public/lib/escher/test/run_all_unittests.cc similarity index 100% rename from public/lib/escher/test/run_all_unittests.cc rename to garnet/public/lib/escher/test/run_all_unittests.cc
diff --git a/public/lib/escher/test/scene/directional_light_unittest.cc b/garnet/public/lib/escher/test/scene/directional_light_unittest.cc similarity index 100% rename from public/lib/escher/test/scene/directional_light_unittest.cc rename to garnet/public/lib/escher/test/scene/directional_light_unittest.cc
diff --git a/public/lib/escher/test/shape/rounded_rect_factory_unittest.cc b/garnet/public/lib/escher/test/shape/rounded_rect_factory_unittest.cc similarity index 100% rename from public/lib/escher/test/shape/rounded_rect_factory_unittest.cc rename to garnet/public/lib/escher/test/shape/rounded_rect_factory_unittest.cc
diff --git a/public/lib/escher/test/shape/rounded_rect_unittest.cc b/garnet/public/lib/escher/test/shape/rounded_rect_unittest.cc similarity index 100% rename from public/lib/escher/test/shape/rounded_rect_unittest.cc rename to garnet/public/lib/escher/test/shape/rounded_rect_unittest.cc
diff --git a/public/lib/escher/test/transform_unittest.cc b/garnet/public/lib/escher/test/transform_unittest.cc similarity index 100% rename from public/lib/escher/test/transform_unittest.cc rename to garnet/public/lib/escher/test/transform_unittest.cc
diff --git a/public/lib/escher/test/util/align_unittest.cc b/garnet/public/lib/escher/test/util/align_unittest.cc similarity index 100% rename from public/lib/escher/test/util/align_unittest.cc rename to garnet/public/lib/escher/test/util/align_unittest.cc
diff --git a/public/lib/escher/test/util/bit_ops_unittest.cc b/garnet/public/lib/escher/test/util/bit_ops_unittest.cc similarity index 100% rename from public/lib/escher/test/util/bit_ops_unittest.cc rename to garnet/public/lib/escher/test/util/bit_ops_unittest.cc
diff --git a/public/lib/escher/test/util/bitmap_unittest.cc b/garnet/public/lib/escher/test/util/bitmap_unittest.cc similarity index 100% rename from public/lib/escher/test/util/bitmap_unittest.cc rename to garnet/public/lib/escher/test/util/bitmap_unittest.cc
diff --git a/public/lib/escher/test/util/block_allocator_unittest.cc b/garnet/public/lib/escher/test/util/block_allocator_unittest.cc similarity index 100% rename from public/lib/escher/test/util/block_allocator_unittest.cc rename to garnet/public/lib/escher/test/util/block_allocator_unittest.cc
diff --git a/public/lib/escher/test/util/enum_utils_unittest.cc b/garnet/public/lib/escher/test/util/enum_utils_unittest.cc similarity index 100% rename from public/lib/escher/test/util/enum_utils_unittest.cc rename to garnet/public/lib/escher/test/util/enum_utils_unittest.cc
diff --git a/public/lib/escher/test/util/hash_cache_unittest.cc b/garnet/public/lib/escher/test/util/hash_cache_unittest.cc similarity index 100% rename from public/lib/escher/test/util/hash_cache_unittest.cc rename to garnet/public/lib/escher/test/util/hash_cache_unittest.cc
diff --git a/public/lib/escher/test/util/hash_unittest.cc b/garnet/public/lib/escher/test/util/hash_unittest.cc similarity index 100% rename from public/lib/escher/test/util/hash_unittest.cc rename to garnet/public/lib/escher/test/util/hash_unittest.cc
diff --git a/public/lib/escher/test/util/hashable_unittest.cc b/garnet/public/lib/escher/test/util/hashable_unittest.cc similarity index 100% rename from public/lib/escher/test/util/hashable_unittest.cc rename to garnet/public/lib/escher/test/util/hashable_unittest.cc
diff --git a/public/lib/escher/test/util/hashmap_unittest.cc b/garnet/public/lib/escher/test/util/hashmap_unittest.cc similarity index 100% rename from public/lib/escher/test/util/hashmap_unittest.cc rename to garnet/public/lib/escher/test/util/hashmap_unittest.cc
diff --git a/public/lib/escher/test/util/intrusive_list_unittest.cc b/garnet/public/lib/escher/test/util/intrusive_list_unittest.cc similarity index 100% rename from public/lib/escher/test/util/intrusive_list_unittest.cc rename to garnet/public/lib/escher/test/util/intrusive_list_unittest.cc
diff --git a/public/lib/escher/test/util/object_pool_unittest.cc b/garnet/public/lib/escher/test/util/object_pool_unittest.cc similarity index 100% rename from public/lib/escher/test/util/object_pool_unittest.cc rename to garnet/public/lib/escher/test/util/object_pool_unittest.cc
diff --git a/public/lib/escher/test/util/stack_allocator_unittest.cc b/garnet/public/lib/escher/test/util/stack_allocator_unittest.cc similarity index 100% rename from public/lib/escher/test/util/stack_allocator_unittest.cc rename to garnet/public/lib/escher/test/util/stack_allocator_unittest.cc
diff --git a/public/lib/escher/test/vk/buffer_unittest.cc b/garnet/public/lib/escher/test/vk/buffer_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/buffer_unittest.cc rename to garnet/public/lib/escher/test/vk/buffer_unittest.cc
diff --git a/public/lib/escher/test/vk/command_buffer_unittest.cc b/garnet/public/lib/escher/test/vk/command_buffer_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/command_buffer_unittest.cc rename to garnet/public/lib/escher/test/vk/command_buffer_unittest.cc
diff --git a/public/lib/escher/test/vk/descriptor_set_allocator_unittest.cc b/garnet/public/lib/escher/test/vk/descriptor_set_allocator_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/descriptor_set_allocator_unittest.cc rename to garnet/public/lib/escher/test/vk/descriptor_set_allocator_unittest.cc
diff --git a/public/lib/escher/test/vk/descriptor_set_layout_unittest.cc b/garnet/public/lib/escher/test/vk/descriptor_set_layout_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/descriptor_set_layout_unittest.cc rename to garnet/public/lib/escher/test/vk/descriptor_set_layout_unittest.cc
diff --git a/public/lib/escher/test/vk/framebuffer_allocator_unittest.cc b/garnet/public/lib/escher/test/vk/framebuffer_allocator_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/framebuffer_allocator_unittest.cc rename to garnet/public/lib/escher/test/vk/framebuffer_allocator_unittest.cc
diff --git a/public/lib/escher/test/vk/render_pass_cache_unittest.cc b/garnet/public/lib/escher/test/vk/render_pass_cache_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/render_pass_cache_unittest.cc rename to garnet/public/lib/escher/test/vk/render_pass_cache_unittest.cc
diff --git a/public/lib/escher/test/vk/shader_module_template_unittest.cc b/garnet/public/lib/escher/test/vk/shader_module_template_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/shader_module_template_unittest.cc rename to garnet/public/lib/escher/test/vk/shader_module_template_unittest.cc
diff --git a/public/lib/escher/test/vk/shader_program_unittest.cc b/garnet/public/lib/escher/test/vk/shader_program_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/shader_program_unittest.cc rename to garnet/public/lib/escher/test/vk/shader_program_unittest.cc
diff --git a/public/lib/escher/test/vk/vulkan_tester.h b/garnet/public/lib/escher/test/vk/vulkan_tester.h similarity index 100% rename from public/lib/escher/test/vk/vulkan_tester.h rename to garnet/public/lib/escher/test/vk/vulkan_tester.h
diff --git a/public/lib/escher/test/vk/vulkan_utils_unittest.cc b/garnet/public/lib/escher/test/vk/vulkan_utils_unittest.cc similarity index 100% rename from public/lib/escher/test/vk/vulkan_utils_unittest.cc rename to garnet/public/lib/escher/test/vk/vulkan_utils_unittest.cc
diff --git a/public/lib/escher/third_party/.gitignore b/garnet/public/lib/escher/third_party/.gitignore similarity index 100% rename from public/lib/escher/third_party/.gitignore rename to garnet/public/lib/escher/third_party/.gitignore
diff --git a/public/lib/escher/third_party/SHAs/.gitignore b/garnet/public/lib/escher/third_party/SHAs/.gitignore similarity index 100% rename from public/lib/escher/third_party/SHAs/.gitignore rename to garnet/public/lib/escher/third_party/SHAs/.gitignore
diff --git a/public/lib/escher/third_party/SHAs/README.md b/garnet/public/lib/escher/third_party/SHAs/README.md similarity index 100% rename from public/lib/escher/third_party/SHAs/README.md rename to garnet/public/lib/escher/third_party/SHAs/README.md
diff --git a/public/lib/escher/third_party/SHAs/required/vulkansdk b/garnet/public/lib/escher/third_party/SHAs/required/vulkansdk similarity index 100% rename from public/lib/escher/third_party/SHAs/required/vulkansdk rename to garnet/public/lib/escher/third_party/SHAs/required/vulkansdk
diff --git a/public/lib/escher/third_party/SHAs/required/vulkansdk-glslang b/garnet/public/lib/escher/third_party/SHAs/required/vulkansdk-glslang similarity index 100% rename from public/lib/escher/third_party/SHAs/required/vulkansdk-glslang rename to garnet/public/lib/escher/third_party/SHAs/required/vulkansdk-glslang
diff --git a/public/lib/escher/third_party/VulkanMemoryAllocator/LICENSE.txt b/garnet/public/lib/escher/third_party/VulkanMemoryAllocator/LICENSE.txt similarity index 100% rename from public/lib/escher/third_party/VulkanMemoryAllocator/LICENSE.txt rename to garnet/public/lib/escher/third_party/VulkanMemoryAllocator/LICENSE.txt
diff --git a/public/lib/escher/third_party/VulkanMemoryAllocator/README.fuchsia b/garnet/public/lib/escher/third_party/VulkanMemoryAllocator/README.fuchsia similarity index 100% rename from public/lib/escher/third_party/VulkanMemoryAllocator/README.fuchsia rename to garnet/public/lib/escher/third_party/VulkanMemoryAllocator/README.fuchsia
diff --git a/public/lib/escher/third_party/VulkanMemoryAllocator/vk_mem_alloc.h b/garnet/public/lib/escher/third_party/VulkanMemoryAllocator/vk_mem_alloc.h similarity index 100% rename from public/lib/escher/third_party/VulkanMemoryAllocator/vk_mem_alloc.h rename to garnet/public/lib/escher/third_party/VulkanMemoryAllocator/vk_mem_alloc.h
diff --git a/public/lib/escher/third_party/granite/LICENSE b/garnet/public/lib/escher/third_party/granite/LICENSE similarity index 100% rename from public/lib/escher/third_party/granite/LICENSE rename to garnet/public/lib/escher/third_party/granite/LICENSE
diff --git a/public/lib/escher/third_party/granite/README.fuchsia b/garnet/public/lib/escher/third_party/granite/README.fuchsia similarity index 100% rename from public/lib/escher/third_party/granite/README.fuchsia rename to garnet/public/lib/escher/third_party/granite/README.fuchsia
diff --git a/public/lib/escher/third_party/granite/vk/command_buffer.cc b/garnet/public/lib/escher/third_party/granite/vk/command_buffer.cc similarity index 100% rename from public/lib/escher/third_party/granite/vk/command_buffer.cc rename to garnet/public/lib/escher/third_party/granite/vk/command_buffer.cc
diff --git a/public/lib/escher/third_party/granite/vk/command_buffer.h b/garnet/public/lib/escher/third_party/granite/vk/command_buffer.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/command_buffer.h rename to garnet/public/lib/escher/third_party/granite/vk/command_buffer.h
diff --git a/public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.cc b/garnet/public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.cc similarity index 100% rename from public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.cc rename to garnet/public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.cc
diff --git a/public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.h b/garnet/public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.h rename to garnet/public/lib/escher/third_party/granite/vk/command_buffer_pipeline_state.h
diff --git a/public/lib/escher/third_party/granite/vk/descriptor_set_layout.cc b/garnet/public/lib/escher/third_party/granite/vk/descriptor_set_layout.cc similarity index 100% rename from public/lib/escher/third_party/granite/vk/descriptor_set_layout.cc rename to garnet/public/lib/escher/third_party/granite/vk/descriptor_set_layout.cc
diff --git a/public/lib/escher/third_party/granite/vk/descriptor_set_layout.h b/garnet/public/lib/escher/third_party/granite/vk/descriptor_set_layout.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/descriptor_set_layout.h rename to garnet/public/lib/escher/third_party/granite/vk/descriptor_set_layout.h
diff --git a/public/lib/escher/third_party/granite/vk/pipeline_layout.cc b/garnet/public/lib/escher/third_party/granite/vk/pipeline_layout.cc similarity index 100% rename from public/lib/escher/third_party/granite/vk/pipeline_layout.cc rename to garnet/public/lib/escher/third_party/granite/vk/pipeline_layout.cc
diff --git a/public/lib/escher/third_party/granite/vk/pipeline_layout.h b/garnet/public/lib/escher/third_party/granite/vk/pipeline_layout.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/pipeline_layout.h rename to garnet/public/lib/escher/third_party/granite/vk/pipeline_layout.h
diff --git a/public/lib/escher/third_party/granite/vk/render_pass.cc b/garnet/public/lib/escher/third_party/granite/vk/render_pass.cc similarity index 100% rename from public/lib/escher/third_party/granite/vk/render_pass.cc rename to garnet/public/lib/escher/third_party/granite/vk/render_pass.cc
diff --git a/public/lib/escher/third_party/granite/vk/render_pass.h b/garnet/public/lib/escher/third_party/granite/vk/render_pass.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/render_pass.h rename to garnet/public/lib/escher/third_party/granite/vk/render_pass.h
diff --git a/public/lib/escher/third_party/granite/vk/render_pass_info.cc b/garnet/public/lib/escher/third_party/granite/vk/render_pass_info.cc similarity index 100% rename from public/lib/escher/third_party/granite/vk/render_pass_info.cc rename to garnet/public/lib/escher/third_party/granite/vk/render_pass_info.cc
diff --git a/public/lib/escher/third_party/granite/vk/render_pass_info.h b/garnet/public/lib/escher/third_party/granite/vk/render_pass_info.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/render_pass_info.h rename to garnet/public/lib/escher/third_party/granite/vk/render_pass_info.h
diff --git a/public/lib/escher/third_party/granite/vk/shader_module_resource_layout.h b/garnet/public/lib/escher/third_party/granite/vk/shader_module_resource_layout.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/shader_module_resource_layout.h rename to garnet/public/lib/escher/third_party/granite/vk/shader_module_resource_layout.h
diff --git a/public/lib/escher/third_party/granite/vk/shader_utils.cc b/garnet/public/lib/escher/third_party/granite/vk/shader_utils.cc similarity index 100% rename from public/lib/escher/third_party/granite/vk/shader_utils.cc rename to garnet/public/lib/escher/third_party/granite/vk/shader_utils.cc
diff --git a/public/lib/escher/third_party/granite/vk/shader_utils.h b/garnet/public/lib/escher/third_party/granite/vk/shader_utils.h similarity index 100% rename from public/lib/escher/third_party/granite/vk/shader_utils.h rename to garnet/public/lib/escher/third_party/granite/vk/shader_utils.h
diff --git a/public/lib/escher/third_party/null_vulkan/README.fuchsia b/garnet/public/lib/escher/third_party/null_vulkan/README.fuchsia similarity index 100% rename from public/lib/escher/third_party/null_vulkan/README.fuchsia rename to garnet/public/lib/escher/third_party/null_vulkan/README.fuchsia
diff --git a/public/lib/escher/third_party/null_vulkan/escher_null_vulkan.cc b/garnet/public/lib/escher/third_party/null_vulkan/escher_null_vulkan.cc similarity index 100% rename from public/lib/escher/third_party/null_vulkan/escher_null_vulkan.cc rename to garnet/public/lib/escher/third_party/null_vulkan/escher_null_vulkan.cc
diff --git a/public/lib/escher/util/BUILD.gn b/garnet/public/lib/escher/util/BUILD.gn similarity index 100% rename from public/lib/escher/util/BUILD.gn rename to garnet/public/lib/escher/util/BUILD.gn
diff --git a/public/lib/escher/util/align.h b/garnet/public/lib/escher/util/align.h similarity index 100% rename from public/lib/escher/util/align.h rename to garnet/public/lib/escher/util/align.h
diff --git a/public/lib/escher/util/alloca.h b/garnet/public/lib/escher/util/alloca.h similarity index 100% rename from public/lib/escher/util/alloca.h rename to garnet/public/lib/escher/util/alloca.h
diff --git a/public/lib/escher/util/bit_ops.h b/garnet/public/lib/escher/util/bit_ops.h similarity index 100% rename from public/lib/escher/util/bit_ops.h rename to garnet/public/lib/escher/util/bit_ops.h
diff --git a/public/lib/escher/util/bitmap.h b/garnet/public/lib/escher/util/bitmap.h similarity index 100% rename from public/lib/escher/util/bitmap.h rename to garnet/public/lib/escher/util/bitmap.h
diff --git a/public/lib/escher/util/block_allocator.cc b/garnet/public/lib/escher/util/block_allocator.cc similarity index 100% rename from public/lib/escher/util/block_allocator.cc rename to garnet/public/lib/escher/util/block_allocator.cc
diff --git a/public/lib/escher/util/block_allocator.h b/garnet/public/lib/escher/util/block_allocator.h similarity index 100% rename from public/lib/escher/util/block_allocator.h rename to garnet/public/lib/escher/util/block_allocator.h
diff --git a/public/lib/escher/util/check_vulkan_support.cc b/garnet/public/lib/escher/util/check_vulkan_support.cc similarity index 100% rename from public/lib/escher/util/check_vulkan_support.cc rename to garnet/public/lib/escher/util/check_vulkan_support.cc
diff --git a/public/lib/escher/util/check_vulkan_support.h b/garnet/public/lib/escher/util/check_vulkan_support.h similarity index 100% rename from public/lib/escher/util/check_vulkan_support.h rename to garnet/public/lib/escher/util/check_vulkan_support.h
diff --git a/public/lib/escher/util/debug_print.h b/garnet/public/lib/escher/util/debug_print.h similarity index 100% rename from public/lib/escher/util/debug_print.h rename to garnet/public/lib/escher/util/debug_print.h
diff --git a/public/lib/escher/util/depth_to_color.cc b/garnet/public/lib/escher/util/depth_to_color.cc similarity index 100% rename from public/lib/escher/util/depth_to_color.cc rename to garnet/public/lib/escher/util/depth_to_color.cc
diff --git a/public/lib/escher/util/depth_to_color.h b/garnet/public/lib/escher/util/depth_to_color.h similarity index 100% rename from public/lib/escher/util/depth_to_color.h rename to garnet/public/lib/escher/util/depth_to_color.h
diff --git a/public/lib/escher/util/enum_cast.h b/garnet/public/lib/escher/util/enum_cast.h similarity index 100% rename from public/lib/escher/util/enum_cast.h rename to garnet/public/lib/escher/util/enum_cast.h
diff --git a/public/lib/escher/util/enum_count.h b/garnet/public/lib/escher/util/enum_count.h similarity index 100% rename from public/lib/escher/util/enum_count.h rename to garnet/public/lib/escher/util/enum_count.h
diff --git a/public/lib/escher/util/enum_flags.h b/garnet/public/lib/escher/util/enum_flags.h similarity index 100% rename from public/lib/escher/util/enum_flags.h rename to garnet/public/lib/escher/util/enum_flags.h
diff --git a/public/lib/escher/util/enum_utils.h b/garnet/public/lib/escher/util/enum_utils.h similarity index 100% rename from public/lib/escher/util/enum_utils.h rename to garnet/public/lib/escher/util/enum_utils.h
diff --git a/public/lib/escher/util/epsilon_compare.h b/garnet/public/lib/escher/util/epsilon_compare.h similarity index 100% rename from public/lib/escher/util/epsilon_compare.h rename to garnet/public/lib/escher/util/epsilon_compare.h
diff --git a/public/lib/escher/util/fuchsia_utils.cc b/garnet/public/lib/escher/util/fuchsia_utils.cc similarity index 100% rename from public/lib/escher/util/fuchsia_utils.cc rename to garnet/public/lib/escher/util/fuchsia_utils.cc
diff --git a/public/lib/escher/util/fuchsia_utils.h b/garnet/public/lib/escher/util/fuchsia_utils.h similarity index 100% rename from public/lib/escher/util/fuchsia_utils.h rename to garnet/public/lib/escher/util/fuchsia_utils.h
diff --git a/public/lib/escher/util/hash.h b/garnet/public/lib/escher/util/hash.h similarity index 100% rename from public/lib/escher/util/hash.h rename to garnet/public/lib/escher/util/hash.h
diff --git a/public/lib/escher/util/hash_cache.h b/garnet/public/lib/escher/util/hash_cache.h similarity index 100% rename from public/lib/escher/util/hash_cache.h rename to garnet/public/lib/escher/util/hash_cache.h
diff --git a/public/lib/escher/util/hash_fnv_1a.h b/garnet/public/lib/escher/util/hash_fnv_1a.h similarity index 100% rename from public/lib/escher/util/hash_fnv_1a.h rename to garnet/public/lib/escher/util/hash_fnv_1a.h
diff --git a/public/lib/escher/util/hash_map.h b/garnet/public/lib/escher/util/hash_map.h similarity index 100% rename from public/lib/escher/util/hash_map.h rename to garnet/public/lib/escher/util/hash_map.h
diff --git a/public/lib/escher/util/hashable.h b/garnet/public/lib/escher/util/hashable.h similarity index 100% rename from public/lib/escher/util/hashable.h rename to garnet/public/lib/escher/util/hashable.h
diff --git a/public/lib/escher/util/hasher.h b/garnet/public/lib/escher/util/hasher.h similarity index 100% rename from public/lib/escher/util/hasher.h rename to garnet/public/lib/escher/util/hasher.h
diff --git a/public/lib/escher/util/image_utils.cc b/garnet/public/lib/escher/util/image_utils.cc similarity index 100% rename from public/lib/escher/util/image_utils.cc rename to garnet/public/lib/escher/util/image_utils.cc
diff --git a/public/lib/escher/util/image_utils.h b/garnet/public/lib/escher/util/image_utils.h similarity index 100% rename from public/lib/escher/util/image_utils.h rename to garnet/public/lib/escher/util/image_utils.h
diff --git a/public/lib/escher/util/impl/trace_macros_impl.cc b/garnet/public/lib/escher/util/impl/trace_macros_impl.cc similarity index 100% rename from public/lib/escher/util/impl/trace_macros_impl.cc rename to garnet/public/lib/escher/util/impl/trace_macros_impl.cc
diff --git a/public/lib/escher/util/impl/trace_macros_impl.h b/garnet/public/lib/escher/util/impl/trace_macros_impl.h similarity index 100% rename from public/lib/escher/util/impl/trace_macros_impl.h rename to garnet/public/lib/escher/util/impl/trace_macros_impl.h
diff --git a/public/lib/escher/util/intrusive_list.h b/garnet/public/lib/escher/util/intrusive_list.h similarity index 100% rename from public/lib/escher/util/intrusive_list.h rename to garnet/public/lib/escher/util/intrusive_list.h
diff --git a/public/lib/escher/util/object_pool.h b/garnet/public/lib/escher/util/object_pool.h similarity index 100% rename from public/lib/escher/util/object_pool.h rename to garnet/public/lib/escher/util/object_pool.h
diff --git a/public/lib/escher/util/pair_hasher.h b/garnet/public/lib/escher/util/pair_hasher.h similarity index 100% rename from public/lib/escher/util/pair_hasher.h rename to garnet/public/lib/escher/util/pair_hasher.h
diff --git a/public/lib/escher/util/stack_allocator.h b/garnet/public/lib/escher/util/stack_allocator.h similarity index 100% rename from public/lib/escher/util/stack_allocator.h rename to garnet/public/lib/escher/util/stack_allocator.h
diff --git a/public/lib/escher/util/stopwatch.h b/garnet/public/lib/escher/util/stopwatch.h similarity index 100% rename from public/lib/escher/util/stopwatch.h rename to garnet/public/lib/escher/util/stopwatch.h
diff --git a/public/lib/escher/util/string_utils.h b/garnet/public/lib/escher/util/string_utils.h similarity index 100% rename from public/lib/escher/util/string_utils.h rename to garnet/public/lib/escher/util/string_utils.h
diff --git a/public/lib/escher/util/system_values.h b/garnet/public/lib/escher/util/system_values.h similarity index 100% rename from public/lib/escher/util/system_values.h rename to garnet/public/lib/escher/util/system_values.h
diff --git a/public/lib/escher/util/trace_macros.h b/garnet/public/lib/escher/util/trace_macros.h similarity index 100% rename from public/lib/escher/util/trace_macros.h rename to garnet/public/lib/escher/util/trace_macros.h
diff --git a/public/lib/escher/util/tracer.cc b/garnet/public/lib/escher/util/tracer.cc similarity index 100% rename from public/lib/escher/util/tracer.cc rename to garnet/public/lib/escher/util/tracer.cc
diff --git a/public/lib/escher/util/tracer.h b/garnet/public/lib/escher/util/tracer.h similarity index 100% rename from public/lib/escher/util/tracer.h rename to garnet/public/lib/escher/util/tracer.h
diff --git a/public/lib/escher/util/type_utils.h b/garnet/public/lib/escher/util/type_utils.h similarity index 100% rename from public/lib/escher/util/type_utils.h rename to garnet/public/lib/escher/util/type_utils.h
diff --git a/public/lib/escher/vk/buffer.cc b/garnet/public/lib/escher/vk/buffer.cc similarity index 100% rename from public/lib/escher/vk/buffer.cc rename to garnet/public/lib/escher/vk/buffer.cc
diff --git a/public/lib/escher/vk/buffer.h b/garnet/public/lib/escher/vk/buffer.h similarity index 100% rename from public/lib/escher/vk/buffer.h rename to garnet/public/lib/escher/vk/buffer.h
diff --git a/public/lib/escher/vk/buffer_factory.h b/garnet/public/lib/escher/vk/buffer_factory.h similarity index 100% rename from public/lib/escher/vk/buffer_factory.h rename to garnet/public/lib/escher/vk/buffer_factory.h
diff --git a/public/lib/escher/vk/command_buffer.h b/garnet/public/lib/escher/vk/command_buffer.h similarity index 100% rename from public/lib/escher/vk/command_buffer.h rename to garnet/public/lib/escher/vk/command_buffer.h
diff --git a/public/lib/escher/vk/framebuffer.cc b/garnet/public/lib/escher/vk/framebuffer.cc similarity index 100% rename from public/lib/escher/vk/framebuffer.cc rename to garnet/public/lib/escher/vk/framebuffer.cc
diff --git a/public/lib/escher/vk/framebuffer.h b/garnet/public/lib/escher/vk/framebuffer.h similarity index 100% rename from public/lib/escher/vk/framebuffer.h rename to garnet/public/lib/escher/vk/framebuffer.h
diff --git a/public/lib/escher/vk/gpu_allocator.h b/garnet/public/lib/escher/vk/gpu_allocator.h similarity index 100% rename from public/lib/escher/vk/gpu_allocator.h rename to garnet/public/lib/escher/vk/gpu_allocator.h
diff --git a/public/lib/escher/vk/gpu_mem.cc b/garnet/public/lib/escher/vk/gpu_mem.cc similarity index 100% rename from public/lib/escher/vk/gpu_mem.cc rename to garnet/public/lib/escher/vk/gpu_mem.cc
diff --git a/public/lib/escher/vk/gpu_mem.h b/garnet/public/lib/escher/vk/gpu_mem.h similarity index 100% rename from public/lib/escher/vk/gpu_mem.h rename to garnet/public/lib/escher/vk/gpu_mem.h
diff --git a/public/lib/escher/vk/image.cc b/garnet/public/lib/escher/vk/image.cc similarity index 100% rename from public/lib/escher/vk/image.cc rename to garnet/public/lib/escher/vk/image.cc
diff --git a/public/lib/escher/vk/image.h b/garnet/public/lib/escher/vk/image.h similarity index 100% rename from public/lib/escher/vk/image.h rename to garnet/public/lib/escher/vk/image.h
diff --git a/public/lib/escher/vk/image_factory.h b/garnet/public/lib/escher/vk/image_factory.h similarity index 100% rename from public/lib/escher/vk/image_factory.h rename to garnet/public/lib/escher/vk/image_factory.h
diff --git a/public/lib/escher/vk/image_view.cc b/garnet/public/lib/escher/vk/image_view.cc similarity index 100% rename from public/lib/escher/vk/image_view.cc rename to garnet/public/lib/escher/vk/image_view.cc
diff --git a/public/lib/escher/vk/image_view.h b/garnet/public/lib/escher/vk/image_view.h similarity index 100% rename from public/lib/escher/vk/image_view.h rename to garnet/public/lib/escher/vk/image_view.h
diff --git a/public/lib/escher/vk/impl/descriptor_set_allocator.cc b/garnet/public/lib/escher/vk/impl/descriptor_set_allocator.cc similarity index 100% rename from public/lib/escher/vk/impl/descriptor_set_allocator.cc rename to garnet/public/lib/escher/vk/impl/descriptor_set_allocator.cc
diff --git a/public/lib/escher/vk/impl/descriptor_set_allocator.h b/garnet/public/lib/escher/vk/impl/descriptor_set_allocator.h similarity index 100% rename from public/lib/escher/vk/impl/descriptor_set_allocator.h rename to garnet/public/lib/escher/vk/impl/descriptor_set_allocator.h
diff --git a/public/lib/escher/vk/impl/framebuffer.cc b/garnet/public/lib/escher/vk/impl/framebuffer.cc similarity index 100% rename from public/lib/escher/vk/impl/framebuffer.cc rename to garnet/public/lib/escher/vk/impl/framebuffer.cc
diff --git a/public/lib/escher/vk/impl/framebuffer.h b/garnet/public/lib/escher/vk/impl/framebuffer.h similarity index 100% rename from public/lib/escher/vk/impl/framebuffer.h rename to garnet/public/lib/escher/vk/impl/framebuffer.h
diff --git a/public/lib/escher/vk/impl/framebuffer_allocator.cc b/garnet/public/lib/escher/vk/impl/framebuffer_allocator.cc similarity index 100% rename from public/lib/escher/vk/impl/framebuffer_allocator.cc rename to garnet/public/lib/escher/vk/impl/framebuffer_allocator.cc
diff --git a/public/lib/escher/vk/impl/framebuffer_allocator.h b/garnet/public/lib/escher/vk/impl/framebuffer_allocator.h similarity index 100% rename from public/lib/escher/vk/impl/framebuffer_allocator.h rename to garnet/public/lib/escher/vk/impl/framebuffer_allocator.h
diff --git a/public/lib/escher/vk/impl/pipeline_layout_cache.cc b/garnet/public/lib/escher/vk/impl/pipeline_layout_cache.cc similarity index 100% rename from public/lib/escher/vk/impl/pipeline_layout_cache.cc rename to garnet/public/lib/escher/vk/impl/pipeline_layout_cache.cc
diff --git a/public/lib/escher/vk/impl/pipeline_layout_cache.h b/garnet/public/lib/escher/vk/impl/pipeline_layout_cache.h similarity index 100% rename from public/lib/escher/vk/impl/pipeline_layout_cache.h rename to garnet/public/lib/escher/vk/impl/pipeline_layout_cache.h
diff --git a/public/lib/escher/vk/impl/render_pass_cache.cc b/garnet/public/lib/escher/vk/impl/render_pass_cache.cc similarity index 100% rename from public/lib/escher/vk/impl/render_pass_cache.cc rename to garnet/public/lib/escher/vk/impl/render_pass_cache.cc
diff --git a/public/lib/escher/vk/impl/render_pass_cache.h b/garnet/public/lib/escher/vk/impl/render_pass_cache.h similarity index 100% rename from public/lib/escher/vk/impl/render_pass_cache.h rename to garnet/public/lib/escher/vk/impl/render_pass_cache.h
diff --git a/public/lib/escher/vk/naive_gpu_allocator.cc b/garnet/public/lib/escher/vk/naive_gpu_allocator.cc similarity index 100% rename from public/lib/escher/vk/naive_gpu_allocator.cc rename to garnet/public/lib/escher/vk/naive_gpu_allocator.cc
diff --git a/public/lib/escher/vk/naive_gpu_allocator.h b/garnet/public/lib/escher/vk/naive_gpu_allocator.h similarity index 100% rename from public/lib/escher/vk/naive_gpu_allocator.h rename to garnet/public/lib/escher/vk/naive_gpu_allocator.h
diff --git a/public/lib/escher/vk/render_pass.cc b/garnet/public/lib/escher/vk/render_pass.cc similarity index 100% rename from public/lib/escher/vk/render_pass.cc rename to garnet/public/lib/escher/vk/render_pass.cc
diff --git a/public/lib/escher/vk/render_pass.h b/garnet/public/lib/escher/vk/render_pass.h similarity index 100% rename from public/lib/escher/vk/render_pass.h rename to garnet/public/lib/escher/vk/render_pass.h
diff --git a/public/lib/escher/vk/render_pass_info.h b/garnet/public/lib/escher/vk/render_pass_info.h similarity index 100% rename from public/lib/escher/vk/render_pass_info.h rename to garnet/public/lib/escher/vk/render_pass_info.h
diff --git a/public/lib/escher/vk/shader_module.cc b/garnet/public/lib/escher/vk/shader_module.cc similarity index 100% rename from public/lib/escher/vk/shader_module.cc rename to garnet/public/lib/escher/vk/shader_module.cc
diff --git a/public/lib/escher/vk/shader_module.h b/garnet/public/lib/escher/vk/shader_module.h similarity index 100% rename from public/lib/escher/vk/shader_module.h rename to garnet/public/lib/escher/vk/shader_module.h
diff --git a/public/lib/escher/vk/shader_module_template.cc b/garnet/public/lib/escher/vk/shader_module_template.cc similarity index 100% rename from public/lib/escher/vk/shader_module_template.cc rename to garnet/public/lib/escher/vk/shader_module_template.cc
diff --git a/public/lib/escher/vk/shader_module_template.h b/garnet/public/lib/escher/vk/shader_module_template.h similarity index 100% rename from public/lib/escher/vk/shader_module_template.h rename to garnet/public/lib/escher/vk/shader_module_template.h
diff --git a/public/lib/escher/vk/shader_program.cc b/garnet/public/lib/escher/vk/shader_program.cc similarity index 100% rename from public/lib/escher/vk/shader_program.cc rename to garnet/public/lib/escher/vk/shader_program.cc
diff --git a/public/lib/escher/vk/shader_program.h b/garnet/public/lib/escher/vk/shader_program.h similarity index 100% rename from public/lib/escher/vk/shader_program.h rename to garnet/public/lib/escher/vk/shader_program.h
diff --git a/public/lib/escher/vk/shader_program_factory.cc b/garnet/public/lib/escher/vk/shader_program_factory.cc similarity index 100% rename from public/lib/escher/vk/shader_program_factory.cc rename to garnet/public/lib/escher/vk/shader_program_factory.cc
diff --git a/public/lib/escher/vk/shader_program_factory.h b/garnet/public/lib/escher/vk/shader_program_factory.h similarity index 100% rename from public/lib/escher/vk/shader_program_factory.h rename to garnet/public/lib/escher/vk/shader_program_factory.h
diff --git a/public/lib/escher/vk/shader_stage.h b/garnet/public/lib/escher/vk/shader_stage.h similarity index 100% rename from public/lib/escher/vk/shader_stage.h rename to garnet/public/lib/escher/vk/shader_stage.h
diff --git a/public/lib/escher/vk/shader_variant_args.cc b/garnet/public/lib/escher/vk/shader_variant_args.cc similarity index 100% rename from public/lib/escher/vk/shader_variant_args.cc rename to garnet/public/lib/escher/vk/shader_variant_args.cc
diff --git a/public/lib/escher/vk/shader_variant_args.h b/garnet/public/lib/escher/vk/shader_variant_args.h similarity index 100% rename from public/lib/escher/vk/shader_variant_args.h rename to garnet/public/lib/escher/vk/shader_variant_args.h
diff --git a/public/lib/escher/vk/texture.cc b/garnet/public/lib/escher/vk/texture.cc similarity index 100% rename from public/lib/escher/vk/texture.cc rename to garnet/public/lib/escher/vk/texture.cc
diff --git a/public/lib/escher/vk/texture.h b/garnet/public/lib/escher/vk/texture.h similarity index 100% rename from public/lib/escher/vk/texture.h rename to garnet/public/lib/escher/vk/texture.h
diff --git a/public/lib/escher/vk/vk_mem_alloc.cc b/garnet/public/lib/escher/vk/vk_mem_alloc.cc similarity index 100% rename from public/lib/escher/vk/vk_mem_alloc.cc rename to garnet/public/lib/escher/vk/vk_mem_alloc.cc
diff --git a/public/lib/escher/vk/vma_gpu_allocator.cc b/garnet/public/lib/escher/vk/vma_gpu_allocator.cc similarity index 100% rename from public/lib/escher/vk/vma_gpu_allocator.cc rename to garnet/public/lib/escher/vk/vma_gpu_allocator.cc
diff --git a/public/lib/escher/vk/vma_gpu_allocator.h b/garnet/public/lib/escher/vk/vma_gpu_allocator.h similarity index 100% rename from public/lib/escher/vk/vma_gpu_allocator.h rename to garnet/public/lib/escher/vk/vma_gpu_allocator.h
diff --git a/public/lib/escher/vk/vulkan_context.h b/garnet/public/lib/escher/vk/vulkan_context.h similarity index 100% rename from public/lib/escher/vk/vulkan_context.h rename to garnet/public/lib/escher/vk/vulkan_context.h
diff --git a/public/lib/escher/vk/vulkan_device_queues.cc b/garnet/public/lib/escher/vk/vulkan_device_queues.cc similarity index 100% rename from public/lib/escher/vk/vulkan_device_queues.cc rename to garnet/public/lib/escher/vk/vulkan_device_queues.cc
diff --git a/public/lib/escher/vk/vulkan_device_queues.h b/garnet/public/lib/escher/vk/vulkan_device_queues.h similarity index 100% rename from public/lib/escher/vk/vulkan_device_queues.h rename to garnet/public/lib/escher/vk/vulkan_device_queues.h
diff --git a/public/lib/escher/vk/vulkan_instance.cc b/garnet/public/lib/escher/vk/vulkan_instance.cc similarity index 100% rename from public/lib/escher/vk/vulkan_instance.cc rename to garnet/public/lib/escher/vk/vulkan_instance.cc
diff --git a/public/lib/escher/vk/vulkan_instance.h b/garnet/public/lib/escher/vk/vulkan_instance.h similarity index 100% rename from public/lib/escher/vk/vulkan_instance.h rename to garnet/public/lib/escher/vk/vulkan_instance.h
diff --git a/public/lib/escher/vk/vulkan_limits.h b/garnet/public/lib/escher/vk/vulkan_limits.h similarity index 100% rename from public/lib/escher/vk/vulkan_limits.h rename to garnet/public/lib/escher/vk/vulkan_limits.h
diff --git a/public/lib/escher/vk/vulkan_swapchain.cc b/garnet/public/lib/escher/vk/vulkan_swapchain.cc similarity index 100% rename from public/lib/escher/vk/vulkan_swapchain.cc rename to garnet/public/lib/escher/vk/vulkan_swapchain.cc
diff --git a/public/lib/escher/vk/vulkan_swapchain.h b/garnet/public/lib/escher/vk/vulkan_swapchain.h similarity index 100% rename from public/lib/escher/vk/vulkan_swapchain.h rename to garnet/public/lib/escher/vk/vulkan_swapchain.h
diff --git a/public/lib/escher/vk/vulkan_swapchain_helper.cc b/garnet/public/lib/escher/vk/vulkan_swapchain_helper.cc similarity index 100% rename from public/lib/escher/vk/vulkan_swapchain_helper.cc rename to garnet/public/lib/escher/vk/vulkan_swapchain_helper.cc
diff --git a/public/lib/escher/vk/vulkan_swapchain_helper.h b/garnet/public/lib/escher/vk/vulkan_swapchain_helper.h similarity index 100% rename from public/lib/escher/vk/vulkan_swapchain_helper.h rename to garnet/public/lib/escher/vk/vulkan_swapchain_helper.h
diff --git a/public/lib/fidl/MAINTAINERS b/garnet/public/lib/fidl/MAINTAINERS similarity index 100% rename from public/lib/fidl/MAINTAINERS rename to garnet/public/lib/fidl/MAINTAINERS
diff --git a/public/lib/fidl/README.md b/garnet/public/lib/fidl/README.md similarity index 100% rename from public/lib/fidl/README.md rename to garnet/public/lib/fidl/README.md
diff --git a/public/lib/fidl/compatibility_test/BUILD.gn b/garnet/public/lib/fidl/compatibility_test/BUILD.gn similarity index 100% rename from public/lib/fidl/compatibility_test/BUILD.gn rename to garnet/public/lib/fidl/compatibility_test/BUILD.gn
diff --git a/public/lib/fidl/compatibility_test/README.md b/garnet/public/lib/fidl/compatibility_test/README.md similarity index 100% rename from public/lib/fidl/compatibility_test/README.md rename to garnet/public/lib/fidl/compatibility_test/README.md
diff --git a/public/lib/fidl/compatibility_test/compatibility_test_service.fidl b/garnet/public/lib/fidl/compatibility_test/compatibility_test_service.fidl similarity index 100% rename from public/lib/fidl/compatibility_test/compatibility_test_service.fidl rename to garnet/public/lib/fidl/compatibility_test/compatibility_test_service.fidl
diff --git a/public/lib/fidl/compatibility_test/echo_client_app.cc b/garnet/public/lib/fidl/compatibility_test/echo_client_app.cc similarity index 100% rename from public/lib/fidl/compatibility_test/echo_client_app.cc rename to garnet/public/lib/fidl/compatibility_test/echo_client_app.cc
diff --git a/public/lib/fidl/compatibility_test/echo_client_app.h b/garnet/public/lib/fidl/compatibility_test/echo_client_app.h similarity index 100% rename from public/lib/fidl/compatibility_test/echo_client_app.h rename to garnet/public/lib/fidl/compatibility_test/echo_client_app.h
diff --git a/public/lib/fidl/cpp/BUILD.gn b/garnet/public/lib/fidl/cpp/BUILD.gn similarity index 100% rename from public/lib/fidl/cpp/BUILD.gn rename to garnet/public/lib/fidl/cpp/BUILD.gn
diff --git a/public/lib/fidl/cpp/array.h b/garnet/public/lib/fidl/cpp/array.h similarity index 100% rename from public/lib/fidl/cpp/array.h rename to garnet/public/lib/fidl/cpp/array.h
diff --git a/public/lib/fidl/cpp/array_unittest.cc b/garnet/public/lib/fidl/cpp/array_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/array_unittest.cc rename to garnet/public/lib/fidl/cpp/array_unittest.cc
diff --git a/public/lib/fidl/cpp/binding.h b/garnet/public/lib/fidl/cpp/binding.h similarity index 100% rename from public/lib/fidl/cpp/binding.h rename to garnet/public/lib/fidl/cpp/binding.h
diff --git a/public/lib/fidl/cpp/binding_set.h b/garnet/public/lib/fidl/cpp/binding_set.h similarity index 100% rename from public/lib/fidl/cpp/binding_set.h rename to garnet/public/lib/fidl/cpp/binding_set.h
diff --git a/public/lib/fidl/cpp/binding_set_unittest.cc b/garnet/public/lib/fidl/cpp/binding_set_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/binding_set_unittest.cc rename to garnet/public/lib/fidl/cpp/binding_set_unittest.cc
diff --git a/public/lib/fidl/cpp/binding_unittest.cc b/garnet/public/lib/fidl/cpp/binding_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/binding_unittest.cc rename to garnet/public/lib/fidl/cpp/binding_unittest.cc
diff --git a/public/lib/fidl/cpp/clone.cc b/garnet/public/lib/fidl/cpp/clone.cc similarity index 100% rename from public/lib/fidl/cpp/clone.cc rename to garnet/public/lib/fidl/cpp/clone.cc
diff --git a/public/lib/fidl/cpp/clone.h b/garnet/public/lib/fidl/cpp/clone.h similarity index 100% rename from public/lib/fidl/cpp/clone.h rename to garnet/public/lib/fidl/cpp/clone.h
diff --git a/public/lib/fidl/cpp/clone_unittest.cc b/garnet/public/lib/fidl/cpp/clone_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/clone_unittest.cc rename to garnet/public/lib/fidl/cpp/clone_unittest.cc
diff --git a/public/lib/fidl/cpp/coding_traits.cc b/garnet/public/lib/fidl/cpp/coding_traits.cc similarity index 100% rename from public/lib/fidl/cpp/coding_traits.cc rename to garnet/public/lib/fidl/cpp/coding_traits.cc
diff --git a/public/lib/fidl/cpp/coding_traits.h b/garnet/public/lib/fidl/cpp/coding_traits.h similarity index 100% rename from public/lib/fidl/cpp/coding_traits.h rename to garnet/public/lib/fidl/cpp/coding_traits.h
diff --git a/public/lib/fidl/cpp/comparison.h b/garnet/public/lib/fidl/cpp/comparison.h similarity index 100% rename from public/lib/fidl/cpp/comparison.h rename to garnet/public/lib/fidl/cpp/comparison.h
diff --git a/public/lib/fidl/cpp/decoder.cc b/garnet/public/lib/fidl/cpp/decoder.cc similarity index 100% rename from public/lib/fidl/cpp/decoder.cc rename to garnet/public/lib/fidl/cpp/decoder.cc
diff --git a/public/lib/fidl/cpp/decoder.h b/garnet/public/lib/fidl/cpp/decoder.h similarity index 100% rename from public/lib/fidl/cpp/decoder.h rename to garnet/public/lib/fidl/cpp/decoder.h
diff --git a/public/lib/fidl/cpp/encoder.cc b/garnet/public/lib/fidl/cpp/encoder.cc similarity index 100% rename from public/lib/fidl/cpp/encoder.cc rename to garnet/public/lib/fidl/cpp/encoder.cc
diff --git a/public/lib/fidl/cpp/encoder.h b/garnet/public/lib/fidl/cpp/encoder.h similarity index 100% rename from public/lib/fidl/cpp/encoder.h rename to garnet/public/lib/fidl/cpp/encoder.h
diff --git a/public/lib/fidl/cpp/enum.h b/garnet/public/lib/fidl/cpp/enum.h similarity index 100% rename from public/lib/fidl/cpp/enum.h rename to garnet/public/lib/fidl/cpp/enum.h
diff --git a/public/lib/fidl/cpp/fidl_test.cc b/garnet/public/lib/fidl/cpp/fidl_test.cc similarity index 100% rename from public/lib/fidl/cpp/fidl_test.cc rename to garnet/public/lib/fidl/cpp/fidl_test.cc
diff --git a/public/lib/fidl/cpp/fidl_test.fidl b/garnet/public/lib/fidl/cpp/fidl_test.fidl similarity index 100% rename from public/lib/fidl/cpp/fidl_test.fidl rename to garnet/public/lib/fidl/cpp/fidl_test.fidl
diff --git a/public/lib/fidl/cpp/interface_handle.h b/garnet/public/lib/fidl/cpp/interface_handle.h similarity index 100% rename from public/lib/fidl/cpp/interface_handle.h rename to garnet/public/lib/fidl/cpp/interface_handle.h
diff --git a/public/lib/fidl/cpp/interface_handle_unittest.cc b/garnet/public/lib/fidl/cpp/interface_handle_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/interface_handle_unittest.cc rename to garnet/public/lib/fidl/cpp/interface_handle_unittest.cc
diff --git a/public/lib/fidl/cpp/interface_ptr.h b/garnet/public/lib/fidl/cpp/interface_ptr.h similarity index 100% rename from public/lib/fidl/cpp/interface_ptr.h rename to garnet/public/lib/fidl/cpp/interface_ptr.h
diff --git a/public/lib/fidl/cpp/interface_ptr_set.h b/garnet/public/lib/fidl/cpp/interface_ptr_set.h similarity index 100% rename from public/lib/fidl/cpp/interface_ptr_set.h rename to garnet/public/lib/fidl/cpp/interface_ptr_set.h
diff --git a/public/lib/fidl/cpp/interface_ptr_set_unittest.cc b/garnet/public/lib/fidl/cpp/interface_ptr_set_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/interface_ptr_set_unittest.cc rename to garnet/public/lib/fidl/cpp/interface_ptr_set_unittest.cc
diff --git a/public/lib/fidl/cpp/interface_ptr_unittest.cc b/garnet/public/lib/fidl/cpp/interface_ptr_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/interface_ptr_unittest.cc rename to garnet/public/lib/fidl/cpp/interface_ptr_unittest.cc
diff --git a/public/lib/fidl/cpp/interface_request.h b/garnet/public/lib/fidl/cpp/interface_request.h similarity index 100% rename from public/lib/fidl/cpp/interface_request.h rename to garnet/public/lib/fidl/cpp/interface_request.h
diff --git a/public/lib/fidl/cpp/interface_request_unittest.cc b/garnet/public/lib/fidl/cpp/interface_request_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/interface_request_unittest.cc rename to garnet/public/lib/fidl/cpp/interface_request_unittest.cc
diff --git a/public/lib/fidl/cpp/internal/header.h b/garnet/public/lib/fidl/cpp/internal/header.h similarity index 100% rename from public/lib/fidl/cpp/internal/header.h rename to garnet/public/lib/fidl/cpp/internal/header.h
diff --git a/public/lib/fidl/cpp/internal/implementation.h b/garnet/public/lib/fidl/cpp/internal/implementation.h similarity index 100% rename from public/lib/fidl/cpp/internal/implementation.h rename to garnet/public/lib/fidl/cpp/internal/implementation.h
diff --git a/public/lib/fidl/cpp/internal/logging.cc b/garnet/public/lib/fidl/cpp/internal/logging.cc similarity index 100% rename from public/lib/fidl/cpp/internal/logging.cc rename to garnet/public/lib/fidl/cpp/internal/logging.cc
diff --git a/public/lib/fidl/cpp/internal/logging.h b/garnet/public/lib/fidl/cpp/internal/logging.h similarity index 100% rename from public/lib/fidl/cpp/internal/logging.h rename to garnet/public/lib/fidl/cpp/internal/logging.h
diff --git a/public/lib/fidl/cpp/internal/message_handler.cc b/garnet/public/lib/fidl/cpp/internal/message_handler.cc similarity index 100% rename from public/lib/fidl/cpp/internal/message_handler.cc rename to garnet/public/lib/fidl/cpp/internal/message_handler.cc
diff --git a/public/lib/fidl/cpp/internal/message_handler.h b/garnet/public/lib/fidl/cpp/internal/message_handler.h similarity index 100% rename from public/lib/fidl/cpp/internal/message_handler.h rename to garnet/public/lib/fidl/cpp/internal/message_handler.h
diff --git a/public/lib/fidl/cpp/internal/message_reader.cc b/garnet/public/lib/fidl/cpp/internal/message_reader.cc similarity index 100% rename from public/lib/fidl/cpp/internal/message_reader.cc rename to garnet/public/lib/fidl/cpp/internal/message_reader.cc
diff --git a/public/lib/fidl/cpp/internal/message_reader.h b/garnet/public/lib/fidl/cpp/internal/message_reader.h similarity index 100% rename from public/lib/fidl/cpp/internal/message_reader.h rename to garnet/public/lib/fidl/cpp/internal/message_reader.h
diff --git a/public/lib/fidl/cpp/internal/message_reader_unittest.cc b/garnet/public/lib/fidl/cpp/internal/message_reader_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/internal/message_reader_unittest.cc rename to garnet/public/lib/fidl/cpp/internal/message_reader_unittest.cc
diff --git a/public/lib/fidl/cpp/internal/pending_response.cc b/garnet/public/lib/fidl/cpp/internal/pending_response.cc similarity index 100% rename from public/lib/fidl/cpp/internal/pending_response.cc rename to garnet/public/lib/fidl/cpp/internal/pending_response.cc
diff --git a/public/lib/fidl/cpp/internal/pending_response.h b/garnet/public/lib/fidl/cpp/internal/pending_response.h similarity index 100% rename from public/lib/fidl/cpp/internal/pending_response.h rename to garnet/public/lib/fidl/cpp/internal/pending_response.h
diff --git a/public/lib/fidl/cpp/internal/proxy.cc b/garnet/public/lib/fidl/cpp/internal/proxy.cc similarity index 100% rename from public/lib/fidl/cpp/internal/proxy.cc rename to garnet/public/lib/fidl/cpp/internal/proxy.cc
diff --git a/public/lib/fidl/cpp/internal/proxy.h b/garnet/public/lib/fidl/cpp/internal/proxy.h similarity index 100% rename from public/lib/fidl/cpp/internal/proxy.h rename to garnet/public/lib/fidl/cpp/internal/proxy.h
diff --git a/public/lib/fidl/cpp/internal/proxy_controller.cc b/garnet/public/lib/fidl/cpp/internal/proxy_controller.cc similarity index 100% rename from public/lib/fidl/cpp/internal/proxy_controller.cc rename to garnet/public/lib/fidl/cpp/internal/proxy_controller.cc
diff --git a/public/lib/fidl/cpp/internal/proxy_controller.h b/garnet/public/lib/fidl/cpp/internal/proxy_controller.h similarity index 100% rename from public/lib/fidl/cpp/internal/proxy_controller.h rename to garnet/public/lib/fidl/cpp/internal/proxy_controller.h
diff --git a/public/lib/fidl/cpp/internal/proxy_controller_unittest.cc b/garnet/public/lib/fidl/cpp/internal/proxy_controller_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/internal/proxy_controller_unittest.cc rename to garnet/public/lib/fidl/cpp/internal/proxy_controller_unittest.cc
diff --git a/public/lib/fidl/cpp/internal/stub.cc b/garnet/public/lib/fidl/cpp/internal/stub.cc similarity index 100% rename from public/lib/fidl/cpp/internal/stub.cc rename to garnet/public/lib/fidl/cpp/internal/stub.cc
diff --git a/public/lib/fidl/cpp/internal/stub.h b/garnet/public/lib/fidl/cpp/internal/stub.h similarity index 100% rename from public/lib/fidl/cpp/internal/stub.h rename to garnet/public/lib/fidl/cpp/internal/stub.h
diff --git a/public/lib/fidl/cpp/internal/stub_controller.cc b/garnet/public/lib/fidl/cpp/internal/stub_controller.cc similarity index 100% rename from public/lib/fidl/cpp/internal/stub_controller.cc rename to garnet/public/lib/fidl/cpp/internal/stub_controller.cc
diff --git a/public/lib/fidl/cpp/internal/stub_controller.h b/garnet/public/lib/fidl/cpp/internal/stub_controller.h similarity index 100% rename from public/lib/fidl/cpp/internal/stub_controller.h rename to garnet/public/lib/fidl/cpp/internal/stub_controller.h
diff --git a/public/lib/fidl/cpp/internal/stub_controller_unittest.cc b/garnet/public/lib/fidl/cpp/internal/stub_controller_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/internal/stub_controller_unittest.cc rename to garnet/public/lib/fidl/cpp/internal/stub_controller_unittest.cc
diff --git a/public/lib/fidl/cpp/internal/synchronous_proxy.cc b/garnet/public/lib/fidl/cpp/internal/synchronous_proxy.cc similarity index 100% rename from public/lib/fidl/cpp/internal/synchronous_proxy.cc rename to garnet/public/lib/fidl/cpp/internal/synchronous_proxy.cc
diff --git a/public/lib/fidl/cpp/internal/synchronous_proxy.h b/garnet/public/lib/fidl/cpp/internal/synchronous_proxy.h similarity index 100% rename from public/lib/fidl/cpp/internal/synchronous_proxy.h rename to garnet/public/lib/fidl/cpp/internal/synchronous_proxy.h
diff --git a/public/lib/fidl/cpp/internal/weak_stub_controller.cc b/garnet/public/lib/fidl/cpp/internal/weak_stub_controller.cc similarity index 100% rename from public/lib/fidl/cpp/internal/weak_stub_controller.cc rename to garnet/public/lib/fidl/cpp/internal/weak_stub_controller.cc
diff --git a/public/lib/fidl/cpp/internal/weak_stub_controller.h b/garnet/public/lib/fidl/cpp/internal/weak_stub_controller.h similarity index 100% rename from public/lib/fidl/cpp/internal/weak_stub_controller.h rename to garnet/public/lib/fidl/cpp/internal/weak_stub_controller.h
diff --git a/public/lib/fidl/cpp/object_coding.h b/garnet/public/lib/fidl/cpp/object_coding.h similarity index 100% rename from public/lib/fidl/cpp/object_coding.h rename to garnet/public/lib/fidl/cpp/object_coding.h
diff --git a/public/lib/fidl/cpp/object_coding_unittest.cc b/garnet/public/lib/fidl/cpp/object_coding_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/object_coding_unittest.cc rename to garnet/public/lib/fidl/cpp/object_coding_unittest.cc
diff --git a/public/lib/fidl/cpp/optional.h b/garnet/public/lib/fidl/cpp/optional.h similarity index 100% rename from public/lib/fidl/cpp/optional.h rename to garnet/public/lib/fidl/cpp/optional.h
diff --git a/public/lib/fidl/cpp/roundtrip_test.cc b/garnet/public/lib/fidl/cpp/roundtrip_test.cc similarity index 100% rename from public/lib/fidl/cpp/roundtrip_test.cc rename to garnet/public/lib/fidl/cpp/roundtrip_test.cc
diff --git a/public/lib/fidl/cpp/string.cc b/garnet/public/lib/fidl/cpp/string.cc similarity index 100% rename from public/lib/fidl/cpp/string.cc rename to garnet/public/lib/fidl/cpp/string.cc
diff --git a/public/lib/fidl/cpp/string.h b/garnet/public/lib/fidl/cpp/string.h similarity index 100% rename from public/lib/fidl/cpp/string.h rename to garnet/public/lib/fidl/cpp/string.h
diff --git a/public/lib/fidl/cpp/string_unittest.cc b/garnet/public/lib/fidl/cpp/string_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/string_unittest.cc rename to garnet/public/lib/fidl/cpp/string_unittest.cc
diff --git a/public/lib/fidl/cpp/synchronous_interface_ptr.h b/garnet/public/lib/fidl/cpp/synchronous_interface_ptr.h similarity index 100% rename from public/lib/fidl/cpp/synchronous_interface_ptr.h rename to garnet/public/lib/fidl/cpp/synchronous_interface_ptr.h
diff --git a/public/lib/fidl/cpp/synchronous_interface_ptr_unittest.cc b/garnet/public/lib/fidl/cpp/synchronous_interface_ptr_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/synchronous_interface_ptr_unittest.cc rename to garnet/public/lib/fidl/cpp/synchronous_interface_ptr_unittest.cc
diff --git a/public/lib/fidl/cpp/test/BUILD.gn b/garnet/public/lib/fidl/cpp/test/BUILD.gn similarity index 100% rename from public/lib/fidl/cpp/test/BUILD.gn rename to garnet/public/lib/fidl/cpp/test/BUILD.gn
diff --git a/public/lib/fidl/cpp/test/async_loop_for_test.cc b/garnet/public/lib/fidl/cpp/test/async_loop_for_test.cc similarity index 100% rename from public/lib/fidl/cpp/test/async_loop_for_test.cc rename to garnet/public/lib/fidl/cpp/test/async_loop_for_test.cc
diff --git a/public/lib/fidl/cpp/test/async_loop_for_test.h b/garnet/public/lib/fidl/cpp/test/async_loop_for_test.h similarity index 100% rename from public/lib/fidl/cpp/test/async_loop_for_test.h rename to garnet/public/lib/fidl/cpp/test/async_loop_for_test.h
diff --git a/public/lib/fidl/cpp/test/fidl_types.cc b/garnet/public/lib/fidl/cpp/test/fidl_types.cc similarity index 100% rename from public/lib/fidl/cpp/test/fidl_types.cc rename to garnet/public/lib/fidl/cpp/test/fidl_types.cc
diff --git a/public/lib/fidl/cpp/test/fidl_types.h b/garnet/public/lib/fidl/cpp/test/fidl_types.h similarity index 100% rename from public/lib/fidl/cpp/test/fidl_types.h rename to garnet/public/lib/fidl/cpp/test/fidl_types.h
diff --git a/public/lib/fidl/cpp/test/frobinator.fidl b/garnet/public/lib/fidl/cpp/test/frobinator.fidl similarity index 100% rename from public/lib/fidl/cpp/test/frobinator.fidl rename to garnet/public/lib/fidl/cpp/test/frobinator.fidl
diff --git a/public/lib/fidl/cpp/test/frobinator_impl.cc b/garnet/public/lib/fidl/cpp/test/frobinator_impl.cc similarity index 100% rename from public/lib/fidl/cpp/test/frobinator_impl.cc rename to garnet/public/lib/fidl/cpp/test/frobinator_impl.cc
diff --git a/public/lib/fidl/cpp/test/frobinator_impl.h b/garnet/public/lib/fidl/cpp/test/frobinator_impl.h similarity index 100% rename from public/lib/fidl/cpp/test/frobinator_impl.h rename to garnet/public/lib/fidl/cpp/test/frobinator_impl.h
diff --git a/public/lib/fidl/cpp/thread_safe_binding_set.h b/garnet/public/lib/fidl/cpp/thread_safe_binding_set.h similarity index 100% rename from public/lib/fidl/cpp/thread_safe_binding_set.h rename to garnet/public/lib/fidl/cpp/thread_safe_binding_set.h
diff --git a/public/lib/fidl/cpp/thread_safe_binding_set_unittest.cc b/garnet/public/lib/fidl/cpp/thread_safe_binding_set_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/thread_safe_binding_set_unittest.cc rename to garnet/public/lib/fidl/cpp/thread_safe_binding_set_unittest.cc
diff --git a/public/lib/fidl/cpp/traits.h b/garnet/public/lib/fidl/cpp/traits.h similarity index 100% rename from public/lib/fidl/cpp/traits.h rename to garnet/public/lib/fidl/cpp/traits.h
diff --git a/public/lib/fidl/cpp/vector.h b/garnet/public/lib/fidl/cpp/vector.h similarity index 100% rename from public/lib/fidl/cpp/vector.h rename to garnet/public/lib/fidl/cpp/vector.h
diff --git a/public/lib/fidl/cpp/vector_unittest.cc b/garnet/public/lib/fidl/cpp/vector_unittest.cc similarity index 100% rename from public/lib/fidl/cpp/vector_unittest.cc rename to garnet/public/lib/fidl/cpp/vector_unittest.cc
diff --git a/public/lib/fidl/fuzz/BUILD.gn b/garnet/public/lib/fidl/fuzz/BUILD.gn similarity index 100% rename from public/lib/fidl/fuzz/BUILD.gn rename to garnet/public/lib/fidl/fuzz/BUILD.gn
diff --git a/public/lib/fidl/fuzz/compiler.cc b/garnet/public/lib/fidl/fuzz/compiler.cc similarity index 100% rename from public/lib/fidl/fuzz/compiler.cc rename to garnet/public/lib/fidl/fuzz/compiler.cc
diff --git a/public/lib/fidl/fuzz/input_corpus/leaktest1.fidl b/garnet/public/lib/fidl/fuzz/input_corpus/leaktest1.fidl similarity index 100% rename from public/lib/fidl/fuzz/input_corpus/leaktest1.fidl rename to garnet/public/lib/fidl/fuzz/input_corpus/leaktest1.fidl
diff --git a/public/lib/fidl/fuzz/input_corpus/leaktest2.fidl b/garnet/public/lib/fidl/fuzz/input_corpus/leaktest2.fidl similarity index 100% rename from public/lib/fidl/fuzz/input_corpus/leaktest2.fidl rename to garnet/public/lib/fidl/fuzz/input_corpus/leaktest2.fidl
diff --git a/public/lib/fidl/fuzz/input_corpus/test1.fidl b/garnet/public/lib/fidl/fuzz/input_corpus/test1.fidl similarity index 100% rename from public/lib/fidl/fuzz/input_corpus/test1.fidl rename to garnet/public/lib/fidl/fuzz/input_corpus/test1.fidl
diff --git a/public/lib/fidl/rust/fidl/BUILD.gn b/garnet/public/lib/fidl/rust/fidl/BUILD.gn similarity index 100% rename from public/lib/fidl/rust/fidl/BUILD.gn rename to garnet/public/lib/fidl/rust/fidl/BUILD.gn
diff --git a/public/lib/fidl/rust/fidl/src/client.rs b/garnet/public/lib/fidl/rust/fidl/src/client.rs similarity index 100% rename from public/lib/fidl/rust/fidl/src/client.rs rename to garnet/public/lib/fidl/rust/fidl/src/client.rs
diff --git a/public/lib/fidl/rust/fidl/src/encoding.rs b/garnet/public/lib/fidl/rust/fidl/src/encoding.rs similarity index 100% rename from public/lib/fidl/rust/fidl/src/encoding.rs rename to garnet/public/lib/fidl/rust/fidl/src/encoding.rs
diff --git a/public/lib/fidl/rust/fidl/src/endpoints.rs b/garnet/public/lib/fidl/rust/fidl/src/endpoints.rs similarity index 100% rename from public/lib/fidl/rust/fidl/src/endpoints.rs rename to garnet/public/lib/fidl/rust/fidl/src/endpoints.rs
diff --git a/public/lib/fidl/rust/fidl/src/error.rs b/garnet/public/lib/fidl/rust/fidl/src/error.rs similarity index 100% rename from public/lib/fidl/rust/fidl/src/error.rs rename to garnet/public/lib/fidl/rust/fidl/src/error.rs
diff --git a/public/lib/fidl/rust/fidl/src/lib.rs b/garnet/public/lib/fidl/rust/fidl/src/lib.rs similarity index 100% rename from public/lib/fidl/rust/fidl/src/lib.rs rename to garnet/public/lib/fidl/rust/fidl/src/lib.rs
diff --git a/public/lib/fidl/tools/analysis/README.md b/garnet/public/lib/fidl/tools/analysis/README.md similarity index 100% rename from public/lib/fidl/tools/analysis/README.md rename to garnet/public/lib/fidl/tools/analysis/README.md
diff --git a/public/lib/fidl/tools/analysis/ir.py b/garnet/public/lib/fidl/tools/analysis/ir.py similarity index 100% rename from public/lib/fidl/tools/analysis/ir.py rename to garnet/public/lib/fidl/tools/analysis/ir.py
diff --git a/public/lib/fidl/tools/analysis/single_use.py b/garnet/public/lib/fidl/tools/analysis/single_use.py similarity index 100% rename from public/lib/fidl/tools/analysis/single_use.py rename to garnet/public/lib/fidl/tools/analysis/single_use.py
diff --git "a/public/lib/fidl/tools/sublime/Comments \050FIDL\051.tmPreferences" "b/garnet/public/lib/fidl/tools/sublime/Comments \050FIDL\051.tmPreferences" similarity index 100% rename from "public/lib/fidl/tools/sublime/Comments \050FIDL\051.tmPreferences" rename to "garnet/public/lib/fidl/tools/sublime/Comments \050FIDL\051.tmPreferences"
diff --git a/public/lib/fidl/tools/sublime/FIDL.sublime-syntax b/garnet/public/lib/fidl/tools/sublime/FIDL.sublime-syntax similarity index 100% rename from public/lib/fidl/tools/sublime/FIDL.sublime-syntax rename to garnet/public/lib/fidl/tools/sublime/FIDL.sublime-syntax
diff --git a/public/lib/fidl/tools/vim/README.md b/garnet/public/lib/fidl/tools/vim/README.md similarity index 100% rename from public/lib/fidl/tools/vim/README.md rename to garnet/public/lib/fidl/tools/vim/README.md
diff --git a/public/lib/fidl/tools/vim/ftdetect/fidl.vim b/garnet/public/lib/fidl/tools/vim/ftdetect/fidl.vim similarity index 100% rename from public/lib/fidl/tools/vim/ftdetect/fidl.vim rename to garnet/public/lib/fidl/tools/vim/ftdetect/fidl.vim
diff --git a/public/lib/fidl/tools/vim/ftplugin/fidl.vim b/garnet/public/lib/fidl/tools/vim/ftplugin/fidl.vim similarity index 100% rename from public/lib/fidl/tools/vim/ftplugin/fidl.vim rename to garnet/public/lib/fidl/tools/vim/ftplugin/fidl.vim
diff --git a/public/lib/fidl/tools/vim/indent/fidl.vim b/garnet/public/lib/fidl/tools/vim/indent/fidl.vim similarity index 100% rename from public/lib/fidl/tools/vim/indent/fidl.vim rename to garnet/public/lib/fidl/tools/vim/indent/fidl.vim
diff --git a/public/lib/fidl/tools/vim/syntax/fidl.vim b/garnet/public/lib/fidl/tools/vim/syntax/fidl.vim similarity index 100% rename from public/lib/fidl/tools/vim/syntax/fidl.vim rename to garnet/public/lib/fidl/tools/vim/syntax/fidl.vim
diff --git a/public/lib/fostr/BUILD.gn b/garnet/public/lib/fostr/BUILD.gn similarity index 100% rename from public/lib/fostr/BUILD.gn rename to garnet/public/lib/fostr/BUILD.gn
diff --git a/public/lib/fostr/MAINTAINERS b/garnet/public/lib/fostr/MAINTAINERS similarity index 100% rename from public/lib/fostr/MAINTAINERS rename to garnet/public/lib/fostr/MAINTAINERS
diff --git a/public/lib/fostr/README.md b/garnet/public/lib/fostr/README.md similarity index 100% rename from public/lib/fostr/README.md rename to garnet/public/lib/fostr/README.md
diff --git a/public/lib/fostr/fidl/fuchsia.auth/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.auth/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.auth/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.auth/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.data/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.data/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.data/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.data/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.hardware.ethernet/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.hardware.ethernet/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.hardware.ethernet/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.hardware.ethernet/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.images/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.images/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.images/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.images/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.io/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.io/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.io/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.io/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.math/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.math/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.math/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.math/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.math/amendments.json b/garnet/public/lib/fostr/fidl/fuchsia.math/amendments.json similarity index 100% rename from public/lib/fostr/fidl/fuchsia.math/amendments.json rename to garnet/public/lib/fostr/fidl/fuchsia.math/amendments.json
diff --git a/public/lib/fostr/fidl/fuchsia.mdns/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.mdns/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.mdns/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.mdns/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.media/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.media/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.media/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.media/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.mediacodec/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.mediacodec/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.mediacodec/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.mediacodec/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.mediaplayer/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.mediaplayer/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.mediaplayer/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.mediaplayer/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.mem/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.mem/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.mem/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.mem/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.net.oldhttp/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.net.oldhttp/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.net.oldhttp/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.net.oldhttp/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.net/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.net/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.net/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.net/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.netstack/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.netstack/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.netstack/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.netstack/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.overnet.protocol/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.overnet.protocol/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.overnet.protocol/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.overnet.protocol/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.overnet/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.overnet/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.overnet/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.overnet/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.sys/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.sys/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.sys/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.sys/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.sys2/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.sys2/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.sys2/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.sys2/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.gfx/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.gfx/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.gfx/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.gfx/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.input/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.input/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.input/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.input/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.input/amendments.json b/garnet/public/lib/fostr/fidl/fuchsia.ui.input/amendments.json similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.input/amendments.json rename to garnet/public/lib/fostr/fidl/fuchsia.ui.input/amendments.json
diff --git a/public/lib/fostr/fidl/fuchsia.ui.policy/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.policy/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.policy/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.policy/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.scenic/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.scenic/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.scenic/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.scenic/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.vectorial/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.vectorial/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.vectorial/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.vectorial/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.views/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.views/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.views/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.views/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.viewsv1/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.viewsv1/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1/BUILD.gn
diff --git a/public/lib/fostr/fidl/fuchsia.ui.viewsv1/amendments.json b/garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1/amendments.json similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.viewsv1/amendments.json rename to garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1/amendments.json
diff --git a/public/lib/fostr/fidl/fuchsia.ui.viewsv1token/BUILD.gn b/garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1token/BUILD.gn similarity index 100% rename from public/lib/fostr/fidl/fuchsia.ui.viewsv1token/BUILD.gn rename to garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1token/BUILD.gn
diff --git a/public/lib/fostr/fidl_types.cc b/garnet/public/lib/fostr/fidl_types.cc similarity index 100% rename from public/lib/fostr/fidl_types.cc rename to garnet/public/lib/fostr/fidl_types.cc
diff --git a/public/lib/fostr/fidl_types.h b/garnet/public/lib/fostr/fidl_types.h similarity index 100% rename from public/lib/fostr/fidl_types.h rename to garnet/public/lib/fostr/fidl_types.h
diff --git a/public/lib/fostr/hex_dump.cc b/garnet/public/lib/fostr/hex_dump.cc similarity index 100% rename from public/lib/fostr/hex_dump.cc rename to garnet/public/lib/fostr/hex_dump.cc
diff --git a/public/lib/fostr/hex_dump.h b/garnet/public/lib/fostr/hex_dump.h similarity index 100% rename from public/lib/fostr/hex_dump.h rename to garnet/public/lib/fostr/hex_dump.h
diff --git a/public/lib/fostr/indent.cc b/garnet/public/lib/fostr/indent.cc similarity index 100% rename from public/lib/fostr/indent.cc rename to garnet/public/lib/fostr/indent.cc
diff --git a/public/lib/fostr/indent.h b/garnet/public/lib/fostr/indent.h similarity index 100% rename from public/lib/fostr/indent.h rename to garnet/public/lib/fostr/indent.h
diff --git a/public/lib/fostr/test/fidl_types_unittests.cc b/garnet/public/lib/fostr/test/fidl_types_unittests.cc similarity index 100% rename from public/lib/fostr/test/fidl_types_unittests.cc rename to garnet/public/lib/fostr/test/fidl_types_unittests.cc
diff --git a/public/lib/fostr/test/hex_dump_unittests.cc b/garnet/public/lib/fostr/test/hex_dump_unittests.cc similarity index 100% rename from public/lib/fostr/test/hex_dump_unittests.cc rename to garnet/public/lib/fostr/test/hex_dump_unittests.cc
diff --git a/public/lib/fostr/test/indent_unittests.cc b/garnet/public/lib/fostr/test/indent_unittests.cc similarity index 100% rename from public/lib/fostr/test/indent_unittests.cc rename to garnet/public/lib/fostr/test/indent_unittests.cc
diff --git a/public/lib/fostr/test/zx_types_unittests.cc b/garnet/public/lib/fostr/test/zx_types_unittests.cc similarity index 100% rename from public/lib/fostr/test/zx_types_unittests.cc rename to garnet/public/lib/fostr/test/zx_types_unittests.cc
diff --git a/public/lib/fostr/zx_types.cc b/garnet/public/lib/fostr/zx_types.cc similarity index 100% rename from public/lib/fostr/zx_types.cc rename to garnet/public/lib/fostr/zx_types.cc
diff --git a/public/lib/fostr/zx_types.h b/garnet/public/lib/fostr/zx_types.h similarity index 100% rename from public/lib/fostr/zx_types.h rename to garnet/public/lib/fostr/zx_types.h
diff --git a/public/lib/fsl/BUILD.gn b/garnet/public/lib/fsl/BUILD.gn similarity index 100% rename from public/lib/fsl/BUILD.gn rename to garnet/public/lib/fsl/BUILD.gn
diff --git a/public/lib/fsl/MAINTAINERS b/garnet/public/lib/fsl/MAINTAINERS similarity index 100% rename from public/lib/fsl/MAINTAINERS rename to garnet/public/lib/fsl/MAINTAINERS
diff --git a/public/lib/fsl/README.md b/garnet/public/lib/fsl/README.md similarity index 100% rename from public/lib/fsl/README.md rename to garnet/public/lib/fsl/README.md
diff --git a/public/lib/fsl/handles/BUILD.gn b/garnet/public/lib/fsl/handles/BUILD.gn similarity index 100% rename from public/lib/fsl/handles/BUILD.gn rename to garnet/public/lib/fsl/handles/BUILD.gn
diff --git a/public/lib/fsl/handles/object_info.cc b/garnet/public/lib/fsl/handles/object_info.cc similarity index 100% rename from public/lib/fsl/handles/object_info.cc rename to garnet/public/lib/fsl/handles/object_info.cc
diff --git a/public/lib/fsl/handles/object_info.h b/garnet/public/lib/fsl/handles/object_info.h similarity index 100% rename from public/lib/fsl/handles/object_info.h rename to garnet/public/lib/fsl/handles/object_info.h
diff --git a/public/lib/fsl/handles/object_info_unittest.cc b/garnet/public/lib/fsl/handles/object_info_unittest.cc similarity index 100% rename from public/lib/fsl/handles/object_info_unittest.cc rename to garnet/public/lib/fsl/handles/object_info_unittest.cc
diff --git a/public/lib/fsl/io/BUILD.gn b/garnet/public/lib/fsl/io/BUILD.gn similarity index 100% rename from public/lib/fsl/io/BUILD.gn rename to garnet/public/lib/fsl/io/BUILD.gn
diff --git a/public/lib/fsl/io/device_watcher.cc b/garnet/public/lib/fsl/io/device_watcher.cc similarity index 100% rename from public/lib/fsl/io/device_watcher.cc rename to garnet/public/lib/fsl/io/device_watcher.cc
diff --git a/public/lib/fsl/io/device_watcher.h b/garnet/public/lib/fsl/io/device_watcher.h similarity index 100% rename from public/lib/fsl/io/device_watcher.h rename to garnet/public/lib/fsl/io/device_watcher.h
diff --git a/public/lib/fsl/io/fd.cc b/garnet/public/lib/fsl/io/fd.cc similarity index 100% rename from public/lib/fsl/io/fd.cc rename to garnet/public/lib/fsl/io/fd.cc
diff --git a/public/lib/fsl/io/fd.h b/garnet/public/lib/fsl/io/fd.h similarity index 100% rename from public/lib/fsl/io/fd.h rename to garnet/public/lib/fsl/io/fd.h
diff --git a/public/lib/fsl/io/redirection.cc b/garnet/public/lib/fsl/io/redirection.cc similarity index 100% rename from public/lib/fsl/io/redirection.cc rename to garnet/public/lib/fsl/io/redirection.cc
diff --git a/public/lib/fsl/io/redirection.h b/garnet/public/lib/fsl/io/redirection.h similarity index 100% rename from public/lib/fsl/io/redirection.h rename to garnet/public/lib/fsl/io/redirection.h
diff --git a/public/lib/fsl/io/redirection_unittest.cc b/garnet/public/lib/fsl/io/redirection_unittest.cc similarity index 100% rename from public/lib/fsl/io/redirection_unittest.cc rename to garnet/public/lib/fsl/io/redirection_unittest.cc
diff --git a/public/lib/fsl/socket/BUILD.gn b/garnet/public/lib/fsl/socket/BUILD.gn similarity index 100% rename from public/lib/fsl/socket/BUILD.gn rename to garnet/public/lib/fsl/socket/BUILD.gn
diff --git a/public/lib/fsl/socket/blocking_drain.cc b/garnet/public/lib/fsl/socket/blocking_drain.cc similarity index 100% rename from public/lib/fsl/socket/blocking_drain.cc rename to garnet/public/lib/fsl/socket/blocking_drain.cc
diff --git a/public/lib/fsl/socket/blocking_drain.h b/garnet/public/lib/fsl/socket/blocking_drain.h similarity index 100% rename from public/lib/fsl/socket/blocking_drain.h rename to garnet/public/lib/fsl/socket/blocking_drain.h
diff --git a/public/lib/fsl/socket/blocking_drain_unittest.cc b/garnet/public/lib/fsl/socket/blocking_drain_unittest.cc similarity index 100% rename from public/lib/fsl/socket/blocking_drain_unittest.cc rename to garnet/public/lib/fsl/socket/blocking_drain_unittest.cc
diff --git a/public/lib/fsl/socket/files.cc b/garnet/public/lib/fsl/socket/files.cc similarity index 100% rename from public/lib/fsl/socket/files.cc rename to garnet/public/lib/fsl/socket/files.cc
diff --git a/public/lib/fsl/socket/files.h b/garnet/public/lib/fsl/socket/files.h similarity index 100% rename from public/lib/fsl/socket/files.h rename to garnet/public/lib/fsl/socket/files.h
diff --git a/public/lib/fsl/socket/files_unittest.cc b/garnet/public/lib/fsl/socket/files_unittest.cc similarity index 100% rename from public/lib/fsl/socket/files_unittest.cc rename to garnet/public/lib/fsl/socket/files_unittest.cc
diff --git a/public/lib/fsl/socket/socket_drainer.cc b/garnet/public/lib/fsl/socket/socket_drainer.cc similarity index 100% rename from public/lib/fsl/socket/socket_drainer.cc rename to garnet/public/lib/fsl/socket/socket_drainer.cc
diff --git a/public/lib/fsl/socket/socket_drainer.h b/garnet/public/lib/fsl/socket/socket_drainer.h similarity index 100% rename from public/lib/fsl/socket/socket_drainer.h rename to garnet/public/lib/fsl/socket/socket_drainer.h
diff --git a/public/lib/fsl/socket/socket_drainer_unittest.cc b/garnet/public/lib/fsl/socket/socket_drainer_unittest.cc similarity index 100% rename from public/lib/fsl/socket/socket_drainer_unittest.cc rename to garnet/public/lib/fsl/socket/socket_drainer_unittest.cc
diff --git a/public/lib/fsl/socket/strings.cc b/garnet/public/lib/fsl/socket/strings.cc similarity index 100% rename from public/lib/fsl/socket/strings.cc rename to garnet/public/lib/fsl/socket/strings.cc
diff --git a/public/lib/fsl/socket/strings.h b/garnet/public/lib/fsl/socket/strings.h similarity index 100% rename from public/lib/fsl/socket/strings.h rename to garnet/public/lib/fsl/socket/strings.h
diff --git a/public/lib/fsl/socket/strings_unittest.cc b/garnet/public/lib/fsl/socket/strings_unittest.cc similarity index 100% rename from public/lib/fsl/socket/strings_unittest.cc rename to garnet/public/lib/fsl/socket/strings_unittest.cc
diff --git a/public/lib/fsl/syslogger/BUILD.gn b/garnet/public/lib/fsl/syslogger/BUILD.gn similarity index 100% rename from public/lib/fsl/syslogger/BUILD.gn rename to garnet/public/lib/fsl/syslogger/BUILD.gn
diff --git a/public/lib/fsl/syslogger/init.cc b/garnet/public/lib/fsl/syslogger/init.cc similarity index 100% rename from public/lib/fsl/syslogger/init.cc rename to garnet/public/lib/fsl/syslogger/init.cc
diff --git a/public/lib/fsl/syslogger/init.h b/garnet/public/lib/fsl/syslogger/init.h similarity index 100% rename from public/lib/fsl/syslogger/init.h rename to garnet/public/lib/fsl/syslogger/init.h
diff --git a/public/lib/fsl/syslogger/init_unittest.cc b/garnet/public/lib/fsl/syslogger/init_unittest.cc similarity index 100% rename from public/lib/fsl/syslogger/init_unittest.cc rename to garnet/public/lib/fsl/syslogger/init_unittest.cc
diff --git a/public/lib/fsl/tasks/BUILD.gn b/garnet/public/lib/fsl/tasks/BUILD.gn similarity index 100% rename from public/lib/fsl/tasks/BUILD.gn rename to garnet/public/lib/fsl/tasks/BUILD.gn
diff --git a/public/lib/fsl/tasks/fd_waiter.cc b/garnet/public/lib/fsl/tasks/fd_waiter.cc similarity index 100% rename from public/lib/fsl/tasks/fd_waiter.cc rename to garnet/public/lib/fsl/tasks/fd_waiter.cc
diff --git a/public/lib/fsl/tasks/fd_waiter.h b/garnet/public/lib/fsl/tasks/fd_waiter.h similarity index 100% rename from public/lib/fsl/tasks/fd_waiter.h rename to garnet/public/lib/fsl/tasks/fd_waiter.h
diff --git a/public/lib/fsl/tasks/fd_waiter_unittest.cc b/garnet/public/lib/fsl/tasks/fd_waiter_unittest.cc similarity index 100% rename from public/lib/fsl/tasks/fd_waiter_unittest.cc rename to garnet/public/lib/fsl/tasks/fd_waiter_unittest.cc
diff --git a/public/lib/fsl/types/BUILD.gn b/garnet/public/lib/fsl/types/BUILD.gn similarity index 100% rename from public/lib/fsl/types/BUILD.gn rename to garnet/public/lib/fsl/types/BUILD.gn
diff --git a/public/lib/fsl/types/type_converters.cc b/garnet/public/lib/fsl/types/type_converters.cc similarity index 100% rename from public/lib/fsl/types/type_converters.cc rename to garnet/public/lib/fsl/types/type_converters.cc
diff --git a/public/lib/fsl/types/type_converters.h b/garnet/public/lib/fsl/types/type_converters.h similarity index 100% rename from public/lib/fsl/types/type_converters.h rename to garnet/public/lib/fsl/types/type_converters.h
diff --git a/public/lib/fsl/types/type_converters_unittest.cc b/garnet/public/lib/fsl/types/type_converters_unittest.cc similarity index 100% rename from public/lib/fsl/types/type_converters_unittest.cc rename to garnet/public/lib/fsl/types/type_converters_unittest.cc
diff --git a/public/lib/fsl/vmo/BUILD.gn b/garnet/public/lib/fsl/vmo/BUILD.gn similarity index 100% rename from public/lib/fsl/vmo/BUILD.gn rename to garnet/public/lib/fsl/vmo/BUILD.gn
diff --git a/public/lib/fsl/vmo/file.cc b/garnet/public/lib/fsl/vmo/file.cc similarity index 100% rename from public/lib/fsl/vmo/file.cc rename to garnet/public/lib/fsl/vmo/file.cc
diff --git a/public/lib/fsl/vmo/file.h b/garnet/public/lib/fsl/vmo/file.h similarity index 100% rename from public/lib/fsl/vmo/file.h rename to garnet/public/lib/fsl/vmo/file.h
diff --git a/public/lib/fsl/vmo/file_unittest.cc b/garnet/public/lib/fsl/vmo/file_unittest.cc similarity index 100% rename from public/lib/fsl/vmo/file_unittest.cc rename to garnet/public/lib/fsl/vmo/file_unittest.cc
diff --git a/public/lib/fsl/vmo/shared_vmo.cc b/garnet/public/lib/fsl/vmo/shared_vmo.cc similarity index 100% rename from public/lib/fsl/vmo/shared_vmo.cc rename to garnet/public/lib/fsl/vmo/shared_vmo.cc
diff --git a/public/lib/fsl/vmo/shared_vmo.h b/garnet/public/lib/fsl/vmo/shared_vmo.h similarity index 100% rename from public/lib/fsl/vmo/shared_vmo.h rename to garnet/public/lib/fsl/vmo/shared_vmo.h
diff --git a/public/lib/fsl/vmo/shared_vmo_unittest.cc b/garnet/public/lib/fsl/vmo/shared_vmo_unittest.cc similarity index 100% rename from public/lib/fsl/vmo/shared_vmo_unittest.cc rename to garnet/public/lib/fsl/vmo/shared_vmo_unittest.cc
diff --git a/public/lib/fsl/vmo/sized_vmo.cc b/garnet/public/lib/fsl/vmo/sized_vmo.cc similarity index 100% rename from public/lib/fsl/vmo/sized_vmo.cc rename to garnet/public/lib/fsl/vmo/sized_vmo.cc
diff --git a/public/lib/fsl/vmo/sized_vmo.h b/garnet/public/lib/fsl/vmo/sized_vmo.h similarity index 100% rename from public/lib/fsl/vmo/sized_vmo.h rename to garnet/public/lib/fsl/vmo/sized_vmo.h
diff --git a/public/lib/fsl/vmo/strings.h b/garnet/public/lib/fsl/vmo/strings.h similarity index 100% rename from public/lib/fsl/vmo/strings.h rename to garnet/public/lib/fsl/vmo/strings.h
diff --git a/public/lib/fsl/vmo/strings_unittest.cc b/garnet/public/lib/fsl/vmo/strings_unittest.cc similarity index 100% rename from public/lib/fsl/vmo/strings_unittest.cc rename to garnet/public/lib/fsl/vmo/strings_unittest.cc
diff --git a/public/lib/fsl/vmo/vector.h b/garnet/public/lib/fsl/vmo/vector.h similarity index 100% rename from public/lib/fsl/vmo/vector.h rename to garnet/public/lib/fsl/vmo/vector.h
diff --git a/public/lib/fsl/vmo/vector_unittest.cc b/garnet/public/lib/fsl/vmo/vector_unittest.cc similarity index 100% rename from public/lib/fsl/vmo/vector_unittest.cc rename to garnet/public/lib/fsl/vmo/vector_unittest.cc
diff --git a/public/lib/fsl/vmo/vmo.cc b/garnet/public/lib/fsl/vmo/vmo.cc similarity index 100% rename from public/lib/fsl/vmo/vmo.cc rename to garnet/public/lib/fsl/vmo/vmo.cc
diff --git a/public/lib/fxl/BUILD.gn b/garnet/public/lib/fxl/BUILD.gn similarity index 100% rename from public/lib/fxl/BUILD.gn rename to garnet/public/lib/fxl/BUILD.gn
diff --git a/public/lib/fxl/MAINTAINERS b/garnet/public/lib/fxl/MAINTAINERS similarity index 100% rename from public/lib/fxl/MAINTAINERS rename to garnet/public/lib/fxl/MAINTAINERS
diff --git a/public/lib/fxl/README.md b/garnet/public/lib/fxl/README.md similarity index 100% rename from public/lib/fxl/README.md rename to garnet/public/lib/fxl/README.md
diff --git a/public/lib/fxl/arraysize.h b/garnet/public/lib/fxl/arraysize.h similarity index 100% rename from public/lib/fxl/arraysize.h rename to garnet/public/lib/fxl/arraysize.h
diff --git a/public/lib/fxl/arraysize_unittest.cc b/garnet/public/lib/fxl/arraysize_unittest.cc similarity index 100% rename from public/lib/fxl/arraysize_unittest.cc rename to garnet/public/lib/fxl/arraysize_unittest.cc
diff --git a/public/lib/fxl/build_config.h b/garnet/public/lib/fxl/build_config.h similarity index 100% rename from public/lib/fxl/build_config.h rename to garnet/public/lib/fxl/build_config.h
diff --git a/public/lib/fxl/command_line.cc b/garnet/public/lib/fxl/command_line.cc similarity index 100% rename from public/lib/fxl/command_line.cc rename to garnet/public/lib/fxl/command_line.cc
diff --git a/public/lib/fxl/command_line.h b/garnet/public/lib/fxl/command_line.h similarity index 100% rename from public/lib/fxl/command_line.h rename to garnet/public/lib/fxl/command_line.h
diff --git a/public/lib/fxl/command_line_unittest.cc b/garnet/public/lib/fxl/command_line_unittest.cc similarity index 100% rename from public/lib/fxl/command_line_unittest.cc rename to garnet/public/lib/fxl/command_line_unittest.cc
diff --git a/public/lib/fxl/compiler_specific.h b/garnet/public/lib/fxl/compiler_specific.h similarity index 100% rename from public/lib/fxl/compiler_specific.h rename to garnet/public/lib/fxl/compiler_specific.h
diff --git a/public/lib/fxl/debug/debugger.cc b/garnet/public/lib/fxl/debug/debugger.cc similarity index 100% rename from public/lib/fxl/debug/debugger.cc rename to garnet/public/lib/fxl/debug/debugger.cc
diff --git a/public/lib/fxl/debug/debugger.h b/garnet/public/lib/fxl/debug/debugger.h similarity index 100% rename from public/lib/fxl/debug/debugger.h rename to garnet/public/lib/fxl/debug/debugger.h
diff --git a/public/lib/fxl/files/directory.cc b/garnet/public/lib/fxl/files/directory.cc similarity index 100% rename from public/lib/fxl/files/directory.cc rename to garnet/public/lib/fxl/files/directory.cc
diff --git a/public/lib/fxl/files/directory.h b/garnet/public/lib/fxl/files/directory.h similarity index 100% rename from public/lib/fxl/files/directory.h rename to garnet/public/lib/fxl/files/directory.h
diff --git a/public/lib/fxl/files/directory_unittest.cc b/garnet/public/lib/fxl/files/directory_unittest.cc similarity index 100% rename from public/lib/fxl/files/directory_unittest.cc rename to garnet/public/lib/fxl/files/directory_unittest.cc
diff --git a/public/lib/fxl/files/eintr_wrapper.h b/garnet/public/lib/fxl/files/eintr_wrapper.h similarity index 100% rename from public/lib/fxl/files/eintr_wrapper.h rename to garnet/public/lib/fxl/files/eintr_wrapper.h
diff --git a/public/lib/fxl/files/file.cc b/garnet/public/lib/fxl/files/file.cc similarity index 100% rename from public/lib/fxl/files/file.cc rename to garnet/public/lib/fxl/files/file.cc
diff --git a/public/lib/fxl/files/file.h b/garnet/public/lib/fxl/files/file.h similarity index 100% rename from public/lib/fxl/files/file.h rename to garnet/public/lib/fxl/files/file.h
diff --git a/public/lib/fxl/files/file_descriptor.cc b/garnet/public/lib/fxl/files/file_descriptor.cc similarity index 100% rename from public/lib/fxl/files/file_descriptor.cc rename to garnet/public/lib/fxl/files/file_descriptor.cc
diff --git a/public/lib/fxl/files/file_descriptor.h b/garnet/public/lib/fxl/files/file_descriptor.h similarity index 100% rename from public/lib/fxl/files/file_descriptor.h rename to garnet/public/lib/fxl/files/file_descriptor.h
diff --git a/public/lib/fxl/files/file_descriptor_unittest.cc b/garnet/public/lib/fxl/files/file_descriptor_unittest.cc similarity index 100% rename from public/lib/fxl/files/file_descriptor_unittest.cc rename to garnet/public/lib/fxl/files/file_descriptor_unittest.cc
diff --git a/public/lib/fxl/files/file_unittest.cc b/garnet/public/lib/fxl/files/file_unittest.cc similarity index 100% rename from public/lib/fxl/files/file_unittest.cc rename to garnet/public/lib/fxl/files/file_unittest.cc
diff --git a/public/lib/fxl/files/glob.cc b/garnet/public/lib/fxl/files/glob.cc similarity index 100% rename from public/lib/fxl/files/glob.cc rename to garnet/public/lib/fxl/files/glob.cc
diff --git a/public/lib/fxl/files/glob.h b/garnet/public/lib/fxl/files/glob.h similarity index 100% rename from public/lib/fxl/files/glob.h rename to garnet/public/lib/fxl/files/glob.h
diff --git a/public/lib/fxl/files/glob_unittest.cc b/garnet/public/lib/fxl/files/glob_unittest.cc similarity index 100% rename from public/lib/fxl/files/glob_unittest.cc rename to garnet/public/lib/fxl/files/glob_unittest.cc
diff --git a/public/lib/fxl/files/path.cc b/garnet/public/lib/fxl/files/path.cc similarity index 100% rename from public/lib/fxl/files/path.cc rename to garnet/public/lib/fxl/files/path.cc
diff --git a/public/lib/fxl/files/path.h b/garnet/public/lib/fxl/files/path.h similarity index 100% rename from public/lib/fxl/files/path.h rename to garnet/public/lib/fxl/files/path.h
diff --git a/public/lib/fxl/files/path_unittest.cc b/garnet/public/lib/fxl/files/path_unittest.cc similarity index 100% rename from public/lib/fxl/files/path_unittest.cc rename to garnet/public/lib/fxl/files/path_unittest.cc
diff --git a/public/lib/fxl/files/scoped_temp_dir.cc b/garnet/public/lib/fxl/files/scoped_temp_dir.cc similarity index 100% rename from public/lib/fxl/files/scoped_temp_dir.cc rename to garnet/public/lib/fxl/files/scoped_temp_dir.cc
diff --git a/public/lib/fxl/files/scoped_temp_dir.h b/garnet/public/lib/fxl/files/scoped_temp_dir.h similarity index 100% rename from public/lib/fxl/files/scoped_temp_dir.h rename to garnet/public/lib/fxl/files/scoped_temp_dir.h
diff --git a/public/lib/fxl/files/scoped_temp_dir_unittest.cc b/garnet/public/lib/fxl/files/scoped_temp_dir_unittest.cc similarity index 100% rename from public/lib/fxl/files/scoped_temp_dir_unittest.cc rename to garnet/public/lib/fxl/files/scoped_temp_dir_unittest.cc
diff --git a/public/lib/fxl/files/symlink.cc b/garnet/public/lib/fxl/files/symlink.cc similarity index 100% rename from public/lib/fxl/files/symlink.cc rename to garnet/public/lib/fxl/files/symlink.cc
diff --git a/public/lib/fxl/files/symlink.h b/garnet/public/lib/fxl/files/symlink.h similarity index 100% rename from public/lib/fxl/files/symlink.h rename to garnet/public/lib/fxl/files/symlink.h
diff --git a/public/lib/fxl/files/unique_fd.cc b/garnet/public/lib/fxl/files/unique_fd.cc similarity index 100% rename from public/lib/fxl/files/unique_fd.cc rename to garnet/public/lib/fxl/files/unique_fd.cc
diff --git a/public/lib/fxl/files/unique_fd.h b/garnet/public/lib/fxl/files/unique_fd.h similarity index 100% rename from public/lib/fxl/files/unique_fd.h rename to garnet/public/lib/fxl/files/unique_fd.h
diff --git a/public/lib/fxl/functional/apply.h b/garnet/public/lib/fxl/functional/apply.h similarity index 100% rename from public/lib/fxl/functional/apply.h rename to garnet/public/lib/fxl/functional/apply.h
diff --git a/public/lib/fxl/functional/apply_unittest.cc b/garnet/public/lib/fxl/functional/apply_unittest.cc similarity index 100% rename from public/lib/fxl/functional/apply_unittest.cc rename to garnet/public/lib/fxl/functional/apply_unittest.cc
diff --git a/public/lib/fxl/functional/bind_callback.h b/garnet/public/lib/fxl/functional/bind_callback.h similarity index 100% rename from public/lib/fxl/functional/bind_callback.h rename to garnet/public/lib/fxl/functional/bind_callback.h
diff --git a/public/lib/fxl/functional/bind_callback_unittest.cc b/garnet/public/lib/fxl/functional/bind_callback_unittest.cc similarity index 100% rename from public/lib/fxl/functional/bind_callback_unittest.cc rename to garnet/public/lib/fxl/functional/bind_callback_unittest.cc
diff --git a/public/lib/fxl/functional/cancelable_callback.h b/garnet/public/lib/fxl/functional/cancelable_callback.h similarity index 100% rename from public/lib/fxl/functional/cancelable_callback.h rename to garnet/public/lib/fxl/functional/cancelable_callback.h
diff --git a/public/lib/fxl/functional/cancelable_callback_unittest.cc b/garnet/public/lib/fxl/functional/cancelable_callback_unittest.cc similarity index 100% rename from public/lib/fxl/functional/cancelable_callback_unittest.cc rename to garnet/public/lib/fxl/functional/cancelable_callback_unittest.cc
diff --git a/public/lib/fxl/functional/closure.h b/garnet/public/lib/fxl/functional/closure.h similarity index 100% rename from public/lib/fxl/functional/closure.h rename to garnet/public/lib/fxl/functional/closure.h
diff --git a/public/lib/fxl/functional/make_copyable.h b/garnet/public/lib/fxl/functional/make_copyable.h similarity index 100% rename from public/lib/fxl/functional/make_copyable.h rename to garnet/public/lib/fxl/functional/make_copyable.h
diff --git a/public/lib/fxl/functional/make_copyable_unittest.cc b/garnet/public/lib/fxl/functional/make_copyable_unittest.cc similarity index 100% rename from public/lib/fxl/functional/make_copyable_unittest.cc rename to garnet/public/lib/fxl/functional/make_copyable_unittest.cc
diff --git a/public/lib/fxl/fxl_export.h b/garnet/public/lib/fxl/fxl_export.h similarity index 100% rename from public/lib/fxl/fxl_export.h rename to garnet/public/lib/fxl/fxl_export.h
diff --git a/public/lib/fxl/log_level.h b/garnet/public/lib/fxl/log_level.h similarity index 100% rename from public/lib/fxl/log_level.h rename to garnet/public/lib/fxl/log_level.h
diff --git a/public/lib/fxl/log_settings.cc b/garnet/public/lib/fxl/log_settings.cc similarity index 100% rename from public/lib/fxl/log_settings.cc rename to garnet/public/lib/fxl/log_settings.cc
diff --git a/public/lib/fxl/log_settings.h b/garnet/public/lib/fxl/log_settings.h similarity index 100% rename from public/lib/fxl/log_settings.h rename to garnet/public/lib/fxl/log_settings.h
diff --git a/public/lib/fxl/log_settings_command_line.cc b/garnet/public/lib/fxl/log_settings_command_line.cc similarity index 100% rename from public/lib/fxl/log_settings_command_line.cc rename to garnet/public/lib/fxl/log_settings_command_line.cc
diff --git a/public/lib/fxl/log_settings_command_line.h b/garnet/public/lib/fxl/log_settings_command_line.h similarity index 100% rename from public/lib/fxl/log_settings_command_line.h rename to garnet/public/lib/fxl/log_settings_command_line.h
diff --git a/public/lib/fxl/log_settings_state.cc b/garnet/public/lib/fxl/log_settings_state.cc similarity index 100% rename from public/lib/fxl/log_settings_state.cc rename to garnet/public/lib/fxl/log_settings_state.cc
diff --git a/public/lib/fxl/log_settings_unittest.cc b/garnet/public/lib/fxl/log_settings_unittest.cc similarity index 100% rename from public/lib/fxl/log_settings_unittest.cc rename to garnet/public/lib/fxl/log_settings_unittest.cc
diff --git a/public/lib/fxl/logging.cc b/garnet/public/lib/fxl/logging.cc similarity index 100% rename from public/lib/fxl/logging.cc rename to garnet/public/lib/fxl/logging.cc
diff --git a/public/lib/fxl/logging.h b/garnet/public/lib/fxl/logging.h similarity index 100% rename from public/lib/fxl/logging.h rename to garnet/public/lib/fxl/logging.h
diff --git a/public/lib/fxl/macros.h b/garnet/public/lib/fxl/macros.h similarity index 100% rename from public/lib/fxl/macros.h rename to garnet/public/lib/fxl/macros.h
diff --git a/public/lib/fxl/memory/ref_counted.h b/garnet/public/lib/fxl/memory/ref_counted.h similarity index 100% rename from public/lib/fxl/memory/ref_counted.h rename to garnet/public/lib/fxl/memory/ref_counted.h
diff --git a/public/lib/fxl/memory/ref_counted_internal.h b/garnet/public/lib/fxl/memory/ref_counted_internal.h similarity index 100% rename from public/lib/fxl/memory/ref_counted_internal.h rename to garnet/public/lib/fxl/memory/ref_counted_internal.h
diff --git a/public/lib/fxl/memory/ref_counted_unittest.cc b/garnet/public/lib/fxl/memory/ref_counted_unittest.cc similarity index 100% rename from public/lib/fxl/memory/ref_counted_unittest.cc rename to garnet/public/lib/fxl/memory/ref_counted_unittest.cc
diff --git a/public/lib/fxl/memory/ref_ptr.h b/garnet/public/lib/fxl/memory/ref_ptr.h similarity index 100% rename from public/lib/fxl/memory/ref_ptr.h rename to garnet/public/lib/fxl/memory/ref_ptr.h
diff --git a/public/lib/fxl/memory/ref_ptr_internal.h b/garnet/public/lib/fxl/memory/ref_ptr_internal.h similarity index 100% rename from public/lib/fxl/memory/ref_ptr_internal.h rename to garnet/public/lib/fxl/memory/ref_ptr_internal.h
diff --git a/public/lib/fxl/memory/unique_object.h b/garnet/public/lib/fxl/memory/unique_object.h similarity index 100% rename from public/lib/fxl/memory/unique_object.h rename to garnet/public/lib/fxl/memory/unique_object.h
diff --git a/public/lib/fxl/memory/weak_ptr.h b/garnet/public/lib/fxl/memory/weak_ptr.h similarity index 100% rename from public/lib/fxl/memory/weak_ptr.h rename to garnet/public/lib/fxl/memory/weak_ptr.h
diff --git a/public/lib/fxl/memory/weak_ptr_internal.cc b/garnet/public/lib/fxl/memory/weak_ptr_internal.cc similarity index 100% rename from public/lib/fxl/memory/weak_ptr_internal.cc rename to garnet/public/lib/fxl/memory/weak_ptr_internal.cc
diff --git a/public/lib/fxl/memory/weak_ptr_internal.h b/garnet/public/lib/fxl/memory/weak_ptr_internal.h similarity index 100% rename from public/lib/fxl/memory/weak_ptr_internal.h rename to garnet/public/lib/fxl/memory/weak_ptr_internal.h
diff --git a/public/lib/fxl/memory/weak_ptr_unittest.cc b/garnet/public/lib/fxl/memory/weak_ptr_unittest.cc similarity index 100% rename from public/lib/fxl/memory/weak_ptr_unittest.cc rename to garnet/public/lib/fxl/memory/weak_ptr_unittest.cc
diff --git a/public/lib/fxl/observer_list.h b/garnet/public/lib/fxl/observer_list.h similarity index 100% rename from public/lib/fxl/observer_list.h rename to garnet/public/lib/fxl/observer_list.h
diff --git a/public/lib/fxl/observer_list_unittest.cc b/garnet/public/lib/fxl/observer_list_unittest.cc similarity index 100% rename from public/lib/fxl/observer_list_unittest.cc rename to garnet/public/lib/fxl/observer_list_unittest.cc
diff --git a/public/lib/fxl/random/rand.cc b/garnet/public/lib/fxl/random/rand.cc similarity index 100% rename from public/lib/fxl/random/rand.cc rename to garnet/public/lib/fxl/random/rand.cc
diff --git a/public/lib/fxl/random/rand.h b/garnet/public/lib/fxl/random/rand.h similarity index 100% rename from public/lib/fxl/random/rand.h rename to garnet/public/lib/fxl/random/rand.h
diff --git a/public/lib/fxl/random/rand_unittest.cc b/garnet/public/lib/fxl/random/rand_unittest.cc similarity index 100% rename from public/lib/fxl/random/rand_unittest.cc rename to garnet/public/lib/fxl/random/rand_unittest.cc
diff --git a/public/lib/fxl/random/uuid.cc b/garnet/public/lib/fxl/random/uuid.cc similarity index 100% rename from public/lib/fxl/random/uuid.cc rename to garnet/public/lib/fxl/random/uuid.cc
diff --git a/public/lib/fxl/random/uuid.h b/garnet/public/lib/fxl/random/uuid.h similarity index 100% rename from public/lib/fxl/random/uuid.h rename to garnet/public/lib/fxl/random/uuid.h
diff --git a/public/lib/fxl/random/uuid_unittest.cc b/garnet/public/lib/fxl/random/uuid_unittest.cc similarity index 100% rename from public/lib/fxl/random/uuid_unittest.cc rename to garnet/public/lib/fxl/random/uuid_unittest.cc
diff --git a/public/lib/fxl/strings/ascii.cc b/garnet/public/lib/fxl/strings/ascii.cc similarity index 100% rename from public/lib/fxl/strings/ascii.cc rename to garnet/public/lib/fxl/strings/ascii.cc
diff --git a/public/lib/fxl/strings/ascii.h b/garnet/public/lib/fxl/strings/ascii.h similarity index 100% rename from public/lib/fxl/strings/ascii.h rename to garnet/public/lib/fxl/strings/ascii.h
diff --git a/public/lib/fxl/strings/ascii_unittest.cc b/garnet/public/lib/fxl/strings/ascii_unittest.cc similarity index 100% rename from public/lib/fxl/strings/ascii_unittest.cc rename to garnet/public/lib/fxl/strings/ascii_unittest.cc
diff --git a/public/lib/fxl/strings/concatenate.cc b/garnet/public/lib/fxl/strings/concatenate.cc similarity index 100% rename from public/lib/fxl/strings/concatenate.cc rename to garnet/public/lib/fxl/strings/concatenate.cc
diff --git a/public/lib/fxl/strings/concatenate.h b/garnet/public/lib/fxl/strings/concatenate.h similarity index 100% rename from public/lib/fxl/strings/concatenate.h rename to garnet/public/lib/fxl/strings/concatenate.h
diff --git a/public/lib/fxl/strings/concatenate_unittest.cc b/garnet/public/lib/fxl/strings/concatenate_unittest.cc similarity index 100% rename from public/lib/fxl/strings/concatenate_unittest.cc rename to garnet/public/lib/fxl/strings/concatenate_unittest.cc
diff --git a/public/lib/fxl/strings/join_strings.h b/garnet/public/lib/fxl/strings/join_strings.h similarity index 100% rename from public/lib/fxl/strings/join_strings.h rename to garnet/public/lib/fxl/strings/join_strings.h
diff --git a/public/lib/fxl/strings/join_strings_unittest.cc b/garnet/public/lib/fxl/strings/join_strings_unittest.cc similarity index 100% rename from public/lib/fxl/strings/join_strings_unittest.cc rename to garnet/public/lib/fxl/strings/join_strings_unittest.cc
diff --git a/public/lib/fxl/strings/split_string.cc b/garnet/public/lib/fxl/strings/split_string.cc similarity index 100% rename from public/lib/fxl/strings/split_string.cc rename to garnet/public/lib/fxl/strings/split_string.cc
diff --git a/public/lib/fxl/strings/split_string.h b/garnet/public/lib/fxl/strings/split_string.h similarity index 100% rename from public/lib/fxl/strings/split_string.h rename to garnet/public/lib/fxl/strings/split_string.h
diff --git a/public/lib/fxl/strings/split_string_unittest.cc b/garnet/public/lib/fxl/strings/split_string_unittest.cc similarity index 100% rename from public/lib/fxl/strings/split_string_unittest.cc rename to garnet/public/lib/fxl/strings/split_string_unittest.cc
diff --git a/public/lib/fxl/strings/string_number_conversions.cc b/garnet/public/lib/fxl/strings/string_number_conversions.cc similarity index 100% rename from public/lib/fxl/strings/string_number_conversions.cc rename to garnet/public/lib/fxl/strings/string_number_conversions.cc
diff --git a/public/lib/fxl/strings/string_number_conversions.h b/garnet/public/lib/fxl/strings/string_number_conversions.h similarity index 100% rename from public/lib/fxl/strings/string_number_conversions.h rename to garnet/public/lib/fxl/strings/string_number_conversions.h
diff --git a/public/lib/fxl/strings/string_number_conversions_unittest.cc b/garnet/public/lib/fxl/strings/string_number_conversions_unittest.cc similarity index 100% rename from public/lib/fxl/strings/string_number_conversions_unittest.cc rename to garnet/public/lib/fxl/strings/string_number_conversions_unittest.cc
diff --git a/public/lib/fxl/strings/string_printf.cc b/garnet/public/lib/fxl/strings/string_printf.cc similarity index 100% rename from public/lib/fxl/strings/string_printf.cc rename to garnet/public/lib/fxl/strings/string_printf.cc
diff --git a/public/lib/fxl/strings/string_printf.h b/garnet/public/lib/fxl/strings/string_printf.h similarity index 100% rename from public/lib/fxl/strings/string_printf.h rename to garnet/public/lib/fxl/strings/string_printf.h
diff --git a/public/lib/fxl/strings/string_printf_unittest.cc b/garnet/public/lib/fxl/strings/string_printf_unittest.cc similarity index 100% rename from public/lib/fxl/strings/string_printf_unittest.cc rename to garnet/public/lib/fxl/strings/string_printf_unittest.cc
diff --git a/public/lib/fxl/strings/string_view.cc b/garnet/public/lib/fxl/strings/string_view.cc similarity index 100% rename from public/lib/fxl/strings/string_view.cc rename to garnet/public/lib/fxl/strings/string_view.cc
diff --git a/public/lib/fxl/strings/string_view.h b/garnet/public/lib/fxl/strings/string_view.h similarity index 100% rename from public/lib/fxl/strings/string_view.h rename to garnet/public/lib/fxl/strings/string_view.h
diff --git a/public/lib/fxl/strings/string_view_unittest.cc b/garnet/public/lib/fxl/strings/string_view_unittest.cc similarity index 100% rename from public/lib/fxl/strings/string_view_unittest.cc rename to garnet/public/lib/fxl/strings/string_view_unittest.cc
diff --git a/public/lib/fxl/strings/substitute.cc b/garnet/public/lib/fxl/strings/substitute.cc similarity index 100% rename from public/lib/fxl/strings/substitute.cc rename to garnet/public/lib/fxl/strings/substitute.cc
diff --git a/public/lib/fxl/strings/substitute.h b/garnet/public/lib/fxl/strings/substitute.h similarity index 100% rename from public/lib/fxl/strings/substitute.h rename to garnet/public/lib/fxl/strings/substitute.h
diff --git a/public/lib/fxl/strings/substitute_unittest.cc b/garnet/public/lib/fxl/strings/substitute_unittest.cc similarity index 100% rename from public/lib/fxl/strings/substitute_unittest.cc rename to garnet/public/lib/fxl/strings/substitute_unittest.cc
diff --git a/public/lib/fxl/strings/trim.cc b/garnet/public/lib/fxl/strings/trim.cc similarity index 100% rename from public/lib/fxl/strings/trim.cc rename to garnet/public/lib/fxl/strings/trim.cc
diff --git a/public/lib/fxl/strings/trim.h b/garnet/public/lib/fxl/strings/trim.h similarity index 100% rename from public/lib/fxl/strings/trim.h rename to garnet/public/lib/fxl/strings/trim.h
diff --git a/public/lib/fxl/strings/trim_unittest.cc b/garnet/public/lib/fxl/strings/trim_unittest.cc similarity index 100% rename from public/lib/fxl/strings/trim_unittest.cc rename to garnet/public/lib/fxl/strings/trim_unittest.cc
diff --git a/public/lib/fxl/strings/utf_codecs.cc b/garnet/public/lib/fxl/strings/utf_codecs.cc similarity index 100% rename from public/lib/fxl/strings/utf_codecs.cc rename to garnet/public/lib/fxl/strings/utf_codecs.cc
diff --git a/public/lib/fxl/strings/utf_codecs.h b/garnet/public/lib/fxl/strings/utf_codecs.h similarity index 100% rename from public/lib/fxl/strings/utf_codecs.h rename to garnet/public/lib/fxl/strings/utf_codecs.h
diff --git a/public/lib/fxl/synchronization/thread_annotations.h b/garnet/public/lib/fxl/synchronization/thread_annotations.h similarity index 100% rename from public/lib/fxl/synchronization/thread_annotations.h rename to garnet/public/lib/fxl/synchronization/thread_annotations.h
diff --git a/public/lib/fxl/synchronization/thread_annotations_unittest.cc b/garnet/public/lib/fxl/synchronization/thread_annotations_unittest.cc similarity index 100% rename from public/lib/fxl/synchronization/thread_annotations_unittest.cc rename to garnet/public/lib/fxl/synchronization/thread_annotations_unittest.cc
diff --git a/public/lib/fxl/synchronization/thread_checker.h b/garnet/public/lib/fxl/synchronization/thread_checker.h similarity index 100% rename from public/lib/fxl/synchronization/thread_checker.h rename to garnet/public/lib/fxl/synchronization/thread_checker.h
diff --git a/public/lib/fxl/synchronization/thread_checker_unittest.cc b/garnet/public/lib/fxl/synchronization/thread_checker_unittest.cc similarity index 100% rename from public/lib/fxl/synchronization/thread_checker_unittest.cc rename to garnet/public/lib/fxl/synchronization/thread_checker_unittest.cc
diff --git a/public/lib/fxl/synchronization/waitable_event.cc b/garnet/public/lib/fxl/synchronization/waitable_event.cc similarity index 100% rename from public/lib/fxl/synchronization/waitable_event.cc rename to garnet/public/lib/fxl/synchronization/waitable_event.cc
diff --git a/public/lib/fxl/synchronization/waitable_event.h b/garnet/public/lib/fxl/synchronization/waitable_event.h similarity index 100% rename from public/lib/fxl/synchronization/waitable_event.h rename to garnet/public/lib/fxl/synchronization/waitable_event.h
diff --git a/public/lib/fxl/synchronization/waitable_event_unittest.cc b/garnet/public/lib/fxl/synchronization/waitable_event_unittest.cc similarity index 100% rename from public/lib/fxl/synchronization/waitable_event_unittest.cc rename to garnet/public/lib/fxl/synchronization/waitable_event_unittest.cc
diff --git a/public/lib/fxl/tasks/task_runner.cc b/garnet/public/lib/fxl/tasks/task_runner.cc similarity index 100% rename from public/lib/fxl/tasks/task_runner.cc rename to garnet/public/lib/fxl/tasks/task_runner.cc
diff --git a/public/lib/fxl/tasks/task_runner.h b/garnet/public/lib/fxl/tasks/task_runner.h similarity index 100% rename from public/lib/fxl/tasks/task_runner.h rename to garnet/public/lib/fxl/tasks/task_runner.h
diff --git a/public/lib/fxl/test/BUILD.gn b/garnet/public/lib/fxl/test/BUILD.gn similarity index 100% rename from public/lib/fxl/test/BUILD.gn rename to garnet/public/lib/fxl/test/BUILD.gn
diff --git a/public/lib/fxl/test/fake_task_runner.cc b/garnet/public/lib/fxl/test/fake_task_runner.cc similarity index 100% rename from public/lib/fxl/test/fake_task_runner.cc rename to garnet/public/lib/fxl/test/fake_task_runner.cc
diff --git a/public/lib/fxl/test/fake_task_runner.h b/garnet/public/lib/fxl/test/fake_task_runner.h similarity index 100% rename from public/lib/fxl/test/fake_task_runner.h rename to garnet/public/lib/fxl/test/fake_task_runner.h
diff --git a/public/lib/fxl/test/fake_task_runner_unittest.cc b/garnet/public/lib/fxl/test/fake_task_runner_unittest.cc similarity index 100% rename from public/lib/fxl/test/fake_task_runner_unittest.cc rename to garnet/public/lib/fxl/test/fake_task_runner_unittest.cc
diff --git a/public/lib/fxl/test/run_all_unittests.cc b/garnet/public/lib/fxl/test/run_all_unittests.cc similarity index 100% rename from public/lib/fxl/test/run_all_unittests.cc rename to garnet/public/lib/fxl/test/run_all_unittests.cc
diff --git a/public/lib/fxl/test/timeout_tolerance.h b/garnet/public/lib/fxl/test/timeout_tolerance.h similarity index 100% rename from public/lib/fxl/test/timeout_tolerance.h rename to garnet/public/lib/fxl/test/timeout_tolerance.h
diff --git a/public/lib/fxl/third_party/icu/LICENSE b/garnet/public/lib/fxl/third_party/icu/LICENSE similarity index 100% rename from public/lib/fxl/third_party/icu/LICENSE rename to garnet/public/lib/fxl/third_party/icu/LICENSE
diff --git a/public/lib/fxl/third_party/icu/README.fuchsia b/garnet/public/lib/fxl/third_party/icu/README.fuchsia similarity index 100% rename from public/lib/fxl/third_party/icu/README.fuchsia rename to garnet/public/lib/fxl/third_party/icu/README.fuchsia
diff --git a/public/lib/fxl/third_party/icu/icu_utf.cc b/garnet/public/lib/fxl/third_party/icu/icu_utf.cc similarity index 100% rename from public/lib/fxl/third_party/icu/icu_utf.cc rename to garnet/public/lib/fxl/third_party/icu/icu_utf.cc
diff --git a/public/lib/fxl/third_party/icu/icu_utf.h b/garnet/public/lib/fxl/third_party/icu/icu_utf.h similarity index 100% rename from public/lib/fxl/third_party/icu/icu_utf.h rename to garnet/public/lib/fxl/third_party/icu/icu_utf.h
diff --git a/public/lib/fxl/threading/thread.cc b/garnet/public/lib/fxl/threading/thread.cc similarity index 100% rename from public/lib/fxl/threading/thread.cc rename to garnet/public/lib/fxl/threading/thread.cc
diff --git a/public/lib/fxl/threading/thread.h b/garnet/public/lib/fxl/threading/thread.h similarity index 100% rename from public/lib/fxl/threading/thread.h rename to garnet/public/lib/fxl/threading/thread.h
diff --git a/public/lib/fxl/threading/thread_unittest.cc b/garnet/public/lib/fxl/threading/thread_unittest.cc similarity index 100% rename from public/lib/fxl/threading/thread_unittest.cc rename to garnet/public/lib/fxl/threading/thread_unittest.cc
diff --git a/public/lib/fxl/time/stopwatch.cc b/garnet/public/lib/fxl/time/stopwatch.cc similarity index 100% rename from public/lib/fxl/time/stopwatch.cc rename to garnet/public/lib/fxl/time/stopwatch.cc
diff --git a/public/lib/fxl/time/stopwatch.h b/garnet/public/lib/fxl/time/stopwatch.h similarity index 100% rename from public/lib/fxl/time/stopwatch.h rename to garnet/public/lib/fxl/time/stopwatch.h
diff --git a/public/lib/fxl/time/stopwatch_unittest.cc b/garnet/public/lib/fxl/time/stopwatch_unittest.cc similarity index 100% rename from public/lib/fxl/time/stopwatch_unittest.cc rename to garnet/public/lib/fxl/time/stopwatch_unittest.cc
diff --git a/public/lib/fxl/time/time_delta.h b/garnet/public/lib/fxl/time/time_delta.h similarity index 100% rename from public/lib/fxl/time/time_delta.h rename to garnet/public/lib/fxl/time/time_delta.h
diff --git a/public/lib/fxl/time/time_delta_unittest.cc b/garnet/public/lib/fxl/time/time_delta_unittest.cc similarity index 100% rename from public/lib/fxl/time/time_delta_unittest.cc rename to garnet/public/lib/fxl/time/time_delta_unittest.cc
diff --git a/public/lib/fxl/time/time_point.cc b/garnet/public/lib/fxl/time/time_point.cc similarity index 100% rename from public/lib/fxl/time/time_point.cc rename to garnet/public/lib/fxl/time/time_point.cc
diff --git a/public/lib/fxl/time/time_point.h b/garnet/public/lib/fxl/time/time_point.h similarity index 100% rename from public/lib/fxl/time/time_point.h rename to garnet/public/lib/fxl/time/time_point.h
diff --git a/public/lib/fxl/time/time_point_unittest.cc b/garnet/public/lib/fxl/time/time_point_unittest.cc similarity index 100% rename from public/lib/fxl/time/time_point_unittest.cc rename to garnet/public/lib/fxl/time/time_point_unittest.cc
diff --git a/public/lib/fxl/time/time_printers.cc b/garnet/public/lib/fxl/time/time_printers.cc similarity index 100% rename from public/lib/fxl/time/time_printers.cc rename to garnet/public/lib/fxl/time/time_printers.cc
diff --git a/public/lib/fxl/time/time_unittest.cc b/garnet/public/lib/fxl/time/time_unittest.cc similarity index 100% rename from public/lib/fxl/time/time_unittest.cc rename to garnet/public/lib/fxl/time/time_unittest.cc
diff --git a/public/lib/fxl/type_converter.h b/garnet/public/lib/fxl/type_converter.h similarity index 100% rename from public/lib/fxl/type_converter.h rename to garnet/public/lib/fxl/type_converter.h
diff --git a/public/lib/gtest/BUILD.gn b/garnet/public/lib/gtest/BUILD.gn similarity index 100% rename from public/lib/gtest/BUILD.gn rename to garnet/public/lib/gtest/BUILD.gn
diff --git a/public/lib/gtest/MAINTAINERS b/garnet/public/lib/gtest/MAINTAINERS similarity index 100% rename from public/lib/gtest/MAINTAINERS rename to garnet/public/lib/gtest/MAINTAINERS
diff --git a/public/lib/gtest/real_loop_fixture.cc b/garnet/public/lib/gtest/real_loop_fixture.cc similarity index 100% rename from public/lib/gtest/real_loop_fixture.cc rename to garnet/public/lib/gtest/real_loop_fixture.cc
diff --git a/public/lib/gtest/real_loop_fixture.h b/garnet/public/lib/gtest/real_loop_fixture.h similarity index 100% rename from public/lib/gtest/real_loop_fixture.h rename to garnet/public/lib/gtest/real_loop_fixture.h
diff --git a/public/lib/gtest/real_loop_fixture_unittest.cc b/garnet/public/lib/gtest/real_loop_fixture_unittest.cc similarity index 100% rename from public/lib/gtest/real_loop_fixture_unittest.cc rename to garnet/public/lib/gtest/real_loop_fixture_unittest.cc
diff --git a/public/lib/gtest/test_loop_fixture.cc b/garnet/public/lib/gtest/test_loop_fixture.cc similarity index 100% rename from public/lib/gtest/test_loop_fixture.cc rename to garnet/public/lib/gtest/test_loop_fixture.cc
diff --git a/public/lib/gtest/test_loop_fixture.h b/garnet/public/lib/gtest/test_loop_fixture.h similarity index 100% rename from public/lib/gtest/test_loop_fixture.h rename to garnet/public/lib/gtest/test_loop_fixture.h
diff --git a/public/lib/gtest/test_loop_fixture_unittest.cc b/garnet/public/lib/gtest/test_loop_fixture_unittest.cc similarity index 100% rename from public/lib/gtest/test_loop_fixture_unittest.cc rename to garnet/public/lib/gtest/test_loop_fixture_unittest.cc
diff --git a/public/lib/guest/BUILD.gn b/garnet/public/lib/guest/BUILD.gn similarity index 100% rename from public/lib/guest/BUILD.gn rename to garnet/public/lib/guest/BUILD.gn
diff --git a/public/lib/guest/MAINTAINERS b/garnet/public/lib/guest/MAINTAINERS similarity index 100% rename from public/lib/guest/MAINTAINERS rename to garnet/public/lib/guest/MAINTAINERS
diff --git a/public/lib/guest/scenic_wayland_dispatcher.cc b/garnet/public/lib/guest/scenic_wayland_dispatcher.cc similarity index 100% rename from public/lib/guest/scenic_wayland_dispatcher.cc rename to garnet/public/lib/guest/scenic_wayland_dispatcher.cc
diff --git a/public/lib/guest/scenic_wayland_dispatcher.h b/garnet/public/lib/guest/scenic_wayland_dispatcher.h similarity index 100% rename from public/lib/guest/scenic_wayland_dispatcher.h rename to garnet/public/lib/guest/scenic_wayland_dispatcher.h
diff --git a/public/lib/icu_data/MAINTAINERS b/garnet/public/lib/icu_data/MAINTAINERS similarity index 100% rename from public/lib/icu_data/MAINTAINERS rename to garnet/public/lib/icu_data/MAINTAINERS
diff --git a/public/lib/icu_data/cpp/BUILD.gn b/garnet/public/lib/icu_data/cpp/BUILD.gn similarity index 100% rename from public/lib/icu_data/cpp/BUILD.gn rename to garnet/public/lib/icu_data/cpp/BUILD.gn
diff --git a/public/lib/icu_data/cpp/icu_data.cc b/garnet/public/lib/icu_data/cpp/icu_data.cc similarity index 100% rename from public/lib/icu_data/cpp/icu_data.cc rename to garnet/public/lib/icu_data/cpp/icu_data.cc
diff --git a/public/lib/icu_data/cpp/icu_data.h b/garnet/public/lib/icu_data/cpp/icu_data.h similarity index 100% rename from public/lib/icu_data/cpp/icu_data.h rename to garnet/public/lib/icu_data/cpp/icu_data.h
diff --git a/public/lib/images/MAINTAINERS b/garnet/public/lib/images/MAINTAINERS similarity index 100% rename from public/lib/images/MAINTAINERS rename to garnet/public/lib/images/MAINTAINERS
diff --git a/public/lib/images/cpp/BUILD.gn b/garnet/public/lib/images/cpp/BUILD.gn similarity index 100% rename from public/lib/images/cpp/BUILD.gn rename to garnet/public/lib/images/cpp/BUILD.gn
diff --git a/public/lib/images/cpp/images.cc b/garnet/public/lib/images/cpp/images.cc similarity index 100% rename from public/lib/images/cpp/images.cc rename to garnet/public/lib/images/cpp/images.cc
diff --git a/public/lib/images/cpp/images.h b/garnet/public/lib/images/cpp/images.h similarity index 100% rename from public/lib/images/cpp/images.h rename to garnet/public/lib/images/cpp/images.h
diff --git a/public/lib/inspect/BUILD.gn b/garnet/public/lib/inspect/BUILD.gn similarity index 100% rename from public/lib/inspect/BUILD.gn rename to garnet/public/lib/inspect/BUILD.gn
diff --git a/public/lib/inspect/inspect.cc b/garnet/public/lib/inspect/inspect.cc similarity index 100% rename from public/lib/inspect/inspect.cc rename to garnet/public/lib/inspect/inspect.cc
diff --git a/public/lib/inspect/inspect.h b/garnet/public/lib/inspect/inspect.h similarity index 100% rename from public/lib/inspect/inspect.h rename to garnet/public/lib/inspect/inspect.h
diff --git a/public/lib/json/BUILD.gn b/garnet/public/lib/json/BUILD.gn similarity index 100% rename from public/lib/json/BUILD.gn rename to garnet/public/lib/json/BUILD.gn
diff --git a/public/lib/json/json_parser.cc b/garnet/public/lib/json/json_parser.cc similarity index 100% rename from public/lib/json/json_parser.cc rename to garnet/public/lib/json/json_parser.cc
diff --git a/public/lib/json/json_parser.h b/garnet/public/lib/json/json_parser.h similarity index 100% rename from public/lib/json/json_parser.h rename to garnet/public/lib/json/json_parser.h
diff --git a/public/lib/json/json_parser_unittest.cc b/garnet/public/lib/json/json_parser_unittest.cc similarity index 100% rename from public/lib/json/json_parser_unittest.cc rename to garnet/public/lib/json/json_parser_unittest.cc
diff --git a/public/lib/mdns/MAINTAINERS b/garnet/public/lib/mdns/MAINTAINERS similarity index 100% rename from public/lib/mdns/MAINTAINERS rename to garnet/public/lib/mdns/MAINTAINERS
diff --git a/public/lib/mdns/cpp/BUILD.gn b/garnet/public/lib/mdns/cpp/BUILD.gn similarity index 100% rename from public/lib/mdns/cpp/BUILD.gn rename to garnet/public/lib/mdns/cpp/BUILD.gn
diff --git a/public/lib/mdns/cpp/service_subscriber.cc b/garnet/public/lib/mdns/cpp/service_subscriber.cc similarity index 100% rename from public/lib/mdns/cpp/service_subscriber.cc rename to garnet/public/lib/mdns/cpp/service_subscriber.cc
diff --git a/public/lib/mdns/cpp/service_subscriber.h b/garnet/public/lib/mdns/cpp/service_subscriber.h similarity index 100% rename from public/lib/mdns/cpp/service_subscriber.h rename to garnet/public/lib/mdns/cpp/service_subscriber.h
diff --git a/public/lib/media/audio/BUILD.gn b/garnet/public/lib/media/audio/BUILD.gn similarity index 100% rename from public/lib/media/audio/BUILD.gn rename to garnet/public/lib/media/audio/BUILD.gn
diff --git a/public/lib/media/audio/perceived_level.cc b/garnet/public/lib/media/audio/perceived_level.cc similarity index 100% rename from public/lib/media/audio/perceived_level.cc rename to garnet/public/lib/media/audio/perceived_level.cc
diff --git a/public/lib/media/audio/perceived_level.h b/garnet/public/lib/media/audio/perceived_level.h similarity index 100% rename from public/lib/media/audio/perceived_level.h rename to garnet/public/lib/media/audio/perceived_level.h
diff --git a/public/lib/media/audio/types.cc b/garnet/public/lib/media/audio/types.cc similarity index 100% rename from public/lib/media/audio/types.cc rename to garnet/public/lib/media/audio/types.cc
diff --git a/public/lib/media/audio/types.h b/garnet/public/lib/media/audio/types.h similarity index 100% rename from public/lib/media/audio/types.h rename to garnet/public/lib/media/audio/types.h
diff --git a/public/lib/media/audio_dfx/BUILD.gn b/garnet/public/lib/media/audio_dfx/BUILD.gn similarity index 100% rename from public/lib/media/audio_dfx/BUILD.gn rename to garnet/public/lib/media/audio_dfx/BUILD.gn
diff --git a/public/lib/media/audio_dfx/README.md b/garnet/public/lib/media/audio_dfx/README.md similarity index 100% rename from public/lib/media/audio_dfx/README.md rename to garnet/public/lib/media/audio_dfx/README.md
diff --git a/public/lib/media/audio_dfx/audio_device_fx.h b/garnet/public/lib/media/audio_dfx/audio_device_fx.h similarity index 100% rename from public/lib/media/audio_dfx/audio_device_fx.h rename to garnet/public/lib/media/audio_dfx/audio_device_fx.h
diff --git a/public/lib/media/audio_dfx/lib/README.md b/garnet/public/lib/media/audio_dfx/lib/README.md similarity index 100% rename from public/lib/media/audio_dfx/lib/README.md rename to garnet/public/lib/media/audio_dfx/lib/README.md
diff --git a/public/lib/media/audio_dfx/lib/dfx_base.cc b/garnet/public/lib/media/audio_dfx/lib/dfx_base.cc similarity index 100% rename from public/lib/media/audio_dfx/lib/dfx_base.cc rename to garnet/public/lib/media/audio_dfx/lib/dfx_base.cc
diff --git a/public/lib/media/audio_dfx/lib/dfx_base.h b/garnet/public/lib/media/audio_dfx/lib/dfx_base.h similarity index 100% rename from public/lib/media/audio_dfx/lib/dfx_base.h rename to garnet/public/lib/media/audio_dfx/lib/dfx_base.h
diff --git a/public/lib/media/audio_dfx/lib/dfx_delay.cc b/garnet/public/lib/media/audio_dfx/lib/dfx_delay.cc similarity index 100% rename from public/lib/media/audio_dfx/lib/dfx_delay.cc rename to garnet/public/lib/media/audio_dfx/lib/dfx_delay.cc
diff --git a/public/lib/media/audio_dfx/lib/dfx_delay.h b/garnet/public/lib/media/audio_dfx/lib/dfx_delay.h similarity index 100% rename from public/lib/media/audio_dfx/lib/dfx_delay.h rename to garnet/public/lib/media/audio_dfx/lib/dfx_delay.h
diff --git a/public/lib/media/audio_dfx/lib/dfx_rechannel.h b/garnet/public/lib/media/audio_dfx/lib/dfx_rechannel.h similarity index 100% rename from public/lib/media/audio_dfx/lib/dfx_rechannel.h rename to garnet/public/lib/media/audio_dfx/lib/dfx_rechannel.h
diff --git a/public/lib/media/audio_dfx/lib/dfx_swap.h b/garnet/public/lib/media/audio_dfx/lib/dfx_swap.h similarity index 100% rename from public/lib/media/audio_dfx/lib/dfx_swap.h rename to garnet/public/lib/media/audio_dfx/lib/dfx_swap.h
diff --git a/public/lib/media/audio_dfx/lib/lib_dfx.cc b/garnet/public/lib/media/audio_dfx/lib/lib_dfx.cc similarity index 100% rename from public/lib/media/audio_dfx/lib/lib_dfx.cc rename to garnet/public/lib/media/audio_dfx/lib/lib_dfx.cc
diff --git a/public/lib/media/audio_dfx/meta/audio_dfx_tests.cmx b/garnet/public/lib/media/audio_dfx/meta/audio_dfx_tests.cmx similarity index 100% rename from public/lib/media/audio_dfx/meta/audio_dfx_tests.cmx rename to garnet/public/lib/media/audio_dfx/meta/audio_dfx_tests.cmx
diff --git a/public/lib/media/audio_dfx/test/README.md b/garnet/public/lib/media/audio_dfx/test/README.md similarity index 100% rename from public/lib/media/audio_dfx/test/README.md rename to garnet/public/lib/media/audio_dfx/test/README.md
diff --git a/public/lib/media/audio_dfx/test/audio_dfx_tests.cc b/garnet/public/lib/media/audio_dfx/test/audio_dfx_tests.cc similarity index 100% rename from public/lib/media/audio_dfx/test/audio_dfx_tests.cc rename to garnet/public/lib/media/audio_dfx/test/audio_dfx_tests.cc
diff --git a/public/lib/media/timeline/BUILD.gn b/garnet/public/lib/media/timeline/BUILD.gn similarity index 100% rename from public/lib/media/timeline/BUILD.gn rename to garnet/public/lib/media/timeline/BUILD.gn
diff --git a/public/lib/media/timeline/meta/media_lib_timeline_tests.cmx b/garnet/public/lib/media/timeline/meta/media_lib_timeline_tests.cmx similarity index 100% rename from public/lib/media/timeline/meta/media_lib_timeline_tests.cmx rename to garnet/public/lib/media/timeline/meta/media_lib_timeline_tests.cmx
diff --git a/public/lib/media/timeline/test/timeline_function_test.cc b/garnet/public/lib/media/timeline/test/timeline_function_test.cc similarity index 100% rename from public/lib/media/timeline/test/timeline_function_test.cc rename to garnet/public/lib/media/timeline/test/timeline_function_test.cc
diff --git a/public/lib/media/timeline/test/timeline_rate_test.cc b/garnet/public/lib/media/timeline/test/timeline_rate_test.cc similarity index 100% rename from public/lib/media/timeline/test/timeline_rate_test.cc rename to garnet/public/lib/media/timeline/test/timeline_rate_test.cc
diff --git a/public/lib/media/timeline/timeline.h b/garnet/public/lib/media/timeline/timeline.h similarity index 100% rename from public/lib/media/timeline/timeline.h rename to garnet/public/lib/media/timeline/timeline.h
diff --git a/public/lib/media/timeline/timeline_function.cc b/garnet/public/lib/media/timeline/timeline_function.cc similarity index 100% rename from public/lib/media/timeline/timeline_function.cc rename to garnet/public/lib/media/timeline/timeline_function.cc
diff --git a/public/lib/media/timeline/timeline_function.h b/garnet/public/lib/media/timeline/timeline_function.h similarity index 100% rename from public/lib/media/timeline/timeline_function.h rename to garnet/public/lib/media/timeline/timeline_function.h
diff --git a/public/lib/media/timeline/timeline_rate.cc b/garnet/public/lib/media/timeline/timeline_rate.cc similarity index 100% rename from public/lib/media/timeline/timeline_rate.cc rename to garnet/public/lib/media/timeline/timeline_rate.cc
diff --git a/public/lib/media/timeline/timeline_rate.h b/garnet/public/lib/media/timeline/timeline_rate.h similarity index 100% rename from public/lib/media/timeline/timeline_rate.h rename to garnet/public/lib/media/timeline/timeline_rate.h
diff --git a/public/lib/media/timeline/type_converters.cc b/garnet/public/lib/media/timeline/type_converters.cc similarity index 100% rename from public/lib/media/timeline/type_converters.cc rename to garnet/public/lib/media/timeline/type_converters.cc
diff --git a/public/lib/media/timeline/type_converters.h b/garnet/public/lib/media/timeline/type_converters.h similarity index 100% rename from public/lib/media/timeline/type_converters.h rename to garnet/public/lib/media/timeline/type_converters.h
diff --git a/public/lib/media/transport/BUILD.gn b/garnet/public/lib/media/transport/BUILD.gn similarity index 100% rename from public/lib/media/transport/BUILD.gn rename to garnet/public/lib/media/transport/BUILD.gn
diff --git a/public/lib/media/transport/fifo_allocator.cc b/garnet/public/lib/media/transport/fifo_allocator.cc similarity index 100% rename from public/lib/media/transport/fifo_allocator.cc rename to garnet/public/lib/media/transport/fifo_allocator.cc
diff --git a/public/lib/media/transport/fifo_allocator.h b/garnet/public/lib/media/transport/fifo_allocator.h similarity index 100% rename from public/lib/media/transport/fifo_allocator.h rename to garnet/public/lib/media/transport/fifo_allocator.h
diff --git a/public/lib/media/transport/mapped_shared_buffer.cc b/garnet/public/lib/media/transport/mapped_shared_buffer.cc similarity index 100% rename from public/lib/media/transport/mapped_shared_buffer.cc rename to garnet/public/lib/media/transport/mapped_shared_buffer.cc
diff --git a/public/lib/media/transport/mapped_shared_buffer.h b/garnet/public/lib/media/transport/mapped_shared_buffer.h similarity index 100% rename from public/lib/media/transport/mapped_shared_buffer.h rename to garnet/public/lib/media/transport/mapped_shared_buffer.h
diff --git a/public/lib/media/transport/meta/media_lib_transport_tests.cmx b/garnet/public/lib/media/transport/meta/media_lib_transport_tests.cmx similarity index 100% rename from public/lib/media/transport/meta/media_lib_transport_tests.cmx rename to garnet/public/lib/media/transport/meta/media_lib_transport_tests.cmx
diff --git a/public/lib/media/transport/shared_buffer_set.cc b/garnet/public/lib/media/transport/shared_buffer_set.cc similarity index 100% rename from public/lib/media/transport/shared_buffer_set.cc rename to garnet/public/lib/media/transport/shared_buffer_set.cc
diff --git a/public/lib/media/transport/shared_buffer_set.h b/garnet/public/lib/media/transport/shared_buffer_set.h similarity index 100% rename from public/lib/media/transport/shared_buffer_set.h rename to garnet/public/lib/media/transport/shared_buffer_set.h
diff --git a/public/lib/media/transport/shared_buffer_set_allocator.cc b/garnet/public/lib/media/transport/shared_buffer_set_allocator.cc similarity index 100% rename from public/lib/media/transport/shared_buffer_set_allocator.cc rename to garnet/public/lib/media/transport/shared_buffer_set_allocator.cc
diff --git a/public/lib/media/transport/shared_buffer_set_allocator.h b/garnet/public/lib/media/transport/shared_buffer_set_allocator.h similarity index 100% rename from public/lib/media/transport/shared_buffer_set_allocator.h rename to garnet/public/lib/media/transport/shared_buffer_set_allocator.h
diff --git a/public/lib/media/transport/test/shared_buffer_set_allocator_test.cc b/garnet/public/lib/media/transport/test/shared_buffer_set_allocator_test.cc similarity index 100% rename from public/lib/media/transport/test/shared_buffer_set_allocator_test.cc rename to garnet/public/lib/media/transport/test/shared_buffer_set_allocator_test.cc
diff --git a/public/lib/media/transport/test/shared_buffer_set_test.cc b/garnet/public/lib/media/transport/test/shared_buffer_set_test.cc similarity index 100% rename from public/lib/media/transport/test/shared_buffer_set_test.cc rename to garnet/public/lib/media/transport/test/shared_buffer_set_test.cc
diff --git a/public/lib/netconnector/MAINTAINERS b/garnet/public/lib/netconnector/MAINTAINERS similarity index 100% rename from public/lib/netconnector/MAINTAINERS rename to garnet/public/lib/netconnector/MAINTAINERS
diff --git a/public/lib/netconnector/cpp/BUILD.gn b/garnet/public/lib/netconnector/cpp/BUILD.gn similarity index 100% rename from public/lib/netconnector/cpp/BUILD.gn rename to garnet/public/lib/netconnector/cpp/BUILD.gn
diff --git a/public/lib/netconnector/cpp/message_relay.cc b/garnet/public/lib/netconnector/cpp/message_relay.cc similarity index 100% rename from public/lib/netconnector/cpp/message_relay.cc rename to garnet/public/lib/netconnector/cpp/message_relay.cc
diff --git a/public/lib/netconnector/cpp/message_relay.h b/garnet/public/lib/netconnector/cpp/message_relay.h similarity index 100% rename from public/lib/netconnector/cpp/message_relay.h rename to garnet/public/lib/netconnector/cpp/message_relay.h
diff --git a/public/lib/netconnector/cpp/message_relay_unittest.cc b/garnet/public/lib/netconnector/cpp/message_relay_unittest.cc similarity index 100% rename from public/lib/netconnector/cpp/message_relay_unittest.cc rename to garnet/public/lib/netconnector/cpp/message_relay_unittest.cc
diff --git a/public/lib/netconnector/cpp/net_stub_responder.h b/garnet/public/lib/netconnector/cpp/net_stub_responder.h similarity index 100% rename from public/lib/netconnector/cpp/net_stub_responder.h rename to garnet/public/lib/netconnector/cpp/net_stub_responder.h
diff --git a/public/lib/netemul/BUILD.gn b/garnet/public/lib/netemul/BUILD.gn similarity index 100% rename from public/lib/netemul/BUILD.gn rename to garnet/public/lib/netemul/BUILD.gn
diff --git a/public/lib/netemul/MAINTAINERS b/garnet/public/lib/netemul/MAINTAINERS similarity index 100% rename from public/lib/netemul/MAINTAINERS rename to garnet/public/lib/netemul/MAINTAINERS
diff --git a/public/lib/netemul/bus/BUILD.gn b/garnet/public/lib/netemul/bus/BUILD.gn similarity index 100% rename from public/lib/netemul/bus/BUILD.gn rename to garnet/public/lib/netemul/bus/BUILD.gn
diff --git a/public/lib/netemul/bus/bus.cc b/garnet/public/lib/netemul/bus/bus.cc similarity index 100% rename from public/lib/netemul/bus/bus.cc rename to garnet/public/lib/netemul/bus/bus.cc
diff --git a/public/lib/netemul/bus/bus.h b/garnet/public/lib/netemul/bus/bus.h similarity index 100% rename from public/lib/netemul/bus/bus.h rename to garnet/public/lib/netemul/bus/bus.h
diff --git a/public/lib/netemul/bus/bus_manager.cc b/garnet/public/lib/netemul/bus/bus_manager.cc similarity index 100% rename from public/lib/netemul/bus/bus_manager.cc rename to garnet/public/lib/netemul/bus/bus_manager.cc
diff --git a/public/lib/netemul/bus/bus_manager.h b/garnet/public/lib/netemul/bus/bus_manager.h similarity index 100% rename from public/lib/netemul/bus/bus_manager.h rename to garnet/public/lib/netemul/bus/bus_manager.h
diff --git a/public/lib/netemul/bus/bus_unittest.cc b/garnet/public/lib/netemul/bus/bus_unittest.cc similarity index 100% rename from public/lib/netemul/bus/bus_unittest.cc rename to garnet/public/lib/netemul/bus/bus_unittest.cc
diff --git a/public/lib/netemul/fidl/BUILD.gn b/garnet/public/lib/netemul/fidl/BUILD.gn similarity index 100% rename from public/lib/netemul/fidl/BUILD.gn rename to garnet/public/lib/netemul/fidl/BUILD.gn
diff --git a/public/lib/netemul/fidl/bus.fidl b/garnet/public/lib/netemul/fidl/bus.fidl similarity index 100% rename from public/lib/netemul/fidl/bus.fidl rename to garnet/public/lib/netemul/fidl/bus.fidl
diff --git a/public/lib/netemul/fidl/environment.fidl b/garnet/public/lib/netemul/fidl/environment.fidl similarity index 100% rename from public/lib/netemul/fidl/environment.fidl rename to garnet/public/lib/netemul/fidl/environment.fidl
diff --git a/public/lib/netemul/fidl/network.fidl b/garnet/public/lib/netemul/fidl/network.fidl similarity index 100% rename from public/lib/netemul/fidl/network.fidl rename to garnet/public/lib/netemul/fidl/network.fidl
diff --git a/public/lib/netemul/network/BUILD.gn b/garnet/public/lib/netemul/network/BUILD.gn similarity index 100% rename from public/lib/netemul/network/BUILD.gn rename to garnet/public/lib/netemul/network/BUILD.gn
diff --git a/public/lib/netemul/network/consumer.h b/garnet/public/lib/netemul/network/consumer.h similarity index 100% rename from public/lib/netemul/network/consumer.h rename to garnet/public/lib/netemul/network/consumer.h
diff --git a/public/lib/netemul/network/endpoint.cc b/garnet/public/lib/netemul/network/endpoint.cc similarity index 100% rename from public/lib/netemul/network/endpoint.cc rename to garnet/public/lib/netemul/network/endpoint.cc
diff --git a/public/lib/netemul/network/endpoint.h b/garnet/public/lib/netemul/network/endpoint.h similarity index 100% rename from public/lib/netemul/network/endpoint.h rename to garnet/public/lib/netemul/network/endpoint.h
diff --git a/public/lib/netemul/network/endpoint_manager.cc b/garnet/public/lib/netemul/network/endpoint_manager.cc similarity index 100% rename from public/lib/netemul/network/endpoint_manager.cc rename to garnet/public/lib/netemul/network/endpoint_manager.cc
diff --git a/public/lib/netemul/network/endpoint_manager.h b/garnet/public/lib/netemul/network/endpoint_manager.h similarity index 100% rename from public/lib/netemul/network/endpoint_manager.h rename to garnet/public/lib/netemul/network/endpoint_manager.h
diff --git a/public/lib/netemul/network/ethernet_client.cc b/garnet/public/lib/netemul/network/ethernet_client.cc similarity index 100% rename from public/lib/netemul/network/ethernet_client.cc rename to garnet/public/lib/netemul/network/ethernet_client.cc
diff --git a/public/lib/netemul/network/ethernet_client.h b/garnet/public/lib/netemul/network/ethernet_client.h similarity index 100% rename from public/lib/netemul/network/ethernet_client.h rename to garnet/public/lib/netemul/network/ethernet_client.h
diff --git a/public/lib/netemul/network/ethertap_client.cc b/garnet/public/lib/netemul/network/ethertap_client.cc similarity index 100% rename from public/lib/netemul/network/ethertap_client.cc rename to garnet/public/lib/netemul/network/ethertap_client.cc
diff --git a/public/lib/netemul/network/ethertap_client.h b/garnet/public/lib/netemul/network/ethertap_client.h similarity index 100% rename from public/lib/netemul/network/ethertap_client.h rename to garnet/public/lib/netemul/network/ethertap_client.h
diff --git a/public/lib/netemul/network/ethertap_client_unittest.cc b/garnet/public/lib/netemul/network/ethertap_client_unittest.cc similarity index 100% rename from public/lib/netemul/network/ethertap_client_unittest.cc rename to garnet/public/lib/netemul/network/ethertap_client_unittest.cc
diff --git a/public/lib/netemul/network/ethertap_types.h b/garnet/public/lib/netemul/network/ethertap_types.h similarity index 100% rename from public/lib/netemul/network/ethertap_types.h rename to garnet/public/lib/netemul/network/ethertap_types.h
diff --git a/public/lib/netemul/network/fake_endpoint.cc b/garnet/public/lib/netemul/network/fake_endpoint.cc similarity index 100% rename from public/lib/netemul/network/fake_endpoint.cc rename to garnet/public/lib/netemul/network/fake_endpoint.cc
diff --git a/public/lib/netemul/network/fake_endpoint.h b/garnet/public/lib/netemul/network/fake_endpoint.h similarity index 100% rename from public/lib/netemul/network/fake_endpoint.h rename to garnet/public/lib/netemul/network/fake_endpoint.h
diff --git a/public/lib/netemul/network/network.cc b/garnet/public/lib/netemul/network/network.cc similarity index 100% rename from public/lib/netemul/network/network.cc rename to garnet/public/lib/netemul/network/network.cc
diff --git a/public/lib/netemul/network/network.h b/garnet/public/lib/netemul/network/network.h similarity index 100% rename from public/lib/netemul/network/network.h rename to garnet/public/lib/netemul/network/network.h
diff --git a/public/lib/netemul/network/network_context.cc b/garnet/public/lib/netemul/network/network_context.cc similarity index 100% rename from public/lib/netemul/network/network_context.cc rename to garnet/public/lib/netemul/network/network_context.cc
diff --git a/public/lib/netemul/network/network_context.h b/garnet/public/lib/netemul/network/network_context.h similarity index 100% rename from public/lib/netemul/network/network_context.h rename to garnet/public/lib/netemul/network/network_context.h
diff --git a/public/lib/netemul/network/network_manager.cc b/garnet/public/lib/netemul/network/network_manager.cc similarity index 100% rename from public/lib/netemul/network/network_manager.cc rename to garnet/public/lib/netemul/network/network_manager.cc
diff --git a/public/lib/netemul/network/network_manager.h b/garnet/public/lib/netemul/network/network_manager.h similarity index 100% rename from public/lib/netemul/network/network_manager.h rename to garnet/public/lib/netemul/network/network_manager.h
diff --git a/public/lib/netemul/network/network_service_unittest.cc b/garnet/public/lib/netemul/network/network_service_unittest.cc similarity index 100% rename from public/lib/netemul/network/network_service_unittest.cc rename to garnet/public/lib/netemul/network/network_service_unittest.cc
diff --git a/public/lib/netstack/c/BUILD.gn b/garnet/public/lib/netstack/c/BUILD.gn similarity index 100% rename from public/lib/netstack/c/BUILD.gn rename to garnet/public/lib/netstack/c/BUILD.gn
diff --git a/public/lib/netstack/c/netconfig.h b/garnet/public/lib/netstack/c/netconfig.h similarity index 100% rename from public/lib/netstack/c/netconfig.h rename to garnet/public/lib/netstack/c/netconfig.h
diff --git a/public/lib/network_wrapper/BUILD.gn b/garnet/public/lib/network_wrapper/BUILD.gn similarity index 100% rename from public/lib/network_wrapper/BUILD.gn rename to garnet/public/lib/network_wrapper/BUILD.gn
diff --git a/public/lib/network_wrapper/MAINTAINERS b/garnet/public/lib/network_wrapper/MAINTAINERS similarity index 100% rename from public/lib/network_wrapper/MAINTAINERS rename to garnet/public/lib/network_wrapper/MAINTAINERS
diff --git a/public/lib/network_wrapper/fake_network_wrapper.cc b/garnet/public/lib/network_wrapper/fake_network_wrapper.cc similarity index 100% rename from public/lib/network_wrapper/fake_network_wrapper.cc rename to garnet/public/lib/network_wrapper/fake_network_wrapper.cc
diff --git a/public/lib/network_wrapper/fake_network_wrapper.h b/garnet/public/lib/network_wrapper/fake_network_wrapper.h similarity index 100% rename from public/lib/network_wrapper/fake_network_wrapper.h rename to garnet/public/lib/network_wrapper/fake_network_wrapper.h
diff --git a/public/lib/network_wrapper/network_wrapper.h b/garnet/public/lib/network_wrapper/network_wrapper.h similarity index 100% rename from public/lib/network_wrapper/network_wrapper.h rename to garnet/public/lib/network_wrapper/network_wrapper.h
diff --git a/public/lib/network_wrapper/network_wrapper_impl.cc b/garnet/public/lib/network_wrapper/network_wrapper_impl.cc similarity index 100% rename from public/lib/network_wrapper/network_wrapper_impl.cc rename to garnet/public/lib/network_wrapper/network_wrapper_impl.cc
diff --git a/public/lib/network_wrapper/network_wrapper_impl.h b/garnet/public/lib/network_wrapper/network_wrapper_impl.h similarity index 100% rename from public/lib/network_wrapper/network_wrapper_impl.h rename to garnet/public/lib/network_wrapper/network_wrapper_impl.h
diff --git a/public/lib/network_wrapper/network_wrapper_impl_unittest.cc b/garnet/public/lib/network_wrapper/network_wrapper_impl_unittest.cc similarity index 100% rename from public/lib/network_wrapper/network_wrapper_impl_unittest.cc rename to garnet/public/lib/network_wrapper/network_wrapper_impl_unittest.cc
diff --git a/public/lib/pkg_url/BUILD.gn b/garnet/public/lib/pkg_url/BUILD.gn similarity index 100% rename from public/lib/pkg_url/BUILD.gn rename to garnet/public/lib/pkg_url/BUILD.gn
diff --git a/public/lib/pkg_url/fuchsia_pkg_url.cc b/garnet/public/lib/pkg_url/fuchsia_pkg_url.cc similarity index 100% rename from public/lib/pkg_url/fuchsia_pkg_url.cc rename to garnet/public/lib/pkg_url/fuchsia_pkg_url.cc
diff --git a/public/lib/pkg_url/fuchsia_pkg_url.h b/garnet/public/lib/pkg_url/fuchsia_pkg_url.h similarity index 100% rename from public/lib/pkg_url/fuchsia_pkg_url.h rename to garnet/public/lib/pkg_url/fuchsia_pkg_url.h
diff --git a/public/lib/pkg_url/fuchsia_pkg_url_unittest.cc b/garnet/public/lib/pkg_url/fuchsia_pkg_url_unittest.cc similarity index 100% rename from public/lib/pkg_url/fuchsia_pkg_url_unittest.cc rename to garnet/public/lib/pkg_url/fuchsia_pkg_url_unittest.cc
diff --git a/public/lib/pkg_url/meta/pkg_url_unittests.cmx b/garnet/public/lib/pkg_url/meta/pkg_url_unittests.cmx similarity index 100% rename from public/lib/pkg_url/meta/pkg_url_unittests.cmx rename to garnet/public/lib/pkg_url/meta/pkg_url_unittests.cmx
diff --git a/public/lib/pkg_url/url_resolver.cc b/garnet/public/lib/pkg_url/url_resolver.cc similarity index 100% rename from public/lib/pkg_url/url_resolver.cc rename to garnet/public/lib/pkg_url/url_resolver.cc
diff --git a/public/lib/pkg_url/url_resolver.h b/garnet/public/lib/pkg_url/url_resolver.h similarity index 100% rename from public/lib/pkg_url/url_resolver.h rename to garnet/public/lib/pkg_url/url_resolver.h
diff --git a/public/lib/pkg_url/url_resolver_unittest.cc b/garnet/public/lib/pkg_url/url_resolver_unittest.cc similarity index 100% rename from public/lib/pkg_url/url_resolver_unittest.cc rename to garnet/public/lib/pkg_url/url_resolver_unittest.cc
diff --git a/public/lib/svc/BUILD.gn b/garnet/public/lib/svc/BUILD.gn similarity index 100% rename from public/lib/svc/BUILD.gn rename to garnet/public/lib/svc/BUILD.gn
diff --git a/public/lib/svc/MAINTAINERS b/garnet/public/lib/svc/MAINTAINERS similarity index 100% rename from public/lib/svc/MAINTAINERS rename to garnet/public/lib/svc/MAINTAINERS
diff --git a/public/lib/svc/cpp/BUILD.gn b/garnet/public/lib/svc/cpp/BUILD.gn similarity index 100% rename from public/lib/svc/cpp/BUILD.gn rename to garnet/public/lib/svc/cpp/BUILD.gn
diff --git a/public/lib/svc/cpp/service_namespace.cc b/garnet/public/lib/svc/cpp/service_namespace.cc similarity index 100% rename from public/lib/svc/cpp/service_namespace.cc rename to garnet/public/lib/svc/cpp/service_namespace.cc
diff --git a/public/lib/svc/cpp/service_namespace.h b/garnet/public/lib/svc/cpp/service_namespace.h similarity index 100% rename from public/lib/svc/cpp/service_namespace.h rename to garnet/public/lib/svc/cpp/service_namespace.h
diff --git a/public/lib/svc/cpp/service_provider_bridge.cc b/garnet/public/lib/svc/cpp/service_provider_bridge.cc similarity index 100% rename from public/lib/svc/cpp/service_provider_bridge.cc rename to garnet/public/lib/svc/cpp/service_provider_bridge.cc
diff --git a/public/lib/svc/cpp/service_provider_bridge.h b/garnet/public/lib/svc/cpp/service_provider_bridge.h similarity index 100% rename from public/lib/svc/cpp/service_provider_bridge.h rename to garnet/public/lib/svc/cpp/service_provider_bridge.h
diff --git a/public/lib/svc/cpp/services.cc b/garnet/public/lib/svc/cpp/services.cc similarity index 100% rename from public/lib/svc/cpp/services.cc rename to garnet/public/lib/svc/cpp/services.cc
diff --git a/public/lib/svc/cpp/services.h b/garnet/public/lib/svc/cpp/services.h similarity index 100% rename from public/lib/svc/cpp/services.h rename to garnet/public/lib/svc/cpp/services.h
diff --git a/public/lib/svc/dir.cc b/garnet/public/lib/svc/dir.cc similarity index 100% rename from public/lib/svc/dir.cc rename to garnet/public/lib/svc/dir.cc
diff --git a/public/lib/svc/dir.h b/garnet/public/lib/svc/dir.h similarity index 100% rename from public/lib/svc/dir.h rename to garnet/public/lib/svc/dir.h
diff --git a/public/lib/svc/dir_unittest.cc b/garnet/public/lib/svc/dir_unittest.cc similarity index 100% rename from public/lib/svc/dir_unittest.cc rename to garnet/public/lib/svc/dir_unittest.cc
diff --git a/public/lib/svc/go/src/svc/BUILD.gn b/garnet/public/lib/svc/go/src/svc/BUILD.gn similarity index 100% rename from public/lib/svc/go/src/svc/BUILD.gn rename to garnet/public/lib/svc/go/src/svc/BUILD.gn
diff --git a/public/lib/svc/go/src/svc/services/services.go b/garnet/public/lib/svc/go/src/svc/services/services.go similarity index 100% rename from public/lib/svc/go/src/svc/services/services.go rename to garnet/public/lib/svc/go/src/svc/services/services.go
diff --git a/public/lib/svc/go/src/svc/svcfs/svcfs.go b/garnet/public/lib/svc/go/src/svc/svcfs/svcfs.go similarity index 100% rename from public/lib/svc/go/src/svc/svcfs/svcfs.go rename to garnet/public/lib/svc/go/src/svc/svcfs/svcfs.go
diff --git a/public/lib/svc/go/src/svc/svcns/svcns.go b/garnet/public/lib/svc/go/src/svc/svcns/svcns.go similarity index 100% rename from public/lib/svc/go/src/svc/svcns/svcns.go rename to garnet/public/lib/svc/go/src/svc/svcns/svcns.go
diff --git a/public/lib/syslog/cpp/BUILD.gn b/garnet/public/lib/syslog/cpp/BUILD.gn similarity index 100% rename from public/lib/syslog/cpp/BUILD.gn rename to garnet/public/lib/syslog/cpp/BUILD.gn
diff --git a/public/lib/syslog/cpp/logger.cc b/garnet/public/lib/syslog/cpp/logger.cc similarity index 100% rename from public/lib/syslog/cpp/logger.cc rename to garnet/public/lib/syslog/cpp/logger.cc
diff --git a/public/lib/syslog/cpp/logger.h b/garnet/public/lib/syslog/cpp/logger.h similarity index 100% rename from public/lib/syslog/cpp/logger.h rename to garnet/public/lib/syslog/cpp/logger.h
diff --git a/public/lib/syslog/cpp/logger_init.cc b/garnet/public/lib/syslog/cpp/logger_init.cc similarity index 100% rename from public/lib/syslog/cpp/logger_init.cc rename to garnet/public/lib/syslog/cpp/logger_init.cc
diff --git a/public/lib/syslog/cpp/logger_unittest.cc b/garnet/public/lib/syslog/cpp/logger_unittest.cc similarity index 100% rename from public/lib/syslog/cpp/logger_unittest.cc rename to garnet/public/lib/syslog/cpp/logger_unittest.cc
diff --git a/public/lib/syslog/cpp/run_all_unittests.cc b/garnet/public/lib/syslog/cpp/run_all_unittests.cc similarity index 100% rename from public/lib/syslog/cpp/run_all_unittests.cc rename to garnet/public/lib/syslog/cpp/run_all_unittests.cc
diff --git a/public/lib/syslog/go/src/syslog/BUILD.gn b/garnet/public/lib/syslog/go/src/syslog/BUILD.gn similarity index 100% rename from public/lib/syslog/go/src/syslog/BUILD.gn rename to garnet/public/lib/syslog/go/src/syslog/BUILD.gn
diff --git a/public/lib/syslog/go/src/syslog/logger/logger.go b/garnet/public/lib/syslog/go/src/syslog/logger/logger.go similarity index 100% rename from public/lib/syslog/go/src/syslog/logger/logger.go rename to garnet/public/lib/syslog/go/src/syslog/logger/logger.go
diff --git a/public/lib/test_runner/cpp/BUILD.gn b/garnet/public/lib/test_runner/cpp/BUILD.gn similarity index 100% rename from public/lib/test_runner/cpp/BUILD.gn rename to garnet/public/lib/test_runner/cpp/BUILD.gn
diff --git a/public/lib/test_runner/cpp/gtest_main.cc b/garnet/public/lib/test_runner/cpp/gtest_main.cc similarity index 100% rename from public/lib/test_runner/cpp/gtest_main.cc rename to garnet/public/lib/test_runner/cpp/gtest_main.cc
diff --git a/public/lib/test_runner/cpp/reporting/BUILD.gn b/garnet/public/lib/test_runner/cpp/reporting/BUILD.gn similarity index 100% rename from public/lib/test_runner/cpp/reporting/BUILD.gn rename to garnet/public/lib/test_runner/cpp/reporting/BUILD.gn
diff --git a/public/lib/test_runner/cpp/reporting/gtest_listener.cc b/garnet/public/lib/test_runner/cpp/reporting/gtest_listener.cc similarity index 100% rename from public/lib/test_runner/cpp/reporting/gtest_listener.cc rename to garnet/public/lib/test_runner/cpp/reporting/gtest_listener.cc
diff --git a/public/lib/test_runner/cpp/reporting/gtest_listener.h b/garnet/public/lib/test_runner/cpp/reporting/gtest_listener.h similarity index 100% rename from public/lib/test_runner/cpp/reporting/gtest_listener.h rename to garnet/public/lib/test_runner/cpp/reporting/gtest_listener.h
diff --git a/public/lib/test_runner/cpp/reporting/reporter.cc b/garnet/public/lib/test_runner/cpp/reporting/reporter.cc similarity index 100% rename from public/lib/test_runner/cpp/reporting/reporter.cc rename to garnet/public/lib/test_runner/cpp/reporting/reporter.cc
diff --git a/public/lib/test_runner/cpp/reporting/reporter.h b/garnet/public/lib/test_runner/cpp/reporting/reporter.h similarity index 100% rename from public/lib/test_runner/cpp/reporting/reporter.h rename to garnet/public/lib/test_runner/cpp/reporting/reporter.h
diff --git a/public/lib/test_runner/cpp/scope.cc b/garnet/public/lib/test_runner/cpp/scope.cc similarity index 100% rename from public/lib/test_runner/cpp/scope.cc rename to garnet/public/lib/test_runner/cpp/scope.cc
diff --git a/public/lib/test_runner/cpp/scope.h b/garnet/public/lib/test_runner/cpp/scope.h similarity index 100% rename from public/lib/test_runner/cpp/scope.h rename to garnet/public/lib/test_runner/cpp/scope.h
diff --git a/public/lib/test_runner/cpp/test_runner.cc b/garnet/public/lib/test_runner/cpp/test_runner.cc similarity index 100% rename from public/lib/test_runner/cpp/test_runner.cc rename to garnet/public/lib/test_runner/cpp/test_runner.cc
diff --git a/public/lib/test_runner/cpp/test_runner.h b/garnet/public/lib/test_runner/cpp/test_runner.h similarity index 100% rename from public/lib/test_runner/cpp/test_runner.h rename to garnet/public/lib/test_runner/cpp/test_runner.h
diff --git a/public/lib/test_runner/cpp/test_runner_store_impl.cc b/garnet/public/lib/test_runner/cpp/test_runner_store_impl.cc similarity index 100% rename from public/lib/test_runner/cpp/test_runner_store_impl.cc rename to garnet/public/lib/test_runner/cpp/test_runner_store_impl.cc
diff --git a/public/lib/test_runner/cpp/test_runner_store_impl.h b/garnet/public/lib/test_runner/cpp/test_runner_store_impl.h similarity index 100% rename from public/lib/test_runner/cpp/test_runner_store_impl.h rename to garnet/public/lib/test_runner/cpp/test_runner_store_impl.h
diff --git a/public/lib/timekeeper/BUILD.gn b/garnet/public/lib/timekeeper/BUILD.gn similarity index 100% rename from public/lib/timekeeper/BUILD.gn rename to garnet/public/lib/timekeeper/BUILD.gn
diff --git a/public/lib/timekeeper/async_test_clock.cc b/garnet/public/lib/timekeeper/async_test_clock.cc similarity index 100% rename from public/lib/timekeeper/async_test_clock.cc rename to garnet/public/lib/timekeeper/async_test_clock.cc
diff --git a/public/lib/timekeeper/async_test_clock.h b/garnet/public/lib/timekeeper/async_test_clock.h similarity index 100% rename from public/lib/timekeeper/async_test_clock.h rename to garnet/public/lib/timekeeper/async_test_clock.h
diff --git a/public/lib/timekeeper/async_test_clock_unittest.cc b/garnet/public/lib/timekeeper/async_test_clock_unittest.cc similarity index 100% rename from public/lib/timekeeper/async_test_clock_unittest.cc rename to garnet/public/lib/timekeeper/async_test_clock_unittest.cc
diff --git a/public/lib/timekeeper/clock.h b/garnet/public/lib/timekeeper/clock.h similarity index 100% rename from public/lib/timekeeper/clock.h rename to garnet/public/lib/timekeeper/clock.h
diff --git a/public/lib/timekeeper/monotonic_test_clock_base.cc b/garnet/public/lib/timekeeper/monotonic_test_clock_base.cc similarity index 100% rename from public/lib/timekeeper/monotonic_test_clock_base.cc rename to garnet/public/lib/timekeeper/monotonic_test_clock_base.cc
diff --git a/public/lib/timekeeper/monotonic_test_clock_base.h b/garnet/public/lib/timekeeper/monotonic_test_clock_base.h similarity index 100% rename from public/lib/timekeeper/monotonic_test_clock_base.h rename to garnet/public/lib/timekeeper/monotonic_test_clock_base.h
diff --git a/public/lib/timekeeper/system_clock.h b/garnet/public/lib/timekeeper/system_clock.h similarity index 100% rename from public/lib/timekeeper/system_clock.h rename to garnet/public/lib/timekeeper/system_clock.h
diff --git a/public/lib/timekeeper/system_clock_unittest.cc b/garnet/public/lib/timekeeper/system_clock_unittest.cc similarity index 100% rename from public/lib/timekeeper/system_clock_unittest.cc rename to garnet/public/lib/timekeeper/system_clock_unittest.cc
diff --git a/public/lib/timekeeper/test_clock.cc b/garnet/public/lib/timekeeper/test_clock.cc similarity index 100% rename from public/lib/timekeeper/test_clock.cc rename to garnet/public/lib/timekeeper/test_clock.cc
diff --git a/public/lib/timekeeper/test_clock.h b/garnet/public/lib/timekeeper/test_clock.h similarity index 100% rename from public/lib/timekeeper/test_clock.h rename to garnet/public/lib/timekeeper/test_clock.h
diff --git a/public/lib/timekeeper/test_clock_unittest.cc b/garnet/public/lib/timekeeper/test_clock_unittest.cc similarity index 100% rename from public/lib/timekeeper/test_clock_unittest.cc rename to garnet/public/lib/timekeeper/test_clock_unittest.cc
diff --git a/public/lib/timekeeper/test_loop_test_clock.cc b/garnet/public/lib/timekeeper/test_loop_test_clock.cc similarity index 100% rename from public/lib/timekeeper/test_loop_test_clock.cc rename to garnet/public/lib/timekeeper/test_loop_test_clock.cc
diff --git a/public/lib/timekeeper/test_loop_test_clock.h b/garnet/public/lib/timekeeper/test_loop_test_clock.h similarity index 100% rename from public/lib/timekeeper/test_loop_test_clock.h rename to garnet/public/lib/timekeeper/test_loop_test_clock.h
diff --git a/public/lib/timekeeper/test_loop_test_clock_unittest.cc b/garnet/public/lib/timekeeper/test_loop_test_clock_unittest.cc similarity index 100% rename from public/lib/timekeeper/test_loop_test_clock_unittest.cc rename to garnet/public/lib/timekeeper/test_loop_test_clock_unittest.cc
diff --git a/public/lib/ui/MAINTAINERS b/garnet/public/lib/ui/MAINTAINERS similarity index 100% rename from public/lib/ui/MAINTAINERS rename to garnet/public/lib/ui/MAINTAINERS
diff --git a/public/lib/ui/base_view/cpp/BUILD.gn b/garnet/public/lib/ui/base_view/cpp/BUILD.gn similarity index 100% rename from public/lib/ui/base_view/cpp/BUILD.gn rename to garnet/public/lib/ui/base_view/cpp/BUILD.gn
diff --git a/public/lib/ui/base_view/cpp/base_view.cc b/garnet/public/lib/ui/base_view/cpp/base_view.cc similarity index 100% rename from public/lib/ui/base_view/cpp/base_view.cc rename to garnet/public/lib/ui/base_view/cpp/base_view.cc
diff --git a/public/lib/ui/base_view/cpp/base_view.h b/garnet/public/lib/ui/base_view/cpp/base_view.h similarity index 100% rename from public/lib/ui/base_view/cpp/base_view.h rename to garnet/public/lib/ui/base_view/cpp/base_view.h
diff --git a/public/lib/ui/base_view/cpp/v1_base_view.cc b/garnet/public/lib/ui/base_view/cpp/v1_base_view.cc similarity index 100% rename from public/lib/ui/base_view/cpp/v1_base_view.cc rename to garnet/public/lib/ui/base_view/cpp/v1_base_view.cc
diff --git a/public/lib/ui/base_view/cpp/v1_base_view.h b/garnet/public/lib/ui/base_view/cpp/v1_base_view.h similarity index 100% rename from public/lib/ui/base_view/cpp/v1_base_view.h rename to garnet/public/lib/ui/base_view/cpp/v1_base_view.h
diff --git a/public/lib/ui/base_view/cpp/view_provider_component.cc b/garnet/public/lib/ui/base_view/cpp/view_provider_component.cc similarity index 100% rename from public/lib/ui/base_view/cpp/view_provider_component.cc rename to garnet/public/lib/ui/base_view/cpp/view_provider_component.cc
diff --git a/public/lib/ui/base_view/cpp/view_provider_component.h b/garnet/public/lib/ui/base_view/cpp/view_provider_component.h similarity index 100% rename from public/lib/ui/base_view/cpp/view_provider_component.h rename to garnet/public/lib/ui/base_view/cpp/view_provider_component.h
diff --git a/public/lib/ui/base_view/cpp/view_provider_service.cc b/garnet/public/lib/ui/base_view/cpp/view_provider_service.cc similarity index 100% rename from public/lib/ui/base_view/cpp/view_provider_service.cc rename to garnet/public/lib/ui/base_view/cpp/view_provider_service.cc
diff --git a/public/lib/ui/base_view/cpp/view_provider_service.h b/garnet/public/lib/ui/base_view/cpp/view_provider_service.h similarity index 100% rename from public/lib/ui/base_view/cpp/view_provider_service.h rename to garnet/public/lib/ui/base_view/cpp/view_provider_service.h
diff --git a/public/lib/ui/geometry/cpp/BUILD.gn b/garnet/public/lib/ui/geometry/cpp/BUILD.gn similarity index 100% rename from public/lib/ui/geometry/cpp/BUILD.gn rename to garnet/public/lib/ui/geometry/cpp/BUILD.gn
diff --git a/public/lib/ui/geometry/cpp/formatting.cc b/garnet/public/lib/ui/geometry/cpp/formatting.cc similarity index 100% rename from public/lib/ui/geometry/cpp/formatting.cc rename to garnet/public/lib/ui/geometry/cpp/formatting.cc
diff --git a/public/lib/ui/geometry/cpp/formatting.h b/garnet/public/lib/ui/geometry/cpp/formatting.h similarity index 100% rename from public/lib/ui/geometry/cpp/formatting.h rename to garnet/public/lib/ui/geometry/cpp/formatting.h
diff --git a/public/lib/ui/geometry/cpp/geometry_util.cc b/garnet/public/lib/ui/geometry/cpp/geometry_util.cc similarity index 100% rename from public/lib/ui/geometry/cpp/geometry_util.cc rename to garnet/public/lib/ui/geometry/cpp/geometry_util.cc
diff --git a/public/lib/ui/geometry/cpp/geometry_util.h b/garnet/public/lib/ui/geometry/cpp/geometry_util.h similarity index 100% rename from public/lib/ui/geometry/cpp/geometry_util.h rename to garnet/public/lib/ui/geometry/cpp/geometry_util.h
diff --git a/public/lib/ui/geometry/cpp/tests/geometry_util_unittests.cc b/garnet/public/lib/ui/geometry/cpp/tests/geometry_util_unittests.cc similarity index 100% rename from public/lib/ui/geometry/cpp/tests/geometry_util_unittests.cc rename to garnet/public/lib/ui/geometry/cpp/tests/geometry_util_unittests.cc
diff --git a/public/lib/ui/gfx/cpp/BUILD.gn b/garnet/public/lib/ui/gfx/cpp/BUILD.gn similarity index 100% rename from public/lib/ui/gfx/cpp/BUILD.gn rename to garnet/public/lib/ui/gfx/cpp/BUILD.gn
diff --git a/public/lib/ui/gfx/cpp/math.cc b/garnet/public/lib/ui/gfx/cpp/math.cc similarity index 100% rename from public/lib/ui/gfx/cpp/math.cc rename to garnet/public/lib/ui/gfx/cpp/math.cc
diff --git a/public/lib/ui/gfx/cpp/math.h b/garnet/public/lib/ui/gfx/cpp/math.h similarity index 100% rename from public/lib/ui/gfx/cpp/math.h rename to garnet/public/lib/ui/gfx/cpp/math.h
diff --git a/public/lib/ui/input/BUILD.gn b/garnet/public/lib/ui/input/BUILD.gn similarity index 100% rename from public/lib/ui/input/BUILD.gn rename to garnet/public/lib/ui/input/BUILD.gn
diff --git a/public/lib/ui/input/cpp/BUILD.gn b/garnet/public/lib/ui/input/cpp/BUILD.gn similarity index 100% rename from public/lib/ui/input/cpp/BUILD.gn rename to garnet/public/lib/ui/input/cpp/BUILD.gn
diff --git a/public/lib/ui/input/cpp/formatting.cc b/garnet/public/lib/ui/input/cpp/formatting.cc similarity index 100% rename from public/lib/ui/input/cpp/formatting.cc rename to garnet/public/lib/ui/input/cpp/formatting.cc
diff --git a/public/lib/ui/input/cpp/formatting.h b/garnet/public/lib/ui/input/cpp/formatting.h similarity index 100% rename from public/lib/ui/input/cpp/formatting.h rename to garnet/public/lib/ui/input/cpp/formatting.h
diff --git a/public/lib/ui/input/device_state.cc b/garnet/public/lib/ui/input/device_state.cc similarity index 100% rename from public/lib/ui/input/device_state.cc rename to garnet/public/lib/ui/input/device_state.cc
diff --git a/public/lib/ui/input/device_state.h b/garnet/public/lib/ui/input/device_state.h similarity index 100% rename from public/lib/ui/input/device_state.h rename to garnet/public/lib/ui/input/device_state.h
diff --git a/public/lib/ui/input/input_device_impl.cc b/garnet/public/lib/ui/input/input_device_impl.cc similarity index 100% rename from public/lib/ui/input/input_device_impl.cc rename to garnet/public/lib/ui/input/input_device_impl.cc
diff --git a/public/lib/ui/input/input_device_impl.h b/garnet/public/lib/ui/input/input_device_impl.h similarity index 100% rename from public/lib/ui/input/input_device_impl.h rename to garnet/public/lib/ui/input/input_device_impl.h
diff --git a/public/lib/ui/scenic/BUILD.gn b/garnet/public/lib/ui/scenic/BUILD.gn similarity index 100% rename from public/lib/ui/scenic/BUILD.gn rename to garnet/public/lib/ui/scenic/BUILD.gn
diff --git a/public/lib/ui/scenic/README.md b/garnet/public/lib/ui/scenic/README.md similarity index 100% rename from public/lib/ui/scenic/README.md rename to garnet/public/lib/ui/scenic/README.md
diff --git a/public/lib/ui/scenic/cpp/BUILD.gn b/garnet/public/lib/ui/scenic/cpp/BUILD.gn similarity index 100% rename from public/lib/ui/scenic/cpp/BUILD.gn rename to garnet/public/lib/ui/scenic/cpp/BUILD.gn
diff --git a/public/lib/ui/scenic/cpp/commands.cc b/garnet/public/lib/ui/scenic/cpp/commands.cc similarity index 100% rename from public/lib/ui/scenic/cpp/commands.cc rename to garnet/public/lib/ui/scenic/cpp/commands.cc
diff --git a/public/lib/ui/scenic/cpp/commands.h b/garnet/public/lib/ui/scenic/cpp/commands.h similarity index 100% rename from public/lib/ui/scenic/cpp/commands.h rename to garnet/public/lib/ui/scenic/cpp/commands.h
diff --git a/public/lib/ui/scenic/cpp/host_image_cycler.cc b/garnet/public/lib/ui/scenic/cpp/host_image_cycler.cc similarity index 100% rename from public/lib/ui/scenic/cpp/host_image_cycler.cc rename to garnet/public/lib/ui/scenic/cpp/host_image_cycler.cc
diff --git a/public/lib/ui/scenic/cpp/host_image_cycler.h b/garnet/public/lib/ui/scenic/cpp/host_image_cycler.h similarity index 100% rename from public/lib/ui/scenic/cpp/host_image_cycler.h rename to garnet/public/lib/ui/scenic/cpp/host_image_cycler.h
diff --git a/public/lib/ui/scenic/cpp/host_memory.cc b/garnet/public/lib/ui/scenic/cpp/host_memory.cc similarity index 100% rename from public/lib/ui/scenic/cpp/host_memory.cc rename to garnet/public/lib/ui/scenic/cpp/host_memory.cc
diff --git a/public/lib/ui/scenic/cpp/host_memory.h b/garnet/public/lib/ui/scenic/cpp/host_memory.h similarity index 100% rename from public/lib/ui/scenic/cpp/host_memory.h rename to garnet/public/lib/ui/scenic/cpp/host_memory.h
diff --git a/public/lib/ui/scenic/cpp/id.h b/garnet/public/lib/ui/scenic/cpp/id.h similarity index 100% rename from public/lib/ui/scenic/cpp/id.h rename to garnet/public/lib/ui/scenic/cpp/id.h
diff --git a/public/lib/ui/scenic/cpp/resources.cc b/garnet/public/lib/ui/scenic/cpp/resources.cc similarity index 100% rename from public/lib/ui/scenic/cpp/resources.cc rename to garnet/public/lib/ui/scenic/cpp/resources.cc
diff --git a/public/lib/ui/scenic/cpp/resources.h b/garnet/public/lib/ui/scenic/cpp/resources.h similarity index 100% rename from public/lib/ui/scenic/cpp/resources.h rename to garnet/public/lib/ui/scenic/cpp/resources.h
diff --git a/public/lib/ui/scenic/cpp/session.cc b/garnet/public/lib/ui/scenic/cpp/session.cc similarity index 100% rename from public/lib/ui/scenic/cpp/session.cc rename to garnet/public/lib/ui/scenic/cpp/session.cc
diff --git a/public/lib/ui/scenic/cpp/session.h b/garnet/public/lib/ui/scenic/cpp/session.h similarity index 100% rename from public/lib/ui/scenic/cpp/session.h rename to garnet/public/lib/ui/scenic/cpp/session.h
diff --git a/public/lib/ui/scenic/cpp/util/mesh_utils.cc b/garnet/public/lib/ui/scenic/cpp/util/mesh_utils.cc similarity index 100% rename from public/lib/ui/scenic/cpp/util/mesh_utils.cc rename to garnet/public/lib/ui/scenic/cpp/util/mesh_utils.cc
diff --git a/public/lib/ui/scenic/cpp/util/mesh_utils.h b/garnet/public/lib/ui/scenic/cpp/util/mesh_utils.h similarity index 100% rename from public/lib/ui/scenic/cpp/util/mesh_utils.h rename to garnet/public/lib/ui/scenic/cpp/util/mesh_utils.h
diff --git a/public/lib/ui/scenic/fidl_helpers.h b/garnet/public/lib/ui/scenic/fidl_helpers.h similarity index 100% rename from public/lib/ui/scenic/fidl_helpers.h rename to garnet/public/lib/ui/scenic/fidl_helpers.h
diff --git a/public/lib/ui/sketchy/client/BUILD.gn b/garnet/public/lib/ui/sketchy/client/BUILD.gn similarity index 100% rename from public/lib/ui/sketchy/client/BUILD.gn rename to garnet/public/lib/ui/sketchy/client/BUILD.gn
diff --git a/public/lib/ui/sketchy/client/canvas.cc b/garnet/public/lib/ui/sketchy/client/canvas.cc similarity index 100% rename from public/lib/ui/sketchy/client/canvas.cc rename to garnet/public/lib/ui/sketchy/client/canvas.cc
diff --git a/public/lib/ui/sketchy/client/canvas.h b/garnet/public/lib/ui/sketchy/client/canvas.h similarity index 100% rename from public/lib/ui/sketchy/client/canvas.h rename to garnet/public/lib/ui/sketchy/client/canvas.h
diff --git a/public/lib/ui/sketchy/client/glm_hack.h b/garnet/public/lib/ui/sketchy/client/glm_hack.h similarity index 100% rename from public/lib/ui/sketchy/client/glm_hack.h rename to garnet/public/lib/ui/sketchy/client/glm_hack.h
diff --git a/public/lib/ui/sketchy/client/resources.cc b/garnet/public/lib/ui/sketchy/client/resources.cc similarity index 100% rename from public/lib/ui/sketchy/client/resources.cc rename to garnet/public/lib/ui/sketchy/client/resources.cc
diff --git a/public/lib/ui/sketchy/client/resources.h b/garnet/public/lib/ui/sketchy/client/resources.h similarity index 100% rename from public/lib/ui/sketchy/client/resources.h rename to garnet/public/lib/ui/sketchy/client/resources.h
diff --git a/public/lib/ui/sketchy/client/types.cc b/garnet/public/lib/ui/sketchy/client/types.cc similarity index 100% rename from public/lib/ui/sketchy/client/types.cc rename to garnet/public/lib/ui/sketchy/client/types.cc
diff --git a/public/lib/ui/sketchy/client/types.h b/garnet/public/lib/ui/sketchy/client/types.h similarity index 100% rename from public/lib/ui/sketchy/client/types.h rename to garnet/public/lib/ui/sketchy/client/types.h
diff --git a/public/lib/ui/tests/mocks/BUILD.gn b/garnet/public/lib/ui/tests/mocks/BUILD.gn similarity index 100% rename from public/lib/ui/tests/mocks/BUILD.gn rename to garnet/public/lib/ui/tests/mocks/BUILD.gn
diff --git a/public/lib/ui/tests/mocks/mock_input_device.cc b/garnet/public/lib/ui/tests/mocks/mock_input_device.cc similarity index 100% rename from public/lib/ui/tests/mocks/mock_input_device.cc rename to garnet/public/lib/ui/tests/mocks/mock_input_device.cc
diff --git a/public/lib/ui/tests/mocks/mock_input_device.h b/garnet/public/lib/ui/tests/mocks/mock_input_device.h similarity index 100% rename from public/lib/ui/tests/mocks/mock_input_device.h rename to garnet/public/lib/ui/tests/mocks/mock_input_device.h
diff --git a/public/lib/ui/tests/mocks/mock_input_device_registry.cc b/garnet/public/lib/ui/tests/mocks/mock_input_device_registry.cc similarity index 100% rename from public/lib/ui/tests/mocks/mock_input_device_registry.cc rename to garnet/public/lib/ui/tests/mocks/mock_input_device_registry.cc
diff --git a/public/lib/ui/tests/mocks/mock_input_device_registry.h b/garnet/public/lib/ui/tests/mocks/mock_input_device_registry.h similarity index 100% rename from public/lib/ui/tests/mocks/mock_input_device_registry.h rename to garnet/public/lib/ui/tests/mocks/mock_input_device_registry.h
diff --git a/public/lib/ui/tests/mocks/mock_view_container_listener.cc b/garnet/public/lib/ui/tests/mocks/mock_view_container_listener.cc similarity index 100% rename from public/lib/ui/tests/mocks/mock_view_container_listener.cc rename to garnet/public/lib/ui/tests/mocks/mock_view_container_listener.cc
diff --git a/public/lib/ui/tests/mocks/mock_view_container_listener.h b/garnet/public/lib/ui/tests/mocks/mock_view_container_listener.h similarity index 100% rename from public/lib/ui/tests/mocks/mock_view_container_listener.h rename to garnet/public/lib/ui/tests/mocks/mock_view_container_listener.h
diff --git a/public/lib/ui/tests/mocks/mock_view_listener.cc b/garnet/public/lib/ui/tests/mocks/mock_view_listener.cc similarity index 100% rename from public/lib/ui/tests/mocks/mock_view_listener.cc rename to garnet/public/lib/ui/tests/mocks/mock_view_listener.cc
diff --git a/public/lib/ui/tests/mocks/mock_view_listener.h b/garnet/public/lib/ui/tests/mocks/mock_view_listener.h similarity index 100% rename from public/lib/ui/tests/mocks/mock_view_listener.h rename to garnet/public/lib/ui/tests/mocks/mock_view_listener.h
diff --git a/public/lib/ui/tests/mocks/mock_view_tree_listener.cc b/garnet/public/lib/ui/tests/mocks/mock_view_tree_listener.cc similarity index 100% rename from public/lib/ui/tests/mocks/mock_view_tree_listener.cc rename to garnet/public/lib/ui/tests/mocks/mock_view_tree_listener.cc
diff --git a/public/lib/ui/tests/mocks/mock_view_tree_listener.h b/garnet/public/lib/ui/tests/mocks/mock_view_tree_listener.h similarity index 100% rename from public/lib/ui/tests/mocks/mock_view_tree_listener.h rename to garnet/public/lib/ui/tests/mocks/mock_view_tree_listener.h
diff --git a/public/lib/ui/tests/scenic_tests.json b/garnet/public/lib/ui/tests/scenic_tests.json similarity index 100% rename from public/lib/ui/tests/scenic_tests.json rename to garnet/public/lib/ui/tests/scenic_tests.json
diff --git a/public/lib/ui/view_framework/BUILD.gn b/garnet/public/lib/ui/view_framework/BUILD.gn similarity index 100% rename from public/lib/ui/view_framework/BUILD.gn rename to garnet/public/lib/ui/view_framework/BUILD.gn
diff --git a/public/lib/ui/view_framework/README.md b/garnet/public/lib/ui/view_framework/README.md similarity index 100% rename from public/lib/ui/view_framework/README.md rename to garnet/public/lib/ui/view_framework/README.md
diff --git a/public/lib/ui/view_framework/base_view.cc b/garnet/public/lib/ui/view_framework/base_view.cc similarity index 100% rename from public/lib/ui/view_framework/base_view.cc rename to garnet/public/lib/ui/view_framework/base_view.cc
diff --git a/public/lib/ui/view_framework/base_view.h b/garnet/public/lib/ui/view_framework/base_view.h similarity index 100% rename from public/lib/ui/view_framework/base_view.h rename to garnet/public/lib/ui/view_framework/base_view.h
diff --git a/public/lib/ui/view_framework/view_provider_app.cc b/garnet/public/lib/ui/view_framework/view_provider_app.cc similarity index 100% rename from public/lib/ui/view_framework/view_provider_app.cc rename to garnet/public/lib/ui/view_framework/view_provider_app.cc
diff --git a/public/lib/ui/view_framework/view_provider_app.h b/garnet/public/lib/ui/view_framework/view_provider_app.h similarity index 100% rename from public/lib/ui/view_framework/view_provider_app.h rename to garnet/public/lib/ui/view_framework/view_provider_app.h
diff --git a/public/lib/ui/view_framework/view_provider_service.cc b/garnet/public/lib/ui/view_framework/view_provider_service.cc similarity index 100% rename from public/lib/ui/view_framework/view_provider_service.cc rename to garnet/public/lib/ui/view_framework/view_provider_service.cc
diff --git a/public/lib/ui/view_framework/view_provider_service.h b/garnet/public/lib/ui/view_framework/view_provider_service.h similarity index 100% rename from public/lib/ui/view_framework/view_provider_service.h rename to garnet/public/lib/ui/view_framework/view_provider_service.h
diff --git a/public/lib/ui/views/cpp/BUILD.gn b/garnet/public/lib/ui/views/cpp/BUILD.gn similarity index 100% rename from public/lib/ui/views/cpp/BUILD.gn rename to garnet/public/lib/ui/views/cpp/BUILD.gn
diff --git a/public/lib/ui/views/cpp/formatting.cc b/garnet/public/lib/ui/views/cpp/formatting.cc similarity index 100% rename from public/lib/ui/views/cpp/formatting.cc rename to garnet/public/lib/ui/views/cpp/formatting.cc
diff --git a/public/lib/ui/views/cpp/formatting.h b/garnet/public/lib/ui/views/cpp/formatting.h similarity index 100% rename from public/lib/ui/views/cpp/formatting.h rename to garnet/public/lib/ui/views/cpp/formatting.h
diff --git a/public/lib/url/BUILD.gn b/garnet/public/lib/url/BUILD.gn similarity index 100% rename from public/lib/url/BUILD.gn rename to garnet/public/lib/url/BUILD.gn
diff --git a/public/lib/url/MAINTAINERS b/garnet/public/lib/url/MAINTAINERS similarity index 100% rename from public/lib/url/MAINTAINERS rename to garnet/public/lib/url/MAINTAINERS
diff --git a/public/lib/url/README.md b/garnet/public/lib/url/README.md similarity index 100% rename from public/lib/url/README.md rename to garnet/public/lib/url/README.md
diff --git a/public/lib/url/dummy_unittest.cc b/garnet/public/lib/url/dummy_unittest.cc similarity index 100% rename from public/lib/url/dummy_unittest.cc rename to garnet/public/lib/url/dummy_unittest.cc
diff --git a/public/lib/url/gurl.cc b/garnet/public/lib/url/gurl.cc similarity index 100% rename from public/lib/url/gurl.cc rename to garnet/public/lib/url/gurl.cc
diff --git a/public/lib/url/gurl.h b/garnet/public/lib/url/gurl.h similarity index 100% rename from public/lib/url/gurl.h rename to garnet/public/lib/url/gurl.h
diff --git a/public/lib/url/gurl_unittest.cc b/garnet/public/lib/url/gurl_unittest.cc similarity index 100% rename from public/lib/url/gurl_unittest.cc rename to garnet/public/lib/url/gurl_unittest.cc
diff --git a/public/lib/url/test/icu_unittest_base.h b/garnet/public/lib/url/test/icu_unittest_base.h similarity index 100% rename from public/lib/url/test/icu_unittest_base.h rename to garnet/public/lib/url/test/icu_unittest_base.h
diff --git a/public/lib/url/third_party/mozilla/LICENSE.txt b/garnet/public/lib/url/third_party/mozilla/LICENSE.txt similarity index 100% rename from public/lib/url/third_party/mozilla/LICENSE.txt rename to garnet/public/lib/url/third_party/mozilla/LICENSE.txt
diff --git a/public/lib/url/third_party/mozilla/README.fuchsia b/garnet/public/lib/url/third_party/mozilla/README.fuchsia similarity index 100% rename from public/lib/url/third_party/mozilla/README.fuchsia rename to garnet/public/lib/url/third_party/mozilla/README.fuchsia
diff --git a/public/lib/url/third_party/mozilla/url_parse.cc b/garnet/public/lib/url/third_party/mozilla/url_parse.cc similarity index 100% rename from public/lib/url/third_party/mozilla/url_parse.cc rename to garnet/public/lib/url/third_party/mozilla/url_parse.cc
diff --git a/public/lib/url/third_party/mozilla/url_parse.h b/garnet/public/lib/url/third_party/mozilla/url_parse.h similarity index 100% rename from public/lib/url/third_party/mozilla/url_parse.h rename to garnet/public/lib/url/third_party/mozilla/url_parse.h
diff --git a/public/lib/url/url_canon.h b/garnet/public/lib/url/url_canon.h similarity index 100% rename from public/lib/url/url_canon.h rename to garnet/public/lib/url/url_canon.h
diff --git a/public/lib/url/url_canon_etc.cc b/garnet/public/lib/url/url_canon_etc.cc similarity index 100% rename from public/lib/url/url_canon_etc.cc rename to garnet/public/lib/url/url_canon_etc.cc
diff --git a/public/lib/url/url_canon_fileurl.cc b/garnet/public/lib/url/url_canon_fileurl.cc similarity index 100% rename from public/lib/url/url_canon_fileurl.cc rename to garnet/public/lib/url/url_canon_fileurl.cc
diff --git a/public/lib/url/url_canon_host.cc b/garnet/public/lib/url/url_canon_host.cc similarity index 100% rename from public/lib/url/url_canon_host.cc rename to garnet/public/lib/url/url_canon_host.cc
diff --git a/public/lib/url/url_canon_icu.cc b/garnet/public/lib/url/url_canon_icu.cc similarity index 100% rename from public/lib/url/url_canon_icu.cc rename to garnet/public/lib/url/url_canon_icu.cc
diff --git a/public/lib/url/url_canon_icu.h b/garnet/public/lib/url/url_canon_icu.h similarity index 100% rename from public/lib/url/url_canon_icu.h rename to garnet/public/lib/url/url_canon_icu.h
diff --git a/public/lib/url/url_canon_icu_unittest.cc b/garnet/public/lib/url/url_canon_icu_unittest.cc similarity index 100% rename from public/lib/url/url_canon_icu_unittest.cc rename to garnet/public/lib/url/url_canon_icu_unittest.cc
diff --git a/public/lib/url/url_canon_internal.cc b/garnet/public/lib/url/url_canon_internal.cc similarity index 100% rename from public/lib/url/url_canon_internal.cc rename to garnet/public/lib/url/url_canon_internal.cc
diff --git a/public/lib/url/url_canon_internal.h b/garnet/public/lib/url/url_canon_internal.h similarity index 100% rename from public/lib/url/url_canon_internal.h rename to garnet/public/lib/url/url_canon_internal.h
diff --git a/public/lib/url/url_canon_internal_file.h b/garnet/public/lib/url/url_canon_internal_file.h similarity index 100% rename from public/lib/url/url_canon_internal_file.h rename to garnet/public/lib/url/url_canon_internal_file.h
diff --git a/public/lib/url/url_canon_ip.cc b/garnet/public/lib/url/url_canon_ip.cc similarity index 100% rename from public/lib/url/url_canon_ip.cc rename to garnet/public/lib/url/url_canon_ip.cc
diff --git a/public/lib/url/url_canon_ip.h b/garnet/public/lib/url/url_canon_ip.h similarity index 100% rename from public/lib/url/url_canon_ip.h rename to garnet/public/lib/url/url_canon_ip.h
diff --git a/public/lib/url/url_canon_mailtourl.cc b/garnet/public/lib/url/url_canon_mailtourl.cc similarity index 100% rename from public/lib/url/url_canon_mailtourl.cc rename to garnet/public/lib/url/url_canon_mailtourl.cc
diff --git a/public/lib/url/url_canon_path.cc b/garnet/public/lib/url/url_canon_path.cc similarity index 100% rename from public/lib/url/url_canon_path.cc rename to garnet/public/lib/url/url_canon_path.cc
diff --git a/public/lib/url/url_canon_pathurl.cc b/garnet/public/lib/url/url_canon_pathurl.cc similarity index 100% rename from public/lib/url/url_canon_pathurl.cc rename to garnet/public/lib/url/url_canon_pathurl.cc
diff --git a/public/lib/url/url_canon_query.cc b/garnet/public/lib/url/url_canon_query.cc similarity index 100% rename from public/lib/url/url_canon_query.cc rename to garnet/public/lib/url/url_canon_query.cc
diff --git a/public/lib/url/url_canon_relative.cc b/garnet/public/lib/url/url_canon_relative.cc similarity index 100% rename from public/lib/url/url_canon_relative.cc rename to garnet/public/lib/url/url_canon_relative.cc
diff --git a/public/lib/url/url_canon_stdstring.cc b/garnet/public/lib/url/url_canon_stdstring.cc similarity index 100% rename from public/lib/url/url_canon_stdstring.cc rename to garnet/public/lib/url/url_canon_stdstring.cc
diff --git a/public/lib/url/url_canon_stdstring.h b/garnet/public/lib/url/url_canon_stdstring.h similarity index 100% rename from public/lib/url/url_canon_stdstring.h rename to garnet/public/lib/url/url_canon_stdstring.h
diff --git a/public/lib/url/url_canon_stdurl.cc b/garnet/public/lib/url/url_canon_stdurl.cc similarity index 100% rename from public/lib/url/url_canon_stdurl.cc rename to garnet/public/lib/url/url_canon_stdurl.cc
diff --git a/public/lib/url/url_canon_unittest.cc b/garnet/public/lib/url/url_canon_unittest.cc similarity index 100% rename from public/lib/url/url_canon_unittest.cc rename to garnet/public/lib/url/url_canon_unittest.cc
diff --git a/public/lib/url/url_constants.cc b/garnet/public/lib/url/url_constants.cc similarity index 100% rename from public/lib/url/url_constants.cc rename to garnet/public/lib/url/url_constants.cc
diff --git a/public/lib/url/url_constants.h b/garnet/public/lib/url/url_constants.h similarity index 100% rename from public/lib/url/url_constants.h rename to garnet/public/lib/url/url_constants.h
diff --git a/public/lib/url/url_export.h b/garnet/public/lib/url/url_export.h similarity index 100% rename from public/lib/url/url_export.h rename to garnet/public/lib/url/url_export.h
diff --git a/public/lib/url/url_file.h b/garnet/public/lib/url/url_file.h similarity index 100% rename from public/lib/url/url_file.h rename to garnet/public/lib/url/url_file.h
diff --git a/public/lib/url/url_parse_file.cc b/garnet/public/lib/url/url_parse_file.cc similarity index 100% rename from public/lib/url/url_parse_file.cc rename to garnet/public/lib/url/url_parse_file.cc
diff --git a/public/lib/url/url_parse_internal.h b/garnet/public/lib/url/url_parse_internal.h similarity index 100% rename from public/lib/url/url_parse_internal.h rename to garnet/public/lib/url/url_parse_internal.h
diff --git a/public/lib/url/url_parse_unittest.cc b/garnet/public/lib/url/url_parse_unittest.cc similarity index 100% rename from public/lib/url/url_parse_unittest.cc rename to garnet/public/lib/url/url_parse_unittest.cc
diff --git a/public/lib/url/url_test_utils.h b/garnet/public/lib/url/url_test_utils.h similarity index 100% rename from public/lib/url/url_test_utils.h rename to garnet/public/lib/url/url_test_utils.h
diff --git a/public/lib/url/url_util.cc b/garnet/public/lib/url/url_util.cc similarity index 100% rename from public/lib/url/url_util.cc rename to garnet/public/lib/url/url_util.cc
diff --git a/public/lib/url/url_util.h b/garnet/public/lib/url/url_util.h similarity index 100% rename from public/lib/url/url_util.h rename to garnet/public/lib/url/url_util.h
diff --git a/public/lib/url/url_util_internal.h b/garnet/public/lib/url/url_util_internal.h similarity index 100% rename from public/lib/url/url_util_internal.h rename to garnet/public/lib/url/url_util_internal.h
diff --git a/public/lib/url/url_util_unittest.cc b/garnet/public/lib/url/url_util_unittest.cc similarity index 100% rename from public/lib/url/url_util_unittest.cc rename to garnet/public/lib/url/url_util_unittest.cc
diff --git a/public/lib/vfs/cpp/BUILD.gn b/garnet/public/lib/vfs/cpp/BUILD.gn similarity index 100% rename from public/lib/vfs/cpp/BUILD.gn rename to garnet/public/lib/vfs/cpp/BUILD.gn
diff --git a/public/lib/vfs/cpp/MAINTAINERS b/garnet/public/lib/vfs/cpp/MAINTAINERS similarity index 100% rename from public/lib/vfs/cpp/MAINTAINERS rename to garnet/public/lib/vfs/cpp/MAINTAINERS
diff --git a/public/lib/vfs/cpp/connection.cc b/garnet/public/lib/vfs/cpp/connection.cc similarity index 100% rename from public/lib/vfs/cpp/connection.cc rename to garnet/public/lib/vfs/cpp/connection.cc
diff --git a/public/lib/vfs/cpp/connection.h b/garnet/public/lib/vfs/cpp/connection.h similarity index 100% rename from public/lib/vfs/cpp/connection.h rename to garnet/public/lib/vfs/cpp/connection.h
diff --git a/public/lib/vfs/cpp/directory.cc b/garnet/public/lib/vfs/cpp/directory.cc similarity index 100% rename from public/lib/vfs/cpp/directory.cc rename to garnet/public/lib/vfs/cpp/directory.cc
diff --git a/public/lib/vfs/cpp/directory.h b/garnet/public/lib/vfs/cpp/directory.h similarity index 100% rename from public/lib/vfs/cpp/directory.h rename to garnet/public/lib/vfs/cpp/directory.h
diff --git a/public/lib/vfs/cpp/file.cc b/garnet/public/lib/vfs/cpp/file.cc similarity index 100% rename from public/lib/vfs/cpp/file.cc rename to garnet/public/lib/vfs/cpp/file.cc
diff --git a/public/lib/vfs/cpp/file.h b/garnet/public/lib/vfs/cpp/file.h similarity index 100% rename from public/lib/vfs/cpp/file.h rename to garnet/public/lib/vfs/cpp/file.h
diff --git a/public/lib/vfs/cpp/file_unittest.cc b/garnet/public/lib/vfs/cpp/file_unittest.cc similarity index 100% rename from public/lib/vfs/cpp/file_unittest.cc rename to garnet/public/lib/vfs/cpp/file_unittest.cc
diff --git a/public/lib/vfs/cpp/flags.h b/garnet/public/lib/vfs/cpp/flags.h similarity index 100% rename from public/lib/vfs/cpp/flags.h rename to garnet/public/lib/vfs/cpp/flags.h
diff --git a/public/lib/vfs/cpp/internal/directory_connection.cc b/garnet/public/lib/vfs/cpp/internal/directory_connection.cc similarity index 100% rename from public/lib/vfs/cpp/internal/directory_connection.cc rename to garnet/public/lib/vfs/cpp/internal/directory_connection.cc
diff --git a/public/lib/vfs/cpp/internal/directory_connection.h b/garnet/public/lib/vfs/cpp/internal/directory_connection.h similarity index 100% rename from public/lib/vfs/cpp/internal/directory_connection.h rename to garnet/public/lib/vfs/cpp/internal/directory_connection.h
diff --git a/public/lib/vfs/cpp/internal/file_connection.cc b/garnet/public/lib/vfs/cpp/internal/file_connection.cc similarity index 100% rename from public/lib/vfs/cpp/internal/file_connection.cc rename to garnet/public/lib/vfs/cpp/internal/file_connection.cc
diff --git a/public/lib/vfs/cpp/internal/file_connection.h b/garnet/public/lib/vfs/cpp/internal/file_connection.h similarity index 100% rename from public/lib/vfs/cpp/internal/file_connection.h rename to garnet/public/lib/vfs/cpp/internal/file_connection.h
diff --git a/public/lib/vfs/cpp/internal/node_connection.cc b/garnet/public/lib/vfs/cpp/internal/node_connection.cc similarity index 100% rename from public/lib/vfs/cpp/internal/node_connection.cc rename to garnet/public/lib/vfs/cpp/internal/node_connection.cc
diff --git a/public/lib/vfs/cpp/internal/node_connection.h b/garnet/public/lib/vfs/cpp/internal/node_connection.h similarity index 100% rename from public/lib/vfs/cpp/internal/node_connection.h rename to garnet/public/lib/vfs/cpp/internal/node_connection.h
diff --git a/public/lib/vfs/cpp/meta/vfs_cpp_unittests.cmx b/garnet/public/lib/vfs/cpp/meta/vfs_cpp_unittests.cmx similarity index 100% rename from public/lib/vfs/cpp/meta/vfs_cpp_unittests.cmx rename to garnet/public/lib/vfs/cpp/meta/vfs_cpp_unittests.cmx
diff --git a/public/lib/vfs/cpp/node.cc b/garnet/public/lib/vfs/cpp/node.cc similarity index 100% rename from public/lib/vfs/cpp/node.cc rename to garnet/public/lib/vfs/cpp/node.cc
diff --git a/public/lib/vfs/cpp/node.h b/garnet/public/lib/vfs/cpp/node.h similarity index 100% rename from public/lib/vfs/cpp/node.h rename to garnet/public/lib/vfs/cpp/node.h
diff --git a/public/lib/vfs/cpp/pseudo_file.cc b/garnet/public/lib/vfs/cpp/pseudo_file.cc similarity index 100% rename from public/lib/vfs/cpp/pseudo_file.cc rename to garnet/public/lib/vfs/cpp/pseudo_file.cc
diff --git a/public/lib/vfs/cpp/pseudo_file.h b/garnet/public/lib/vfs/cpp/pseudo_file.h similarity index 100% rename from public/lib/vfs/cpp/pseudo_file.h rename to garnet/public/lib/vfs/cpp/pseudo_file.h
diff --git a/public/lib/vfs/cpp/pseudo_file_unittest.cc b/garnet/public/lib/vfs/cpp/pseudo_file_unittest.cc similarity index 100% rename from public/lib/vfs/cpp/pseudo_file_unittest.cc rename to garnet/public/lib/vfs/cpp/pseudo_file_unittest.cc
diff --git a/public/lib/vulkan/BUILD.gn b/garnet/public/lib/vulkan/BUILD.gn similarity index 100% rename from public/lib/vulkan/BUILD.gn rename to garnet/public/lib/vulkan/BUILD.gn
diff --git a/public/rust/.gitignore b/garnet/public/rust/.gitignore similarity index 100% rename from public/rust/.gitignore rename to garnet/public/rust/.gitignore
diff --git a/public/rust/BUILD.gn b/garnet/public/rust/BUILD.gn similarity index 100% rename from public/rust/BUILD.gn rename to garnet/public/rust/BUILD.gn
diff --git a/public/rust/MAINTAINERS b/garnet/public/rust/MAINTAINERS similarity index 100% rename from public/rust/MAINTAINERS rename to garnet/public/rust/MAINTAINERS
diff --git a/public/rust/carnelian/BUILD.gn b/garnet/public/rust/carnelian/BUILD.gn similarity index 100% rename from public/rust/carnelian/BUILD.gn rename to garnet/public/rust/carnelian/BUILD.gn
diff --git a/public/rust/carnelian/MAINTAINERS b/garnet/public/rust/carnelian/MAINTAINERS similarity index 100% rename from public/rust/carnelian/MAINTAINERS rename to garnet/public/rust/carnelian/MAINTAINERS
diff --git a/public/rust/carnelian/README.md b/garnet/public/rust/carnelian/README.md similarity index 100% rename from public/rust/carnelian/README.md rename to garnet/public/rust/carnelian/README.md
diff --git a/public/rust/carnelian/examples/embedding.rs b/garnet/public/rust/carnelian/examples/embedding.rs similarity index 100% rename from public/rust/carnelian/examples/embedding.rs rename to garnet/public/rust/carnelian/examples/embedding.rs
diff --git a/public/rust/carnelian/examples/spinning_square.rs b/garnet/public/rust/carnelian/examples/spinning_square.rs similarity index 100% rename from public/rust/carnelian/examples/spinning_square.rs rename to garnet/public/rust/carnelian/examples/spinning_square.rs
diff --git a/public/rust/carnelian/meta/example.cmx b/garnet/public/rust/carnelian/meta/example.cmx similarity index 100% rename from public/rust/carnelian/meta/example.cmx rename to garnet/public/rust/carnelian/meta/example.cmx
diff --git a/public/rust/carnelian/src/app.rs b/garnet/public/rust/carnelian/src/app.rs similarity index 100% rename from public/rust/carnelian/src/app.rs rename to garnet/public/rust/carnelian/src/app.rs
diff --git a/public/rust/carnelian/src/canvas.rs b/garnet/public/rust/carnelian/src/canvas.rs similarity index 100% rename from public/rust/carnelian/src/canvas.rs rename to garnet/public/rust/carnelian/src/canvas.rs
diff --git a/public/rust/carnelian/src/lib.rs b/garnet/public/rust/carnelian/src/lib.rs similarity index 100% rename from public/rust/carnelian/src/lib.rs rename to garnet/public/rust/carnelian/src/lib.rs
diff --git a/public/rust/carnelian/src/view.rs b/garnet/public/rust/carnelian/src/view.rs similarity index 100% rename from public/rust/carnelian/src/view.rs rename to garnet/public/rust/carnelian/src/view.rs
diff --git a/public/rust/fdio/BUILD.gn b/garnet/public/rust/fdio/BUILD.gn similarity index 100% rename from public/rust/fdio/BUILD.gn rename to garnet/public/rust/fdio/BUILD.gn
diff --git a/public/rust/fdio/README.md b/garnet/public/rust/fdio/README.md similarity index 100% rename from public/rust/fdio/README.md rename to garnet/public/rust/fdio/README.md
diff --git a/public/rust/fdio/scripts/bindgen-fdio.sh b/garnet/public/rust/fdio/scripts/bindgen-fdio.sh similarity index 100% rename from public/rust/fdio/scripts/bindgen-fdio.sh rename to garnet/public/rust/fdio/scripts/bindgen-fdio.sh
diff --git a/public/rust/fdio/src/fdio_sys.rs b/garnet/public/rust/fdio/src/fdio_sys.rs similarity index 100% rename from public/rust/fdio/src/fdio_sys.rs rename to garnet/public/rust/fdio/src/fdio_sys.rs
diff --git a/public/rust/fdio/src/lib.rs b/garnet/public/rust/fdio/src/lib.rs similarity index 100% rename from public/rust/fdio/src/lib.rs rename to garnet/public/rust/fdio/src/lib.rs
diff --git a/public/rust/fuchsia-app/BUILD.gn b/garnet/public/rust/fuchsia-app/BUILD.gn similarity index 100% rename from public/rust/fuchsia-app/BUILD.gn rename to garnet/public/rust/fuchsia-app/BUILD.gn
diff --git a/public/rust/fuchsia-app/isolated_component_test/BUILD.gn b/garnet/public/rust/fuchsia-app/isolated_component_test/BUILD.gn similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/BUILD.gn rename to garnet/public/rust/fuchsia-app/isolated_component_test/BUILD.gn
diff --git a/public/rust/fuchsia-app/isolated_component_test/README.md b/garnet/public/rust/fuchsia-app/isolated_component_test/README.md similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/README.md rename to garnet/public/rust/fuchsia-app/isolated_component_test/README.md
diff --git a/public/rust/fuchsia-app/isolated_component_test/echos.fidl b/garnet/public/rust/fuchsia-app/isolated_component_test/echos.fidl similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/echos.fidl rename to garnet/public/rust/fuchsia-app/isolated_component_test/echos.fidl
diff --git a/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_inner_component.rs b/garnet/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_inner_component.rs similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_inner_component.rs rename to garnet/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_inner_component.rs
diff --git a/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_middle_component.rs b/garnet/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_middle_component.rs similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_middle_component.rs rename to garnet/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_middle_component.rs
diff --git a/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_outer_component.rs b/garnet/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_outer_component.rs similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_outer_component.rs rename to garnet/public/rust/fuchsia-app/isolated_component_test/fuchsia_app_test_outer_component.rs
diff --git a/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_inner_component.cmx b/garnet/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_inner_component.cmx similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_inner_component.cmx rename to garnet/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_inner_component.cmx
diff --git a/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_middle_component.cmx b/garnet/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_middle_component.cmx similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_middle_component.cmx rename to garnet/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_middle_component.cmx
diff --git a/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_outer_component.cmx b/garnet/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_outer_component.cmx similarity index 100% rename from public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_outer_component.cmx rename to garnet/public/rust/fuchsia-app/isolated_component_test/meta/fuchsia_app_test_outer_component.cmx
diff --git a/public/rust/fuchsia-app/src/lib.rs b/garnet/public/rust/fuchsia-app/src/lib.rs similarity index 100% rename from public/rust/fuchsia-app/src/lib.rs rename to garnet/public/rust/fuchsia-app/src/lib.rs
diff --git a/public/rust/fuchsia-archive/BUILD.gn b/garnet/public/rust/fuchsia-archive/BUILD.gn similarity index 100% rename from public/rust/fuchsia-archive/BUILD.gn rename to garnet/public/rust/fuchsia-archive/BUILD.gn
diff --git a/public/rust/fuchsia-archive/src/lib.rs b/garnet/public/rust/fuchsia-archive/src/lib.rs similarity index 100% rename from public/rust/fuchsia-archive/src/lib.rs rename to garnet/public/rust/fuchsia-archive/src/lib.rs
diff --git a/public/rust/fuchsia-async-macro/BUILD.gn b/garnet/public/rust/fuchsia-async-macro/BUILD.gn similarity index 100% rename from public/rust/fuchsia-async-macro/BUILD.gn rename to garnet/public/rust/fuchsia-async-macro/BUILD.gn
diff --git a/public/rust/fuchsia-async-macro/Cargo.toml b/garnet/public/rust/fuchsia-async-macro/Cargo.toml similarity index 100% rename from public/rust/fuchsia-async-macro/Cargo.toml rename to garnet/public/rust/fuchsia-async-macro/Cargo.toml
diff --git a/public/rust/fuchsia-async-macro/src/lib.rs b/garnet/public/rust/fuchsia-async-macro/src/lib.rs similarity index 100% rename from public/rust/fuchsia-async-macro/src/lib.rs rename to garnet/public/rust/fuchsia-async-macro/src/lib.rs
diff --git a/public/rust/fuchsia-async/BUILD.gn b/garnet/public/rust/fuchsia-async/BUILD.gn similarity index 100% rename from public/rust/fuchsia-async/BUILD.gn rename to garnet/public/rust/fuchsia-async/BUILD.gn
diff --git a/public/rust/fuchsia-async/src/atomic_future.rs b/garnet/public/rust/fuchsia-async/src/atomic_future.rs similarity index 100% rename from public/rust/fuchsia-async/src/atomic_future.rs rename to garnet/public/rust/fuchsia-async/src/atomic_future.rs
diff --git a/public/rust/fuchsia-async/src/channel.rs b/garnet/public/rust/fuchsia-async/src/channel.rs similarity index 100% rename from public/rust/fuchsia-async/src/channel.rs rename to garnet/public/rust/fuchsia-async/src/channel.rs
diff --git a/public/rust/fuchsia-async/src/executor.rs b/garnet/public/rust/fuchsia-async/src/executor.rs similarity index 100% rename from public/rust/fuchsia-async/src/executor.rs rename to garnet/public/rust/fuchsia-async/src/executor.rs
diff --git a/public/rust/fuchsia-async/src/fifo.rs b/garnet/public/rust/fuchsia-async/src/fifo.rs similarity index 100% rename from public/rust/fuchsia-async/src/fifo.rs rename to garnet/public/rust/fuchsia-async/src/fifo.rs
diff --git a/public/rust/fuchsia-async/src/lib.rs b/garnet/public/rust/fuchsia-async/src/lib.rs similarity index 100% rename from public/rust/fuchsia-async/src/lib.rs rename to garnet/public/rust/fuchsia-async/src/lib.rs
diff --git a/public/rust/fuchsia-async/src/net/mod.rs b/garnet/public/rust/fuchsia-async/src/net/mod.rs similarity index 100% rename from public/rust/fuchsia-async/src/net/mod.rs rename to garnet/public/rust/fuchsia-async/src/net/mod.rs
diff --git a/public/rust/fuchsia-async/src/net/tcp.rs b/garnet/public/rust/fuchsia-async/src/net/tcp.rs similarity index 100% rename from public/rust/fuchsia-async/src/net/tcp.rs rename to garnet/public/rust/fuchsia-async/src/net/tcp.rs
diff --git a/public/rust/fuchsia-async/src/net/udp.rs b/garnet/public/rust/fuchsia-async/src/net/udp.rs similarity index 100% rename from public/rust/fuchsia-async/src/net/udp.rs rename to garnet/public/rust/fuchsia-async/src/net/udp.rs
diff --git a/public/rust/fuchsia-async/src/on_signals.rs b/garnet/public/rust/fuchsia-async/src/on_signals.rs similarity index 100% rename from public/rust/fuchsia-async/src/on_signals.rs rename to garnet/public/rust/fuchsia-async/src/on_signals.rs
diff --git a/public/rust/fuchsia-async/src/rwhandle.rs b/garnet/public/rust/fuchsia-async/src/rwhandle.rs similarity index 100% rename from public/rust/fuchsia-async/src/rwhandle.rs rename to garnet/public/rust/fuchsia-async/src/rwhandle.rs
diff --git a/public/rust/fuchsia-async/src/socket.rs b/garnet/public/rust/fuchsia-async/src/socket.rs similarity index 100% rename from public/rust/fuchsia-async/src/socket.rs rename to garnet/public/rust/fuchsia-async/src/socket.rs
diff --git a/public/rust/fuchsia-async/src/temp.rs b/garnet/public/rust/fuchsia-async/src/temp.rs similarity index 100% rename from public/rust/fuchsia-async/src/temp.rs rename to garnet/public/rust/fuchsia-async/src/temp.rs
diff --git a/public/rust/fuchsia-async/src/timer.rs b/garnet/public/rust/fuchsia-async/src/timer.rs similarity index 100% rename from public/rust/fuchsia-async/src/timer.rs rename to garnet/public/rust/fuchsia-async/src/timer.rs
diff --git a/public/rust/fuchsia-cobalt/BUILD.gn b/garnet/public/rust/fuchsia-cobalt/BUILD.gn similarity index 100% rename from public/rust/fuchsia-cobalt/BUILD.gn rename to garnet/public/rust/fuchsia-cobalt/BUILD.gn
diff --git a/public/rust/fuchsia-cobalt/src/lib.rs b/garnet/public/rust/fuchsia-cobalt/src/lib.rs similarity index 100% rename from public/rust/fuchsia-cobalt/src/lib.rs rename to garnet/public/rust/fuchsia-cobalt/src/lib.rs
diff --git a/public/rust/fuchsia-component/BUILD.gn b/garnet/public/rust/fuchsia-component/BUILD.gn similarity index 100% rename from public/rust/fuchsia-component/BUILD.gn rename to garnet/public/rust/fuchsia-component/BUILD.gn
diff --git a/public/rust/fuchsia-component/src/lib.rs b/garnet/public/rust/fuchsia-component/src/lib.rs similarity index 100% rename from public/rust/fuchsia-component/src/lib.rs rename to garnet/public/rust/fuchsia-component/src/lib.rs
diff --git a/public/rust/fuchsia-cprng/BUILD.gn b/garnet/public/rust/fuchsia-cprng/BUILD.gn similarity index 100% rename from public/rust/fuchsia-cprng/BUILD.gn rename to garnet/public/rust/fuchsia-cprng/BUILD.gn
diff --git a/public/rust/fuchsia-cprng/README.md b/garnet/public/rust/fuchsia-cprng/README.md similarity index 100% rename from public/rust/fuchsia-cprng/README.md rename to garnet/public/rust/fuchsia-cprng/README.md
diff --git a/public/rust/fuchsia-cprng/src/lib.rs b/garnet/public/rust/fuchsia-cprng/src/lib.rs similarity index 100% rename from public/rust/fuchsia-cprng/src/lib.rs rename to garnet/public/rust/fuchsia-cprng/src/lib.rs
diff --git a/public/rust/fuchsia-ddk/.gitignore b/garnet/public/rust/fuchsia-ddk/.gitignore similarity index 100% rename from public/rust/fuchsia-ddk/.gitignore rename to garnet/public/rust/fuchsia-ddk/.gitignore
diff --git a/public/rust/fuchsia-ddk/BUILD.gn b/garnet/public/rust/fuchsia-ddk/BUILD.gn similarity index 100% rename from public/rust/fuchsia-ddk/BUILD.gn rename to garnet/public/rust/fuchsia-ddk/BUILD.gn
diff --git a/public/rust/fuchsia-ddk/README.md b/garnet/public/rust/fuchsia-ddk/README.md similarity index 100% rename from public/rust/fuchsia-ddk/README.md rename to garnet/public/rust/fuchsia-ddk/README.md
diff --git a/public/rust/fuchsia-ddk/examples/ddk_toy/Cargo.toml b/garnet/public/rust/fuchsia-ddk/examples/ddk_toy/Cargo.toml similarity index 100% rename from public/rust/fuchsia-ddk/examples/ddk_toy/Cargo.toml rename to garnet/public/rust/fuchsia-ddk/examples/ddk_toy/Cargo.toml
diff --git a/public/rust/fuchsia-ddk/examples/ddk_toy/README.md b/garnet/public/rust/fuchsia-ddk/examples/ddk_toy/README.md similarity index 100% rename from public/rust/fuchsia-ddk/examples/ddk_toy/README.md rename to garnet/public/rust/fuchsia-ddk/examples/ddk_toy/README.md
diff --git a/public/rust/fuchsia-ddk/examples/ddk_toy/build.rs b/garnet/public/rust/fuchsia-ddk/examples/ddk_toy/build.rs similarity index 100% rename from public/rust/fuchsia-ddk/examples/ddk_toy/build.rs rename to garnet/public/rust/fuchsia-ddk/examples/ddk_toy/build.rs
diff --git a/public/rust/fuchsia-ddk/examples/ddk_toy/src/binding.c b/garnet/public/rust/fuchsia-ddk/examples/ddk_toy/src/binding.c similarity index 100% rename from public/rust/fuchsia-ddk/examples/ddk_toy/src/binding.c rename to garnet/public/rust/fuchsia-ddk/examples/ddk_toy/src/binding.c
diff --git a/public/rust/fuchsia-ddk/examples/ddk_toy/src/lib.rs b/garnet/public/rust/fuchsia-ddk/examples/ddk_toy/src/lib.rs similarity index 100% rename from public/rust/fuchsia-ddk/examples/ddk_toy/src/lib.rs rename to garnet/public/rust/fuchsia-ddk/examples/ddk_toy/src/lib.rs
diff --git a/public/rust/fuchsia-ddk/examples/microorb/Cargo.toml b/garnet/public/rust/fuchsia-ddk/examples/microorb/Cargo.toml similarity index 100% rename from public/rust/fuchsia-ddk/examples/microorb/Cargo.toml rename to garnet/public/rust/fuchsia-ddk/examples/microorb/Cargo.toml
diff --git a/public/rust/fuchsia-ddk/examples/microorb/build.rs b/garnet/public/rust/fuchsia-ddk/examples/microorb/build.rs similarity index 100% rename from public/rust/fuchsia-ddk/examples/microorb/build.rs rename to garnet/public/rust/fuchsia-ddk/examples/microorb/build.rs
diff --git a/public/rust/fuchsia-ddk/examples/microorb/src/binding.c b/garnet/public/rust/fuchsia-ddk/examples/microorb/src/binding.c similarity index 100% rename from public/rust/fuchsia-ddk/examples/microorb/src/binding.c rename to garnet/public/rust/fuchsia-ddk/examples/microorb/src/binding.c
diff --git a/public/rust/fuchsia-ddk/examples/microorb/src/lib.rs b/garnet/public/rust/fuchsia-ddk/examples/microorb/src/lib.rs similarity index 100% rename from public/rust/fuchsia-ddk/examples/microorb/src/lib.rs rename to garnet/public/rust/fuchsia-ddk/examples/microorb/src/lib.rs
diff --git a/public/rust/fuchsia-ddk/fuchsia-ddk-sys/BUILD.gn b/garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/BUILD.gn similarity index 100% rename from public/rust/fuchsia-ddk/fuchsia-ddk-sys/BUILD.gn rename to garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/BUILD.gn
diff --git a/public/rust/fuchsia-ddk/fuchsia-ddk-sys/Cargo.toml b/garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/Cargo.toml similarity index 100% rename from public/rust/fuchsia-ddk/fuchsia-ddk-sys/Cargo.toml rename to garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/Cargo.toml
diff --git a/public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs b/garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs similarity index 100% rename from public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs rename to garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs
diff --git a/public/rust/fuchsia-ddk/src/lib.rs b/garnet/public/rust/fuchsia-ddk/src/lib.rs similarity index 100% rename from public/rust/fuchsia-ddk/src/lib.rs rename to garnet/public/rust/fuchsia-ddk/src/lib.rs
diff --git a/public/rust/fuchsia-ddk/src/usb.rs b/garnet/public/rust/fuchsia-ddk/src/usb.rs similarity index 100% rename from public/rust/fuchsia-ddk/src/usb.rs rename to garnet/public/rust/fuchsia-ddk/src/usb.rs
diff --git a/public/rust/fuchsia-device/BUILD.gn b/garnet/public/rust/fuchsia-device/BUILD.gn similarity index 100% rename from public/rust/fuchsia-device/BUILD.gn rename to garnet/public/rust/fuchsia-device/BUILD.gn
diff --git a/public/rust/fuchsia-device/src/lib.rs b/garnet/public/rust/fuchsia-device/src/lib.rs similarity index 100% rename from public/rust/fuchsia-device/src/lib.rs rename to garnet/public/rust/fuchsia-device/src/lib.rs
diff --git a/public/rust/fuchsia-device/src/pty.rs b/garnet/public/rust/fuchsia-device/src/pty.rs similarity index 100% rename from public/rust/fuchsia-device/src/pty.rs rename to garnet/public/rust/fuchsia-device/src/pty.rs
diff --git a/public/rust/fuchsia-framebuffer/BUILD.gn b/garnet/public/rust/fuchsia-framebuffer/BUILD.gn similarity index 100% rename from public/rust/fuchsia-framebuffer/BUILD.gn rename to garnet/public/rust/fuchsia-framebuffer/BUILD.gn
diff --git a/public/rust/fuchsia-framebuffer/src/lib.rs b/garnet/public/rust/fuchsia-framebuffer/src/lib.rs similarity index 100% rename from public/rust/fuchsia-framebuffer/src/lib.rs rename to garnet/public/rust/fuchsia-framebuffer/src/lib.rs
diff --git a/public/rust/fuchsia-hyper/BUILD.gn b/garnet/public/rust/fuchsia-hyper/BUILD.gn similarity index 100% rename from public/rust/fuchsia-hyper/BUILD.gn rename to garnet/public/rust/fuchsia-hyper/BUILD.gn
diff --git a/public/rust/fuchsia-hyper/src/lib.rs b/garnet/public/rust/fuchsia-hyper/src/lib.rs similarity index 100% rename from public/rust/fuchsia-hyper/src/lib.rs rename to garnet/public/rust/fuchsia-hyper/src/lib.rs
diff --git a/public/rust/fuchsia-inspect/BUILD.gn b/garnet/public/rust/fuchsia-inspect/BUILD.gn similarity index 100% rename from public/rust/fuchsia-inspect/BUILD.gn rename to garnet/public/rust/fuchsia-inspect/BUILD.gn
diff --git a/public/rust/fuchsia-inspect/src/lib.rs b/garnet/public/rust/fuchsia-inspect/src/lib.rs similarity index 100% rename from public/rust/fuchsia-inspect/src/lib.rs rename to garnet/public/rust/fuchsia-inspect/src/lib.rs
diff --git a/public/rust/fuchsia-inspect/src/object.rs b/garnet/public/rust/fuchsia-inspect/src/object.rs similarity index 100% rename from public/rust/fuchsia-inspect/src/object.rs rename to garnet/public/rust/fuchsia-inspect/src/object.rs
diff --git a/public/rust/fuchsia-inspect/src/objectwrapper.rs b/garnet/public/rust/fuchsia-inspect/src/objectwrapper.rs similarity index 100% rename from public/rust/fuchsia-inspect/src/objectwrapper.rs rename to garnet/public/rust/fuchsia-inspect/src/objectwrapper.rs
diff --git a/public/rust/fuchsia-merkle/BUILD.gn b/garnet/public/rust/fuchsia-merkle/BUILD.gn similarity index 100% rename from public/rust/fuchsia-merkle/BUILD.gn rename to garnet/public/rust/fuchsia-merkle/BUILD.gn
diff --git a/public/rust/fuchsia-merkle/src/builder.rs b/garnet/public/rust/fuchsia-merkle/src/builder.rs similarity index 100% rename from public/rust/fuchsia-merkle/src/builder.rs rename to garnet/public/rust/fuchsia-merkle/src/builder.rs
diff --git a/public/rust/fuchsia-merkle/src/hash.rs b/garnet/public/rust/fuchsia-merkle/src/hash.rs similarity index 100% rename from public/rust/fuchsia-merkle/src/hash.rs rename to garnet/public/rust/fuchsia-merkle/src/hash.rs
diff --git a/public/rust/fuchsia-merkle/src/lib.rs b/garnet/public/rust/fuchsia-merkle/src/lib.rs similarity index 100% rename from public/rust/fuchsia-merkle/src/lib.rs rename to garnet/public/rust/fuchsia-merkle/src/lib.rs
diff --git a/public/rust/fuchsia-merkle/src/tree.rs b/garnet/public/rust/fuchsia-merkle/src/tree.rs similarity index 100% rename from public/rust/fuchsia-merkle/src/tree.rs rename to garnet/public/rust/fuchsia-merkle/src/tree.rs
diff --git a/public/rust/fuchsia-merkle/src/util.rs b/garnet/public/rust/fuchsia-merkle/src/util.rs similarity index 100% rename from public/rust/fuchsia-merkle/src/util.rs rename to garnet/public/rust/fuchsia-merkle/src/util.rs
diff --git a/public/rust/fuchsia-merkle/src/writer.rs b/garnet/public/rust/fuchsia-merkle/src/writer.rs similarity index 100% rename from public/rust/fuchsia-merkle/src/writer.rs rename to garnet/public/rust/fuchsia-merkle/src/writer.rs
diff --git a/public/rust/fuchsia-scenic/BUILD.gn b/garnet/public/rust/fuchsia-scenic/BUILD.gn similarity index 100% rename from public/rust/fuchsia-scenic/BUILD.gn rename to garnet/public/rust/fuchsia-scenic/BUILD.gn
diff --git a/public/rust/fuchsia-scenic/MAINTAINERS b/garnet/public/rust/fuchsia-scenic/MAINTAINERS similarity index 100% rename from public/rust/fuchsia-scenic/MAINTAINERS rename to garnet/public/rust/fuchsia-scenic/MAINTAINERS
diff --git a/public/rust/fuchsia-scenic/src/cmd.rs b/garnet/public/rust/fuchsia-scenic/src/cmd.rs similarity index 100% rename from public/rust/fuchsia-scenic/src/cmd.rs rename to garnet/public/rust/fuchsia-scenic/src/cmd.rs
diff --git a/public/rust/fuchsia-scenic/src/lib.rs b/garnet/public/rust/fuchsia-scenic/src/lib.rs similarity index 100% rename from public/rust/fuchsia-scenic/src/lib.rs rename to garnet/public/rust/fuchsia-scenic/src/lib.rs
diff --git a/public/rust/fuchsia-syslog-listener/BUILD.gn b/garnet/public/rust/fuchsia-syslog-listener/BUILD.gn similarity index 100% rename from public/rust/fuchsia-syslog-listener/BUILD.gn rename to garnet/public/rust/fuchsia-syslog-listener/BUILD.gn
diff --git a/public/rust/fuchsia-syslog-listener/src/lib.rs b/garnet/public/rust/fuchsia-syslog-listener/src/lib.rs similarity index 100% rename from public/rust/fuchsia-syslog-listener/src/lib.rs rename to garnet/public/rust/fuchsia-syslog-listener/src/lib.rs
diff --git a/public/rust/fuchsia-syslog/BUILD.gn b/garnet/public/rust/fuchsia-syslog/BUILD.gn similarity index 100% rename from public/rust/fuchsia-syslog/BUILD.gn rename to garnet/public/rust/fuchsia-syslog/BUILD.gn
diff --git a/public/rust/fuchsia-syslog/src/lib.rs b/garnet/public/rust/fuchsia-syslog/src/lib.rs similarity index 100% rename from public/rust/fuchsia-syslog/src/lib.rs rename to garnet/public/rust/fuchsia-syslog/src/lib.rs
diff --git a/public/rust/fuchsia-syslog/src/syslog.rs b/garnet/public/rust/fuchsia-syslog/src/syslog.rs similarity index 100% rename from public/rust/fuchsia-syslog/src/syslog.rs rename to garnet/public/rust/fuchsia-syslog/src/syslog.rs
diff --git a/public/rust/fuchsia-system-alloc/BUILD.gn b/garnet/public/rust/fuchsia-system-alloc/BUILD.gn similarity index 100% rename from public/rust/fuchsia-system-alloc/BUILD.gn rename to garnet/public/rust/fuchsia-system-alloc/BUILD.gn
diff --git a/public/rust/fuchsia-system-alloc/src/lib.rs b/garnet/public/rust/fuchsia-system-alloc/src/lib.rs similarity index 100% rename from public/rust/fuchsia-system-alloc/src/lib.rs rename to garnet/public/rust/fuchsia-system-alloc/src/lib.rs
diff --git a/public/rust/fuchsia-trace/BUILD.gn b/garnet/public/rust/fuchsia-trace/BUILD.gn similarity index 100% rename from public/rust/fuchsia-trace/BUILD.gn rename to garnet/public/rust/fuchsia-trace/BUILD.gn
diff --git a/public/rust/fuchsia-trace/README.md b/garnet/public/rust/fuchsia-trace/README.md similarity index 100% rename from public/rust/fuchsia-trace/README.md rename to garnet/public/rust/fuchsia-trace/README.md
diff --git a/public/rust/fuchsia-trace/src/lib.rs b/garnet/public/rust/fuchsia-trace/src/lib.rs similarity index 100% rename from public/rust/fuchsia-trace/src/lib.rs rename to garnet/public/rust/fuchsia-trace/src/lib.rs
diff --git a/public/rust/fuchsia-ui/BUILD.gn b/garnet/public/rust/fuchsia-ui/BUILD.gn similarity index 100% rename from public/rust/fuchsia-ui/BUILD.gn rename to garnet/public/rust/fuchsia-ui/BUILD.gn
diff --git a/public/rust/fuchsia-ui/MAINTAINERS b/garnet/public/rust/fuchsia-ui/MAINTAINERS similarity index 100% rename from public/rust/fuchsia-ui/MAINTAINERS rename to garnet/public/rust/fuchsia-ui/MAINTAINERS
diff --git a/public/rust/fuchsia-ui/README.md b/garnet/public/rust/fuchsia-ui/README.md similarity index 100% rename from public/rust/fuchsia-ui/README.md rename to garnet/public/rust/fuchsia-ui/README.md
diff --git a/public/rust/fuchsia-ui/meta/example.cmx b/garnet/public/rust/fuchsia-ui/meta/example.cmx similarity index 100% rename from public/rust/fuchsia-ui/meta/example.cmx rename to garnet/public/rust/fuchsia-ui/meta/example.cmx
diff --git a/public/rust/fuchsia-ui/src/app.rs b/garnet/public/rust/fuchsia-ui/src/app.rs similarity index 100% rename from public/rust/fuchsia-ui/src/app.rs rename to garnet/public/rust/fuchsia-ui/src/app.rs
diff --git a/public/rust/fuchsia-ui/src/canvas.rs b/garnet/public/rust/fuchsia-ui/src/canvas.rs similarity index 100% rename from public/rust/fuchsia-ui/src/canvas.rs rename to garnet/public/rust/fuchsia-ui/src/canvas.rs
diff --git a/public/rust/fuchsia-ui/src/lib.rs b/garnet/public/rust/fuchsia-ui/src/lib.rs similarity index 100% rename from public/rust/fuchsia-ui/src/lib.rs rename to garnet/public/rust/fuchsia-ui/src/lib.rs
diff --git a/public/rust/fuchsia-ui/src/view.rs b/garnet/public/rust/fuchsia-ui/src/view.rs similarity index 100% rename from public/rust/fuchsia-ui/src/view.rs rename to garnet/public/rust/fuchsia-ui/src/view.rs
diff --git a/public/rust/fuchsia-vfs/.gitignore b/garnet/public/rust/fuchsia-vfs/.gitignore similarity index 100% rename from public/rust/fuchsia-vfs/.gitignore rename to garnet/public/rust/fuchsia-vfs/.gitignore
diff --git a/public/rust/fuchsia-vfs/README.md b/garnet/public/rust/fuchsia-vfs/README.md similarity index 100% rename from public/rust/fuchsia-vfs/README.md rename to garnet/public/rust/fuchsia-vfs/README.md
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/BUILD.gn b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/BUILD.gn similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/BUILD.gn rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/BUILD.gn
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/common.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/common.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/common.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/common.rs
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory.rs
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory_entry.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory_entry.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory_entry.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/directory_entry.rs
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/file.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/file.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/file.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/file.rs
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/lib.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/lib.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/lib.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/lib.rs
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/test_utils.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/test_utils.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/test_utils.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/test_utils.rs
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/watcher_connection.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/watcher_connection.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/watcher_connection.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-pseudo-fs/src/watcher_connection.rs
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-watcher/BUILD.gn b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-watcher/BUILD.gn similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-watcher/BUILD.gn rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-watcher/BUILD.gn
diff --git a/public/rust/fuchsia-vfs/fuchsia-vfs-watcher/src/lib.rs b/garnet/public/rust/fuchsia-vfs/fuchsia-vfs-watcher/src/lib.rs similarity index 100% rename from public/rust/fuchsia-vfs/fuchsia-vfs-watcher/src/lib.rs rename to garnet/public/rust/fuchsia-vfs/fuchsia-vfs-watcher/src/lib.rs
diff --git a/public/rust/fuchsia-zircon/BUILD.gn b/garnet/public/rust/fuchsia-zircon/BUILD.gn similarity index 100% rename from public/rust/fuchsia-zircon/BUILD.gn rename to garnet/public/rust/fuchsia-zircon/BUILD.gn
diff --git a/public/rust/fuchsia-zircon/Cargo.toml b/garnet/public/rust/fuchsia-zircon/Cargo.toml similarity index 100% rename from public/rust/fuchsia-zircon/Cargo.toml rename to garnet/public/rust/fuchsia-zircon/Cargo.toml
diff --git a/public/rust/fuchsia-zircon/README.md b/garnet/public/rust/fuchsia-zircon/README.md similarity index 100% rename from public/rust/fuchsia-zircon/README.md rename to garnet/public/rust/fuchsia-zircon/README.md
diff --git a/public/rust/fuchsia-zircon/examples/BUILD.gn b/garnet/public/rust/fuchsia-zircon/examples/BUILD.gn similarity index 100% rename from public/rust/fuchsia-zircon/examples/BUILD.gn rename to garnet/public/rust/fuchsia-zircon/examples/BUILD.gn
diff --git a/public/rust/fuchsia-zircon/examples/zx_toy/BUILD.gn b/garnet/public/rust/fuchsia-zircon/examples/zx_toy/BUILD.gn similarity index 100% rename from public/rust/fuchsia-zircon/examples/zx_toy/BUILD.gn rename to garnet/public/rust/fuchsia-zircon/examples/zx_toy/BUILD.gn
diff --git a/public/rust/fuchsia-zircon/examples/zx_toy/Cargo.toml b/garnet/public/rust/fuchsia-zircon/examples/zx_toy/Cargo.toml similarity index 100% rename from public/rust/fuchsia-zircon/examples/zx_toy/Cargo.toml rename to garnet/public/rust/fuchsia-zircon/examples/zx_toy/Cargo.toml
diff --git a/public/rust/fuchsia-zircon/examples/zx_toy/src/main.rs b/garnet/public/rust/fuchsia-zircon/examples/zx_toy/src/main.rs similarity index 100% rename from public/rust/fuchsia-zircon/examples/zx_toy/src/main.rs rename to garnet/public/rust/fuchsia-zircon/examples/zx_toy/src/main.rs
diff --git a/public/rust/fuchsia-zircon/fuchsia-zircon-sys/BUILD.gn b/garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/BUILD.gn similarity index 100% rename from public/rust/fuchsia-zircon/fuchsia-zircon-sys/BUILD.gn rename to garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/BUILD.gn
diff --git a/public/rust/fuchsia-zircon/fuchsia-zircon-sys/Cargo.toml b/garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/Cargo.toml similarity index 100% rename from public/rust/fuchsia-zircon/fuchsia-zircon-sys/Cargo.toml rename to garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/Cargo.toml
diff --git a/public/rust/fuchsia-zircon/fuchsia-zircon-sys/examples/hello.rs b/garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/examples/hello.rs similarity index 100% rename from public/rust/fuchsia-zircon/fuchsia-zircon-sys/examples/hello.rs rename to garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/examples/hello.rs
diff --git a/public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/definitions.rs b/garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/definitions.rs similarity index 100% rename from public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/definitions.rs rename to garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/definitions.rs
diff --git a/public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/lib.rs b/garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/lib.rs similarity index 100% rename from public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/lib.rs rename to garnet/public/rust/fuchsia-zircon/fuchsia-zircon-sys/src/lib.rs
diff --git a/public/rust/fuchsia-zircon/src/channel.rs b/garnet/public/rust/fuchsia-zircon/src/channel.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/channel.rs rename to garnet/public/rust/fuchsia-zircon/src/channel.rs
diff --git a/public/rust/fuchsia-zircon/src/cprng.rs b/garnet/public/rust/fuchsia-zircon/src/cprng.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/cprng.rs rename to garnet/public/rust/fuchsia-zircon/src/cprng.rs
diff --git a/public/rust/fuchsia-zircon/src/event.rs b/garnet/public/rust/fuchsia-zircon/src/event.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/event.rs rename to garnet/public/rust/fuchsia-zircon/src/event.rs
diff --git a/public/rust/fuchsia-zircon/src/eventpair.rs b/garnet/public/rust/fuchsia-zircon/src/eventpair.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/eventpair.rs rename to garnet/public/rust/fuchsia-zircon/src/eventpair.rs
diff --git a/public/rust/fuchsia-zircon/src/fifo.rs b/garnet/public/rust/fuchsia-zircon/src/fifo.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/fifo.rs rename to garnet/public/rust/fuchsia-zircon/src/fifo.rs
diff --git a/public/rust/fuchsia-zircon/src/guest.rs b/garnet/public/rust/fuchsia-zircon/src/guest.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/guest.rs rename to garnet/public/rust/fuchsia-zircon/src/guest.rs
diff --git a/public/rust/fuchsia-zircon/src/handle.rs b/garnet/public/rust/fuchsia-zircon/src/handle.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/handle.rs rename to garnet/public/rust/fuchsia-zircon/src/handle.rs
diff --git a/public/rust/fuchsia-zircon/src/info.rs b/garnet/public/rust/fuchsia-zircon/src/info.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/info.rs rename to garnet/public/rust/fuchsia-zircon/src/info.rs
diff --git a/public/rust/fuchsia-zircon/src/interrupt.rs b/garnet/public/rust/fuchsia-zircon/src/interrupt.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/interrupt.rs rename to garnet/public/rust/fuchsia-zircon/src/interrupt.rs
diff --git a/public/rust/fuchsia-zircon/src/job.rs b/garnet/public/rust/fuchsia-zircon/src/job.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/job.rs rename to garnet/public/rust/fuchsia-zircon/src/job.rs
diff --git a/public/rust/fuchsia-zircon/src/lib.rs b/garnet/public/rust/fuchsia-zircon/src/lib.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/lib.rs rename to garnet/public/rust/fuchsia-zircon/src/lib.rs
diff --git a/public/rust/fuchsia-zircon/src/log.rs b/garnet/public/rust/fuchsia-zircon/src/log.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/log.rs rename to garnet/public/rust/fuchsia-zircon/src/log.rs
diff --git a/public/rust/fuchsia-zircon/src/port.rs b/garnet/public/rust/fuchsia-zircon/src/port.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/port.rs rename to garnet/public/rust/fuchsia-zircon/src/port.rs
diff --git a/public/rust/fuchsia-zircon/src/process.rs b/garnet/public/rust/fuchsia-zircon/src/process.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/process.rs rename to garnet/public/rust/fuchsia-zircon/src/process.rs
diff --git a/public/rust/fuchsia-zircon/src/property.rs b/garnet/public/rust/fuchsia-zircon/src/property.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/property.rs rename to garnet/public/rust/fuchsia-zircon/src/property.rs
diff --git a/public/rust/fuchsia-zircon/src/rights.rs b/garnet/public/rust/fuchsia-zircon/src/rights.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/rights.rs rename to garnet/public/rust/fuchsia-zircon/src/rights.rs
diff --git a/public/rust/fuchsia-zircon/src/signals.rs b/garnet/public/rust/fuchsia-zircon/src/signals.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/signals.rs rename to garnet/public/rust/fuchsia-zircon/src/signals.rs
diff --git a/public/rust/fuchsia-zircon/src/socket.rs b/garnet/public/rust/fuchsia-zircon/src/socket.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/socket.rs rename to garnet/public/rust/fuchsia-zircon/src/socket.rs
diff --git a/public/rust/fuchsia-zircon/src/status.rs b/garnet/public/rust/fuchsia-zircon/src/status.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/status.rs rename to garnet/public/rust/fuchsia-zircon/src/status.rs
diff --git a/public/rust/fuchsia-zircon/src/thread.rs b/garnet/public/rust/fuchsia-zircon/src/thread.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/thread.rs rename to garnet/public/rust/fuchsia-zircon/src/thread.rs
diff --git a/public/rust/fuchsia-zircon/src/time.rs b/garnet/public/rust/fuchsia-zircon/src/time.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/time.rs rename to garnet/public/rust/fuchsia-zircon/src/time.rs
diff --git a/public/rust/fuchsia-zircon/src/vmar.rs b/garnet/public/rust/fuchsia-zircon/src/vmar.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/vmar.rs rename to garnet/public/rust/fuchsia-zircon/src/vmar.rs
diff --git a/public/rust/fuchsia-zircon/src/vmo.rs b/garnet/public/rust/fuchsia-zircon/src/vmo.rs similarity index 100% rename from public/rust/fuchsia-zircon/src/vmo.rs rename to garnet/public/rust/fuchsia-zircon/src/vmo.rs
diff --git a/public/rust/fuchsia-zircon/tools/gen_status.py b/garnet/public/rust/fuchsia-zircon/tools/gen_status.py similarity index 100% rename from public/rust/fuchsia-zircon/tools/gen_status.py rename to garnet/public/rust/fuchsia-zircon/tools/gen_status.py
diff --git a/public/rust/mapped-vmo/BUILD.gn b/garnet/public/rust/mapped-vmo/BUILD.gn similarity index 100% rename from public/rust/mapped-vmo/BUILD.gn rename to garnet/public/rust/mapped-vmo/BUILD.gn
diff --git a/public/rust/mapped-vmo/MAINTAINERS b/garnet/public/rust/mapped-vmo/MAINTAINERS similarity index 100% rename from public/rust/mapped-vmo/MAINTAINERS rename to garnet/public/rust/mapped-vmo/MAINTAINERS
diff --git a/public/rust/mapped-vmo/src/lib.rs b/garnet/public/rust/mapped-vmo/src/lib.rs similarity index 100% rename from public/rust/mapped-vmo/src/lib.rs rename to garnet/public/rust/mapped-vmo/src/lib.rs
diff --git a/public/rust/mundane/BUILD.gn b/garnet/public/rust/mundane/BUILD.gn similarity index 100% rename from public/rust/mundane/BUILD.gn rename to garnet/public/rust/mundane/BUILD.gn
diff --git a/public/rust/mundane/CONTRIBUTING.md b/garnet/public/rust/mundane/CONTRIBUTING.md similarity index 100% rename from public/rust/mundane/CONTRIBUTING.md rename to garnet/public/rust/mundane/CONTRIBUTING.md
diff --git a/public/rust/mundane/DESIGN.md b/garnet/public/rust/mundane/DESIGN.md similarity index 100% rename from public/rust/mundane/DESIGN.md rename to garnet/public/rust/mundane/DESIGN.md
diff --git a/public/rust/mundane/MAINTAINERS b/garnet/public/rust/mundane/MAINTAINERS similarity index 100% rename from public/rust/mundane/MAINTAINERS rename to garnet/public/rust/mundane/MAINTAINERS
diff --git a/public/rust/mundane/README.md b/garnet/public/rust/mundane/README.md similarity index 100% rename from public/rust/mundane/README.md rename to garnet/public/rust/mundane/README.md
diff --git a/public/rust/mundane/src/boringssl/abort.rs b/garnet/public/rust/mundane/src/boringssl/abort.rs similarity index 100% rename from public/rust/mundane/src/boringssl/abort.rs rename to garnet/public/rust/mundane/src/boringssl/abort.rs
diff --git a/public/rust/mundane/src/boringssl/mod.rs b/garnet/public/rust/mundane/src/boringssl/mod.rs similarity index 100% rename from public/rust/mundane/src/boringssl/mod.rs rename to garnet/public/rust/mundane/src/boringssl/mod.rs
diff --git a/public/rust/mundane/src/boringssl/raw.rs b/garnet/public/rust/mundane/src/boringssl/raw.rs similarity index 100% rename from public/rust/mundane/src/boringssl/raw.rs rename to garnet/public/rust/mundane/src/boringssl/raw.rs
diff --git a/public/rust/mundane/src/boringssl/wrapper.rs b/garnet/public/rust/mundane/src/boringssl/wrapper.rs similarity index 100% rename from public/rust/mundane/src/boringssl/wrapper.rs rename to garnet/public/rust/mundane/src/boringssl/wrapper.rs
diff --git a/public/rust/mundane/src/hash.rs b/garnet/public/rust/mundane/src/hash.rs similarity index 100% rename from public/rust/mundane/src/hash.rs rename to garnet/public/rust/mundane/src/hash.rs
diff --git a/public/rust/mundane/src/hmac.rs b/garnet/public/rust/mundane/src/hmac.rs similarity index 100% rename from public/rust/mundane/src/hmac.rs rename to garnet/public/rust/mundane/src/hmac.rs
diff --git a/public/rust/mundane/src/insecure.rs b/garnet/public/rust/mundane/src/insecure.rs similarity index 100% rename from public/rust/mundane/src/insecure.rs rename to garnet/public/rust/mundane/src/insecure.rs
diff --git a/public/rust/mundane/src/kdf.rs b/garnet/public/rust/mundane/src/kdf.rs similarity index 100% rename from public/rust/mundane/src/kdf.rs rename to garnet/public/rust/mundane/src/kdf.rs
diff --git a/public/rust/mundane/src/lib.rs b/garnet/public/rust/mundane/src/lib.rs similarity index 100% rename from public/rust/mundane/src/lib.rs rename to garnet/public/rust/mundane/src/lib.rs
diff --git a/public/rust/mundane/src/password.rs b/garnet/public/rust/mundane/src/password.rs similarity index 100% rename from public/rust/mundane/src/password.rs rename to garnet/public/rust/mundane/src/password.rs
diff --git a/public/rust/mundane/src/public/ec/curve.rs b/garnet/public/rust/mundane/src/public/ec/curve.rs similarity index 100% rename from public/rust/mundane/src/public/ec/curve.rs rename to garnet/public/rust/mundane/src/public/ec/curve.rs
diff --git a/public/rust/mundane/src/public/ec/mod.rs b/garnet/public/rust/mundane/src/public/ec/mod.rs similarity index 100% rename from public/rust/mundane/src/public/ec/mod.rs rename to garnet/public/rust/mundane/src/public/ec/mod.rs
diff --git a/public/rust/mundane/src/public/ed25519.rs b/garnet/public/rust/mundane/src/public/ed25519.rs similarity index 100% rename from public/rust/mundane/src/public/ed25519.rs rename to garnet/public/rust/mundane/src/public/ed25519.rs
diff --git a/public/rust/mundane/src/public/mod.rs b/garnet/public/rust/mundane/src/public/mod.rs similarity index 100% rename from public/rust/mundane/src/public/mod.rs rename to garnet/public/rust/mundane/src/public/mod.rs
diff --git a/public/rust/mundane/src/util.rs b/garnet/public/rust/mundane/src/util.rs similarity index 100% rename from public/rust/mundane/src/util.rs rename to garnet/public/rust/mundane/src/util.rs
diff --git a/public/rust/packet/BUILD.gn b/garnet/public/rust/packet/BUILD.gn similarity index 100% rename from public/rust/packet/BUILD.gn rename to garnet/public/rust/packet/BUILD.gn
diff --git a/public/rust/packet/src/lib.rs b/garnet/public/rust/packet/src/lib.rs similarity index 100% rename from public/rust/packet/src/lib.rs rename to garnet/public/rust/packet/src/lib.rs
diff --git a/public/rust/packet/src/serialize.rs b/garnet/public/rust/packet/src/serialize.rs similarity index 100% rename from public/rust/packet/src/serialize.rs rename to garnet/public/rust/packet/src/serialize.rs
diff --git a/public/rust/shared-buffer/BUILD.gn b/garnet/public/rust/shared-buffer/BUILD.gn similarity index 100% rename from public/rust/shared-buffer/BUILD.gn rename to garnet/public/rust/shared-buffer/BUILD.gn
diff --git a/public/rust/shared-buffer/MAINTAINERS b/garnet/public/rust/shared-buffer/MAINTAINERS similarity index 100% rename from public/rust/shared-buffer/MAINTAINERS rename to garnet/public/rust/shared-buffer/MAINTAINERS
diff --git a/public/rust/shared-buffer/src/lib.rs b/garnet/public/rust/shared-buffer/src/lib.rs similarity index 100% rename from public/rust/shared-buffer/src/lib.rs rename to garnet/public/rust/shared-buffer/src/lib.rs
diff --git a/public/rust/tuf/BUILD.gn b/garnet/public/rust/tuf/BUILD.gn similarity index 100% rename from public/rust/tuf/BUILD.gn rename to garnet/public/rust/tuf/BUILD.gn
diff --git a/public/rust/zerocopy/BUILD.gn b/garnet/public/rust/zerocopy/BUILD.gn similarity index 100% rename from public/rust/zerocopy/BUILD.gn rename to garnet/public/rust/zerocopy/BUILD.gn
diff --git a/public/rust/zerocopy/Cargo.toml.crates-io b/garnet/public/rust/zerocopy/Cargo.toml.crates-io similarity index 100% rename from public/rust/zerocopy/Cargo.toml.crates-io rename to garnet/public/rust/zerocopy/Cargo.toml.crates-io
diff --git a/public/rust/zerocopy/MAINTAINERS b/garnet/public/rust/zerocopy/MAINTAINERS similarity index 100% rename from public/rust/zerocopy/MAINTAINERS rename to garnet/public/rust/zerocopy/MAINTAINERS
diff --git a/public/rust/zerocopy/src/lib.rs b/garnet/public/rust/zerocopy/src/lib.rs similarity index 100% rename from public/rust/zerocopy/src/lib.rs rename to garnet/public/rust/zerocopy/src/lib.rs
diff --git a/public/sdk/BUILD.gn b/garnet/public/sdk/BUILD.gn similarity index 100% rename from public/sdk/BUILD.gn rename to garnet/public/sdk/BUILD.gn
diff --git a/public/sdk/docs/BUILD.gn b/garnet/public/sdk/docs/BUILD.gn similarity index 100% rename from public/sdk/docs/BUILD.gn rename to garnet/public/sdk/docs/BUILD.gn
diff --git a/public/sdk/docs/bootserver.md b/garnet/public/sdk/docs/bootserver.md similarity index 100% rename from public/sdk/docs/bootserver.md rename to garnet/public/sdk/docs/bootserver.md
diff --git a/public/sdk/docs/device_discovery.md b/garnet/public/sdk/docs/device_discovery.md similarity index 100% rename from public/sdk/docs/device_discovery.md rename to garnet/public/sdk/docs/device_discovery.md
diff --git a/public/sdk/docs/devices.md b/garnet/public/sdk/docs/devices.md similarity index 100% rename from public/sdk/docs/devices.md rename to garnet/public/sdk/docs/devices.md
diff --git a/public/sdk/docs/logging.md b/garnet/public/sdk/docs/logging.md similarity index 100% rename from public/sdk/docs/logging.md rename to garnet/public/sdk/docs/logging.md
diff --git a/public/sdk/docs/packages.md b/garnet/public/sdk/docs/packages.md similarity index 100% rename from public/sdk/docs/packages.md rename to garnet/public/sdk/docs/packages.md
diff --git a/public/sdk/docs/ssh.md b/garnet/public/sdk/docs/ssh.md similarity index 100% rename from public/sdk/docs/ssh.md rename to garnet/public/sdk/docs/ssh.md
diff --git a/rustfmt.toml b/garnet/rustfmt.toml similarity index 100% rename from rustfmt.toml rename to garnet/rustfmt.toml
diff --git a/test_data/media/third_party/.gitignore b/garnet/test_data/media/third_party/.gitignore similarity index 100% rename from test_data/media/third_party/.gitignore rename to garnet/test_data/media/third_party/.gitignore
diff --git a/testing/runbenchmarks/BUILD.gn b/garnet/testing/runbenchmarks/BUILD.gn similarity index 100% rename from testing/runbenchmarks/BUILD.gn rename to garnet/testing/runbenchmarks/BUILD.gn
diff --git a/testing/runbenchmarks/MAINTAINERS b/garnet/testing/runbenchmarks/MAINTAINERS similarity index 100% rename from testing/runbenchmarks/MAINTAINERS rename to garnet/testing/runbenchmarks/MAINTAINERS
diff --git a/testing/runbenchmarks/README.md b/garnet/testing/runbenchmarks/README.md similarity index 100% rename from testing/runbenchmarks/README.md rename to garnet/testing/runbenchmarks/README.md
diff --git a/testing/runbenchmarks/runbenchmarks.sh b/garnet/testing/runbenchmarks/runbenchmarks.sh similarity index 100% rename from testing/runbenchmarks/runbenchmarks.sh rename to garnet/testing/runbenchmarks/runbenchmarks.sh
diff --git a/tests/benchmarks/BUILD.gn b/garnet/tests/benchmarks/BUILD.gn similarity index 100% rename from tests/benchmarks/BUILD.gn rename to garnet/tests/benchmarks/BUILD.gn
diff --git a/tests/benchmarks/MAINTAINERS b/garnet/tests/benchmarks/MAINTAINERS similarity index 100% rename from tests/benchmarks/MAINTAINERS rename to garnet/tests/benchmarks/MAINTAINERS
diff --git a/tests/benchmarks/benchmarks.sh b/garnet/tests/benchmarks/benchmarks.sh similarity index 100% rename from tests/benchmarks/benchmarks.sh rename to garnet/tests/benchmarks/benchmarks.sh
diff --git a/tests/benchmarks/gfx_benchmarks.sh b/garnet/tests/benchmarks/gfx_benchmarks.sh similarity index 100% rename from tests/benchmarks/gfx_benchmarks.sh rename to garnet/tests/benchmarks/gfx_benchmarks.sh
diff --git a/tests/fidl-changes/BUILD.gn b/garnet/tests/fidl-changes/BUILD.gn similarity index 100% rename from tests/fidl-changes/BUILD.gn rename to garnet/tests/fidl-changes/BUILD.gn
diff --git a/tests/fidl-changes/README.md b/garnet/tests/fidl-changes/README.md similarity index 100% rename from tests/fidl-changes/README.md rename to garnet/tests/fidl-changes/README.md
diff --git a/tests/fidl-changes/cpp/after.cc b/garnet/tests/fidl-changes/cpp/after.cc similarity index 100% rename from tests/fidl-changes/cpp/after.cc rename to garnet/tests/fidl-changes/cpp/after.cc
diff --git a/tests/fidl-changes/cpp/before.cc b/garnet/tests/fidl-changes/cpp/before.cc similarity index 100% rename from tests/fidl-changes/cpp/before.cc rename to garnet/tests/fidl-changes/cpp/before.cc
diff --git a/tests/fidl-changes/fidl/after.fidl b/garnet/tests/fidl-changes/fidl/after.fidl similarity index 100% rename from tests/fidl-changes/fidl/after.fidl rename to garnet/tests/fidl-changes/fidl/after.fidl
diff --git a/tests/fidl-changes/fidl/before.fidl b/garnet/tests/fidl-changes/fidl/before.fidl similarity index 100% rename from tests/fidl-changes/fidl/before.fidl rename to garnet/tests/fidl-changes/fidl/before.fidl
diff --git a/tests/fidl-changes/fidl/during.fidl b/garnet/tests/fidl-changes/fidl/during.fidl similarity index 100% rename from tests/fidl-changes/fidl/during.fidl rename to garnet/tests/fidl-changes/fidl/during.fidl
diff --git a/tests/fidl-changes/go/BUILD.gn b/garnet/tests/fidl-changes/go/BUILD.gn similarity index 100% rename from tests/fidl-changes/go/BUILD.gn rename to garnet/tests/fidl-changes/go/BUILD.gn
diff --git a/tests/fidl-changes/go/client_1_before.go b/garnet/tests/fidl-changes/go/client_1_before.go similarity index 100% rename from tests/fidl-changes/go/client_1_before.go rename to garnet/tests/fidl-changes/go/client_1_before.go
diff --git a/tests/fidl-changes/go/client_2_before_during.go b/garnet/tests/fidl-changes/go/client_2_before_during.go similarity index 100% rename from tests/fidl-changes/go/client_2_before_during.go rename to garnet/tests/fidl-changes/go/client_2_before_during.go
diff --git a/tests/fidl-changes/go/client_3_after_during.go b/garnet/tests/fidl-changes/go/client_3_after_during.go similarity index 100% rename from tests/fidl-changes/go/client_3_after_during.go rename to garnet/tests/fidl-changes/go/client_3_after_during.go
diff --git a/tests/fidl-changes/go/client_4_after.go b/garnet/tests/fidl-changes/go/client_4_after.go similarity index 100% rename from tests/fidl-changes/go/client_4_after.go rename to garnet/tests/fidl-changes/go/client_4_after.go
diff --git a/tests/fidl-changes/go/main.go b/garnet/tests/fidl-changes/go/main.go similarity index 100% rename from tests/fidl-changes/go/main.go rename to garnet/tests/fidl-changes/go/main.go
diff --git a/tests/fidl-changes/go/server_1_before.go b/garnet/tests/fidl-changes/go/server_1_before.go similarity index 100% rename from tests/fidl-changes/go/server_1_before.go rename to garnet/tests/fidl-changes/go/server_1_before.go
diff --git a/tests/fidl-changes/go/server_2_before_during.go b/garnet/tests/fidl-changes/go/server_2_before_during.go similarity index 100% rename from tests/fidl-changes/go/server_2_before_during.go rename to garnet/tests/fidl-changes/go/server_2_before_during.go
diff --git a/tests/fidl-changes/go/server_3_after_during.go b/garnet/tests/fidl-changes/go/server_3_after_during.go similarity index 100% rename from tests/fidl-changes/go/server_3_after_during.go rename to garnet/tests/fidl-changes/go/server_3_after_during.go
diff --git a/tests/fidl-changes/go/server_4_after.go b/garnet/tests/fidl-changes/go/server_4_after.go similarity index 100% rename from tests/fidl-changes/go/server_4_after.go rename to garnet/tests/fidl-changes/go/server_4_after.go
diff --git a/tests/fidl-changes/go/update-during.sh b/garnet/tests/fidl-changes/go/update-during.sh similarity index 100% rename from tests/fidl-changes/go/update-during.sh rename to garnet/tests/fidl-changes/go/update-during.sh
diff --git a/tests/fidl-changes/rust/BUILD.gn b/garnet/tests/fidl-changes/rust/BUILD.gn similarity index 100% rename from tests/fidl-changes/rust/BUILD.gn rename to garnet/tests/fidl-changes/rust/BUILD.gn
diff --git a/tests/fidl-changes/rust/src/after.rs b/garnet/tests/fidl-changes/rust/src/after.rs similarity index 100% rename from tests/fidl-changes/rust/src/after.rs rename to garnet/tests/fidl-changes/rust/src/after.rs
diff --git a/tests/fidl-changes/rust/src/before.rs b/garnet/tests/fidl-changes/rust/src/before.rs similarity index 100% rename from tests/fidl-changes/rust/src/before.rs rename to garnet/tests/fidl-changes/rust/src/before.rs
diff --git a/tests/fidl-changes/rust/src/during.rs b/garnet/tests/fidl-changes/rust/src/during.rs similarity index 100% rename from tests/fidl-changes/rust/src/during.rs rename to garnet/tests/fidl-changes/rust/src/during.rs
diff --git a/tests/fidl-changes/rust/src/main.rs b/garnet/tests/fidl-changes/rust/src/main.rs similarity index 100% rename from tests/fidl-changes/rust/src/main.rs rename to garnet/tests/fidl-changes/rust/src/main.rs
diff --git a/tests/zircon/BUILD.gn b/garnet/tests/zircon/BUILD.gn similarity index 100% rename from tests/zircon/BUILD.gn rename to garnet/tests/zircon/BUILD.gn
diff --git a/third_party/libunwindstack/ArmExidx.cpp b/garnet/third_party/libunwindstack/ArmExidx.cpp similarity index 100% rename from third_party/libunwindstack/ArmExidx.cpp rename to garnet/third_party/libunwindstack/ArmExidx.cpp
diff --git a/third_party/libunwindstack/ArmExidx.h b/garnet/third_party/libunwindstack/ArmExidx.h similarity index 100% rename from third_party/libunwindstack/ArmExidx.h rename to garnet/third_party/libunwindstack/ArmExidx.h
diff --git a/third_party/libunwindstack/AsmGetRegsMips.S b/garnet/third_party/libunwindstack/AsmGetRegsMips.S similarity index 100% rename from third_party/libunwindstack/AsmGetRegsMips.S rename to garnet/third_party/libunwindstack/AsmGetRegsMips.S
diff --git a/third_party/libunwindstack/AsmGetRegsMips64.S b/garnet/third_party/libunwindstack/AsmGetRegsMips64.S similarity index 100% rename from third_party/libunwindstack/AsmGetRegsMips64.S rename to garnet/third_party/libunwindstack/AsmGetRegsMips64.S
diff --git a/third_party/libunwindstack/AsmGetRegsX86.S b/garnet/third_party/libunwindstack/AsmGetRegsX86.S similarity index 100% rename from third_party/libunwindstack/AsmGetRegsX86.S rename to garnet/third_party/libunwindstack/AsmGetRegsX86.S
diff --git a/third_party/libunwindstack/AsmGetRegsX86_64.S b/garnet/third_party/libunwindstack/AsmGetRegsX86_64.S similarity index 100% rename from third_party/libunwindstack/AsmGetRegsX86_64.S rename to garnet/third_party/libunwindstack/AsmGetRegsX86_64.S
diff --git a/third_party/libunwindstack/BUILD.gn b/garnet/third_party/libunwindstack/BUILD.gn similarity index 100% rename from third_party/libunwindstack/BUILD.gn rename to garnet/third_party/libunwindstack/BUILD.gn
diff --git a/third_party/libunwindstack/Check.h b/garnet/third_party/libunwindstack/Check.h similarity index 100% rename from third_party/libunwindstack/Check.h rename to garnet/third_party/libunwindstack/Check.h
diff --git a/third_party/libunwindstack/DexFile.cpp b/garnet/third_party/libunwindstack/DexFile.cpp similarity index 100% rename from third_party/libunwindstack/DexFile.cpp rename to garnet/third_party/libunwindstack/DexFile.cpp
diff --git a/third_party/libunwindstack/DexFile.h b/garnet/third_party/libunwindstack/DexFile.h similarity index 100% rename from third_party/libunwindstack/DexFile.h rename to garnet/third_party/libunwindstack/DexFile.h
diff --git a/third_party/libunwindstack/DexFiles.cpp b/garnet/third_party/libunwindstack/DexFiles.cpp similarity index 100% rename from third_party/libunwindstack/DexFiles.cpp rename to garnet/third_party/libunwindstack/DexFiles.cpp
diff --git a/third_party/libunwindstack/DwarfCfa.cpp b/garnet/third_party/libunwindstack/DwarfCfa.cpp similarity index 100% rename from third_party/libunwindstack/DwarfCfa.cpp rename to garnet/third_party/libunwindstack/DwarfCfa.cpp
diff --git a/third_party/libunwindstack/DwarfCfa.h b/garnet/third_party/libunwindstack/DwarfCfa.h similarity index 100% rename from third_party/libunwindstack/DwarfCfa.h rename to garnet/third_party/libunwindstack/DwarfCfa.h
diff --git a/third_party/libunwindstack/DwarfDebugFrame.h b/garnet/third_party/libunwindstack/DwarfDebugFrame.h similarity index 100% rename from third_party/libunwindstack/DwarfDebugFrame.h rename to garnet/third_party/libunwindstack/DwarfDebugFrame.h
diff --git a/third_party/libunwindstack/DwarfEhFrame.h b/garnet/third_party/libunwindstack/DwarfEhFrame.h similarity index 100% rename from third_party/libunwindstack/DwarfEhFrame.h rename to garnet/third_party/libunwindstack/DwarfEhFrame.h
diff --git a/third_party/libunwindstack/DwarfEhFrameWithHdr.cpp b/garnet/third_party/libunwindstack/DwarfEhFrameWithHdr.cpp similarity index 100% rename from third_party/libunwindstack/DwarfEhFrameWithHdr.cpp rename to garnet/third_party/libunwindstack/DwarfEhFrameWithHdr.cpp
diff --git a/third_party/libunwindstack/DwarfEhFrameWithHdr.h b/garnet/third_party/libunwindstack/DwarfEhFrameWithHdr.h similarity index 100% rename from third_party/libunwindstack/DwarfEhFrameWithHdr.h rename to garnet/third_party/libunwindstack/DwarfEhFrameWithHdr.h
diff --git a/third_party/libunwindstack/DwarfEncoding.h b/garnet/third_party/libunwindstack/DwarfEncoding.h similarity index 100% rename from third_party/libunwindstack/DwarfEncoding.h rename to garnet/third_party/libunwindstack/DwarfEncoding.h
diff --git a/third_party/libunwindstack/DwarfMemory.cpp b/garnet/third_party/libunwindstack/DwarfMemory.cpp similarity index 100% rename from third_party/libunwindstack/DwarfMemory.cpp rename to garnet/third_party/libunwindstack/DwarfMemory.cpp
diff --git a/third_party/libunwindstack/DwarfOp.cpp b/garnet/third_party/libunwindstack/DwarfOp.cpp similarity index 100% rename from third_party/libunwindstack/DwarfOp.cpp rename to garnet/third_party/libunwindstack/DwarfOp.cpp
diff --git a/third_party/libunwindstack/DwarfOp.h b/garnet/third_party/libunwindstack/DwarfOp.h similarity index 100% rename from third_party/libunwindstack/DwarfOp.h rename to garnet/third_party/libunwindstack/DwarfOp.h
diff --git a/third_party/libunwindstack/DwarfSection.cpp b/garnet/third_party/libunwindstack/DwarfSection.cpp similarity index 100% rename from third_party/libunwindstack/DwarfSection.cpp rename to garnet/third_party/libunwindstack/DwarfSection.cpp
diff --git a/third_party/libunwindstack/Elf.cpp b/garnet/third_party/libunwindstack/Elf.cpp similarity index 100% rename from third_party/libunwindstack/Elf.cpp rename to garnet/third_party/libunwindstack/Elf.cpp
diff --git a/third_party/libunwindstack/ElfInterface.cpp b/garnet/third_party/libunwindstack/ElfInterface.cpp similarity index 100% rename from third_party/libunwindstack/ElfInterface.cpp rename to garnet/third_party/libunwindstack/ElfInterface.cpp
diff --git a/third_party/libunwindstack/ElfInterfaceArm.cpp b/garnet/third_party/libunwindstack/ElfInterfaceArm.cpp similarity index 100% rename from third_party/libunwindstack/ElfInterfaceArm.cpp rename to garnet/third_party/libunwindstack/ElfInterfaceArm.cpp
diff --git a/third_party/libunwindstack/ElfInterfaceArm.h b/garnet/third_party/libunwindstack/ElfInterfaceArm.h similarity index 100% rename from third_party/libunwindstack/ElfInterfaceArm.h rename to garnet/third_party/libunwindstack/ElfInterfaceArm.h
diff --git a/third_party/libunwindstack/Global.cpp b/garnet/third_party/libunwindstack/Global.cpp similarity index 100% rename from third_party/libunwindstack/Global.cpp rename to garnet/third_party/libunwindstack/Global.cpp
diff --git a/third_party/libunwindstack/JitDebug.cpp b/garnet/third_party/libunwindstack/JitDebug.cpp similarity index 100% rename from third_party/libunwindstack/JitDebug.cpp rename to garnet/third_party/libunwindstack/JitDebug.cpp
diff --git a/third_party/libunwindstack/LocalUnwinder.cpp b/garnet/third_party/libunwindstack/LocalUnwinder.cpp similarity index 100% rename from third_party/libunwindstack/LocalUnwinder.cpp rename to garnet/third_party/libunwindstack/LocalUnwinder.cpp
diff --git a/third_party/libunwindstack/Log.cpp b/garnet/third_party/libunwindstack/Log.cpp similarity index 100% rename from third_party/libunwindstack/Log.cpp rename to garnet/third_party/libunwindstack/Log.cpp
diff --git a/third_party/libunwindstack/MapInfo.cpp b/garnet/third_party/libunwindstack/MapInfo.cpp similarity index 100% rename from third_party/libunwindstack/MapInfo.cpp rename to garnet/third_party/libunwindstack/MapInfo.cpp
diff --git a/third_party/libunwindstack/Maps.cpp b/garnet/third_party/libunwindstack/Maps.cpp similarity index 100% rename from third_party/libunwindstack/Maps.cpp rename to garnet/third_party/libunwindstack/Maps.cpp
diff --git a/third_party/libunwindstack/Memory.cpp b/garnet/third_party/libunwindstack/Memory.cpp similarity index 100% rename from third_party/libunwindstack/Memory.cpp rename to garnet/third_party/libunwindstack/Memory.cpp
diff --git a/third_party/libunwindstack/NOTICE b/garnet/third_party/libunwindstack/NOTICE similarity index 100% rename from third_party/libunwindstack/NOTICE rename to garnet/third_party/libunwindstack/NOTICE
diff --git a/third_party/libunwindstack/README.fuchsia b/garnet/third_party/libunwindstack/README.fuchsia similarity index 100% rename from third_party/libunwindstack/README.fuchsia rename to garnet/third_party/libunwindstack/README.fuchsia
diff --git a/third_party/libunwindstack/Regs.cpp b/garnet/third_party/libunwindstack/Regs.cpp similarity index 100% rename from third_party/libunwindstack/Regs.cpp rename to garnet/third_party/libunwindstack/Regs.cpp
diff --git a/third_party/libunwindstack/RegsArm.cpp b/garnet/third_party/libunwindstack/RegsArm.cpp similarity index 100% rename from third_party/libunwindstack/RegsArm.cpp rename to garnet/third_party/libunwindstack/RegsArm.cpp
diff --git a/third_party/libunwindstack/RegsArm64.cpp b/garnet/third_party/libunwindstack/RegsArm64.cpp similarity index 100% rename from third_party/libunwindstack/RegsArm64.cpp rename to garnet/third_party/libunwindstack/RegsArm64.cpp
diff --git a/third_party/libunwindstack/RegsInfo.h b/garnet/third_party/libunwindstack/RegsInfo.h similarity index 100% rename from third_party/libunwindstack/RegsInfo.h rename to garnet/third_party/libunwindstack/RegsInfo.h
diff --git a/third_party/libunwindstack/RegsMips.cpp b/garnet/third_party/libunwindstack/RegsMips.cpp similarity index 100% rename from third_party/libunwindstack/RegsMips.cpp rename to garnet/third_party/libunwindstack/RegsMips.cpp
diff --git a/third_party/libunwindstack/RegsMips64.cpp b/garnet/third_party/libunwindstack/RegsMips64.cpp similarity index 100% rename from third_party/libunwindstack/RegsMips64.cpp rename to garnet/third_party/libunwindstack/RegsMips64.cpp
diff --git a/third_party/libunwindstack/RegsX86.cpp b/garnet/third_party/libunwindstack/RegsX86.cpp similarity index 100% rename from third_party/libunwindstack/RegsX86.cpp rename to garnet/third_party/libunwindstack/RegsX86.cpp
diff --git a/third_party/libunwindstack/RegsX86_64.cpp b/garnet/third_party/libunwindstack/RegsX86_64.cpp similarity index 100% rename from third_party/libunwindstack/RegsX86_64.cpp rename to garnet/third_party/libunwindstack/RegsX86_64.cpp
diff --git a/third_party/libunwindstack/Symbols.cpp b/garnet/third_party/libunwindstack/Symbols.cpp similarity index 100% rename from third_party/libunwindstack/Symbols.cpp rename to garnet/third_party/libunwindstack/Symbols.cpp
diff --git a/third_party/libunwindstack/Symbols.h b/garnet/third_party/libunwindstack/Symbols.h similarity index 100% rename from third_party/libunwindstack/Symbols.h rename to garnet/third_party/libunwindstack/Symbols.h
diff --git a/third_party/libunwindstack/Unwinder.cpp b/garnet/third_party/libunwindstack/Unwinder.cpp similarity index 100% rename from third_party/libunwindstack/Unwinder.cpp rename to garnet/third_party/libunwindstack/Unwinder.cpp
diff --git a/third_party/libunwindstack/benchmarks/unwind_benchmarks.cpp b/garnet/third_party/libunwindstack/benchmarks/unwind_benchmarks.cpp similarity index 100% rename from third_party/libunwindstack/benchmarks/unwind_benchmarks.cpp rename to garnet/third_party/libunwindstack/benchmarks/unwind_benchmarks.cpp
diff --git a/third_party/libunwindstack/fuchsia/LogFuchsia.cpp b/garnet/third_party/libunwindstack/fuchsia/LogFuchsia.cpp similarity index 100% rename from third_party/libunwindstack/fuchsia/LogFuchsia.cpp rename to garnet/third_party/libunwindstack/fuchsia/LogFuchsia.cpp
diff --git a/third_party/libunwindstack/fuchsia/MapsFuchsia.cpp b/garnet/third_party/libunwindstack/fuchsia/MapsFuchsia.cpp similarity index 100% rename from third_party/libunwindstack/fuchsia/MapsFuchsia.cpp rename to garnet/third_party/libunwindstack/fuchsia/MapsFuchsia.cpp
diff --git a/third_party/libunwindstack/fuchsia/MemoryFuchsia.cpp b/garnet/third_party/libunwindstack/fuchsia/MemoryFuchsia.cpp similarity index 100% rename from third_party/libunwindstack/fuchsia/MemoryFuchsia.cpp rename to garnet/third_party/libunwindstack/fuchsia/MemoryFuchsia.cpp
diff --git a/third_party/libunwindstack/fuchsia/MemoryFuchsia.h b/garnet/third_party/libunwindstack/fuchsia/MemoryFuchsia.h similarity index 100% rename from third_party/libunwindstack/fuchsia/MemoryFuchsia.h rename to garnet/third_party/libunwindstack/fuchsia/MemoryFuchsia.h
diff --git a/third_party/libunwindstack/fuchsia/RegsFuchsia.h b/garnet/third_party/libunwindstack/fuchsia/RegsFuchsia.h similarity index 100% rename from third_party/libunwindstack/fuchsia/RegsFuchsia.h rename to garnet/third_party/libunwindstack/fuchsia/RegsFuchsia.h
diff --git a/third_party/libunwindstack/fuchsia/RegsFuchsiaArm64.cpp b/garnet/third_party/libunwindstack/fuchsia/RegsFuchsiaArm64.cpp similarity index 100% rename from third_party/libunwindstack/fuchsia/RegsFuchsiaArm64.cpp rename to garnet/third_party/libunwindstack/fuchsia/RegsFuchsiaArm64.cpp
diff --git a/third_party/libunwindstack/fuchsia/RegsFuchsiaX86_64.cpp b/garnet/third_party/libunwindstack/fuchsia/RegsFuchsiaX86_64.cpp similarity index 100% rename from third_party/libunwindstack/fuchsia/RegsFuchsiaX86_64.cpp rename to garnet/third_party/libunwindstack/fuchsia/RegsFuchsiaX86_64.cpp
diff --git a/third_party/libunwindstack/fuchsia/android-base/macros.h b/garnet/third_party/libunwindstack/fuchsia/android-base/macros.h similarity index 100% rename from third_party/libunwindstack/fuchsia/android-base/macros.h rename to garnet/third_party/libunwindstack/fuchsia/android-base/macros.h
diff --git a/third_party/libunwindstack/fuchsia/android-base/stringprintf.h b/garnet/third_party/libunwindstack/fuchsia/android-base/stringprintf.h similarity index 100% rename from third_party/libunwindstack/fuchsia/android-base/stringprintf.h rename to garnet/third_party/libunwindstack/fuchsia/android-base/stringprintf.h
diff --git a/third_party/libunwindstack/fuchsia/android-base/unique_fd.h b/garnet/third_party/libunwindstack/fuchsia/android-base/unique_fd.h similarity index 100% rename from third_party/libunwindstack/fuchsia/android-base/unique_fd.h rename to garnet/third_party/libunwindstack/fuchsia/android-base/unique_fd.h
diff --git a/third_party/libunwindstack/fuchsia/fuchsia_basename.h b/garnet/third_party/libunwindstack/fuchsia/fuchsia_basename.h similarity index 100% rename from third_party/libunwindstack/fuchsia/fuchsia_basename.h rename to garnet/third_party/libunwindstack/fuchsia/fuchsia_basename.h
diff --git a/third_party/libunwindstack/fuchsia/log/log.h b/garnet/third_party/libunwindstack/fuchsia/log/log.h similarity index 100% rename from third_party/libunwindstack/fuchsia/log/log.h rename to garnet/third_party/libunwindstack/fuchsia/log/log.h
diff --git a/third_party/libunwindstack/include/unwindstack/DexFiles.h b/garnet/third_party/libunwindstack/include/unwindstack/DexFiles.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/DexFiles.h rename to garnet/third_party/libunwindstack/include/unwindstack/DexFiles.h
diff --git a/third_party/libunwindstack/include/unwindstack/DwarfError.h b/garnet/third_party/libunwindstack/include/unwindstack/DwarfError.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/DwarfError.h rename to garnet/third_party/libunwindstack/include/unwindstack/DwarfError.h
diff --git a/third_party/libunwindstack/include/unwindstack/DwarfLocation.h b/garnet/third_party/libunwindstack/include/unwindstack/DwarfLocation.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/DwarfLocation.h rename to garnet/third_party/libunwindstack/include/unwindstack/DwarfLocation.h
diff --git a/third_party/libunwindstack/include/unwindstack/DwarfMemory.h b/garnet/third_party/libunwindstack/include/unwindstack/DwarfMemory.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/DwarfMemory.h rename to garnet/third_party/libunwindstack/include/unwindstack/DwarfMemory.h
diff --git a/third_party/libunwindstack/include/unwindstack/DwarfSection.h b/garnet/third_party/libunwindstack/include/unwindstack/DwarfSection.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/DwarfSection.h rename to garnet/third_party/libunwindstack/include/unwindstack/DwarfSection.h
diff --git a/third_party/libunwindstack/include/unwindstack/DwarfStructs.h b/garnet/third_party/libunwindstack/include/unwindstack/DwarfStructs.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/DwarfStructs.h rename to garnet/third_party/libunwindstack/include/unwindstack/DwarfStructs.h
diff --git a/third_party/libunwindstack/include/unwindstack/Elf.h b/garnet/third_party/libunwindstack/include/unwindstack/Elf.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Elf.h rename to garnet/third_party/libunwindstack/include/unwindstack/Elf.h
diff --git a/third_party/libunwindstack/include/unwindstack/ElfInterface.h b/garnet/third_party/libunwindstack/include/unwindstack/ElfInterface.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/ElfInterface.h rename to garnet/third_party/libunwindstack/include/unwindstack/ElfInterface.h
diff --git a/third_party/libunwindstack/include/unwindstack/Error.h b/garnet/third_party/libunwindstack/include/unwindstack/Error.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Error.h rename to garnet/third_party/libunwindstack/include/unwindstack/Error.h
diff --git a/third_party/libunwindstack/include/unwindstack/Global.h b/garnet/third_party/libunwindstack/include/unwindstack/Global.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Global.h rename to garnet/third_party/libunwindstack/include/unwindstack/Global.h
diff --git a/third_party/libunwindstack/include/unwindstack/JitDebug.h b/garnet/third_party/libunwindstack/include/unwindstack/JitDebug.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/JitDebug.h rename to garnet/third_party/libunwindstack/include/unwindstack/JitDebug.h
diff --git a/third_party/libunwindstack/include/unwindstack/LocalUnwinder.h b/garnet/third_party/libunwindstack/include/unwindstack/LocalUnwinder.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/LocalUnwinder.h rename to garnet/third_party/libunwindstack/include/unwindstack/LocalUnwinder.h
diff --git a/third_party/libunwindstack/include/unwindstack/Log.h b/garnet/third_party/libunwindstack/include/unwindstack/Log.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Log.h rename to garnet/third_party/libunwindstack/include/unwindstack/Log.h
diff --git a/third_party/libunwindstack/include/unwindstack/MachineArm.h b/garnet/third_party/libunwindstack/include/unwindstack/MachineArm.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/MachineArm.h rename to garnet/third_party/libunwindstack/include/unwindstack/MachineArm.h
diff --git a/third_party/libunwindstack/include/unwindstack/MachineArm64.h b/garnet/third_party/libunwindstack/include/unwindstack/MachineArm64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/MachineArm64.h rename to garnet/third_party/libunwindstack/include/unwindstack/MachineArm64.h
diff --git a/third_party/libunwindstack/include/unwindstack/MachineMips.h b/garnet/third_party/libunwindstack/include/unwindstack/MachineMips.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/MachineMips.h rename to garnet/third_party/libunwindstack/include/unwindstack/MachineMips.h
diff --git a/third_party/libunwindstack/include/unwindstack/MachineMips64.h b/garnet/third_party/libunwindstack/include/unwindstack/MachineMips64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/MachineMips64.h rename to garnet/third_party/libunwindstack/include/unwindstack/MachineMips64.h
diff --git a/third_party/libunwindstack/include/unwindstack/MachineX86.h b/garnet/third_party/libunwindstack/include/unwindstack/MachineX86.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/MachineX86.h rename to garnet/third_party/libunwindstack/include/unwindstack/MachineX86.h
diff --git a/third_party/libunwindstack/include/unwindstack/MachineX86_64.h b/garnet/third_party/libunwindstack/include/unwindstack/MachineX86_64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/MachineX86_64.h rename to garnet/third_party/libunwindstack/include/unwindstack/MachineX86_64.h
diff --git a/third_party/libunwindstack/include/unwindstack/MapInfo.h b/garnet/third_party/libunwindstack/include/unwindstack/MapInfo.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/MapInfo.h rename to garnet/third_party/libunwindstack/include/unwindstack/MapInfo.h
diff --git a/third_party/libunwindstack/include/unwindstack/Maps.h b/garnet/third_party/libunwindstack/include/unwindstack/Maps.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Maps.h rename to garnet/third_party/libunwindstack/include/unwindstack/Maps.h
diff --git a/third_party/libunwindstack/include/unwindstack/Memory.h b/garnet/third_party/libunwindstack/include/unwindstack/Memory.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Memory.h rename to garnet/third_party/libunwindstack/include/unwindstack/Memory.h
diff --git a/third_party/libunwindstack/include/unwindstack/Regs.h b/garnet/third_party/libunwindstack/include/unwindstack/Regs.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Regs.h rename to garnet/third_party/libunwindstack/include/unwindstack/Regs.h
diff --git a/third_party/libunwindstack/include/unwindstack/RegsArm.h b/garnet/third_party/libunwindstack/include/unwindstack/RegsArm.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/RegsArm.h rename to garnet/third_party/libunwindstack/include/unwindstack/RegsArm.h
diff --git a/third_party/libunwindstack/include/unwindstack/RegsArm64.h b/garnet/third_party/libunwindstack/include/unwindstack/RegsArm64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/RegsArm64.h rename to garnet/third_party/libunwindstack/include/unwindstack/RegsArm64.h
diff --git a/third_party/libunwindstack/include/unwindstack/RegsGetLocal.h b/garnet/third_party/libunwindstack/include/unwindstack/RegsGetLocal.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/RegsGetLocal.h rename to garnet/third_party/libunwindstack/include/unwindstack/RegsGetLocal.h
diff --git a/third_party/libunwindstack/include/unwindstack/RegsMips.h b/garnet/third_party/libunwindstack/include/unwindstack/RegsMips.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/RegsMips.h rename to garnet/third_party/libunwindstack/include/unwindstack/RegsMips.h
diff --git a/third_party/libunwindstack/include/unwindstack/RegsMips64.h b/garnet/third_party/libunwindstack/include/unwindstack/RegsMips64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/RegsMips64.h rename to garnet/third_party/libunwindstack/include/unwindstack/RegsMips64.h
diff --git a/third_party/libunwindstack/include/unwindstack/RegsX86.h b/garnet/third_party/libunwindstack/include/unwindstack/RegsX86.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/RegsX86.h rename to garnet/third_party/libunwindstack/include/unwindstack/RegsX86.h
diff --git a/third_party/libunwindstack/include/unwindstack/RegsX86_64.h b/garnet/third_party/libunwindstack/include/unwindstack/RegsX86_64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/RegsX86_64.h rename to garnet/third_party/libunwindstack/include/unwindstack/RegsX86_64.h
diff --git a/third_party/libunwindstack/include/unwindstack/UcontextArm.h b/garnet/third_party/libunwindstack/include/unwindstack/UcontextArm.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UcontextArm.h rename to garnet/third_party/libunwindstack/include/unwindstack/UcontextArm.h
diff --git a/third_party/libunwindstack/include/unwindstack/UcontextArm64.h b/garnet/third_party/libunwindstack/include/unwindstack/UcontextArm64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UcontextArm64.h rename to garnet/third_party/libunwindstack/include/unwindstack/UcontextArm64.h
diff --git a/third_party/libunwindstack/include/unwindstack/UcontextMips.h b/garnet/third_party/libunwindstack/include/unwindstack/UcontextMips.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UcontextMips.h rename to garnet/third_party/libunwindstack/include/unwindstack/UcontextMips.h
diff --git a/third_party/libunwindstack/include/unwindstack/UcontextMips64.h b/garnet/third_party/libunwindstack/include/unwindstack/UcontextMips64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UcontextMips64.h rename to garnet/third_party/libunwindstack/include/unwindstack/UcontextMips64.h
diff --git a/third_party/libunwindstack/include/unwindstack/UcontextX86.h b/garnet/third_party/libunwindstack/include/unwindstack/UcontextX86.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UcontextX86.h rename to garnet/third_party/libunwindstack/include/unwindstack/UcontextX86.h
diff --git a/third_party/libunwindstack/include/unwindstack/UcontextX86_64.h b/garnet/third_party/libunwindstack/include/unwindstack/UcontextX86_64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UcontextX86_64.h rename to garnet/third_party/libunwindstack/include/unwindstack/UcontextX86_64.h
diff --git a/third_party/libunwindstack/include/unwindstack/Unwinder.h b/garnet/third_party/libunwindstack/include/unwindstack/Unwinder.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/Unwinder.h rename to garnet/third_party/libunwindstack/include/unwindstack/Unwinder.h
diff --git a/third_party/libunwindstack/include/unwindstack/UserArm.h b/garnet/third_party/libunwindstack/include/unwindstack/UserArm.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UserArm.h rename to garnet/third_party/libunwindstack/include/unwindstack/UserArm.h
diff --git a/third_party/libunwindstack/include/unwindstack/UserArm64.h b/garnet/third_party/libunwindstack/include/unwindstack/UserArm64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UserArm64.h rename to garnet/third_party/libunwindstack/include/unwindstack/UserArm64.h
diff --git a/third_party/libunwindstack/include/unwindstack/UserMips.h b/garnet/third_party/libunwindstack/include/unwindstack/UserMips.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UserMips.h rename to garnet/third_party/libunwindstack/include/unwindstack/UserMips.h
diff --git a/third_party/libunwindstack/include/unwindstack/UserMips64.h b/garnet/third_party/libunwindstack/include/unwindstack/UserMips64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UserMips64.h rename to garnet/third_party/libunwindstack/include/unwindstack/UserMips64.h
diff --git a/third_party/libunwindstack/include/unwindstack/UserX86.h b/garnet/third_party/libunwindstack/include/unwindstack/UserX86.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UserX86.h rename to garnet/third_party/libunwindstack/include/unwindstack/UserX86.h
diff --git a/third_party/libunwindstack/include/unwindstack/UserX86_64.h b/garnet/third_party/libunwindstack/include/unwindstack/UserX86_64.h similarity index 100% rename from third_party/libunwindstack/include/unwindstack/UserX86_64.h rename to garnet/third_party/libunwindstack/include/unwindstack/UserX86_64.h
diff --git a/third_party/libunwindstack/tools/unwind.cpp b/garnet/third_party/libunwindstack/tools/unwind.cpp similarity index 100% rename from third_party/libunwindstack/tools/unwind.cpp rename to garnet/third_party/libunwindstack/tools/unwind.cpp
diff --git a/third_party/libunwindstack/tools/unwind_for_offline.cpp b/garnet/third_party/libunwindstack/tools/unwind_for_offline.cpp similarity index 100% rename from third_party/libunwindstack/tools/unwind_for_offline.cpp rename to garnet/third_party/libunwindstack/tools/unwind_for_offline.cpp
diff --git a/third_party/libunwindstack/tools/unwind_info.cpp b/garnet/third_party/libunwindstack/tools/unwind_info.cpp similarity index 100% rename from third_party/libunwindstack/tools/unwind_info.cpp rename to garnet/third_party/libunwindstack/tools/unwind_info.cpp
diff --git a/third_party/libunwindstack/tools/unwind_reg_info.cpp b/garnet/third_party/libunwindstack/tools/unwind_reg_info.cpp similarity index 100% rename from third_party/libunwindstack/tools/unwind_reg_info.cpp rename to garnet/third_party/libunwindstack/tools/unwind_reg_info.cpp
diff --git a/third_party/libunwindstack/tools/unwind_symbols.cpp b/garnet/third_party/libunwindstack/tools/unwind_symbols.cpp similarity index 100% rename from third_party/libunwindstack/tools/unwind_symbols.cpp rename to garnet/third_party/libunwindstack/tools/unwind_symbols.cpp
diff --git a/third_party/llvm/.gitignore b/garnet/third_party/llvm/.gitignore similarity index 100% rename from third_party/llvm/.gitignore rename to garnet/third_party/llvm/.gitignore
diff --git a/third_party/llvm/BUILD.gn b/garnet/third_party/llvm/BUILD.gn similarity index 100% rename from third_party/llvm/BUILD.gn rename to garnet/third_party/llvm/BUILD.gn
diff --git a/tools/cipd-update.sh b/garnet/tools/cipd-update.sh similarity index 100% rename from tools/cipd-update.sh rename to garnet/tools/cipd-update.sh
diff --git a/tools/cipd.ensure b/garnet/tools/cipd.ensure similarity index 100% rename from tools/cipd.ensure rename to garnet/tools/cipd.ensure
diff --git a/tools/cipd_internal.ensure b/garnet/tools/cipd_internal.ensure similarity index 100% rename from tools/cipd_internal.ensure rename to garnet/tools/cipd_internal.ensure
diff --git a/tools/gen-last-update b/garnet/tools/gen-last-update similarity index 100% rename from tools/gen-last-update rename to garnet/tools/gen-last-update
diff --git a/tools/gen-ssh-keys.sh b/garnet/tools/gen-ssh-keys.sh similarity index 100% rename from tools/gen-ssh-keys.sh rename to garnet/tools/gen-ssh-keys.sh
diff --git a/tools/vboot_reference/BUILD.gn b/garnet/tools/vboot_reference/BUILD.gn similarity index 100% rename from tools/vboot_reference/BUILD.gn rename to garnet/tools/vboot_reference/BUILD.gn
diff --git a/tools/vboot_reference/futility_cmds.c b/garnet/tools/vboot_reference/futility_cmds.c similarity index 100% rename from tools/vboot_reference/futility_cmds.c rename to garnet/tools/vboot_reference/futility_cmds.c
diff --git a/tools/vboot_reference/uuid/uuid.cc b/garnet/tools/vboot_reference/uuid/uuid.cc similarity index 100% rename from tools/vboot_reference/uuid/uuid.cc rename to garnet/tools/vboot_reference/uuid/uuid.cc
diff --git a/tools/vboot_reference/uuid/uuid.h b/garnet/tools/vboot_reference/uuid/uuid.h similarity index 100% rename from tools/vboot_reference/uuid/uuid.h rename to garnet/tools/vboot_reference/uuid/uuid.h
diff --git a/lib/ui/MAINTAINERS b/lib/ui/MAINTAINERS deleted file mode 100644 index 3698684..0000000 --- a/lib/ui/MAINTAINERS +++ /dev/null
@@ -1,2 +0,0 @@ -jjosh@google.com -mikejurka@google.com