diff --git a/garnet/bin/zxdb/main_target.cc b/garnet/bin/zxdb/main_target.cc
index 97f4182..3fa5db7 100644
--- a/garnet/bin/zxdb/main_target.cc
+++ b/garnet/bin/zxdb/main_target.cc
@@ -8,10 +8,10 @@
 #include <memory>
 #include <thread>
 
-#include "garnet/bin/debug_agent/debug_agent.h"
-#include "garnet/bin/debug_agent/remote_api_adapter.h"
 #include "garnet/bin/zxdb/client/session.h"
 #include "garnet/bin/zxdb/console/console.h"
+#include "src/developer/debug/debug_agent/debug_agent.h"
+#include "src/developer/debug/debug_agent/remote_api_adapter.h"
 #include "src/developer/debug/shared/buffered_zx_socket.h"
 #include "src/developer/debug/shared/message_loop_zircon.h"
 
diff --git a/garnet/packages/prod/BUILD.gn b/garnet/packages/prod/BUILD.gn
index d853d54..96ff5ba 100644
--- a/garnet/packages/prod/BUILD.gn
+++ b/garnet/packages/prod/BUILD.gn
@@ -1070,7 +1070,7 @@
 group("debug_agent") {
   testonly = true
   public_deps = [
-    "//garnet/bin/debug_agent",
+    "//src/developer/debug/debug_agent",
   ]
 }
 
diff --git a/garnet/packages/tests/BUILD.gn b/garnet/packages/tests/BUILD.gn
index 0fc3365..d1af79d 100644
--- a/garnet/packages/tests/BUILD.gn
+++ b/garnet/packages/tests/BUILD.gn
@@ -1136,8 +1136,8 @@
 group("debug_agent") {
   testonly = true
   public_deps = [
-    "//garnet/bin/debug_agent:debug_agent_tests",
     "//garnet/packages/prod:debug_agent",
+    "//src/developer/debug/debug_agent:debug_agent_tests",
   ]
 }
 
diff --git a/garnet/bin/debug_agent/BUILD.gn b/src/developer/debug/debug_agent/BUILD.gn
similarity index 86%
rename from garnet/bin/debug_agent/BUILD.gn
rename to src/developer/debug/debug_agent/BUILD.gn
index 8ddd114..05af567 100644
--- a/garnet/bin/debug_agent/BUILD.gn
+++ b/src/developer/debug/debug_agent/BUILD.gn
@@ -162,13 +162,13 @@
   # TODO(donosoc): Move this to it's own package, this is getting pretty
   #                annoyingly big.
   deps = [
-    "//garnet/bin/debug_agent/test_data:breakpoint_test_exe",
-    "//garnet/bin/debug_agent/test_data:debug_agent_test_loadable_module",
-    "//garnet/bin/debug_agent/test_data:debug_test_false",
-    "//garnet/bin/debug_agent/test_data:debug_test_true",
-    "//garnet/bin/debug_agent/test_data:printer",
-    "//garnet/bin/debug_agent/test_data:process_loop",
-    "//garnet/bin/debug_agent/test_data:process_spawner",
+    "//src/developer/debug/debug_agent/test_data:breakpoint_test_exe",
+    "//src/developer/debug/debug_agent/test_data:debug_agent_test_loadable_module",
+    "//src/developer/debug/debug_agent/test_data:debug_test_false",
+    "//src/developer/debug/debug_agent/test_data:debug_test_true",
+    "//src/developer/debug/debug_agent/test_data:printer",
+    "//src/developer/debug/debug_agent/test_data:process_loop",
+    "//src/developer/debug/debug_agent/test_data:process_spawner",
   ]
 
   # Unit tests.
@@ -181,7 +181,7 @@
   ]
 
   # Integration tests.
