diff --git a/garnet/bin/display_capture_test/BUILD.gn b/garnet/bin/display_capture_test/BUILD.gn
index aa25a07..bfee93a 100644
--- a/garnet/bin/display_capture_test/BUILD.gn
+++ b/garnet/bin/display_capture_test/BUILD.gn
@@ -25,8 +25,8 @@
   ]
 
   deps = [
-    "//garnet/lib/media/camera/simple_camera_lib",
     "//garnet/public/lib/fsl",
+    "//src/camera/simple_camera/simple_camera_lib",
     "//zircon/public/fidl/fuchsia-hardware-camera:fuchsia-hardware-camera_c",
     "//zircon/public/fidl/fuchsia-hardware-display",
     "//zircon/public/fidl/fuchsia-hardware-display:fuchsia-hardware-display_c",
diff --git a/garnet/bin/media/BUILD.gn b/garnet/bin/media/BUILD.gn
index 8cec17d..1c3fb1f 100644
--- a/garnet/bin/media/BUILD.gn
+++ b/garnet/bin/media/BUILD.gn
@@ -11,7 +11,6 @@
     ":codec_runner_sw_ffmpeg",
     ":codec_runner_sw_sbc",
     ":services",
-    "camera_manager",
     "codec_factory",
     "codecs",
   ]
diff --git a/garnet/examples/ui/BUILD.gn b/garnet/examples/ui/BUILD.gn
index d5d0374..2c9170f 100644
--- a/garnet/examples/ui/BUILD.gn
+++ b/garnet/examples/ui/BUILD.gn
@@ -20,7 +20,6 @@
     "spinning_square",
     "standalone_app",
     "tile",
-    "video_display",
     "yuv_to_image_pipe",
   ]
 }
@@ -245,21 +244,6 @@
   ]
 }
 
-package("video_display") {
-  deps = [
-    "video_display",
-  ]
-
-  binary = "video_display"
-
-  meta = [
-    {
-      path = rebase_path("meta/ui_example.cmx")
-      dest = "video_display.cmx"
-    },
-  ]
-}
-
 package("yuv_to_image_pipe") {
   deps = [
     "yuv_to_image_pipe",
diff --git a/garnet/packages/examples/BUILD.gn b/garnet/packages/examples/BUILD.gn
index a9864dc..e360d38 100644
--- a/garnet/packages/examples/BUILD.gn
+++ b/garnet/packages/examples/BUILD.gn
@@ -46,9 +46,9 @@
     "//garnet/examples/ui:spinning_square_view",
     "//garnet/examples/ui:standalone_app",
     "//garnet/examples/ui:tile_view",
-    "//garnet/examples/ui:video_display",
     "//garnet/examples/ui:yuv_to_image_pipe",
     "//garnet/packages/prod:scenic",
+    "//src/camera/examples/video_display",
   ]
 }
 
diff --git a/garnet/packages/prod/BUILD.gn b/garnet/packages/prod/BUILD.gn
index b520ebd..c739bd6 100644
--- a/garnet/packages/prod/BUILD.gn
+++ b/garnet/packages/prod/BUILD.gn
@@ -454,14 +454,14 @@
 group("usb_video") {
   testonly = true
   public_deps = [
-    "//garnet/drivers/usb_video",
+    "//src/camera/drivers/usb_video",
   ]
 }
 
 group("virtual_camera") {
   testonly = true
   public_deps = [
-    "//garnet/drivers/virtual_camera",
+    "//src/camera/drivers/virtual_camera",
   ]
 }
 
@@ -611,13 +611,13 @@
 group("media") {
   testonly = true
   public_deps = [
-    "//garnet/bin/media/camera_manager:camera_manager",
-    "//garnet/lib/media/camera/simple_camera_server:simple_camera_server_cpp",
     "//garnet/packages/prod:media_audio",
     "//garnet/packages/prod:media_codec",
     "//garnet/packages/prod:mediaplayer",
     "//garnet/packages/prod:mediasession",
     "//garnet/packages/prod:tts",
+    "//src//camera/simple_camera/simple_camera_server:simple_camera_server_cpp",
+    "//src/camera/camera_manager",
   ]
 }
 
diff --git a/garnet/packages/tests/BUILD.gn b/garnet/packages/tests/BUILD.gn
index 6bee3fe..30c9728 100644
--- a/garnet/packages/tests/BUILD.gn
+++ b/garnet/packages/tests/BUILD.gn
@@ -843,7 +843,7 @@
 group("camera_client") {
   testonly = true
   public_deps = [
-    "//garnet/lib/media/camera/simple_camera_lib:camera_tests",
+    "//src/camera/simple_camera/simple_camera_lib:camera_tests",
     "//src/camera/test/camera_client_test",
   ]
 }
@@ -1065,9 +1065,9 @@
     "//garnet/packages/prod:runtime",
     "//src/sys/component_manager:component_manager_tests",
     "//src/sys/component_manager/tests:elf_runner_test",
+    "//src/sys/component_manager/tests:hub_integration_test",
     "//src/sys/component_manager/tests:no_pkg_resolver_test",
     "//src/sys/component_manager/tests:routing_integration_test",
-    "//src/sys/component_manager/tests:hub_integration_test",
   ]
 }
 
diff --git a/garnet/public/lib/component/cpp/BUILD.gn b/garnet/public/lib/component/cpp/BUILD.gn
index cb117e7..2a4d162 100644
--- a/garnet/public/lib/component/cpp/BUILD.gn
+++ b/garnet/public/lib/component/cpp/BUILD.gn
@@ -67,8 +67,9 @@
     "//garnet/examples/ui/standalone_app/*",
     "//garnet/examples/ui/video_display/*",
     "//garnet/examples/ui/yuv_to_image_pipe/*",
-    "//garnet/lib/media/camera/simple_camera_lib/*",
-    "//garnet/lib/media/camera/simple_camera_server/*",
+    "//src/camera/camera_manager/*",
+    "//src/camera/examples/*",
+    "//src/camera/simple_camera/*",
     "//garnet/lib/media/test/*",
     "//garnet/lib/media/test/*",
     "//garnet/lib/vulkan/tests/vkcube/*",
diff --git a/garnet/bin/media/camera_manager/BUILD.gn b/src/camera/camera_manager/BUILD.gn
similarity index 92%
rename from garnet/bin/media/camera_manager/BUILD.gn
rename to src/camera/camera_manager/BUILD.gn
index 2676a9c..aeee419 100644
--- a/garnet/bin/media/camera_manager/BUILD.gn
+++ b/src/camera/camera_manager/BUILD.gn
@@ -6,9 +6,9 @@
 
 source_set("lib") {
   sources = [
-    "camera_manager_impl.cc",
+    "camera_manager_impl.cpp",
     "camera_manager_impl.h",
-    "video_device_client.cc",
+    "video_device_client.cpp",
     "video_device_client.h",
   ]
 
@@ -36,7 +36,7 @@
   output_name = "camera_manager"
 
   sources = [
-    "camera_manager.cc",
+    "camera_manager.cpp",
   ]
 
   deps = [
diff --git a/garnet/bin/media/camera_manager/camera_manager.cc b/src/camera/camera_manager/camera_manager.cpp
similarity index 85%
rename from garnet/bin/media/camera_manager/camera_manager.cc
rename to src/camera/camera_manager/camera_manager.cpp
index e0b4975..8d32187 100644
--- a/garnet/bin/media/camera_manager/camera_manager.cc
+++ b/src/camera/camera_manager/camera_manager.cpp
@@ -4,7 +4,7 @@
 
 #include <lib/async-loop/cpp/loop.h>
 
-#include "garnet/bin/media/camera_manager/camera_manager_impl.h"
+#include "src/camera/camera_manager/camera_manager_impl.h"
 
 int main(int argc, const char** argv) {
   FXL_LOG(INFO) << "Camera Manager Starting";
diff --git a/garnet/bin/media/camera_manager/camera_manager_impl.cc b/src/camera/camera_manager/camera_manager_impl.cpp
similarity index 98%
rename from garnet/bin/media/camera_manager/camera_manager_impl.cc
rename to src/camera/camera_manager/camera_manager_impl.cpp
index 5c50569..39e44b0 100644
--- a/garnet/bin/media/camera_manager/camera_manager_impl.cc
+++ b/src/camera/camera_manager/camera_manager_impl.cpp
@@ -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/media/camera_manager/camera_manager_impl.h"
+#include "src/camera/camera_manager/camera_manager_impl.h"
 
 #include <ddk/debug.h>
 #include <ddk/driver.h>
diff --git a/garnet/bin/media/camera_manager/camera_manager_impl.h b/src/camera/camera_manager/camera_manager_impl.h
similarity index 91%
rename from garnet/bin/media/camera_manager/camera_manager_impl.h
rename to src/camera/camera_manager/camera_manager_impl.h
index e74c431..51ec206 100644
--- a/garnet/bin/media/camera_manager/camera_manager_impl.h
+++ b/src/camera/camera_manager/camera_manager_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_BIN_MEDIA_CAMERA_MANAGER_CAMERA_MANAGER_IMPL_H_
-#define GARNET_BIN_MEDIA_CAMERA_MANAGER_CAMERA_MANAGER_IMPL_H_
+#ifndef SRC_CAMERA_CAMERA_MANAGER_CAMERA_MANAGER_IMPL_H_
+#define SRC_CAMERA_CAMERA_MANAGER_CAMERA_MANAGER_IMPL_H_
 
 #include <ddk/debug.h>
 #include <ddk/driver.h>
 #include <fuchsia/camera/cpp/fidl.h>
-#include <garnet/bin/media/camera_manager/video_device_client.h>
+#include <src/camera/camera_manager/video_device_client.h>
 #include <lib/fidl/cpp/binding.h>
 #include <lib/fsl/io/device_watcher.h>
 
@@ -74,4 +74,4 @@
 
 }  // namespace camera
 
-#endif  // GARNET_BIN_MEDIA_CAMERA_MANAGER_CAMERA_MANAGER_IMPL_H_
+#endif  // SRC_CAMERA_CAMERA_MANAGER_CAMERA_MANAGER_IMPL_H_
diff --git a/garnet/bin/media/camera_manager/meta/camera_manager.cmx b/src/camera/camera_manager/meta/camera_manager.cmx
similarity index 100%
rename from garnet/bin/media/camera_manager/meta/camera_manager.cmx
rename to src/camera/camera_manager/meta/camera_manager.cmx
diff --git a/garnet/bin/media/camera_manager/video_device_client.cc b/src/camera/camera_manager/video_device_client.cpp
similarity index 98%
rename from garnet/bin/media/camera_manager/video_device_client.cc
rename to src/camera/camera_manager/video_device_client.cpp
index fbc1998..a36fa2c 100644
--- a/garnet/bin/media/camera_manager/video_device_client.cc
+++ b/src/camera/camera_manager/video_device_client.cpp
@@ -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/media/camera_manager/video_device_client.h"
+#include "src/camera/camera_manager/video_device_client.h"
 
 #include <fbl/unique_fd.h>
 #include <fcntl.h>
diff --git a/garnet/bin/media/camera_manager/video_device_client.h b/src/camera/camera_manager/video_device_client.h
similarity index 96%
rename from garnet/bin/media/camera_manager/video_device_client.h
rename to src/camera/camera_manager/video_device_client.h
index 82bdc7b..74b0216 100644
--- a/garnet/bin/media/camera_manager/video_device_client.h
+++ b/src/camera/camera_manager/video_device_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_BIN_MEDIA_CAMERA_MANAGER_VIDEO_DEVICE_CLIENT_H_
-#define GARNET_BIN_MEDIA_CAMERA_MANAGER_VIDEO_DEVICE_CLIENT_H_
+#ifndef SRC_CAMERA_CAMERA_MANAGER_VIDEO_DEVICE_CLIENT_H_
+#define SRC_CAMERA_CAMERA_MANAGER_VIDEO_DEVICE_CLIENT_H_
 
 #include <fuchsia/camera/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
@@ -148,4 +148,4 @@
 
 }  // namespace camera
 
-#endif  // GARNET_BIN_MEDIA_CAMERA_MANAGER_VIDEO_DEVICE_CLIENT_H_
+#endif  // SRC_CAMERA_CAMERA_MANAGER_VIDEO_DEVICE_CLIENT_H_
diff --git a/garnet/drivers/usb_video/BUILD.gn b/src/camera/drivers/usb_video/BUILD.gn
similarity index 100%
rename from garnet/drivers/usb_video/BUILD.gn
rename to src/camera/drivers/usb_video/BUILD.gn
diff --git a/garnet/drivers/usb_video/camera_control_impl.cpp b/src/camera/drivers/usb_video/camera_control_impl.cpp
similarity index 97%
rename from garnet/drivers/usb_video/camera_control_impl.cpp
rename to src/camera/drivers/usb_video/camera_control_impl.cpp
index 876963d..7785030 100644
--- a/garnet/drivers/usb_video/camera_control_impl.cpp
+++ b/src/camera/drivers/usb_video/camera_control_impl.cpp
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "garnet/drivers/usb_video/camera_control_impl.h"
+#include "src/camera/drivers/usb_video/camera_control_impl.h"
 
 #include <ddk/debug.h>
 
-#include "garnet/drivers/usb_video/usb-video-stream.h"
+#include "src/camera/drivers/usb_video/usb-video-stream.h"
 #include "src/lib/fxl/logging.h"
 
 namespace camera {
diff --git a/garnet/drivers/usb_video/camera_control_impl.h b/src/camera/drivers/usb_video/camera_control_impl.h
similarity index 93%
rename from garnet/drivers/usb_video/camera_control_impl.h
rename to src/camera/drivers/usb_video/camera_control_impl.h
index 8841b67..0955645 100644
--- a/garnet/drivers/usb_video/camera_control_impl.h
+++ b/src/camera/drivers/usb_video/camera_control_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_DRIVERS_USB_VIDEO_CAMERA_CONTROL_IMPL_H_
-#define GARNET_DRIVERS_USB_VIDEO_CAMERA_CONTROL_IMPL_H_
+#ifndef SRC_CAMERA_DRIVERS_USB_VIDEO_CAMERA_CONTROL_IMPL_H_
+#define SRC_CAMERA_DRIVERS_USB_VIDEO_CAMERA_CONTROL_IMPL_H_
 
 #include <fbl/unique_ptr.h>
 #include <fuchsia/camera/cpp/fidl.h>
@@ -91,4 +91,4 @@
 
 }  // namespace camera
 
-#endif  // GARNET_DRIVERS_USB_VIDEO_CAMERA_CONTROL_IMPL_H_
+#endif  // SRC_CAMERA_DRIVERS_USB_VIDEO_CAMERA_CONTROL_IMPL_H_
diff --git a/garnet/drivers/usb_video/usb-video-stream.cpp b/src/camera/drivers/usb_video/usb-video-stream.cpp
similarity index 99%
rename from garnet/drivers/usb_video/usb-video-stream.cpp
rename to src/camera/drivers/usb_video/usb-video-stream.cpp
index f245a41..b735e8a 100644
--- a/garnet/drivers/usb_video/usb-video-stream.cpp
+++ b/src/camera/drivers/usb_video/usb-video-stream.cpp
@@ -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/drivers/usb_video/usb-video-stream.h"
+#include "src/camera/drivers/usb_video/usb-video-stream.h"
 
 #include <ddk/debug.h>
 #include <fbl/algorithm.h>
@@ -18,8 +18,8 @@
 #include <string.h>
 #include <usb/usb-request.h>
 
-#include "garnet/drivers/usb_video/camera_control_impl.h"
-#include "garnet/drivers/usb_video/video-util.h"
+#include "src/camera/drivers/usb_video/camera_control_impl.h"
+#include "src/camera/drivers/usb_video/video-util.h"
 
 namespace video {
 namespace usb {
diff --git a/garnet/drivers/usb_video/usb-video-stream.h b/src/camera/drivers/usb_video/usb-video-stream.h
similarity index 95%
rename from garnet/drivers/usb_video/usb-video-stream.h
rename to src/camera/drivers/usb_video/usb-video-stream.h
index 4c0bf40..80f4933 100644
--- a/garnet/drivers/usb_video/usb-video-stream.h
+++ b/src/camera/drivers/usb_video/usb-video-stream.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_DRIVERS_USB_VIDEO_USB_VIDEO_STREAM_H_
-#define GARNET_DRIVERS_USB_VIDEO_USB_VIDEO_STREAM_H_
+#ifndef SRC_CAMERA_DRIVERS_USB_VIDEO_USB_VIDEO_STREAM_H_
+#define SRC_CAMERA_DRIVERS_USB_VIDEO_USB_VIDEO_STREAM_H_
 
 #include <ddktl/device-internal.h>
 #include <ddktl/device.h>
@@ -18,9 +18,9 @@
 #include <lib/zx/vmo.h>
 #include <usb/usb.h>
 
-#include "garnet/drivers/usb_video/camera_control_impl.h"
-#include "garnet/drivers/usb_video/usb-video.h"
-#include "garnet/drivers/usb_video/uvc_format.h"
+#include "src/camera/drivers/usb_video/camera_control_impl.h"
+#include "src/camera/drivers/usb_video/usb-video.h"
+#include "src/camera/drivers/usb_video/uvc_format.h"
 
 namespace video {
 namespace usb {
@@ -227,4 +227,4 @@
 }  // namespace usb
 }  // namespace video
 
-#endif  // GARNET_DRIVERS_USB_VIDEO_USB_VIDEO_STREAM_H_
+#endif  // SRC_CAMERA_DRIVERS_USB_VIDEO_USB_VIDEO_STREAM_H_
diff --git a/garnet/drivers/usb_video/usb-video.cpp b/src/camera/drivers/usb_video/usb-video.cpp
similarity index 98%
rename from garnet/drivers/usb_video/usb-video.cpp
rename to src/camera/drivers/usb_video/usb-video.cpp
index 264930e..2b686b8 100644
--- a/garnet/drivers/usb_video/usb-video.cpp
+++ b/src/camera/drivers/usb_video/usb-video.cpp
@@ -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/drivers/usb_video/usb-video.h"
+#include "src/camera/drivers/usb_video/usb-video.h"
 
 #include <ddk/binding.h>
 #include <ddk/debug.h>
@@ -15,8 +15,8 @@
 #include <usb/usb.h>
 #include <zircon/hw/usb/video.h>
 
-#include "garnet/drivers/usb_video/usb-video-stream.h"
-#include "garnet/drivers/usb_video/uvc_format.h"
+#include "src/camera/drivers/usb_video/usb-video-stream.h"
+#include "src/camera/drivers/usb_video/uvc_format.h"
 
 namespace {
 // The biggest size we are allowing USB descriptor strings to be.
diff --git a/garnet/drivers/usb_video/usb-video.h b/src/camera/drivers/usb_video/usb-video.h
similarity index 84%
rename from garnet/drivers/usb_video/usb-video.h
rename to src/camera/drivers/usb_video/usb-video.h
index b5521f0..802182b 100644
--- a/garnet/drivers/usb_video/usb-video.h
+++ b/src/camera/drivers/usb_video/usb-video.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_DRIVERS_USB_VIDEO_USB_VIDEO_H_
-#define GARNET_DRIVERS_USB_VIDEO_USB_VIDEO_H_
+#ifndef SRC_CAMERA_DRIVERS_USB_VIDEO_USB_VIDEO_H_
+#define SRC_CAMERA_DRIVERS_USB_VIDEO_USB_VIDEO_H_
 
 #include <ddk/device.h>
 #include <fbl/vector.h>
@@ -13,7 +13,7 @@
 #include <zircon/hw/usb.h>
 #include <zircon/hw/usb/video.h>
 
-#include "garnet/drivers/usb_video/uvc_format.h"
+#include "src/camera/drivers/usb_video/uvc_format.h"
 
 namespace video {
 namespace usb {
@@ -47,4 +47,4 @@
 }  // namespace usb
 }  // namespace video
 
-#endif  // GARNET_DRIVERS_USB_VIDEO_USB_VIDEO_H_
+#endif  // SRC_CAMERA_DRIVERS_USB_VIDEO_USB_VIDEO_H_
diff --git a/garnet/drivers/usb_video/uvc_format.cpp b/src/camera/drivers/usb_video/uvc_format.cpp
similarity index 98%
rename from garnet/drivers/usb_video/uvc_format.cpp
rename to src/camera/drivers/usb_video/uvc_format.cpp
index d2dfc2d..22e70e6 100644
--- a/garnet/drivers/usb_video/uvc_format.cpp
+++ b/src/camera/drivers/usb_video/uvc_format.cpp
@@ -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/drivers/usb_video/uvc_format.h"
+#include "src/camera/drivers/usb_video/uvc_format.h"
 
 #include <ddk/debug.h>
 #include <ddk/protocol/usb.h>
@@ -11,7 +11,7 @@
 #include <usb/usb.h>
 #include <zircon/hw/usb/video.h>
 
-#include "garnet/drivers/usb_video/usb-video-stream.h"
+#include "src/camera/drivers/usb_video/usb-video-stream.h"
 
 namespace video {
 namespace usb {
diff --git a/garnet/drivers/usb_video/uvc_format.h b/src/camera/drivers/usb_video/uvc_format.h
similarity index 94%
rename from garnet/drivers/usb_video/uvc_format.h
rename to src/camera/drivers/usb_video/uvc_format.h
index 42a6aa9..55c416b 100644
--- a/garnet/drivers/usb_video/uvc_format.h
+++ b/src/camera/drivers/usb_video/uvc_format.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_DRIVERS_USB_VIDEO_UVC_FORMAT_H_
-#define GARNET_DRIVERS_USB_VIDEO_UVC_FORMAT_H_
+#ifndef SRC_CAMERA_DRIVERS_USB_VIDEO_UVC_FORMAT_H_
+#define SRC_CAMERA_DRIVERS_USB_VIDEO_UVC_FORMAT_H_
 
 #include <ddk/device.h>
 #include <fbl/vector.h>
@@ -107,4 +107,4 @@
 }  // namespace usb
 }  // namespace video
 
-#endif  // GARNET_DRIVERS_USB_VIDEO_UVC_FORMAT_H_
+#endif  // SRC_CAMERA_DRIVERS_USB_VIDEO_UVC_FORMAT_H_
diff --git a/garnet/drivers/usb_video/video-util.c b/src/camera/drivers/usb_video/video-util.c
similarity index 97%
rename from garnet/drivers/usb_video/video-util.c
rename to src/camera/drivers/usb_video/video-util.c
index 8e30063..207f817 100644
--- a/garnet/drivers/usb_video/video-util.c
+++ b/src/camera/drivers/usb_video/video-util.c
@@ -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/drivers/usb_video/video-util.h"
+#include "src/camera/drivers/usb_video/video-util.h"
 
 #include <ddk/debug.h>
 #include <string.h>
diff --git a/garnet/drivers/usb_video/video-util.h b/src/camera/drivers/usb_video/video-util.h
similarity index 88%
rename from garnet/drivers/usb_video/video-util.h
rename to src/camera/drivers/usb_video/video-util.h
index 025898c..88c02cf 100644
--- a/garnet/drivers/usb_video/video-util.h
+++ b/src/camera/drivers/usb_video/video-util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_DRIVERS_USB_VIDEO_VIDEO_UTIL_H_
-#define GARNET_DRIVERS_USB_VIDEO_VIDEO_UTIL_H_
+#ifndef SRC_CAMERA_DRIVERS_USB_VIDEO_VIDEO_UTIL_H_
+#define SRC_CAMERA_DRIVERS_USB_VIDEO_VIDEO_UTIL_H_
 
 #include <usb/usb.h>
 #include <zircon/hw/usb/video.h>
@@ -32,4 +32,4 @@
 
 __END_CDECLS
 
-#endif  // GARNET_DRIVERS_USB_VIDEO_VIDEO_UTIL_H_
+#endif  // SRC_CAMERA_DRIVERS_USB_VIDEO_VIDEO_UTIL_H_
diff --git a/garnet/drivers/virtual_camera/BUILD.gn b/src/camera/drivers/virtual_camera/BUILD.gn
similarity index 100%
rename from garnet/drivers/virtual_camera/BUILD.gn
rename to src/camera/drivers/virtual_camera/BUILD.gn
diff --git a/garnet/drivers/virtual_camera/virtual_camera.cpp b/src/camera/drivers/virtual_camera/virtual_camera.cpp
similarity index 94%
rename from garnet/drivers/virtual_camera/virtual_camera.cpp
rename to src/camera/drivers/virtual_camera/virtual_camera.cpp
index 68af1c5..d9866ae 100644
--- a/garnet/drivers/virtual_camera/virtual_camera.cpp
+++ b/src/camera/drivers/virtual_camera/virtual_camera.cpp
@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "garnet/drivers/virtual_camera/virtual_camera_device.h"
+#include "src/camera/drivers/virtual_camera/virtual_camera_device.h"
 
 namespace virtual_camera {
 
diff --git a/garnet/drivers/virtual_camera/virtual_camera_control.cpp b/src/camera/drivers/virtual_camera/virtual_camera_control.cpp
similarity index 100%
rename from garnet/drivers/virtual_camera/virtual_camera_control.cpp
rename to src/camera/drivers/virtual_camera/virtual_camera_control.cpp
diff --git a/garnet/drivers/virtual_camera/virtual_camera_control.h b/src/camera/drivers/virtual_camera/virtual_camera_control.h
similarity index 94%
rename from garnet/drivers/virtual_camera/virtual_camera_control.h
rename to src/camera/drivers/virtual_camera/virtual_camera_control.h
index 9c2f761..81a81bc 100644
--- a/garnet/drivers/virtual_camera/virtual_camera_control.h
+++ b/src/camera/drivers/virtual_camera/virtual_camera_control.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_CONTROL_H_
-#define GARNET_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_CONTROL_H_
+#ifndef SRC_CAMERA_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_CONTROL_H_
+#define SRC_CAMERA_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_CONTROL_H_
 
 #include <fuchsia/camera/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
@@ -111,4 +111,4 @@
 
 }  // namespace virtual_camera
 
-#endif  // GARNET_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_CONTROL_H_
+#endif  // SRC_CAMERA_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_CONTROL_H_
diff --git a/garnet/drivers/virtual_camera/virtual_camera_device.cpp b/src/camera/drivers/virtual_camera/virtual_camera_device.cpp
similarity index 95%
rename from garnet/drivers/virtual_camera/virtual_camera_device.cpp
rename to src/camera/drivers/virtual_camera/virtual_camera_device.cpp
index 24656b6..104db80 100644
--- a/garnet/drivers/virtual_camera/virtual_camera_device.cpp
+++ b/src/camera/drivers/virtual_camera/virtual_camera_device.cpp
@@ -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/drivers/virtual_camera/virtual_camera_device.h"
+#include "src/camera/drivers/virtual_camera/virtual_camera_device.h"
 
-#include "garnet/drivers/virtual_camera/virtual_camera_control.h"
+#include "src/camera/drivers/virtual_camera/virtual_camera_control.h"
 #include "src/lib/fxl/logging.h"
 
 namespace virtual_camera {
diff --git a/garnet/drivers/virtual_camera/virtual_camera_device.h b/src/camera/drivers/virtual_camera/virtual_camera_device.h
similarity index 83%
rename from garnet/drivers/virtual_camera/virtual_camera_device.h
rename to src/camera/drivers/virtual_camera/virtual_camera_device.h
index 7b89dd7..26534d6 100644
--- a/garnet/drivers/virtual_camera/virtual_camera_device.h
+++ b/src/camera/drivers/virtual_camera/virtual_camera_device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_DEVICE_H_
-#define GARNET_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_DEVICE_H_
+#ifndef SRC_CAMERA_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_DEVICE_H_
+#define SRC_CAMERA_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_DEVICE_H_
 
 #include <ddk/protocol/test.h>
 #include <ddktl/device-internal.h>
@@ -45,4 +45,4 @@
 
 }  // namespace virtual_camera
 
-#endif  // GARNET_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_DEVICE_H_
+#endif  // SRC_CAMERA_DRIVERS_VIRTUAL_CAMERA_VIRTUAL_CAMERA_DEVICE_H_
diff --git a/garnet/examples/ui/video_display/BUILD.gn b/src/camera/examples/video_display/BUILD.gn
similarity index 73%
rename from garnet/examples/ui/video_display/BUILD.gn
rename to src/camera/examples/video_display/BUILD.gn
index f7d2495..3c7b2ff 100644
--- a/garnet/examples/ui/video_display/BUILD.gn
+++ b/src/camera/examples/video_display/BUILD.gn
@@ -3,12 +3,14 @@
 # found in the LICENSE file.
 # this has to match the binary name in examples/ui/Build.gn
 
-executable("video_display") {
+import("//build/package.gni")
+
+executable("video_display_bin") {
   output_name = "video_display"
 
   sources = [
-    "main.cc",
-    "simple_camera_view.cc",
+    "main.cpp",
+    "simple_camera_view.cpp",
     "simple_camera_view.h",
   ]
 
@@ -32,3 +34,18 @@
 
   include_dirs = [ "//lib" ]
 }
+
+package("video_display") {
+  deps = [
+    ":video_display_bin",
+  ]
+
+  binary = "video_display"
+
+  meta = [
+    {
+      path = rebase_path("meta/ui_example.cmx")
+      dest = "video_display.cmx"
+    },
+  ]
+}
diff --git a/garnet/examples/ui/video_display/README.md b/src/camera/examples/video_display/README.md
similarity index 100%
rename from garnet/examples/ui/video_display/README.md
rename to src/camera/examples/video_display/README.md
diff --git a/garnet/examples/ui/video_display/main.cc b/src/camera/examples/video_display/main.cpp
similarity index 93%
rename from garnet/examples/ui/video_display/main.cc
rename to src/camera/examples/video_display/main.cpp
index da6fbec..337ee6f 100644
--- a/garnet/examples/ui/video_display/main.cc
+++ b/src/camera/examples/video_display/main.cpp
@@ -8,7 +8,7 @@
 #include <lib/ui/base_view/cpp/view_provider_component.h>
 #include <trace-provider/provider.h>
 
-#include "garnet/examples/ui/video_display/simple_camera_view.h"
+#include "src/camera/examples/video_display/simple_camera_view.h"
 
 /*
   To run this code, log in and then run the following command:
diff --git a/src/camera/examples/video_display/meta/ui_example.cmx b/src/camera/examples/video_display/meta/ui_example.cmx
new file mode 100644
index 0000000..65ac6fb
--- /dev/null
+++ b/src/camera/examples/video_display/meta/ui_example.cmx
@@ -0,0 +1,14 @@
+{
+    "program": {
+        "binary": "bin/app"
+    },
+    "sandbox": {
+        "services": [
+            "fuchsia.sys.Environment",
+            "fuchsia.sys.Launcher",
+            "fuchsia.tracing.provider.Registry",
+            "fuchsia.ui.policy.Presenter",
+            "fuchsia.ui.scenic.Scenic"
+        ]
+    }
+}
diff --git a/garnet/examples/ui/video_display/simple_camera_view.cc b/src/camera/examples/video_display/simple_camera_view.cpp
similarity index 97%
rename from garnet/examples/ui/video_display/simple_camera_view.cc
rename to src/camera/examples/video_display/simple_camera_view.cpp
index 836b2e8..57807c3 100644
--- a/garnet/examples/ui/video_display/simple_camera_view.cc
+++ b/src/camera/examples/video_display/simple_camera_view.cpp
@@ -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/examples/ui/video_display/simple_camera_view.h"
+#include "src/camera/examples/video_display/simple_camera_view.h"
 
 // clang-format off
 #include "src/ui/lib/glm_workaround/glm_workaround.h"
diff --git a/garnet/examples/ui/video_display/simple_camera_view.h b/src/camera/examples/video_display/simple_camera_view.h
similarity index 86%
rename from garnet/examples/ui/video_display/simple_camera_view.h
rename to src/camera/examples/video_display/simple_camera_view.h
index 278bac3..6542cd4 100644
--- a/garnet/examples/ui/video_display/simple_camera_view.h
+++ b/src/camera/examples/video_display/simple_camera_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_EXAMPLES_UI_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
-#define GARNET_EXAMPLES_UI_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
+#ifndef SRC_CAMERA_EXAMPLES_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
+#define SRC_CAMERA_EXAMPLES_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
 
 #include <deque>
 #include <list>
@@ -47,4 +47,4 @@
 
 }  // namespace video_display
 
-#endif  // GARNET_EXAMPLES_UI_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
+#endif  // SRC_CAMERA_EXAMPLES_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
diff --git a/garnet/lib/media/camera/simple_camera_lib/BUILD.gn b/src/camera/simple_camera/simple_camera_lib/BUILD.gn
similarity index 89%
rename from garnet/lib/media/camera/simple_camera_lib/BUILD.gn
rename to src/camera/simple_camera/simple_camera_lib/BUILD.gn
index 69e1dc7..0952254 100644
--- a/garnet/lib/media/camera/simple_camera_lib/BUILD.gn
+++ b/src/camera/simple_camera/simple_camera_lib/BUILD.gn
@@ -11,11 +11,11 @@
   output_name = "simple_camera_lib"
 
   sources = [
-    "buffer_fence.cc",
+    "buffer_fence.cpp",
     "buffer_fence.h",
-    "frame_scheduler.cc",
+    "frame_scheduler.cpp",
     "frame_scheduler.h",
-    "video_display.cc",
+    "video_display.cpp",
     "video_display.h",
   ]
 
@@ -52,7 +52,7 @@
   testonly = true
 
   sources = [
-    "tests/buffer_fence_unittest.cc",
+    "tests/buffer_fence_unittest.cpp",
   ]
   deps = [
     ":simple_camera_lib",
@@ -63,7 +63,7 @@
 
 test_package("camera_tests") {
   deps = [
-    "//garnet/lib/media/camera/simple_camera_lib:tests",
+    "//src/camera/simple_camera/simple_camera_lib:tests",
   ]
   tests = [
     {
diff --git a/garnet/lib/media/camera/simple_camera_lib/buffer_fence.cc b/src/camera/simple_camera/simple_camera_lib/buffer_fence.cpp
similarity index 96%
rename from garnet/lib/media/camera/simple_camera_lib/buffer_fence.cc
rename to src/camera/simple_camera/simple_camera_lib/buffer_fence.cpp
index 2f3ed2a..922f913 100644
--- a/garnet/lib/media/camera/simple_camera_lib/buffer_fence.cc
+++ b/src/camera/simple_camera/simple_camera_lib/buffer_fence.cpp
@@ -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/lib/media/camera/simple_camera_lib/buffer_fence.h"
+#include "src/camera/simple_camera/simple_camera_lib/buffer_fence.h"
 
 #include <fcntl.h>
 #include <lib/async/default.h>
diff --git a/garnet/lib/media/camera/simple_camera_lib/buffer_fence.h b/src/camera/simple_camera/simple_camera_lib/buffer_fence.h
similarity index 93%
rename from garnet/lib/media/camera/simple_camera_lib/buffer_fence.h
rename to src/camera/simple_camera/simple_camera_lib/buffer_fence.h
index aa77d8b..d4d4ab8 100644
--- a/garnet/lib/media/camera/simple_camera_lib/buffer_fence.h
+++ b/src/camera/simple_camera/simple_camera_lib/buffer_fence.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_BUFFER_FENCE_H_
-#define GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_BUFFER_FENCE_H_
+#ifndef SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_BUFFER_FENCE_H_
+#define SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_BUFFER_FENCE_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/fit/function.h>
@@ -83,4 +83,4 @@
 
 }  // namespace simple_camera
 
-#endif  // GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_FENCED_BUFFER_H_
+#endif  // SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_FENCED_BUFFER_H_
diff --git a/garnet/lib/media/camera/simple_camera_lib/frame_scheduler.cc b/src/camera/simple_camera/simple_camera_lib/frame_scheduler.cpp
similarity index 97%
rename from garnet/lib/media/camera/simple_camera_lib/frame_scheduler.cc
rename to src/camera/simple_camera/simple_camera_lib/frame_scheduler.cpp
index 1e2e64d..c9c387f 100644
--- a/garnet/lib/media/camera/simple_camera_lib/frame_scheduler.cc
+++ b/src/camera/simple_camera/simple_camera_lib/frame_scheduler.cpp
@@ -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/lib/media/camera/simple_camera_lib/frame_scheduler.h>
+#include <src/camera/simple_camera/simple_camera_lib/frame_scheduler.h>
 #include <src/lib/fxl/command_line.h>
 #include <zircon/syscalls.h>
 
diff --git a/garnet/lib/media/camera/simple_camera_lib/frame_scheduler.h b/src/camera/simple_camera/simple_camera_lib/frame_scheduler.h
similarity index 96%
rename from garnet/lib/media/camera/simple_camera_lib/frame_scheduler.h
rename to src/camera/simple_camera/simple_camera_lib/frame_scheduler.h
index 46705ce..2949c15 100644
--- a/garnet/lib/media/camera/simple_camera_lib/frame_scheduler.h
+++ b/src/camera/simple_camera/simple_camera_lib/frame_scheduler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_FRAME_SCHEDULER_H_
-#define GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_FRAME_SCHEDULER_H_
+#ifndef SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_FRAME_SCHEDULER_H_
+#define SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_FRAME_SCHEDULER_H_
 
 #include <stdint.h>
 #include <zircon/compiler.h>
@@ -122,4 +122,4 @@
 
 }  // namespace simple_camera
 
-#endif  // GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_FRAME_SCHEDULER_H_
+#endif  // SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_FRAME_SCHEDULER_H_
diff --git a/garnet/lib/media/camera/simple_camera_lib/meta/simple_camera_unittests.cmx b/src/camera/simple_camera/simple_camera_lib/meta/simple_camera_unittests.cmx
similarity index 100%
rename from garnet/lib/media/camera/simple_camera_lib/meta/simple_camera_unittests.cmx
rename to src/camera/simple_camera/simple_camera_lib/meta/simple_camera_unittests.cmx
diff --git a/garnet/lib/media/camera/simple_camera_lib/tests/buffer_fence_unittest.cc b/src/camera/simple_camera/simple_camera_lib/tests/buffer_fence_unittest.cpp
similarity index 94%
rename from garnet/lib/media/camera/simple_camera_lib/tests/buffer_fence_unittest.cc
rename to src/camera/simple_camera/simple_camera_lib/tests/buffer_fence_unittest.cpp
index dbf0d87..0b942e2 100644
--- a/garnet/lib/media/camera/simple_camera_lib/tests/buffer_fence_unittest.cc
+++ b/src/camera/simple_camera/simple_camera_lib/tests/buffer_fence_unittest.cpp
@@ -4,7 +4,7 @@
 
 #include "gtest/gtest.h"
 #include "lib/gtest/test_loop_fixture.h"
-#include "garnet/lib/media/camera/simple_camera_lib/buffer_fence.h"
+#include "src/camera/simple_camera/simple_camera_lib/buffer_fence.h"
 
 namespace simple_camera {
 namespace test {
diff --git a/garnet/lib/media/camera/simple_camera_lib/video_display.cc b/src/camera/simple_camera/simple_camera_lib/video_display.cpp
similarity index 98%
rename from garnet/lib/media/camera/simple_camera_lib/video_display.cc
rename to src/camera/simple_camera/simple_camera_lib/video_display.cpp
index bc26716..65187fa 100644
--- a/garnet/lib/media/camera/simple_camera_lib/video_display.cc
+++ b/src/camera/simple_camera/simple_camera_lib/video_display.cpp
@@ -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/lib/media/camera/simple_camera_lib/video_display.h"
+#include "src/camera/simple_camera/simple_camera_lib/video_display.h"
 
 #include <fcntl.h>
 #include <src/lib/files/unique_fd.h>
diff --git a/garnet/lib/media/camera/simple_camera_lib/video_display.h b/src/camera/simple_camera/simple_camera_lib/video_display.h
similarity index 87%
rename from garnet/lib/media/camera/simple_camera_lib/video_display.h
rename to src/camera/simple_camera/simple_camera_lib/video_display.h
index eedd7ac..03a2b62 100644
--- a/garnet/lib/media/camera/simple_camera_lib/video_display.h
+++ b/src/camera/simple_camera/simple_camera_lib/video_display.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_VIDEO_DISPLAY_H_
-#define GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_VIDEO_DISPLAY_H_
+#ifndef SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_VIDEO_DISPLAY_H_
+#define SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_VIDEO_DISPLAY_H_
 
 #include <fuchsia/camera/cpp/fidl.h>
 #include <fuchsia/images/cpp/fidl.h>
-#include <garnet/lib/media/camera/simple_camera_lib/buffer_fence.h>
-#include <garnet/lib/media/camera/simple_camera_lib/frame_scheduler.h>
+#include <src/camera/simple_camera/simple_camera_lib/buffer_fence.h>
+#include <src/camera/simple_camera/simple_camera_lib/frame_scheduler.h>
 #include <lib/component/cpp/startup_context.h>
 #include <lib/zx/eventpair.h>
 
@@ -78,4 +78,4 @@
 
 }  // namespace simple_camera
 
-#endif  // GARNET_LIB_MEDIA_CAMERA_SIMPLE_CAMERA_LIB_VIDEO_DISPLAY_H_
+#endif  // SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_VIDEO_DISPLAY_H_
diff --git a/garnet/lib/media/camera/simple_camera_server/BUILD.gn b/src/camera/simple_camera/simple_camera_server/BUILD.gn
similarity index 87%
rename from garnet/lib/media/camera/simple_camera_server/BUILD.gn
rename to src/camera/simple_camera/simple_camera_server/BUILD.gn
index 29bc6f7..cfa5a91 100644
--- a/garnet/lib/media/camera/simple_camera_server/BUILD.gn
+++ b/src/camera/simple_camera/simple_camera_server/BUILD.gn
@@ -6,15 +6,15 @@
 
 source_set("lib") {
   sources = [
-    "simple_camera_server_app.cc",
+    "simple_camera_server_app.cpp",
     "simple_camera_server_app.h",
   ]
 
   public_deps = [
-    "//garnet/lib/media/camera/simple_camera_lib",
     "//garnet/public/lib/component/cpp",
     "//sdk/fidl/fuchsia.simplecamera",
     "//sdk/lib/fidl/cpp",
+    "//src/camera/simple_camera/simple_camera_lib",
   ]
 }
 
@@ -22,7 +22,7 @@
   output_name = "simple_camera_server_cpp"
 
   sources = [
-    "simple_camera_server.cc",
+    "simple_camera_server.cpp",
   ]
 
   deps = [
diff --git a/garnet/lib/media/camera/simple_camera_server/meta/simple_camera_server_cpp.cmx b/src/camera/simple_camera/simple_camera_server/meta/simple_camera_server_cpp.cmx
similarity index 100%
rename from garnet/lib/media/camera/simple_camera_server/meta/simple_camera_server_cpp.cmx
rename to src/camera/simple_camera/simple_camera_server/meta/simple_camera_server_cpp.cmx
diff --git a/garnet/lib/media/camera/simple_camera_server/simple_camera_server.cc b/src/camera/simple_camera/simple_camera_server/simple_camera_server.cpp
similarity index 100%
rename from garnet/lib/media/camera/simple_camera_server/simple_camera_server.cc
rename to src/camera/simple_camera/simple_camera_server/simple_camera_server.cpp
diff --git a/garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.cc b/src/camera/simple_camera/simple_camera_server/simple_camera_server_app.cpp
similarity index 100%
rename from garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.cc
rename to src/camera/simple_camera/simple_camera_server/simple_camera_server_app.cpp
diff --git a/garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.h b/src/camera/simple_camera/simple_camera_server/simple_camera_server_app.h
similarity index 92%
rename from garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.h
rename to src/camera/simple_camera/simple_camera_server/simple_camera_server_app.h
index b3a95e74..a2327f2 100644
--- a/garnet/lib/media/camera/simple_camera_server/simple_camera_server_app.h
+++ b/src/camera/simple_camera/simple_camera_server/simple_camera_server_app.h
@@ -6,7 +6,7 @@
 
 #include <fuchsia/images/cpp/fidl.h>
 #include <fuchsia/simplecamera/cpp/fidl.h>
-#include <garnet/lib/media/camera/simple_camera_lib/video_display.h>
+#include <src/camera/simple_camera/simple_camera_lib/video_display.h>
 
 #include "lib/component/cpp/startup_context.h"
 
diff --git a/src/camera/test/camera_client_test/BUILD.gn b/src/camera/test/camera_client_test/BUILD.gn
index 0aa9b91..930af67 100644
--- a/src/camera/test/camera_client_test/BUILD.gn
+++ b/src/camera/test/camera_client_test/BUILD.gn
@@ -6,7 +6,7 @@
 
 source_set("camera_client_test_src") {
   sources = [
-    "camera_client_test.cc",
+    "camera_client_test.cpp",
     "camera_client_test.h",
   ]
   deps = [
@@ -27,7 +27,7 @@
   output_name = "camera_client_test"
 
   sources = [
-    "main.cc",
+    "main.cpp",
   ]
 
   deps = [
diff --git a/src/camera/test/camera_client_test/camera_client_test.cc b/src/camera/test/camera_client_test/camera_client_test.cpp
similarity index 100%
rename from src/camera/test/camera_client_test/camera_client_test.cc
rename to src/camera/test/camera_client_test/camera_client_test.cpp
diff --git a/src/camera/test/camera_client_test/camera_client_test.h b/src/camera/test/camera_client_test/camera_client_test.h
index 92c9203..3b8c120 100644
--- a/src/camera/test/camera_client_test/camera_client_test.h
+++ b/src/camera/test/camera_client_test/camera_client_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GARNET_EXAMPLES_CAMERA_CAMERA_CLIENT_CAMERA_CLIENT_H_
-#define GARNET_EXAMPLES_CAMERA_CAMERA_CLIENT_CAMERA_CLIENT_H_
+#ifndef SRC_CAMERA_TEST_CAMERA_CLIENT_TEST_CAMERA_CLIENT_TEST_H_
+#define SRC_CAMERA_TEST_CAMERA_CLIENT_TEST_CAMERA_CLIENT_TEST_H_
 
 #include <fuchsia/camera/cpp/fidl.h>
 #include <lib/fit/function.h>
@@ -46,4 +46,4 @@
 
 }  // namespace camera
 
-#endif  // GARNET_EXAMPLES_CAMERA_CAMERA_CLIENT_CAMERA_CLIENT_H_
+#endif  // SRC_CAMERA_TEST_CAMERA_CLIENT_TEST_CAMERA_CLIENT_TEST_H_
diff --git a/src/camera/test/camera_client_test/main.cc b/src/camera/test/camera_client_test/main.cpp
similarity index 100%
rename from src/camera/test/camera_client_test/main.cc
rename to src/camera/test/camera_client_test/main.cpp