-  deps += [ "//garnet/bin/debug_agent/integration_tests" ]
+  deps += [ "//src/developer/debug/debug_agent/integration_tests" ]
   tests += [
     {
       name = "debug_agent_integration_tests"
@@ -213,7 +213,9 @@
 
   # Add the platform specific test binaries
   if (current_cpu == "x64") {
-    deps += [ "//garnet/bin/debug_agent/test_data:write_register_test_exe" ]
+    deps += [
+      "//src/developer/debug/debug_agent/test_data:write_register_test_exe",
+    ]
 
     binaries += [
       {
@@ -221,7 +223,7 @@
       },
     ]
   } else if (current_cpu == "arm64") {
-    deps += [ "//garnet/bin/debug_agent/test_data:hw_breakpointer" ]
+    deps += [ "//src/developer/debug/debug_agent/test_data:hw_breakpointer" ]
 
     binaries += [
       {
diff --git a/garnet/bin/debug_agent/arch.cc b/src/developer/debug/debug_agent/arch.cc
similarity index 92%
rename from garnet/bin/debug_agent/arch.cc
rename to src/developer/debug/debug_agent/arch.cc
index cf317a1..27e197e 100644
--- a/garnet/bin/debug_agent/arch.cc
+++ b/src/developer/debug/debug_agent/arch.cc
@@ -4,7 +4,7 @@
 
 #include <memory>
 
-#include "garnet/bin/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/arch.h"
 
 namespace debug_agent {
 namespace arch {
diff --git a/garnet/bin/debug_agent/arch.h b/src/developer/debug/debug_agent/arch.h
similarity index 96%
rename from garnet/bin/debug_agent/arch.h
rename to src/developer/debug/debug_agent/arch.h
index 9d2fcfc..d3aaf36d 100644
--- a/garnet/bin/debug_agent/arch.h
+++ b/src/developer/debug/debug_agent/arch.h
@@ -11,9 +11,9 @@
 #include "src/developer/debug/ipc/protocol.h"
 
 #if defined(__x86_64__)
-#include "garnet/bin/debug_agent/arch_x64.h"
+#include "src/developer/debug/debug_agent/arch_x64.h"
 #elif defined(__aarch64__)
-#include "garnet/bin/debug_agent/arch_arm64.h"
+#include "src/developer/debug/debug_agent/arch_arm64.h"
 #else
 #error
 #endif
diff --git a/garnet/bin/debug_agent/arch_arm64.cc b/src/developer/debug/debug_agent/arch_arm64.cc
similarity index 99%
rename from garnet/bin/debug_agent/arch_arm64.cc
rename to src/developer/debug/debug_agent/arch_arm64.cc
index 4783966..5aa3afe 100644
--- a/garnet/bin/debug_agent/arch_arm64.cc
+++ b/src/developer/debug/debug_agent/arch_arm64.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/arch.h"
 
 #include <zircon/status.h>
 #include <zircon/syscalls/exception.h>
diff --git a/garnet/bin/debug_agent/arch_arm64.h b/src/developer/debug/debug_agent/arch_arm64.h
similarity index 100%
rename from garnet/bin/debug_agent/arch_arm64.h
rename to src/developer/debug/debug_agent/arch_arm64.h
diff --git a/garnet/bin/debug_agent/arch_arm64_helpers.cc b/src/developer/debug/debug_agent/arch_arm64_helpers.cc
similarity index 84%
rename from garnet/bin/debug_agent/arch_arm64_helpers.cc
rename to src/developer/debug/debug_agent/arch_arm64_helpers.cc
index 2a11f19..29e83e8 100644
--- a/garnet/bin/debug_agent/arch_arm64_helpers.cc
+++ b/src/developer/debug/debug_agent/arch_arm64_helpers.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/arch_arm64_helpers.h"
+#include "src/developer/debug/debug_agent/arch_arm64_helpers.h"
 
-#include "garnet/bin/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/arch.h"
 
 namespace debug_agent {
 namespace arch {
 
 zx_status_t SetupHWBreakpoint(uint64_t address,
-                                 zx_thread_state_debug_regs_t* debug_regs) {
+                              zx_thread_state_debug_regs_t* debug_regs) {
   // We search for an unset register.
   int slot = -1;
   for (int i = 0; i < debug_regs->hw_bps_count; i++) {
@@ -41,7 +41,7 @@
 }
 
 zx_status_t RemoveHWBreakpoint(uint64_t address,
-                                  zx_thread_state_debug_regs_t* debug_regs) {
+                               zx_thread_state_debug_regs_t* debug_regs) {
   // Search for an breakpoint with this address.
   int slot = -1;
   for (int i = 0; i < debug_regs->hw_bps_count; i++) {
diff --git a/garnet/bin/debug_agent/arch_arm64_helpers.h b/src/developer/debug/debug_agent/arch_arm64_helpers.h
similarity index 75%
rename from garnet/bin/debug_agent/arch_arm64_helpers.h
rename to src/developer/debug/debug_agent/arch_arm64_helpers.h
index a7befec..fed26f6 100644
--- a/garnet/bin/debug_agent/arch_arm64_helpers.h
+++ b/src/developer/debug/debug_agent/arch_arm64_helpers.h
@@ -6,7 +6,7 @@
 
 #include <zircon/syscalls/exception.h>
 
-#include "garnet/bin/debug_agent/arch_arm64.h"
+#include "src/developer/debug/debug_agent/arch_arm64.h"
 
 namespace debug_agent {
 namespace arch {
@@ -16,14 +16,12 @@
 // Fills the given state the debug registers to what it should be if we added
 // an execution HW breakpoint for |address|.
 // Return ZX_ERR_NO_RESOURCES if there are no registers left.
-zx_status_t SetupHWBreakpoint(uint64_t address,
-                                 zx_thread_state_debug_regs_t*);
+zx_status_t SetupHWBreakpoint(uint64_t address, zx_thread_state_debug_regs_t*);
 
 // Removes an installed execution HW breakpoint for |address|.
 // If the address is not installed, no functional change will happen and
 // ZX_ERR_OUT_OF_RANGE will be returned.
-zx_status_t RemoveHWBreakpoint(uint64_t address,
-                                  zx_thread_state_debug_regs_t*);
+zx_status_t RemoveHWBreakpoint(uint64_t address, zx_thread_state_debug_regs_t*);
 
 // Useful function for debugging to keep around.
 void PrintDebugRegisters(const zx_thread_state_debug_regs_t&);
diff --git a/garnet/bin/debug_agent/arch_arm64_helpers_unittest.cc b/src/developer/debug/debug_agent/arch_arm64_helpers_unittest.cc
similarity index 99%
rename from garnet/bin/debug_agent/arch_arm64_helpers_unittest.cc
rename to src/developer/debug/debug_agent/arch_arm64_helpers_unittest.cc
index 8a769db..d255273 100644
--- a/garnet/bin/debug_agent/arch_arm64_helpers_unittest.cc
+++ b/src/developer/debug/debug_agent/arch_arm64_helpers_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/arch_arm64_helpers.h"
+#include "src/developer/debug/debug_agent/arch_arm64_helpers.h"
 
 #include <gtest/gtest.h>
 
diff --git a/garnet/bin/debug_agent/arch_x64.cc b/src/developer/debug/debug_agent/arch_x64.cc
similarity index 98%
rename from garnet/bin/debug_agent/arch_x64.cc
rename to src/developer/debug/debug_agent/arch_x64.cc
index 7bd129d..ef60ff2 100644
--- a/garnet/bin/debug_agent/arch_x64.cc
+++ b/src/developer/debug/debug_agent/arch_x64.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/arch.h"
 
 #include <zircon/syscalls/exception.h>
 
-#include "garnet/bin/debug_agent/arch_x64_helpers.h"
-#include "garnet/bin/debug_agent/debugged_thread.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/arch_x64_helpers.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
 #include "src/developer/debug/ipc/register_desc.h"
 
 namespace debug_agent {
diff --git a/garnet/bin/debug_agent/arch_x64.h b/src/developer/debug/debug_agent/arch_x64.h
similarity index 87%
rename from garnet/bin/debug_agent/arch_x64.h
rename to src/developer/debug/debug_agent/arch_x64.h
index f62effa..a5cb05c 100644
--- a/garnet/bin/debug_agent/arch_x64.h
+++ b/src/developer/debug/debug_agent/arch_x64.h
@@ -27,7 +27,7 @@
 constexpr uint64_t kDR6BS = (1 << 14);
 constexpr uint64_t kDR6BT = (1 << 15);
 
-constexpr uint64_t kDR6Mask (0xffff0ff0ul);
+constexpr uint64_t kDR6Mask(0xffff0ff0ul);
 
 // DR7 -------------------------------------------------------------------------
 
@@ -45,14 +45,14 @@
 constexpr uint64_t kDR7GD = (1 << 13);
 constexpr uint64_t kDR7RW0 = (1 << 16);
 constexpr uint64_t kDR7LEN0 = (1 << 18);
-constexpr uint64_t kDR7RW1  = (1 << 20);
+constexpr uint64_t kDR7RW1 = (1 << 20);
 constexpr uint64_t kDR7LEN1 = (1 << 22);
-constexpr uint64_t kDR7RW2  = (1 << 24);
+constexpr uint64_t kDR7RW2 = (1 << 24);
 constexpr uint64_t kDR7LEN2 = (1 << 26);
-constexpr uint64_t kDR7RW3  = (1 << 28);
+constexpr uint64_t kDR7RW3 = (1 << 28);
 constexpr uint64_t kDR7LEN3 = (1 << 30);
 
-constexpr uint64_t kDR7Mask ((1ul << 10) | kDR7LE | kDR7GE);
+constexpr uint64_t kDR7Mask((1ul << 10) | kDR7LE | kDR7GE);
 
 }  // namespace arch
 }  // namespace debug_agent
diff --git a/garnet/bin/debug_agent/arch_x64_helpers.cc b/src/developer/debug/debug_agent/arch_x64_helpers.cc
similarity index 94%
rename from garnet/bin/debug_agent/arch_x64_helpers.cc
rename to src/developer/debug/debug_agent/arch_x64_helpers.cc
index 8ea1dae..da2210f 100644
--- a/garnet/bin/debug_agent/arch_x64_helpers.cc
+++ b/src/developer/debug/debug_agent/arch_x64_helpers.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/arch_x64_helpers.h"
+#include "src/developer/debug/debug_agent/arch_x64_helpers.h"
 
 #include <vector>
 
-#include "garnet/bin/debug_agent/arch.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/arch.h"
 
 namespace debug_agent {
 namespace arch {
@@ -35,7 +35,7 @@
 }  // namespace
 
 zx_status_t SetupHWBreakpoint(uint64_t address,
-                                 zx_thread_state_debug_regs_t* debug_regs) {
+                              zx_thread_state_debug_regs_t* debug_regs) {
   // Search for an unset register.
   // TODO(donosoc): This doesn't check that the address is already set.
   const DebugRegMask* slot = nullptr;
@@ -66,7 +66,7 @@
 }
 
 zx_status_t RemoveHWBreakpoint(uint64_t address,
-                                  zx_thread_state_debug_regs_t* debug_regs) {
+                               zx_thread_state_debug_regs_t* debug_regs) {
   // Search for the address.
   bool found = false;
   for (size_t i = 0; i < 4; i++) {
diff --git a/garnet/bin/debug_agent/arch_x64_helpers.h b/src/developer/debug/debug_agent/arch_x64_helpers.h
similarity index 89%
rename from garnet/bin/debug_agent/arch_x64_helpers.h
rename to src/developer/debug/debug_agent/arch_x64_helpers.h
index 58dbddd..8d99773 100644
--- a/garnet/bin/debug_agent/arch_x64_helpers.h
+++ b/src/developer/debug/debug_agent/arch_x64_helpers.h
@@ -6,10 +6,10 @@
 
 #include <vector>
 
-#include <zircon/syscalls/exception.h>
 #include <lib/zx/thread.h>
+#include <zircon/syscalls/exception.h>
 
-#include "garnet/bin/debug_agent/arch_x64.h"
+#include "src/developer/debug/debug_agent/arch_x64.h"
 
 namespace debug_ipc {
 struct Register;
@@ -25,8 +25,7 @@
 // Returns the state the debug registers should be if we added a execution HW
 // breakpoint for |address|.
 // return ZX_ERR_NO_RESOURCES if there are no registers left.
-zx_status_t SetupHWBreakpoint(uint64_t address,
-                                 zx_thread_state_debug_regs_t*);
+zx_status_t SetupHWBreakpoint(uint64_t address, zx_thread_state_debug_regs_t*);
 
 // Removes an installed execution HW breakpoint for |address|.
 // If the address is not installed, no functional change will happen and
diff --git a/garnet/bin/debug_agent/arch_x64_helpers_unittest.cc b/src/developer/debug/debug_agent/arch_x64_helpers_unittest.cc
similarity index 99%
rename from garnet/bin/debug_agent/arch_x64_helpers_unittest.cc
rename to src/developer/debug/debug_agent/arch_x64_helpers_unittest.cc
index 7ef80dc..4fa81b4 100644
--- a/garnet/bin/debug_agent/arch_x64_helpers_unittest.cc
+++ b/src/developer/debug/debug_agent/arch_x64_helpers_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/arch_x64_helpers.h"
+#include "src/developer/debug/debug_agent/arch_x64_helpers.h"
 
 #include <gtest/gtest.h>
 
diff --git a/garnet/bin/debug_agent/breakpoint.cc b/src/developer/debug/debug_agent/breakpoint.cc
similarity index 93%
rename from garnet/bin/debug_agent/breakpoint.cc
rename to src/developer/debug/debug_agent/breakpoint.cc
index 2bd6f21..60f3795 100644
--- a/garnet/bin/debug_agent/breakpoint.cc
+++ b/src/developer/debug/debug_agent/breakpoint.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/breakpoint.h"
+#include "src/developer/debug/debug_agent/breakpoint.h"
 
-#include "garnet/bin/debug_agent/process_breakpoint.h"
+#include "src/developer/debug/debug_agent/process_breakpoint.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/breakpoint.h b/src/developer/debug/debug_agent/breakpoint.h
similarity index 100%
rename from garnet/bin/debug_agent/breakpoint.h
rename to src/developer/debug/debug_agent/breakpoint.h
diff --git a/garnet/bin/debug_agent/breakpoint_unittest.cc b/src/developer/debug/debug_agent/breakpoint_unittest.cc
similarity index 98%
rename from garnet/bin/debug_agent/breakpoint_unittest.cc
rename to src/developer/debug/debug_agent/breakpoint_unittest.cc
index ad62310..cfa2840 100644
--- a/garnet/bin/debug_agent/breakpoint_unittest.cc
+++ b/src/developer/debug/debug_agent/breakpoint_unittest.cc
@@ -5,8 +5,8 @@
 #include <utility>
 #include <vector>
 
-#include "garnet/bin/debug_agent/breakpoint.h"
 #include "gtest/gtest.h"
+#include "src/developer/debug/debug_agent/breakpoint.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/debug_agent.cc b/src/developer/debug/debug_agent/debug_agent.cc
similarity index 97%
rename from garnet/bin/debug_agent/debug_agent.cc
rename to src/developer/debug/debug_agent/debug_agent.cc
index cf85ddf..cb576b0 100644
--- a/garnet/bin/debug_agent/debug_agent.cc
+++ b/src/developer/debug/debug_agent/debug_agent.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/debug_agent.h"
+#include "src/developer/debug/debug_agent/debug_agent.h"
 
 #include <inttypes.h>
 
@@ -12,16 +12,16 @@
 #include <zircon/syscalls/debug.h>
 #include <zircon/syscalls/exception.h>
 
-#include "garnet/bin/debug_agent/arch.h"
-#include "garnet/bin/debug_agent/debugged_thread.h"
-#include "garnet/bin/debug_agent/launcher.h"
-#include "garnet/bin/debug_agent/object_util.h"
-#include "garnet/bin/debug_agent/process_breakpoint.h"
-#include "garnet/bin/debug_agent/process_info.h"
-#include "garnet/bin/debug_agent/system_info.h"
 #include "lib/fxl/logging.h"
 #include "lib/fxl/strings/concatenate.h"
 #include "lib/fxl/strings/string_printf.h"
+#include "src/developer/debug/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/launcher.h"
+#include "src/developer/debug/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/process_breakpoint.h"
+#include "src/developer/debug/debug_agent/process_info.h"
+#include "src/developer/debug/debug_agent/system_info.h"
 #include "src/developer/debug/ipc/agent_protocol.h"
 #include "src/developer/debug/ipc/debug/block_timer.h"
 #include "src/developer/debug/ipc/debug/logging.h"
diff --git a/garnet/bin/debug_agent/debug_agent.h b/src/developer/debug/debug_agent/debug_agent.h
similarity index 95%
rename from garnet/bin/debug_agent/debug_agent.h
rename to src/developer/debug/debug_agent/debug_agent.h
index cd36ffc..48075b8 100644
--- a/garnet/bin/debug_agent/debug_agent.h
+++ b/src/developer/debug/debug_agent/debug_agent.h
@@ -10,13 +10,13 @@
 
 #include <zircon/types.h>
 
-#include "garnet/bin/debug_agent/breakpoint.h"
-#include "garnet/bin/debug_agent/debugged_job.h"
-#include "garnet/bin/debug_agent/debugged_process.h"
-#include "garnet/bin/debug_agent/remote_api.h"
-#include "garnet/bin/debug_agent/watchpoint.h"
 #include "lib/fxl/macros.h"
 #include "lib/sys/cpp/service_directory.h"
+#include "src/developer/debug/debug_agent/breakpoint.h"
+#include "src/developer/debug/debug_agent/debugged_job.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/remote_api.h"
+#include "src/developer/debug/debug_agent/watchpoint.h"
 #include "src/developer/debug/shared/stream_buffer.h"
 
 namespace debug_agent {
diff --git a/garnet/bin/debug_agent/debugged_job.cc b/src/developer/debug/debug_agent/debugged_job.cc
similarity index 95%
rename from garnet/bin/debug_agent/debugged_job.cc
rename to src/developer/debug/debug_agent/debugged_job.cc
index d0ab0f0..ca5dbde 100644
--- a/garnet/bin/debug_agent/debugged_job.cc
+++ b/src/developer/debug/debug_agent/debugged_job.cc
@@ -4,10 +4,10 @@
 
 #include "src/developer/debug/shared/message_loop_target.h"
 
-#include "garnet/bin/debug_agent/debugged_job.h"
-#include "garnet/bin/debug_agent/object_util.h"
-#include "garnet/bin/debug_agent/system_info.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/debugged_job.h"
+#include "src/developer/debug/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/system_info.h"
 #include "src/developer/debug/ipc/debug/logging.h"
 #include "src/developer/debug/shared/component_utils.h"
 #include "src/developer/debug/shared/regex.h"
diff --git a/garnet/bin/debug_agent/debugged_job.h b/src/developer/debug/debug_agent/debugged_job.h
similarity index 100%
rename from garnet/bin/debug_agent/debugged_job.h
rename to src/developer/debug/debug_agent/debugged_job.h
diff --git a/garnet/bin/debug_agent/debugged_process.cc b/src/developer/debug/debug_agent/debugged_process.cc
similarity index 96%
rename from garnet/bin/debug_agent/debugged_process.cc
rename to src/developer/debug/debug_agent/debugged_process.cc
index 6a3c7e4..db8ef5f 100644
--- a/garnet/bin/debug_agent/debugged_process.cc
+++ b/src/developer/debug/debug_agent/debugged_process.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
 
 #include <inttypes.h>
 #include <zircon/syscalls/exception.h>
 #include <utility>
 
-#include "garnet/bin/debug_agent/debug_agent.h"
-#include "garnet/bin/debug_agent/debugged_thread.h"
-#include "garnet/bin/debug_agent/object_util.h"
-#include "garnet/bin/debug_agent/process_breakpoint.h"
-#include "garnet/bin/debug_agent/process_info.h"
-#include "garnet/bin/debug_agent/process_memory_accessor.h"
-#include "garnet/bin/debug_agent/process_watchpoint.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/debug_agent.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/process_breakpoint.h"
+#include "src/developer/debug/debug_agent/process_info.h"
+#include "src/developer/debug/debug_agent/process_memory_accessor.h"
+#include "src/developer/debug/debug_agent/process_watchpoint.h"
 #include "src/developer/debug/ipc/agent_protocol.h"
 #include "src/developer/debug/ipc/debug/logging.h"
 #include "src/developer/debug/ipc/message_reader.h"
diff --git a/garnet/bin/debug_agent/debugged_process.h b/src/developer/debug/debug_agent/debugged_process.h
similarity index 98%
rename from garnet/bin/debug_agent/debugged_process.h
rename to src/developer/debug/debug_agent/debugged_process.h
index 7578f24..c2df664 100644
--- a/garnet/bin/debug_agent/debugged_process.h
+++ b/src/developer/debug/debug_agent/debugged_process.h
@@ -13,7 +13,7 @@
 #include <lib/zx/socket.h>
 #include <lib/zx/thread.h>
 
-#include "garnet/bin/debug_agent/process_memory_accessor.h"
+#include "src/developer/debug/debug_agent/process_memory_accessor.h"
 #include "src/developer/debug/ipc/protocol.h"
 #include "src/developer/debug/ipc/records_utils.h"
 #include "src/developer/debug/shared/buffered_zx_socket.h"
diff --git a/garnet/bin/debug_agent/debugged_thread.cc b/src/developer/debug/debug_agent/debugged_thread.cc
similarity index 97%
rename from garnet/bin/debug_agent/debugged_thread.cc
rename to src/developer/debug/debug_agent/debugged_thread.cc
index ab71b1b..c870ecc 100644
--- a/garnet/bin/debug_agent/debugged_thread.cc
+++ b/src/developer/debug/debug_agent/debugged_thread.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
 
 #include <inttypes.h>
 #include <zircon/syscalls/debug.h>
 #include <zircon/syscalls/exception.h>
 #include <memory>
 
-#include "garnet/bin/debug_agent/arch.h"
-#include "garnet/bin/debug_agent/debug_agent.h"
-#include "garnet/bin/debug_agent/debugged_process.h"
-#include "garnet/bin/debug_agent/process_breakpoint.h"
-#include "garnet/bin/debug_agent/process_info.h"
-#include "garnet/bin/debug_agent/unwind.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/debug_agent.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/process_breakpoint.h"
+#include "src/developer/debug/debug_agent/process_info.h"
+#include "src/developer/debug/debug_agent/unwind.h"
 #include "src/developer/debug/ipc/agent_protocol.h"
 #include "src/developer/debug/ipc/message_reader.h"
 #include "src/developer/debug/ipc/message_writer.h"
diff --git a/garnet/bin/debug_agent/debugged_thread.h b/src/developer/debug/debug_agent/debugged_thread.h
similarity index 100%
rename from garnet/bin/debug_agent/debugged_thread.h
rename to src/developer/debug/debug_agent/debugged_thread.h
diff --git a/garnet/bin/debug_agent/debugged_thread_unittest.cc b/src/developer/debug/debug_agent/debugged_thread_unittest.cc
similarity index 95%
rename from garnet/bin/debug_agent/debugged_thread_unittest.cc
rename to src/developer/debug/debug_agent/debugged_thread_unittest.cc
index 81b75ae..fb87f42 100644
--- a/garnet/bin/debug_agent/debugged_thread_unittest.cc
+++ b/src/developer/debug/debug_agent/debugged_thread_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/debugged_thread.h"
-#include "garnet/bin/debug_agent/arch.h"
-#include "garnet/bin/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
 #include "gtest/gtest.h"
+#include "src/developer/debug/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
 
 namespace debug_agent {
 
@@ -44,8 +44,8 @@
 class FakeArchProvider : public arch::ArchProvider {
  public:
   zx_status_t ReadRegisters(const debug_ipc::RegisterCategory::Type& type,
-                     const zx::thread&,
-                     std::vector<debug_ipc::Register>* out) override {
+                            const zx::thread&,
+                            std::vector<debug_ipc::Register>* out) override {
     auto it = categories_.find(type);
     if (it == categories_.end())
       return ZX_ERR_INVALID_ARGS;
diff --git a/garnet/bin/debug_agent/integration_tests/BUILD.gn b/src/developer/debug/debug_agent/integration_tests/BUILD.gn
similarity index 95%
rename from garnet/bin/debug_agent/integration_tests/BUILD.gn
rename to src/developer/debug/debug_agent/integration_tests/BUILD.gn
index aa2534a..932569c 100644
--- a/garnet/bin/debug_agent/integration_tests/BUILD.gn
+++ b/src/developer/debug/debug_agent/integration_tests/BUILD.gn
@@ -29,11 +29,11 @@
   ]
 
   deps = [
-    "//garnet/bin/debug_agent:lib",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/fxl/test:gtest_main",
     "//garnet/public/lib/svc/cpp",
     "//sdk/lib/sys/cpp",
+    "//src/developer/debug/debug_agent:lib",
     "//src/developer/debug/ipc:client",
     "//third_party/googletest:gtest",
     "//zircon/public/lib/zx",
diff --git a/garnet/bin/debug_agent/integration_tests/README.md b/src/developer/debug/debug_agent/integration_tests/README.md
similarity index 94%
rename from garnet/bin/debug_agent/integration_tests/README.md
rename to src/developer/debug/debug_agent/integration_tests/README.md
index cc3e424..045cbdb 100644
--- a/garnet/bin/debug_agent/integration_tests/README.md
+++ b/src/developer/debug/debug_agent/integration_tests/README.md
@@ -9,7 +9,7 @@
 The tests generally work by "tricking" the debug agent that it's connected to
 a client. This is important because the DebugAgent works receiving messages
 triggered by the message loop and either returns immediatelly from the remote
-API (//garnet/bin/debug_agent/remote_api.h) or sending out notifications.
+API (//src/developer/debug/debug_agent/remote_api.h) or sending out notifications.
 
 Generally all the interesting behaviour is in the notifications, as they
 represent exceptions (ie. I hit a breakpoint or a process died). There is a
diff --git a/garnet/bin/debug_agent/integration_tests/breakpoint_test.cc b/src/developer/debug/debug_agent/integration_tests/breakpoint_test.cc
similarity index 97%
rename from garnet/bin/debug_agent/integration_tests/breakpoint_test.cc
rename to src/developer/debug/debug_agent/integration_tests/breakpoint_test.cc
index d0a6cd6..7913a42 100644
--- a/garnet/bin/debug_agent/integration_tests/breakpoint_test.cc
+++ b/src/developer/debug/debug_agent/integration_tests/breakpoint_test.cc
@@ -4,10 +4,10 @@
 
 #include <gtest/gtest.h>
 
-#include "garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h"
-#include "garnet/bin/debug_agent/integration_tests/mock_stream_backend.h"
-#include "garnet/bin/debug_agent/integration_tests/so_wrapper.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.h"
+#include "src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h"
+#include "src/developer/debug/debug_agent/integration_tests/so_wrapper.h"
 #include "src/developer/debug/ipc/message_reader.h"
 #include "src/developer/debug/shared/message_loop_target.h"
 #include "src/developer/debug/shared/zx_status.h"
diff --git a/garnet/bin/debug_agent/integration_tests/debugged_job_test.cc b/src/developer/debug/debug_agent/integration_tests/debugged_job_test.cc
similarity index 97%
rename from garnet/bin/debug_agent/integration_tests/debugged_job_test.cc
rename to src/developer/debug/debug_agent/integration_tests/debugged_job_test.cc
index d1ec6c9..a8558ab 100644
--- a/garnet/bin/debug_agent/integration_tests/debugged_job_test.cc
+++ b/src/developer/debug/debug_agent/integration_tests/debugged_job_test.cc
@@ -7,10 +7,10 @@
 #include <gtest/gtest.h>
 #include <lib/fdio/spawn.h>
 
-#include "garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h"
-#include "garnet/bin/debug_agent/integration_tests/mock_stream_backend.h"
-#include "garnet/bin/debug_agent/integration_tests/so_wrapper.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.h"
+#include "src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h"
+#include "src/developer/debug/debug_agent/integration_tests/so_wrapper.h"
 #include "src/developer/debug/ipc/protocol.h"
 #include "src/developer/debug/shared/zx_status.h"
 
diff --git a/garnet/bin/debug_agent/integration_tests/elf_symbol_test.cc b/src/developer/debug/debug_agent/integration_tests/elf_symbol_test.cc
similarity index 95%
rename from garnet/bin/debug_agent/integration_tests/elf_symbol_test.cc
rename to src/developer/debug/debug_agent/integration_tests/elf_symbol_test.cc
index 9d38efe..665f4e3 100644
--- a/garnet/bin/debug_agent/integration_tests/elf_symbol_test.cc
+++ b/src/developer/debug/debug_agent/integration_tests/elf_symbol_test.cc
@@ -5,10 +5,10 @@
 #include <gtest/gtest.h>
 #include <stdio.h>
 
-#include "garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h"
-#include "garnet/bin/debug_agent/integration_tests/mock_stream_backend.h"
-#include "garnet/bin/debug_agent/integration_tests/so_wrapper.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.h"
+#include "src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h"
+#include "src/developer/debug/debug_agent/integration_tests/so_wrapper.h"
 #include "src/developer/debug/ipc/message_reader.h"
 #include "src/developer/debug/shared/message_loop_zircon.h"
 #include "src/developer/debug/shared/zx_status.h"
diff --git a/garnet/bin/debug_agent/integration_tests/message_loop_wrapper.cc b/src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.cc
similarity index 84%
rename from garnet/bin/debug_agent/integration_tests/message_loop_wrapper.cc
rename to src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.cc
index 85c32fd..a171d98d 100644
--- a/garnet/bin/debug_agent/integration_tests/message_loop_wrapper.cc
+++ b/src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h"
+#include "src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.h"
 
 #include "src/developer/debug/shared/message_loop_async.h"
 
diff --git a/garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h b/src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.h
similarity index 100%
rename from garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h
rename to src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.h
diff --git a/garnet/bin/debug_agent/integration_tests/mock_stream_backend.cc b/src/developer/debug/debug_agent/integration_tests/mock_stream_backend.cc
similarity index 97%
rename from garnet/bin/debug_agent/integration_tests/mock_stream_backend.cc
rename to src/developer/debug/debug_agent/integration_tests/mock_stream_backend.cc
index 3678b49..6d2350f 100644
--- a/garnet/bin/debug_agent/integration_tests/mock_stream_backend.cc
+++ b/src/developer/debug/debug_agent/integration_tests/mock_stream_backend.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/integration_tests/mock_stream_backend.h"
+#include "src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h"
 
 #include "lib/fxl/logging.h"
 #include "lib/sys/cpp/service_directory.h"
diff --git a/garnet/bin/debug_agent/integration_tests/mock_stream_backend.h b/src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h
similarity index 97%
rename from garnet/bin/debug_agent/integration_tests/mock_stream_backend.h
rename to src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h
index ee8e9ee..908f4ca 100644
--- a/garnet/bin/debug_agent/integration_tests/mock_stream_backend.h
+++ b/src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "garnet/bin/debug_agent/debug_agent.h"
+#include "src/developer/debug/debug_agent/debug_agent.h"
 #include "src/developer/debug/ipc/client_protocol.h"
 #include "src/developer/debug/ipc/protocol.h"
 #include "src/developer/debug/shared/message_loop.h"
diff --git a/garnet/bin/debug_agent/integration_tests/so_wrapper.cc b/src/developer/debug/debug_agent/integration_tests/so_wrapper.cc
similarity index 90%
rename from garnet/bin/debug_agent/integration_tests/so_wrapper.cc
rename to src/developer/debug/debug_agent/integration_tests/so_wrapper.cc
index bdaf197..9e9781f 100644
--- a/garnet/bin/debug_agent/integration_tests/so_wrapper.cc
+++ b/src/developer/debug/debug_agent/integration_tests/so_wrapper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/integration_tests/so_wrapper.h"
+#include "src/developer/debug/debug_agent/integration_tests/so_wrapper.h"
 
 #include <dlfcn.h>
 #include <link.h>
@@ -61,7 +61,8 @@
   return reinterpret_cast<uint64_t>(symbol);
 }
 
-uint64_t SoWrapper::GetSymbolOffset(const char* module, const char* symbol) const {
+uint64_t SoWrapper::GetSymbolOffset(const char* module,
+                                    const char* symbol) const {
   uint64_t module_start = GetModuleStartAddress(module);
   if (module_start == 0)
     return 0;
diff --git a/garnet/bin/debug_agent/integration_tests/so_wrapper.h b/src/developer/debug/debug_agent/integration_tests/so_wrapper.h
similarity index 100%
rename from garnet/bin/debug_agent/integration_tests/so_wrapper.h
rename to src/developer/debug/debug_agent/integration_tests/so_wrapper.h
diff --git a/garnet/bin/debug_agent/integration_tests/write_registers_test.cc b/src/developer/debug/debug_agent/integration_tests/write_registers_test.cc
similarity index 97%
rename from garnet/bin/debug_agent/integration_tests/write_registers_test.cc
rename to src/developer/debug/debug_agent/integration_tests/write_registers_test.cc
index fad9962..706caee 100644
--- a/garnet/bin/debug_agent/integration_tests/write_registers_test.cc
+++ b/src/developer/debug/debug_agent/integration_tests/write_registers_test.cc
@@ -6,9 +6,9 @@
 
 #include <gtest/gtest.h>
 
-#include "garnet/bin/debug_agent/integration_tests/message_loop_wrapper.h"
-#include "garnet/bin/debug_agent/integration_tests/mock_stream_backend.h"
-#include "garnet/bin/debug_agent/integration_tests/so_wrapper.h"
+#include "src/developer/debug/debug_agent/integration_tests/message_loop_wrapper.h"
+#include "src/developer/debug/debug_agent/integration_tests/mock_stream_backend.h"
+#include "src/developer/debug/debug_agent/integration_tests/so_wrapper.h"
 #include "src/developer/debug/ipc/message_reader.h"
 #include "src/developer/debug/ipc/register_test_support.h"
 #include "src/developer/debug/shared/zx_status.h"
diff --git a/garnet/bin/debug_agent/launcher.cc b/src/developer/debug/debug_agent/launcher.cc
similarity index 92%
rename from garnet/bin/debug_agent/launcher.cc
rename to src/developer/debug/debug_agent/launcher.cc
index 35ba021..2c75ab0 100644
--- a/garnet/bin/debug_agent/launcher.cc
+++ b/src/developer/debug/debug_agent/launcher.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/launcher.h"
+#include "src/developer/debug/debug_agent/launcher.h"
 
 #include <inttypes.h>
 #include <lib/fdio/fd.h>
 #include <lib/fdio/io.h>
 #include <zircon/processargs.h>
 
-#include "garnet/bin/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/object_util.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/launcher.h b/src/developer/debug/debug_agent/launcher.h
similarity index 99%
rename from garnet/bin/debug_agent/launcher.h
rename to src/developer/debug/debug_agent/launcher.h
index 6e72de5..b1bb0b7 100644
--- a/garnet/bin/debug_agent/launcher.h
+++ b/src/developer/debug/debug_agent/launcher.h
@@ -12,8 +12,8 @@
 #include <lib/zx/socket.h>
 
 #include "garnet/lib/process/process_builder.h"
-#include "lib/sys/cpp/service_directory.h"
 #include "lib/fxl/macros.h"
+#include "lib/sys/cpp/service_directory.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/main.cc b/src/developer/debug/debug_agent/main.cc
similarity index 97%
rename from garnet/bin/debug_agent/main.cc
rename to src/developer/debug/debug_agent/main.cc
index d9b6ca5..e3b2cce 100644
--- a/garnet/bin/debug_agent/main.cc
+++ b/src/developer/debug/debug_agent/main.cc
@@ -12,12 +12,12 @@
 #include <unistd.h>
 #include <memory>
 
-#include "garnet/bin/debug_agent/debug_agent.h"
-#include "garnet/bin/debug_agent/remote_api_adapter.h"
-#include "garnet/bin/debug_agent/unwind.h"
 #include "lib/fxl/command_line.h"
 #include "lib/fxl/strings/string_printf.h"
 #include "lib/sys/cpp/service_directory.h"
+#include "src/developer/debug/debug_agent/debug_agent.h"
+#include "src/developer/debug/debug_agent/remote_api_adapter.h"
+#include "src/developer/debug/debug_agent/unwind.h"
 #include "src/developer/debug/ipc/debug/debug.h"
 #include "src/developer/debug/shared/buffered_fd.h"
 #include "src/developer/debug/shared/message_loop_async.h"
diff --git a/garnet/bin/debug_agent/meta/debug_agent.cmx b/src/developer/debug/debug_agent/meta/debug_agent.cmx
similarity index 100%
rename from garnet/bin/debug_agent/meta/debug_agent.cmx
rename to src/developer/debug/debug_agent/meta/debug_agent.cmx
diff --git a/garnet/bin/debug_agent/meta/debug_agent_integration_tests.cmx b/src/developer/debug/debug_agent/meta/debug_agent_integration_tests.cmx
similarity index 100%
rename from garnet/bin/debug_agent/meta/debug_agent_integration_tests.cmx
rename to src/developer/debug/debug_agent/meta/debug_agent_integration_tests.cmx
diff --git a/garnet/bin/debug_agent/meta/debug_agent_unit_tests.cmx b/src/developer/debug/debug_agent/meta/debug_agent_unit_tests.cmx
similarity index 100%
rename from garnet/bin/debug_agent/meta/debug_agent_unit_tests.cmx
rename to src/developer/debug/debug_agent/meta/debug_agent_unit_tests.cmx
diff --git a/garnet/bin/debug_agent/mock_arch_provider.cc b/src/developer/debug/debug_agent/mock_arch_provider.cc
similarity index 91%
rename from garnet/bin/debug_agent/mock_arch_provider.cc
rename to src/developer/debug/debug_agent/mock_arch_provider.cc
index 2c75bee..d08ce09 100644
--- a/garnet/bin/debug_agent/mock_arch_provider.cc
+++ b/src/developer/debug/debug_agent/mock_arch_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/mock_arch_provider.h"
+#include "src/developer/debug/debug_agent/mock_arch_provider.h"
 
 namespace debug_agent {
 
@@ -24,11 +24,10 @@
   return ZX_OK;
 }
 
-zx_status_t MockArchProvider::UninstallWatchpoint(zx::thread*,
-                                const debug_ipc::AddressRange& range) {
+zx_status_t MockArchProvider::UninstallWatchpoint(
+    zx::thread*, const debug_ipc::AddressRange& range) {
   wp_uninstalls_[range]++;
   return ZX_OK;
-
 }
 
 size_t MockArchProvider::BreakpointInstallCount(uint64_t address) const {
diff --git a/garnet/bin/debug_agent/mock_arch_provider.h b/src/developer/debug/debug_agent/mock_arch_provider.h
similarity index 97%
rename from garnet/bin/debug_agent/mock_arch_provider.h
rename to src/developer/debug/debug_agent/mock_arch_provider.h
index 24284c7..6469500 100644
--- a/garnet/bin/debug_agent/mock_arch_provider.h
+++ b/src/developer/debug/debug_agent/mock_arch_provider.h
@@ -7,7 +7,7 @@
 #include <functional>
 #include <map>
 
-#include "garnet/bin/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/arch.h"
 #include "src/developer/debug/ipc/records_utils.h"
 
 namespace debug_agent {
diff --git a/garnet/bin/debug_agent/mock_process.cc b/src/developer/debug/debug_agent/mock_process.cc
similarity index 88%
rename from garnet/bin/debug_agent/mock_process.cc
rename to src/developer/debug/debug_agent/mock_process.cc
index 0dc3c29..7798409 100644
--- a/garnet/bin/debug_agent/mock_process.cc
+++ b/src/developer/debug/debug_agent/mock_process.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/mock_process.h"
+#include "src/developer/debug/debug_agent/mock_process.h"
 
-#include "garnet/bin/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/mock_process.h b/src/developer/debug/debug_agent/mock_process.h
similarity index 91%
rename from garnet/bin/debug_agent/mock_process.h
rename to src/developer/debug/debug_agent/mock_process.h
index 38d495c..bbd1a225 100644
--- a/garnet/bin/debug_agent/mock_process.h
+++ b/src/developer/debug/debug_agent/mock_process.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "garnet/bin/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/object_util.cc b/src/developer/debug/debug_agent/object_util.cc
similarity index 97%
rename from garnet/bin/debug_agent/object_util.cc
rename to src/developer/debug/debug_agent/object_util.cc
index 2259d52a..7d5c1a8 100644
--- a/garnet/bin/debug_agent/object_util.cc
+++ b/src/developer/debug/debug_agent/object_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/object_util.h"
 
 #include <lib/zx/job.h>
 #include <lib/zx/process.h>
diff --git a/garnet/bin/debug_agent/object_util.h b/src/developer/debug/debug_agent/object_util.h
similarity index 100%
rename from garnet/bin/debug_agent/object_util.h
rename to src/developer/debug/debug_agent/object_util.h
diff --git a/garnet/bin/debug_agent/process_breakpoint.cc b/src/developer/debug/debug_agent/process_breakpoint.cc
similarity index 97%
rename from garnet/bin/debug_agent/process_breakpoint.cc
rename to src/developer/debug/debug_agent/process_breakpoint.cc
index ba07d49..40e1d04 100644
--- a/garnet/bin/debug_agent/process_breakpoint.cc
+++ b/src/developer/debug/debug_agent/process_breakpoint.cc
@@ -6,13 +6,12 @@
 
 #include <zircon/status.h>
 #include <zircon/syscalls/exception.h>
-#include <zircon/syscalls/exception.h>
 
-#include "garnet/bin/debug_agent/breakpoint.h"
-#include "garnet/bin/debug_agent/debugged_thread.h"
-#include "garnet/bin/debug_agent/process_breakpoint.h"
 #include "lib/fxl/logging.h"
 #include "lib/fxl/strings/string_printf.h"
+#include "src/developer/debug/debug_agent/breakpoint.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/process_breakpoint.h"
 
 namespace debug_agent {
 
@@ -349,9 +348,7 @@
     ProcessBreakpoint* process_bp)
     : process_bp_(process_bp) {}
 
-ProcessBreakpoint::HardwareBreakpoint::~HardwareBreakpoint() {
-  Uninstall();
-}
+ProcessBreakpoint::HardwareBreakpoint::~HardwareBreakpoint() { Uninstall(); }
 
 zx_status_t ProcessBreakpoint::HardwareBreakpoint::Update(
     const std::set<zx_koid_t>& thread_ids) {
diff --git a/garnet/bin/debug_agent/process_breakpoint.h b/src/developer/debug/debug_agent/process_breakpoint.h
similarity index 97%
rename from garnet/bin/debug_agent/process_breakpoint.h
rename to src/developer/debug/debug_agent/process_breakpoint.h
index dc4fb6b..4f0be6e 100644
--- a/garnet/bin/debug_agent/process_breakpoint.h
+++ b/src/developer/debug/debug_agent/process_breakpoint.h
@@ -7,10 +7,10 @@
 
 #include <map>
 
-#include "garnet/bin/debug_agent/arch.h"
-#include "garnet/bin/debug_agent/debugged_process.h"
-#include "garnet/bin/debug_agent/process_memory_accessor.h"
 #include "lib/fxl/macros.h"
+#include "src/developer/debug/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/process_memory_accessor.h"
 #include "src/developer/debug/ipc/records.h"
 
 namespace debug_agent {
diff --git a/garnet/bin/debug_agent/process_breakpoint_unittest.cc b/src/developer/debug/debug_agent/process_breakpoint_unittest.cc
similarity index 97%
rename from garnet/bin/debug_agent/process_breakpoint_unittest.cc
rename to src/developer/debug/debug_agent/process_breakpoint_unittest.cc
index 409e459..6da0d342 100644
--- a/garnet/bin/debug_agent/process_breakpoint_unittest.cc
+++ b/src/developer/debug/debug_agent/process_breakpoint_unittest.cc
@@ -6,13 +6,13 @@
 
 #include <zircon/syscalls/exception.h>
 
-#include "garnet/bin/debug_agent/breakpoint.h"
-#include "garnet/bin/debug_agent/debugged_thread.h"
-#include "garnet/bin/debug_agent/mock_arch_provider.h"
-#include "garnet/bin/debug_agent/mock_process.h"
-#include "garnet/bin/debug_agent/process_breakpoint.h"
-#include "garnet/bin/debug_agent/process_memory_accessor.h"
 #include "gtest/gtest.h"
+#include "src/developer/debug/debug_agent/breakpoint.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/mock_arch_provider.h"
+#include "src/developer/debug/debug_agent/mock_process.h"
+#include "src/developer/debug/debug_agent/process_breakpoint.h"
+#include "src/developer/debug/debug_agent/process_memory_accessor.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/process_info.cc b/src/developer/debug/debug_agent/process_info.cc
similarity index 97%
rename from garnet/bin/debug_agent/process_info.cc
rename to src/developer/debug/debug_agent/process_info.cc
index 113033a..d4adc97 100644
--- a/garnet/bin/debug_agent/process_info.cc
+++ b/src/developer/debug/debug_agent/process_info.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/process_info.h"
+#include "src/developer/debug/debug_agent/process_info.h"
 
 #include <inttypes.h>
 #include <lib/zx/thread.h>
@@ -14,10 +14,10 @@
 #include <iterator>
 #include <map>
 
-#include "garnet/bin/debug_agent/arch.h"
-#include "garnet/bin/debug_agent/object_util.h"
-#include "garnet/bin/debug_agent/unwind.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/unwind.h"
 #include "src/developer/debug/shared/elf.h"
 
 namespace debug_agent {
diff --git a/garnet/bin/debug_agent/process_info.h b/src/developer/debug/debug_agent/process_info.h
similarity index 100%
rename from garnet/bin/debug_agent/process_info.h
rename to src/developer/debug/debug_agent/process_info.h
diff --git a/garnet/bin/debug_agent/process_info_unittests.cc b/src/developer/debug/debug_agent/process_info_unittests.cc
similarity index 91%
rename from garnet/bin/debug_agent/process_info_unittests.cc
rename to src/developer/debug/debug_agent/process_info_unittests.cc
index 69cfe8c..8218585 100644
--- a/garnet/bin/debug_agent/process_info_unittests.cc
+++ b/src/developer/debug/debug_agent/process_info_unittests.cc
@@ -5,9 +5,9 @@
 #include <lib/zx/process.h>
 #include <lib/zx/thread.h>
 
-#include "garnet/bin/debug_agent/object_util.h"
-#include "garnet/bin/debug_agent/process_info.h"
 #include "gtest/gtest.h"
+#include "src/developer/debug/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/process_info.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/process_memory_accessor.h b/src/developer/debug/debug_agent/process_memory_accessor.h
similarity index 100%
rename from garnet/bin/debug_agent/process_memory_accessor.h
rename to src/developer/debug/debug_agent/process_memory_accessor.h
diff --git a/garnet/bin/debug_agent/process_watchpoint.cc b/src/developer/debug/debug_agent/process_watchpoint.cc
similarity index 94%
rename from garnet/bin/debug_agent/process_watchpoint.cc
rename to src/developer/debug/debug_agent/process_watchpoint.cc
index 1819fd1..c8df9b6 100644
--- a/garnet/bin/debug_agent/process_watchpoint.cc
+++ b/src/developer/debug/debug_agent/process_watchpoint.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/process_watchpoint.h"
+#include "src/developer/debug/debug_agent/process_watchpoint.h"
 
 #include <lib/zx/port.h>
 #include <zircon/syscalls/port.h>
 
-#include "garnet/bin/debug_agent/arch.h"
-#include "garnet/bin/debug_agent/debugged_process.h"
-#include "garnet/bin/debug_agent/debugged_thread.h"
-#include "garnet/bin/debug_agent/watchpoint.h"
+#include "src/developer/debug/debug_agent/arch.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/watchpoint.h"
 #include "src/developer/debug/shared/zx_status.h"
 
 namespace debug_agent {
diff --git a/garnet/bin/debug_agent/process_watchpoint.h b/src/developer/debug/debug_agent/process_watchpoint.h
similarity index 100%
rename from garnet/bin/debug_agent/process_watchpoint.h
rename to src/developer/debug/debug_agent/process_watchpoint.h
diff --git a/garnet/bin/debug_agent/process_watchpoint_unittest.cc b/src/developer/debug/debug_agent/process_watchpoint_unittest.cc
similarity index 91%
rename from garnet/bin/debug_agent/process_watchpoint_unittest.cc
rename to src/developer/debug/debug_agent/process_watchpoint_unittest.cc
index 2cffcc7..4f0050d 100644
--- a/garnet/bin/debug_agent/process_watchpoint_unittest.cc
+++ b/src/developer/debug/debug_agent/process_watchpoint_unittest.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/process_watchpoint.h"
+#include "src/developer/debug/debug_agent/process_watchpoint.h"
 
 #include <gtest/gtest.h>
 
-#include "garnet/bin/debug_agent/debugged_process.h"
-#include "garnet/bin/debug_agent/debugged_thread.h"
-#include "garnet/bin/debug_agent/mock_arch_provider.h"
-#include "garnet/bin/debug_agent/mock_process.h"
-#include "garnet/bin/debug_agent/process_watchpoint.h"
-#include "garnet/bin/debug_agent/watchpoint.h"
+#include "src/developer/debug/debug_agent/debugged_process.h"
+#include "src/developer/debug/debug_agent/debugged_thread.h"
+#include "src/developer/debug/debug_agent/mock_arch_provider.h"
+#include "src/developer/debug/debug_agent/mock_process.h"
+#include "src/developer/debug/debug_agent/process_watchpoint.h"
+#include "src/developer/debug/debug_agent/watchpoint.h"
 #include "src/developer/debug/shared/zx_status.h"
 
 namespace debug_agent {
diff --git a/garnet/bin/debug_agent/remote_api.h b/src/developer/debug/debug_agent/remote_api.h
similarity index 100%
rename from garnet/bin/debug_agent/remote_api.h
rename to src/developer/debug/debug_agent/remote_api.h
diff --git a/garnet/bin/debug_agent/remote_api_adapter.cc b/src/developer/debug/debug_agent/remote_api_adapter.cc
similarity index 96%
rename from garnet/bin/debug_agent/remote_api_adapter.cc
rename to src/developer/debug/debug_agent/remote_api_adapter.cc
index c454f2c..e9ca2a8 100644
--- a/garnet/bin/debug_agent/remote_api_adapter.cc
+++ b/src/developer/debug/debug_agent/remote_api_adapter.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/remote_api_adapter.h"
+#include "src/developer/debug/debug_agent/remote_api_adapter.h"
 
-#include "garnet/bin/debug_agent/remote_api.h"
+#include "src/developer/debug/debug_agent/remote_api.h"
 #include "src/developer/debug/ipc/agent_protocol.h"
 #include "src/developer/debug/ipc/message_reader.h"
 #include "src/developer/debug/ipc/message_writer.h"
diff --git a/garnet/bin/debug_agent/remote_api_adapter.h b/src/developer/debug/debug_agent/remote_api_adapter.h
similarity index 100%
rename from garnet/bin/debug_agent/remote_api_adapter.h
rename to src/developer/debug/debug_agent/remote_api_adapter.h
diff --git a/garnet/bin/debug_agent/system_info.cc b/src/developer/debug/debug_agent/system_info.cc
similarity index 96%
rename from garnet/bin/debug_agent/system_info.cc
rename to src/developer/debug/debug_agent/system_info.cc
index b532583..46183e2 100644
--- a/garnet/bin/debug_agent/system_info.cc
+++ b/src/developer/debug/debug_agent/system_info.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/system_info.h"
+#include "src/developer/debug/debug_agent/system_info.h"
 
 #include <fcntl.h>
 #include <fuchsia/sysinfo/c/fidl.h>
+#include <lib/fdio/directory.h>
 #include <lib/fdio/fd.h>
 #include <lib/fdio/fdio.h>
-#include <lib/fdio/directory.h>
 #include <lib/zx/channel.h>
 #include <lib/zx/job.h>
 #include <lib/zx/process.h>
@@ -16,8 +16,8 @@
 #include <zircon/syscalls.h>
 #include <zircon/syscalls/object.h>
 
-#include "garnet/bin/debug_agent/object_util.h"
 #include "lib/fxl/logging.h"
+#include "src/developer/debug/debug_agent/object_util.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/system_info.h b/src/developer/debug/debug_agent/system_info.h
similarity index 100%
rename from garnet/bin/debug_agent/system_info.h
rename to src/developer/debug/debug_agent/system_info.h
diff --git a/garnet/bin/debug_agent/system_info_unittests.cc b/src/developer/debug/debug_agent/system_info_unittests.cc
similarity index 92%
rename from garnet/bin/debug_agent/system_info_unittests.cc
rename to src/developer/debug/debug_agent/system_info_unittests.cc
index ebf205c..ca3dade 100644
--- a/garnet/bin/debug_agent/system_info_unittests.cc
+++ b/src/developer/debug/debug_agent/system_info_unittests.cc
@@ -4,9 +4,9 @@
 
 #include <lib/zx/process.h>
 
-#include "garnet/bin/debug_agent/object_util.h"
-#include "garnet/bin/debug_agent/system_info.h"
 #include "gtest/gtest.h"
+#include "src/developer/debug/debug_agent/object_util.h"
+#include "src/developer/debug/debug_agent/system_info.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/test_data/BUILD.gn b/src/developer/debug/debug_agent/test_data/BUILD.gn
similarity index 100%
rename from garnet/bin/debug_agent/test_data/BUILD.gn
rename to src/developer/debug/debug_agent/test_data/BUILD.gn
diff --git a/garnet/bin/debug_agent/test_data/README.md b/src/developer/debug/debug_agent/test_data/README.md
similarity index 100%
rename from garnet/bin/debug_agent/test_data/README.md
rename to src/developer/debug/debug_agent/test_data/README.md
diff --git a/garnet/bin/debug_agent/test_data/breakpoint_test_exe.cc b/src/developer/debug/debug_agent/test_data/breakpoint_test_exe.cc
similarity index 78%
rename from garnet/bin/debug_agent/test_data/breakpoint_test_exe.cc
rename to src/developer/debug/debug_agent/test_data/breakpoint_test_exe.cc
index 6dfd404..f6488a4 100644
--- a/garnet/bin/debug_agent/test_data/breakpoint_test_exe.cc
+++ b/src/developer/debug/debug_agent/test_data/breakpoint_test_exe.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/test_data/test_so_symbols.h"
+#include "src/developer/debug/debug_agent/test_data/test_so_symbols.h"
 
 int main(int argc, char* argv[]) {
   int res = InsertBreakpointFunction(argc - 1);
diff --git a/garnet/bin/debug_agent/test_data/breakpoint_test_so.cc b/src/developer/debug/debug_agent/test_data/breakpoint_test_so.cc
similarity index 61%
rename from garnet/bin/debug_agent/test_data/breakpoint_test_so.cc
rename to src/developer/debug/debug_agent/test_data/breakpoint_test_so.cc
index f01f47e..0aa17d0 100644
--- a/garnet/bin/debug_agent/test_data/breakpoint_test_so.cc
+++ b/src/developer/debug/debug_agent/test_data/breakpoint_test_so.cc
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/test_data/test_so_symbols.h"
+#include "src/developer/debug/debug_agent/test_data/test_so_symbols.h"
 
-int InsertBreakpointFunction(int c) {
-  return 10 * c;
-}
+int InsertBreakpointFunction(int c) { return 10 * c; }
 
 void AnotherFunctionForKicks() {}
diff --git a/garnet/bin/debug_agent/test_data/false.c b/src/developer/debug/debug_agent/test_data/false.c
similarity index 100%
rename from garnet/bin/debug_agent/test_data/false.c
rename to src/developer/debug/debug_agent/test_data/false.c
diff --git a/garnet/bin/debug_agent/test_data/hw_breakpointer.cc b/src/developer/debug/debug_agent/test_data/hw_breakpointer.cc
similarity index 96%
rename from garnet/bin/debug_agent/test_data/hw_breakpointer.cc
rename to src/developer/debug/debug_agent/test_data/hw_breakpointer.cc
index 0179820..4237268 100644
--- a/garnet/bin/debug_agent/test_data/hw_breakpointer.cc
+++ b/src/developer/debug/debug_agent/test_data/hw_breakpointer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <zircon/threads.h>
-#include <zircon/syscalls/debug.h>
 #include <zircon/syscalls.h>
+#include <zircon/syscalls/debug.h>
+#include <zircon/threads.h>
 
 #include "lib/fxl/logging.h"
 
@@ -31,9 +31,7 @@
 constexpr char kBeacon[] = "Counter: Thread running.\n";
 
 // This is the function that we will set up the breakpoint to.
-int __NO_INLINE FunctionToBreakpointOn(int c) {
-  return c + c;
-}
+int __NO_INLINE FunctionToBreakpointOn(int c) { return c + c; }
 
 // This is the code that the new thread will run.
 // It's meant to be an eternal loop.
@@ -73,7 +71,7 @@
 
   zx_thread_state_debug_regs_t debug_regs = {};
   auto& hw_bp = debug_regs.hw_bps[0];
-  hw_bp.dbgbcr = 1;   // Activate it.
+  hw_bp.dbgbcr = 1;  // Activate it.
   hw_bp.dbgbvr = reinterpret_cast<uint64_t>(FunctionToBreakpointOn);
 
   FXL_LOG(INFO) << "DBGBVR: 0x" << std::hex << debug_regs.hw_bps[0].dbgbvr;
diff --git a/garnet/bin/debug_agent/test_data/printer.cc b/src/developer/debug/debug_agent/test_data/printer.cc
similarity index 100%
rename from garnet/bin/debug_agent/test_data/printer.cc
rename to src/developer/debug/debug_agent/test_data/printer.cc
diff --git a/garnet/bin/debug_agent/test_data/process_loop.cc b/src/developer/debug/debug_agent/test_data/process_loop.cc
similarity index 100%
rename from garnet/bin/debug_agent/test_data/process_loop.cc
rename to src/developer/debug/debug_agent/test_data/process_loop.cc
diff --git a/garnet/bin/debug_agent/test_data/process_spawner.cc b/src/developer/debug/debug_agent/test_data/process_spawner.cc
similarity index 99%
rename from garnet/bin/debug_agent/test_data/process_spawner.cc
rename to src/developer/debug/debug_agent/test_data/process_spawner.cc
index d7814ff..74286ef6 100644
--- a/garnet/bin/debug_agent/test_data/process_spawner.cc
+++ b/src/developer/debug/debug_agent/test_data/process_spawner.cc
@@ -13,10 +13,10 @@
 #include <lib/fxl/logging.h>
 #include <lib/fxl/strings/string_printf.h>
 #include <lib/zx/job.h>
+#include <zircon/processargs.h>
 #include <zircon/status.h>
 #include <zircon/syscalls.h>
 #include <zircon/syscalls/object.h>
-#include <zircon/processargs.h>
 
 // ProcessSpawner is a simple utility that waits for user input on stdin and
 // creates a new process when anything that doens't say "exit" in it is entered.
diff --git a/garnet/bin/debug_agent/test_data/test_so_symbols.h b/src/developer/debug/debug_agent/test_data/test_so_symbols.h
similarity index 99%
rename from garnet/bin/debug_agent/test_data/test_so_symbols.h
rename to src/developer/debug/debug_agent/test_data/test_so_symbols.h
index 03bd7a9..992186a 100644
--- a/garnet/bin/debug_agent/test_data/test_so_symbols.h
+++ b/src/developer/debug/debug_agent/test_data/test_so_symbols.h
@@ -25,5 +25,4 @@
 
 EXPORT NOINLINE void Test_BranchOnRAX();
 EXPORT NOINLINE void Test_PCJump();
-
 }
diff --git a/garnet/bin/debug_agent/test_data/true.c b/src/developer/debug/debug_agent/test_data/true.c
similarity index 100%
rename from garnet/bin/debug_agent/test_data/true.c
rename to src/developer/debug/debug_agent/test_data/true.c
diff --git a/garnet/bin/debug_agent/test_data/x64_write_register_test_exe.cc b/src/developer/debug/debug_agent/test_data/x64_write_register_test_exe.cc
similarity index 92%
rename from garnet/bin/debug_agent/test_data/x64_write_register_test_exe.cc
rename to src/developer/debug/debug_agent/test_data/x64_write_register_test_exe.cc
index 8f89533..20eed31 100644
--- a/garnet/bin/debug_agent/test_data/x64_write_register_test_exe.cc
+++ b/src/developer/debug/debug_agent/test_data/x64_write_register_test_exe.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/test_data/test_so_symbols.h"
+#include "src/developer/debug/debug_agent/test_data/test_so_symbols.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/garnet/bin/debug_agent/test_data/x64_write_register_test_so.cc b/src/developer/debug/debug_agent/test_data/x64_write_register_test_so.cc
similarity index 87%
rename from garnet/bin/debug_agent/test_data/x64_write_register_test_so.cc
rename to src/developer/debug/debug_agent/test_data/x64_write_register_test_so.cc
index d473f42..e28fc10 100644
--- a/garnet/bin/debug_agent/test_data/x64_write_register_test_so.cc
+++ b/src/developer/debug/debug_agent/test_data/x64_write_register_test_so.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/test_data/test_so_symbols.h"
+#include "src/developer/debug/debug_agent/test_data/test_so_symbols.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -11,16 +11,16 @@
 bool gTestPassed = false;
 
 extern "C" {
-  void Success() {
-    printf("Test passes :)\n");
-    gTestPassed = true;
-  }
+void Success() {
+  printf("Test passes :)\n");
+  gTestPassed = true;
+}
 
-  void Failure() {
-    printf("Test failed :(\n");
-    gTestPassed = false;
-    assert(false);
-  }
+void Failure() {
+  printf("Test failed :(\n");
+  gTestPassed = false;
+  assert(false);
+}
 }
 
 // Common routines
@@ -96,5 +96,3 @@
 
   .popsection
 )");
-
-
diff --git a/garnet/bin/debug_agent/unwind.cc b/src/developer/debug/debug_agent/unwind.cc
similarity index 98%
rename from garnet/bin/debug_agent/unwind.cc
rename to src/developer/debug/debug_agent/unwind.cc
index 998efa4..e5b209e 100644
--- a/garnet/bin/debug_agent/unwind.cc
+++ b/src/developer/debug/debug_agent/unwind.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/unwind.h"
+#include "src/developer/debug/debug_agent/unwind.h"
 
 #include <inttypes.h>
 #include <ngunwind/fuchsia.h>
 #include <ngunwind/libunwind.h>
 #include <algorithm>
 
-#include "garnet/bin/debug_agent/process_info.h"
 #include "garnet/third_party/libunwindstack/fuchsia/MemoryFuchsia.h"
 #include "garnet/third_party/libunwindstack/fuchsia/RegsFuchsia.h"
 #include "garnet/third_party/libunwindstack/include/unwindstack/Unwinder.h"
+#include "src/developer/debug/debug_agent/process_info.h"
 
 namespace debug_agent {
 
diff --git a/garnet/bin/debug_agent/unwind.h b/src/developer/debug/debug_agent/unwind.h
similarity index 100%
rename from garnet/bin/debug_agent/unwind.h
rename to src/developer/debug/debug_agent/unwind.h
diff --git a/garnet/bin/debug_agent/watchpoint.cc b/src/developer/debug/debug_agent/watchpoint.cc
similarity index 97%
rename from garnet/bin/debug_agent/watchpoint.cc
rename to src/developer/debug/debug_agent/watchpoint.cc
index 0119465..1d7e179 100644
--- a/garnet/bin/debug_agent/watchpoint.cc
+++ b/src/developer/debug/debug_agent/watchpoint.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/bin/debug_agent/watchpoint.h"
+#include "src/developer/debug/debug_agent/watchpoint.h"
 
 #include "src/developer/debug/ipc/records_utils.h"
 
diff --git a/garnet/bin/debug_agent/watchpoint.h b/src/developer/debug/debug_agent/watchpoint.h
similarity index 100%
rename from garnet/bin/debug_agent/watchpoint.h
rename to src/developer/debug/debug_agent/watchpoint.h
diff --git a/garnet/bin/debug_agent/zxdb_test_app.cc b/src/developer/debug/debug_agent/zxdb_test_app.cc
similarity index 96%
rename from garnet/bin/debug_agent/zxdb_test_app.cc
rename to src/developer/debug/debug_agent/zxdb_test_app.cc
index 2fc9bc3..5e87506 100644
--- a/garnet/bin/debug_agent/zxdb_test_app.cc
+++ b/src/developer/debug/debug_agent/zxdb_test_app.cc
@@ -85,7 +85,7 @@
 }
 
 void DoArrays(int x, int y) {
-  double array[4][3] = { {0, 1, 2}, {3, 4, 5}, {6, 7, 8}, {9, 10, 11}};
+  double array[4][3] = {{0, 1, 2}, {3, 4, 5}, {6, 7, 8}, {9, 10, 11}};
   double foo = array[1][2];
   (void)foo;
   char buf[2];