diff --git a/.clang-format b/zircon/.clang-format
similarity index 100%
rename from .clang-format
rename to zircon/.clang-format
diff --git a/.clang-tidy b/zircon/.clang-tidy
similarity index 100%
rename from .clang-tidy
rename to zircon/.clang-tidy
diff --git a/.dir-locals.el b/zircon/.dir-locals.el
similarity index 100%
rename from .dir-locals.el
rename to zircon/.dir-locals.el
diff --git a/.gitignore b/zircon/.gitignore
similarity index 100%
rename from .gitignore
rename to zircon/.gitignore
diff --git a/AUTHORS b/zircon/AUTHORS
similarity index 100%
rename from AUTHORS
rename to zircon/AUTHORS
diff --git a/LICENSE b/zircon/LICENSE
similarity index 100%
rename from LICENSE
rename to zircon/LICENSE
diff --git a/MAINTAINERS b/zircon/MAINTAINERS
similarity index 100%
rename from MAINTAINERS
rename to zircon/MAINTAINERS
diff --git a/PATENTS b/zircon/PATENTS
similarity index 100%
rename from PATENTS
rename to zircon/PATENTS
diff --git a/README.md b/zircon/README.md
similarity index 100%
rename from README.md
rename to zircon/README.md
diff --git a/bootloader/LICENSE b/zircon/bootloader/LICENSE
similarity index 100%
rename from bootloader/LICENSE
rename to zircon/bootloader/LICENSE
diff --git a/bootloader/MAINTAINERS b/zircon/bootloader/MAINTAINERS
similarity index 100%
rename from bootloader/MAINTAINERS
rename to zircon/bootloader/MAINTAINERS
diff --git a/bootloader/NOTES.txt b/zircon/bootloader/NOTES.txt
similarity index 100%
rename from bootloader/NOTES.txt
rename to zircon/bootloader/NOTES.txt
diff --git a/bootloader/README.txt b/zircon/bootloader/README.txt
similarity index 100%
rename from bootloader/README.txt
rename to zircon/bootloader/README.txt
diff --git a/bootloader/build.mk b/zircon/bootloader/build.mk
similarity index 100%
rename from bootloader/build.mk
rename to zircon/bootloader/build.mk
diff --git a/bootloader/build/efi-x86-64.lds b/zircon/bootloader/build/efi-x86-64.lds
similarity index 100%
rename from bootloader/build/efi-x86-64.lds
rename to zircon/bootloader/build/efi-x86-64.lds
diff --git a/bootloader/build/mkdiskimg.sh b/zircon/bootloader/build/mkdiskimg.sh
similarity index 100%
rename from bootloader/build/mkdiskimg.sh
rename to zircon/bootloader/build/mkdiskimg.sh
diff --git a/bootloader/include/arpa/inet.h b/zircon/bootloader/include/arpa/inet.h
similarity index 100%
rename from bootloader/include/arpa/inet.h
rename to zircon/bootloader/include/arpa/inet.h
diff --git a/bootloader/include/assert.h b/zircon/bootloader/include/assert.h
similarity index 100%
rename from bootloader/include/assert.h
rename to zircon/bootloader/include/assert.h
diff --git a/bootloader/include/ctype.h b/zircon/bootloader/include/ctype.h
similarity index 100%
rename from bootloader/include/ctype.h
rename to zircon/bootloader/include/ctype.h
diff --git a/bootloader/include/inttypes.h b/zircon/bootloader/include/inttypes.h
similarity index 100%
rename from bootloader/include/inttypes.h
rename to zircon/bootloader/include/inttypes.h
diff --git a/bootloader/include/printf.h b/zircon/bootloader/include/printf.h
similarity index 100%
rename from bootloader/include/printf.h
rename to zircon/bootloader/include/printf.h
diff --git a/bootloader/include/reg.h b/zircon/bootloader/include/reg.h
similarity index 100%
rename from bootloader/include/reg.h
rename to zircon/bootloader/include/reg.h
diff --git a/bootloader/include/stdio.h b/zircon/bootloader/include/stdio.h
similarity index 100%
rename from bootloader/include/stdio.h
rename to zircon/bootloader/include/stdio.h
diff --git a/bootloader/include/stdlib.h b/zircon/bootloader/include/stdlib.h
similarity index 100%
rename from bootloader/include/stdlib.h
rename to zircon/bootloader/include/stdlib.h
diff --git a/bootloader/include/string.h b/zircon/bootloader/include/string.h
similarity index 100%
rename from bootloader/include/string.h
rename to zircon/bootloader/include/string.h
diff --git a/bootloader/include/strings.h b/zircon/bootloader/include/strings.h
similarity index 100%
rename from bootloader/include/strings.h
rename to zircon/bootloader/include/strings.h
diff --git a/bootloader/include/sys/types.h b/zircon/bootloader/include/sys/types.h
similarity index 100%
rename from bootloader/include/sys/types.h
rename to zircon/bootloader/include/sys/types.h
diff --git a/bootloader/include/uchar.h b/zircon/bootloader/include/uchar.h
similarity index 100%
rename from bootloader/include/uchar.h
rename to zircon/bootloader/include/uchar.h
diff --git a/bootloader/include/unistd.h b/zircon/bootloader/include/unistd.h
similarity index 100%
rename from bootloader/include/unistd.h
rename to zircon/bootloader/include/unistd.h
diff --git a/bootloader/include/xefi.h b/zircon/bootloader/include/xefi.h
similarity index 100%
rename from bootloader/include/xefi.h
rename to zircon/bootloader/include/xefi.h
diff --git a/bootloader/lib/console-printf.c b/zircon/bootloader/lib/console-printf.c
similarity index 100%
rename from bootloader/lib/console-printf.c
rename to zircon/bootloader/lib/console-printf.c
diff --git a/bootloader/lib/ctype.c b/zircon/bootloader/lib/ctype.c
similarity index 100%
rename from bootloader/lib/ctype.c
rename to zircon/bootloader/lib/ctype.c
diff --git a/bootloader/lib/efi/guids.c b/zircon/bootloader/lib/efi/guids.c
similarity index 100%
rename from bootloader/lib/efi/guids.c
rename to zircon/bootloader/lib/efi/guids.c
diff --git a/bootloader/lib/inet.c b/zircon/bootloader/lib/inet.c
similarity index 100%
rename from bootloader/lib/inet.c
rename to zircon/bootloader/lib/inet.c
diff --git a/bootloader/lib/loadfile.c b/zircon/bootloader/lib/loadfile.c
similarity index 100%
rename from bootloader/lib/loadfile.c
rename to zircon/bootloader/lib/loadfile.c
diff --git a/bootloader/lib/printf.c b/zircon/bootloader/lib/printf.c
similarity index 100%
rename from bootloader/lib/printf.c
rename to zircon/bootloader/lib/printf.c
diff --git a/bootloader/lib/stdlib.c b/zircon/bootloader/lib/stdlib.c
similarity index 100%
rename from bootloader/lib/stdlib.c
rename to zircon/bootloader/lib/stdlib.c
diff --git a/bootloader/lib/string.c b/zircon/bootloader/lib/string.c
similarity index 100%
rename from bootloader/lib/string.c
rename to zircon/bootloader/lib/string.c
diff --git a/bootloader/lib/strings.c b/zircon/bootloader/lib/strings.c
similarity index 100%
rename from bootloader/lib/strings.c
rename to zircon/bootloader/lib/strings.c
diff --git a/bootloader/lib/xefi.c b/zircon/bootloader/lib/xefi.c
similarity index 100%
rename from bootloader/lib/xefi.c
rename to zircon/bootloader/lib/xefi.c
diff --git a/bootloader/scripts/99-asix.rules b/zircon/bootloader/scripts/99-asix.rules
similarity index 100%
rename from bootloader/scripts/99-asix.rules
rename to zircon/bootloader/scripts/99-asix.rules
diff --git a/bootloader/scripts/bootzircon b/zircon/bootloader/scripts/bootzircon
similarity index 100%
rename from bootloader/scripts/bootzircon
rename to zircon/bootloader/scripts/bootzircon
diff --git a/bootloader/src/cmdline.c b/zircon/bootloader/src/cmdline.c
similarity index 100%
rename from bootloader/src/cmdline.c
rename to zircon/bootloader/src/cmdline.c
diff --git a/bootloader/src/cmdline.h b/zircon/bootloader/src/cmdline.h
similarity index 100%
rename from bootloader/src/cmdline.h
rename to zircon/bootloader/src/cmdline.h
diff --git a/bootloader/src/device_id.c b/zircon/bootloader/src/device_id.c
similarity index 100%
rename from bootloader/src/device_id.c
rename to zircon/bootloader/src/device_id.c
diff --git a/bootloader/src/device_id.h b/zircon/bootloader/src/device_id.h
similarity index 100%
rename from bootloader/src/device_id.h
rename to zircon/bootloader/src/device_id.h
diff --git a/bootloader/src/diskio.c b/zircon/bootloader/src/diskio.c
similarity index 100%
rename from bootloader/src/diskio.c
rename to zircon/bootloader/src/diskio.c
diff --git a/bootloader/src/eff_short_wordlist_1.h b/zircon/bootloader/src/eff_short_wordlist_1.h
similarity index 100%
rename from bootloader/src/eff_short_wordlist_1.h
rename to zircon/bootloader/src/eff_short_wordlist_1.h
diff --git a/bootloader/src/fileio.c b/zircon/bootloader/src/fileio.c
similarity index 100%
rename from bootloader/src/fileio.c
rename to zircon/bootloader/src/fileio.c
diff --git a/bootloader/src/framebuffer.c b/zircon/bootloader/src/framebuffer.c
similarity index 100%
rename from bootloader/src/framebuffer.c
rename to zircon/bootloader/src/framebuffer.c
diff --git a/bootloader/src/framebuffer.h b/zircon/bootloader/src/framebuffer.h
similarity index 100%
rename from bootloader/src/framebuffer.h
rename to zircon/bootloader/src/framebuffer.h
diff --git a/bootloader/src/inet6.c b/zircon/bootloader/src/inet6.c
similarity index 100%
rename from bootloader/src/inet6.c
rename to zircon/bootloader/src/inet6.c
diff --git a/bootloader/src/inet6.h b/zircon/bootloader/src/inet6.h
similarity index 100%
rename from bootloader/src/inet6.h
rename to zircon/bootloader/src/inet6.h
diff --git a/bootloader/src/logo.h b/zircon/bootloader/src/logo.h
similarity index 100%
rename from bootloader/src/logo.h
rename to zircon/bootloader/src/logo.h
diff --git a/bootloader/src/misc.c b/zircon/bootloader/src/misc.c
similarity index 100%
rename from bootloader/src/misc.c
rename to zircon/bootloader/src/misc.c
diff --git a/bootloader/src/netboot.c b/zircon/bootloader/src/netboot.c
similarity index 100%
rename from bootloader/src/netboot.c
rename to zircon/bootloader/src/netboot.c
diff --git a/bootloader/src/netifc.c b/zircon/bootloader/src/netifc.c
similarity index 100%
rename from bootloader/src/netifc.c
rename to zircon/bootloader/src/netifc.c
diff --git a/bootloader/src/netifc.h b/zircon/bootloader/src/netifc.h
similarity index 100%
rename from bootloader/src/netifc.h
rename to zircon/bootloader/src/netifc.h
diff --git a/bootloader/src/osboot.c b/zircon/bootloader/src/osboot.c
similarity index 100%
rename from bootloader/src/osboot.c
rename to zircon/bootloader/src/osboot.c
diff --git a/bootloader/src/osboot.h b/zircon/bootloader/src/osboot.h
similarity index 100%
rename from bootloader/src/osboot.h
rename to zircon/bootloader/src/osboot.h
diff --git a/bootloader/src/pci.c b/zircon/bootloader/src/pci.c
similarity index 100%
rename from bootloader/src/pci.c
rename to zircon/bootloader/src/pci.c
diff --git a/bootloader/src/zircon.c b/zircon/bootloader/src/zircon.c
similarity index 100%
rename from bootloader/src/zircon.c
rename to zircon/bootloader/src/zircon.c
diff --git a/docs/MAINTAINERS b/zircon/docs/MAINTAINERS
similarity index 100%
rename from docs/MAINTAINERS
rename to zircon/docs/MAINTAINERS
diff --git a/docs/abigen/grammar.md b/zircon/docs/abigen/grammar.md
similarity index 100%
rename from docs/abigen/grammar.md
rename to zircon/docs/abigen/grammar.md
diff --git a/docs/architecture_support.md b/zircon/docs/architecture_support.md
similarity index 100%
rename from docs/architecture_support.md
rename to zircon/docs/architecture_support.md
diff --git a/docs/benchmarks/microbenchmarks.md b/zircon/docs/benchmarks/microbenchmarks.md
similarity index 100%
rename from docs/benchmarks/microbenchmarks.md
rename to zircon/docs/benchmarks/microbenchmarks.md
diff --git a/docs/block_device_testing.md b/zircon/docs/block_device_testing.md
similarity index 100%
rename from docs/block_device_testing.md
rename to zircon/docs/block_device_testing.md
diff --git a/docs/bootsvc.md b/zircon/docs/bootsvc.md
similarity index 100%
rename from docs/bootsvc.md
rename to zircon/docs/bootsvc.md
diff --git a/docs/concepts.md b/zircon/docs/concepts.md
similarity index 100%
rename from docs/concepts.md
rename to zircon/docs/concepts.md
diff --git a/docs/contributing.md b/zircon/docs/contributing.md
similarity index 100%
rename from docs/contributing.md
rename to zircon/docs/contributing.md
diff --git a/docs/cxx.md b/zircon/docs/cxx.md
similarity index 100%
rename from docs/cxx.md
rename to zircon/docs/cxx.md
diff --git a/docs/ddk/advanced.md b/zircon/docs/ddk/advanced.md
similarity index 100%
rename from docs/ddk/advanced.md
rename to zircon/docs/ddk/advanced.md
diff --git a/docs/ddk/ddk-tutorial.md b/zircon/docs/ddk/ddk-tutorial.md
similarity index 100%
rename from docs/ddk/ddk-tutorial.md
rename to zircon/docs/ddk/ddk-tutorial.md
diff --git a/docs/ddk/device-model.md b/zircon/docs/ddk/device-model.md
similarity index 100%
rename from docs/ddk/device-model.md
rename to zircon/docs/ddk/device-model.md
diff --git a/docs/ddk/device-ops.md b/zircon/docs/ddk/device-ops.md
similarity index 100%
rename from docs/ddk/device-ops.md
rename to zircon/docs/ddk/device-ops.md
diff --git a/docs/ddk/dma-000-cropped.png b/zircon/docs/ddk/dma-000-cropped.png
similarity index 100%
rename from docs/ddk/dma-000-cropped.png
rename to zircon/docs/ddk/dma-000-cropped.png
diff --git a/docs/ddk/dma-001-cropped.png b/zircon/docs/ddk/dma-001-cropped.png
similarity index 100%
rename from docs/ddk/dma-001-cropped.png
rename to zircon/docs/ddk/dma-001-cropped.png
diff --git a/docs/ddk/dma-002-cropped.png b/zircon/docs/ddk/dma-002-cropped.png
similarity index 100%
rename from docs/ddk/dma-002-cropped.png
rename to zircon/docs/ddk/dma-002-cropped.png
diff --git a/docs/ddk/dma.odg b/zircon/docs/ddk/dma.odg
similarity index 100%
rename from docs/ddk/dma.odg
rename to zircon/docs/ddk/dma.odg
diff --git a/docs/ddk/driver-development.md b/zircon/docs/ddk/driver-development.md
similarity index 100%
rename from docs/ddk/driver-development.md
rename to zircon/docs/ddk/driver-development.md
diff --git a/docs/ddk/ethernet-000-cropped.png b/zircon/docs/ddk/ethernet-000-cropped.png
similarity index 100%
rename from docs/ddk/ethernet-000-cropped.png
rename to zircon/docs/ddk/ethernet-000-cropped.png
diff --git a/docs/ddk/ethernet.md b/zircon/docs/ddk/ethernet.md
similarity index 100%
rename from docs/ddk/ethernet.md
rename to zircon/docs/ddk/ethernet.md
diff --git a/docs/ddk/ethernet.odg b/zircon/docs/ddk/ethernet.odg
similarity index 100%
rename from docs/ddk/ethernet.odg
rename to zircon/docs/ddk/ethernet.odg
diff --git a/docs/ddk/firmware.md b/zircon/docs/ddk/firmware.md
similarity index 100%
rename from docs/ddk/firmware.md
rename to zircon/docs/ddk/firmware.md
diff --git a/docs/ddk/getting_started.md b/zircon/docs/ddk/getting_started.md
similarity index 100%
rename from docs/ddk/getting_started.md
rename to zircon/docs/ddk/getting_started.md
diff --git a/docs/ddk/hardware.md b/zircon/docs/ddk/hardware.md
similarity index 100%
rename from docs/ddk/hardware.md
rename to zircon/docs/ddk/hardware.md
diff --git a/docs/ddk/overview.md b/zircon/docs/ddk/overview.md
similarity index 100%
rename from docs/ddk/overview.md
rename to zircon/docs/ddk/overview.md
diff --git a/docs/ddk/platform-bus.md b/zircon/docs/ddk/platform-bus.md
similarity index 100%
rename from docs/ddk/platform-bus.md
rename to zircon/docs/ddk/platform-bus.md
diff --git a/docs/ddk/platform-bus.png b/zircon/docs/ddk/platform-bus.png
similarity index 100%
rename from docs/ddk/platform-bus.png
rename to zircon/docs/ddk/platform-bus.png
diff --git a/docs/ddk/ramdisk.md b/zircon/docs/ddk/ramdisk.md
similarity index 100%
rename from docs/ddk/ramdisk.md
rename to zircon/docs/ddk/ramdisk.md
diff --git a/docs/ddk/reference.md b/zircon/docs/ddk/reference.md
similarity index 100%
rename from docs/ddk/reference.md
rename to zircon/docs/ddk/reference.md
diff --git a/docs/ddk/simple-000-cropped.png b/zircon/docs/ddk/simple-000-cropped.png
similarity index 100%
rename from docs/ddk/simple-000-cropped.png
rename to zircon/docs/ddk/simple-000-cropped.png
diff --git a/docs/ddk/simple-001-cropped.png b/zircon/docs/ddk/simple-001-cropped.png
similarity index 100%
rename from docs/ddk/simple-001-cropped.png
rename to zircon/docs/ddk/simple-001-cropped.png
diff --git a/docs/ddk/simple-002-cropped.png b/zircon/docs/ddk/simple-002-cropped.png
similarity index 100%
rename from docs/ddk/simple-002-cropped.png
rename to zircon/docs/ddk/simple-002-cropped.png
diff --git a/docs/ddk/simple-003-cropped.png b/zircon/docs/ddk/simple-003-cropped.png
similarity index 100%
rename from docs/ddk/simple-003-cropped.png
rename to zircon/docs/ddk/simple-003-cropped.png
diff --git a/docs/ddk/simple-008-cropped.png b/zircon/docs/ddk/simple-008-cropped.png
similarity index 100%
rename from docs/ddk/simple-008-cropped.png
rename to zircon/docs/ddk/simple-008-cropped.png
diff --git a/docs/ddk/simple.md b/zircon/docs/ddk/simple.md
similarity index 100%
rename from docs/ddk/simple.md
rename to zircon/docs/ddk/simple.md
diff --git a/docs/ddk/simple.odg b/zircon/docs/ddk/simple.odg
similarity index 100%
rename from docs/ddk/simple.odg
rename to zircon/docs/ddk/simple.odg
diff --git a/docs/ddk/tracing.md b/zircon/docs/ddk/tracing.md
similarity index 100%
rename from docs/ddk/tracing.md
rename to zircon/docs/ddk/tracing.md
diff --git a/docs/debugging/acpi.md b/zircon/docs/debugging/acpi.md
similarity index 100%
rename from docs/debugging/acpi.md
rename to zircon/docs/debugging/acpi.md
diff --git a/docs/debugging/tips.md b/zircon/docs/debugging/tips.md
similarity index 100%
rename from docs/debugging/tips.md
rename to zircon/docs/debugging/tips.md
diff --git a/docs/driver_interfaces/audio.md b/zircon/docs/driver_interfaces/audio.md
similarity index 100%
rename from docs/driver_interfaces/audio.md
rename to zircon/docs/driver_interfaces/audio.md
diff --git a/docs/editors.md b/zircon/docs/editors.md
similarity index 100%
rename from docs/editors.md
rename to zircon/docs/editors.md
diff --git a/docs/entropy_collection_todos.md b/zircon/docs/entropy_collection_todos.md
similarity index 100%
rename from docs/entropy_collection_todos.md
rename to zircon/docs/entropy_collection_todos.md
diff --git a/docs/entropy_quality_tests.md b/zircon/docs/entropy_quality_tests.md
similarity index 100%
rename from docs/entropy_quality_tests.md
rename to zircon/docs/entropy_quality_tests.md
diff --git a/docs/errors.md b/zircon/docs/errors.md
similarity index 100%
rename from docs/errors.md
rename to zircon/docs/errors.md
diff --git a/docs/exceptions.md b/zircon/docs/exceptions.md
similarity index 100%
rename from docs/exceptions.md
rename to zircon/docs/exceptions.md
diff --git a/docs/fit_promise_guide.md b/zircon/docs/fit_promise_guide.md
similarity index 100%
rename from docs/fit_promise_guide.md
rename to zircon/docs/fit_promise_guide.md
diff --git a/docs/fuzzing_fidl.md b/zircon/docs/fuzzing_fidl.md
similarity index 100%
rename from docs/fuzzing_fidl.md
rename to zircon/docs/fuzzing_fidl.md
diff --git a/docs/getting_started.md b/zircon/docs/getting_started.md
similarity index 100%
rename from docs/getting_started.md
rename to zircon/docs/getting_started.md
diff --git a/docs/h2md.md b/zircon/docs/h2md.md
similarity index 100%
rename from docs/h2md.md
rename to zircon/docs/h2md.md
diff --git a/docs/hacking.md b/zircon/docs/hacking.md
similarity index 100%
rename from docs/hacking.md
rename to zircon/docs/hacking.md
diff --git a/docs/handles.md b/zircon/docs/handles.md
similarity index 100%
rename from docs/handles.md
rename to zircon/docs/handles.md
diff --git a/docs/jitterentropy/config-basic.md b/zircon/docs/jitterentropy/config-basic.md
similarity index 100%
rename from docs/jitterentropy/config-basic.md
rename to zircon/docs/jitterentropy/config-basic.md
diff --git a/docs/jitterentropy/config-tuning.md b/zircon/docs/jitterentropy/config-tuning.md
similarity index 100%
rename from docs/jitterentropy/config-tuning.md
rename to zircon/docs/jitterentropy/config-tuning.md
diff --git a/docs/kernel_cmdline.md b/zircon/docs/kernel_cmdline.md
similarity index 100%
rename from docs/kernel_cmdline.md
rename to zircon/docs/kernel_cmdline.md
diff --git a/docs/kernel_internal_errors.md b/zircon/docs/kernel_internal_errors.md
similarity index 100%
rename from docs/kernel_internal_errors.md
rename to zircon/docs/kernel_internal_errors.md
diff --git a/docs/kernel_invariants.md b/zircon/docs/kernel_invariants.md
similarity index 100%
rename from docs/kernel_invariants.md
rename to zircon/docs/kernel_invariants.md
diff --git a/docs/kernel_scheduling.md b/zircon/docs/kernel_scheduling.md
similarity index 100%
rename from docs/kernel_scheduling.md
rename to zircon/docs/kernel_scheduling.md
diff --git a/docs/libc.md b/zircon/docs/libc.md
similarity index 100%
rename from docs/libc.md
rename to zircon/docs/libc.md
diff --git a/docs/lockdep-design.md b/zircon/docs/lockdep-design.md
similarity index 100%
rename from docs/lockdep-design.md
rename to zircon/docs/lockdep-design.md
diff --git a/docs/lockdep.md b/zircon/docs/lockdep.md
similarity index 100%
rename from docs/lockdep.md
rename to zircon/docs/lockdep.md
diff --git a/docs/makefile_options.md b/zircon/docs/makefile_options.md
similarity index 100%
rename from docs/makefile_options.md
rename to zircon/docs/makefile_options.md
diff --git a/docs/memory.md b/zircon/docs/memory.md
similarity index 100%
rename from docs/memory.md
rename to zircon/docs/memory.md
diff --git a/docs/minfs.md b/zircon/docs/minfs.md
similarity index 100%
rename from docs/minfs.md
rename to zircon/docs/minfs.md
diff --git a/docs/nand_testing.md b/zircon/docs/nand_testing.md
similarity index 100%
rename from docs/nand_testing.md
rename to zircon/docs/nand_testing.md
diff --git a/docs/objects.md b/zircon/docs/objects.md
similarity index 100%
rename from docs/objects.md
rename to zircon/docs/objects.md
diff --git a/docs/objects/bus_transaction_initiator.md b/zircon/docs/objects/bus_transaction_initiator.md
similarity index 100%
rename from docs/objects/bus_transaction_initiator.md
rename to zircon/docs/objects/bus_transaction_initiator.md
diff --git a/docs/objects/channel.md b/zircon/docs/objects/channel.md
similarity index 100%
rename from docs/objects/channel.md
rename to zircon/docs/objects/channel.md
diff --git a/docs/objects/debuglog.md b/zircon/docs/objects/debuglog.md
similarity index 100%
rename from docs/objects/debuglog.md
rename to zircon/docs/objects/debuglog.md
diff --git a/docs/objects/event.md b/zircon/docs/objects/event.md
similarity index 100%
rename from docs/objects/event.md
rename to zircon/docs/objects/event.md
diff --git a/docs/objects/eventpair.md b/zircon/docs/objects/eventpair.md
similarity index 100%
rename from docs/objects/eventpair.md
rename to zircon/docs/objects/eventpair.md
diff --git a/docs/objects/fifo.md b/zircon/docs/objects/fifo.md
similarity index 100%
rename from docs/objects/fifo.md
rename to zircon/docs/objects/fifo.md
diff --git a/docs/objects/futex.md b/zircon/docs/objects/futex.md
similarity index 100%
rename from docs/objects/futex.md
rename to zircon/docs/objects/futex.md
diff --git a/docs/objects/interrupts.md b/zircon/docs/objects/interrupts.md
similarity index 100%
rename from docs/objects/interrupts.md
rename to zircon/docs/objects/interrupts.md
diff --git a/docs/objects/job.md b/zircon/docs/objects/job.md
similarity index 100%
rename from docs/objects/job.md
rename to zircon/docs/objects/job.md
diff --git a/docs/objects/pinned_memory_token.md b/zircon/docs/objects/pinned_memory_token.md
similarity index 100%
rename from docs/objects/pinned_memory_token.md
rename to zircon/docs/objects/pinned_memory_token.md
diff --git a/docs/objects/port.md b/zircon/docs/objects/port.md
similarity index 100%
rename from docs/objects/port.md
rename to zircon/docs/objects/port.md
diff --git a/docs/objects/process.md b/zircon/docs/objects/process.md
similarity index 100%
rename from docs/objects/process.md
rename to zircon/docs/objects/process.md
diff --git a/docs/objects/resource.md b/zircon/docs/objects/resource.md
similarity index 100%
rename from docs/objects/resource.md
rename to zircon/docs/objects/resource.md
diff --git a/docs/objects/socket.md b/zircon/docs/objects/socket.md
similarity index 100%
rename from docs/objects/socket.md
rename to zircon/docs/objects/socket.md
diff --git a/docs/objects/task.md b/zircon/docs/objects/task.md
similarity index 100%
rename from docs/objects/task.md
rename to zircon/docs/objects/task.md
diff --git a/docs/objects/thread.md b/zircon/docs/objects/thread.md
similarity index 100%
rename from docs/objects/thread.md
rename to zircon/docs/objects/thread.md
diff --git a/docs/objects/timer.md b/zircon/docs/objects/timer.md
similarity index 100%
rename from docs/objects/timer.md
rename to zircon/docs/objects/timer.md
diff --git a/docs/objects/vm_address_region.md b/zircon/docs/objects/vm_address_region.md
similarity index 100%
rename from docs/objects/vm_address_region.md
rename to zircon/docs/objects/vm_address_region.md
diff --git a/docs/objects/vm_object.md b/zircon/docs/objects/vm_object.md
similarity index 100%
rename from docs/objects/vm_object.md
rename to zircon/docs/objects/vm_object.md
diff --git a/docs/oom.md b/zircon/docs/oom.md
similarity index 100%
rename from docs/oom.md
rename to zircon/docs/oom.md
diff --git a/docs/program_loading.md b/zircon/docs/program_loading.md
similarity index 100%
rename from docs/program_loading.md
rename to zircon/docs/program_loading.md
diff --git a/docs/qemu.md b/zircon/docs/qemu.md
similarity index 100%
rename from docs/qemu.md
rename to zircon/docs/qemu.md
diff --git a/docs/rights.md b/zircon/docs/rights.md
similarity index 100%
rename from docs/rights.md
rename to zircon/docs/rights.md
diff --git a/docs/safestack.md b/zircon/docs/safestack.md
similarity index 100%
rename from docs/safestack.md
rename to zircon/docs/safestack.md
diff --git a/docs/self_hosting.md b/zircon/docs/self_hosting.md
similarity index 100%
rename from docs/self_hosting.md
rename to zircon/docs/self_hosting.md
diff --git a/docs/signals.md b/zircon/docs/signals.md
similarity index 100%
rename from docs/signals.md
rename to zircon/docs/signals.md
diff --git a/docs/static_analysis.md b/zircon/docs/static_analysis.md
similarity index 100%
rename from docs/static_analysis.md
rename to zircon/docs/static_analysis.md
diff --git a/docs/symbolizer.md b/zircon/docs/symbolizer.md
similarity index 100%
rename from docs/symbolizer.md
rename to zircon/docs/symbolizer.md
diff --git a/docs/symbolizer_markup.md b/zircon/docs/symbolizer_markup.md
similarity index 100%
rename from docs/symbolizer_markup.md
rename to zircon/docs/symbolizer_markup.md
diff --git a/docs/syscalls.md b/zircon/docs/syscalls.md
similarity index 100%
rename from docs/syscalls.md
rename to zircon/docs/syscalls.md
diff --git a/docs/syscalls/bti_create.md b/zircon/docs/syscalls/bti_create.md
similarity index 100%
rename from docs/syscalls/bti_create.md
rename to zircon/docs/syscalls/bti_create.md
diff --git a/docs/syscalls/bti_pin.md b/zircon/docs/syscalls/bti_pin.md
similarity index 100%
rename from docs/syscalls/bti_pin.md
rename to zircon/docs/syscalls/bti_pin.md
diff --git a/docs/syscalls/bti_release_quarantine.md b/zircon/docs/syscalls/bti_release_quarantine.md
similarity index 100%
rename from docs/syscalls/bti_release_quarantine.md
rename to zircon/docs/syscalls/bti_release_quarantine.md
diff --git a/docs/syscalls/cache_flush.md b/zircon/docs/syscalls/cache_flush.md
similarity index 100%
rename from docs/syscalls/cache_flush.md
rename to zircon/docs/syscalls/cache_flush.md
diff --git a/docs/syscalls/channel_call.md b/zircon/docs/syscalls/channel_call.md
similarity index 100%
rename from docs/syscalls/channel_call.md
rename to zircon/docs/syscalls/channel_call.md
diff --git a/docs/syscalls/channel_call_finish.md b/zircon/docs/syscalls/channel_call_finish.md
similarity index 100%
rename from docs/syscalls/channel_call_finish.md
rename to zircon/docs/syscalls/channel_call_finish.md
diff --git a/docs/syscalls/channel_call_noretry.md b/zircon/docs/syscalls/channel_call_noretry.md
similarity index 100%
rename from docs/syscalls/channel_call_noretry.md
rename to zircon/docs/syscalls/channel_call_noretry.md
diff --git a/docs/syscalls/channel_create.md b/zircon/docs/syscalls/channel_create.md
similarity index 100%
rename from docs/syscalls/channel_create.md
rename to zircon/docs/syscalls/channel_create.md
diff --git a/docs/syscalls/channel_read.md b/zircon/docs/syscalls/channel_read.md
similarity index 100%
rename from docs/syscalls/channel_read.md
rename to zircon/docs/syscalls/channel_read.md
diff --git a/docs/syscalls/channel_read_etc.md b/zircon/docs/syscalls/channel_read_etc.md
similarity index 100%
rename from docs/syscalls/channel_read_etc.md
rename to zircon/docs/syscalls/channel_read_etc.md
diff --git a/docs/syscalls/channel_write.md b/zircon/docs/syscalls/channel_write.md
similarity index 100%
rename from docs/syscalls/channel_write.md
rename to zircon/docs/syscalls/channel_write.md
diff --git a/docs/syscalls/clock_adjust.md b/zircon/docs/syscalls/clock_adjust.md
similarity index 100%
rename from docs/syscalls/clock_adjust.md
rename to zircon/docs/syscalls/clock_adjust.md
diff --git a/docs/syscalls/clock_get.md b/zircon/docs/syscalls/clock_get.md
similarity index 100%
rename from docs/syscalls/clock_get.md
rename to zircon/docs/syscalls/clock_get.md
diff --git a/docs/syscalls/clock_get_monotonic.md b/zircon/docs/syscalls/clock_get_monotonic.md
similarity index 100%
rename from docs/syscalls/clock_get_monotonic.md
rename to zircon/docs/syscalls/clock_get_monotonic.md
diff --git a/docs/syscalls/clock_get_new.md b/zircon/docs/syscalls/clock_get_new.md
similarity index 100%
rename from docs/syscalls/clock_get_new.md
rename to zircon/docs/syscalls/clock_get_new.md
diff --git a/docs/syscalls/cprng_add_entropy.md b/zircon/docs/syscalls/cprng_add_entropy.md
similarity index 100%
rename from docs/syscalls/cprng_add_entropy.md
rename to zircon/docs/syscalls/cprng_add_entropy.md
diff --git a/docs/syscalls/cprng_draw.md b/zircon/docs/syscalls/cprng_draw.md
similarity index 100%
rename from docs/syscalls/cprng_draw.md
rename to zircon/docs/syscalls/cprng_draw.md
diff --git a/docs/syscalls/cprng_draw_once.md b/zircon/docs/syscalls/cprng_draw_once.md
similarity index 100%
rename from docs/syscalls/cprng_draw_once.md
rename to zircon/docs/syscalls/cprng_draw_once.md
diff --git a/docs/syscalls/deadline_after.md b/zircon/docs/syscalls/deadline_after.md
similarity index 100%
rename from docs/syscalls/deadline_after.md
rename to zircon/docs/syscalls/deadline_after.md
diff --git a/docs/syscalls/debug_read.md b/zircon/docs/syscalls/debug_read.md
similarity index 100%
rename from docs/syscalls/debug_read.md
rename to zircon/docs/syscalls/debug_read.md
diff --git a/docs/syscalls/debug_send_command.md b/zircon/docs/syscalls/debug_send_command.md
similarity index 100%
rename from docs/syscalls/debug_send_command.md
rename to zircon/docs/syscalls/debug_send_command.md
diff --git a/docs/syscalls/debug_write.md b/zircon/docs/syscalls/debug_write.md
similarity index 100%
rename from docs/syscalls/debug_write.md
rename to zircon/docs/syscalls/debug_write.md
diff --git a/docs/syscalls/debuglog_create.md b/zircon/docs/syscalls/debuglog_create.md
similarity index 100%
rename from docs/syscalls/debuglog_create.md
rename to zircon/docs/syscalls/debuglog_create.md
diff --git a/docs/syscalls/debuglog_read.md b/zircon/docs/syscalls/debuglog_read.md
similarity index 100%
rename from docs/syscalls/debuglog_read.md
rename to zircon/docs/syscalls/debuglog_read.md
diff --git a/docs/syscalls/debuglog_write.md b/zircon/docs/syscalls/debuglog_write.md
similarity index 100%
rename from docs/syscalls/debuglog_write.md
rename to zircon/docs/syscalls/debuglog_write.md
diff --git a/docs/syscalls/event_create.md b/zircon/docs/syscalls/event_create.md
similarity index 100%
rename from docs/syscalls/event_create.md
rename to zircon/docs/syscalls/event_create.md
diff --git a/docs/syscalls/eventpair_create.md b/zircon/docs/syscalls/eventpair_create.md
similarity index 100%
rename from docs/syscalls/eventpair_create.md
rename to zircon/docs/syscalls/eventpair_create.md
diff --git a/docs/syscalls/fifo_create.md b/zircon/docs/syscalls/fifo_create.md
similarity index 100%
rename from docs/syscalls/fifo_create.md
rename to zircon/docs/syscalls/fifo_create.md
diff --git a/docs/syscalls/fifo_read.md b/zircon/docs/syscalls/fifo_read.md
similarity index 100%
rename from docs/syscalls/fifo_read.md
rename to zircon/docs/syscalls/fifo_read.md
diff --git a/docs/syscalls/fifo_write.md b/zircon/docs/syscalls/fifo_write.md
similarity index 100%
rename from docs/syscalls/fifo_write.md
rename to zircon/docs/syscalls/fifo_write.md
diff --git a/docs/syscalls/framebuffer_get_info.md b/zircon/docs/syscalls/framebuffer_get_info.md
similarity index 100%
rename from docs/syscalls/framebuffer_get_info.md
rename to zircon/docs/syscalls/framebuffer_get_info.md
diff --git a/docs/syscalls/framebuffer_set_range.md b/zircon/docs/syscalls/framebuffer_set_range.md
similarity index 100%
rename from docs/syscalls/framebuffer_set_range.md
rename to zircon/docs/syscalls/framebuffer_set_range.md
diff --git a/docs/syscalls/futex_get_owner.md b/zircon/docs/syscalls/futex_get_owner.md
similarity index 100%
rename from docs/syscalls/futex_get_owner.md
rename to zircon/docs/syscalls/futex_get_owner.md
diff --git a/docs/syscalls/futex_requeue.md b/zircon/docs/syscalls/futex_requeue.md
similarity index 100%
rename from docs/syscalls/futex_requeue.md
rename to zircon/docs/syscalls/futex_requeue.md
diff --git a/docs/syscalls/futex_requeue_deprecated.md b/zircon/docs/syscalls/futex_requeue_deprecated.md
similarity index 100%
rename from docs/syscalls/futex_requeue_deprecated.md
rename to zircon/docs/syscalls/futex_requeue_deprecated.md
diff --git a/docs/syscalls/futex_requeue_single_owner.md b/zircon/docs/syscalls/futex_requeue_single_owner.md
similarity index 100%
rename from docs/syscalls/futex_requeue_single_owner.md
rename to zircon/docs/syscalls/futex_requeue_single_owner.md
diff --git a/docs/syscalls/futex_wait.md b/zircon/docs/syscalls/futex_wait.md
similarity index 100%
rename from docs/syscalls/futex_wait.md
rename to zircon/docs/syscalls/futex_wait.md
diff --git a/docs/syscalls/futex_wait_deprecated.md b/zircon/docs/syscalls/futex_wait_deprecated.md
similarity index 100%
rename from docs/syscalls/futex_wait_deprecated.md
rename to zircon/docs/syscalls/futex_wait_deprecated.md
diff --git a/docs/syscalls/futex_wake.md b/zircon/docs/syscalls/futex_wake.md
similarity index 100%
rename from docs/syscalls/futex_wake.md
rename to zircon/docs/syscalls/futex_wake.md
diff --git a/docs/syscalls/futex_wake_handle_close_thread_exit.md b/zircon/docs/syscalls/futex_wake_handle_close_thread_exit.md
similarity index 100%
rename from docs/syscalls/futex_wake_handle_close_thread_exit.md
rename to zircon/docs/syscalls/futex_wake_handle_close_thread_exit.md
diff --git a/docs/syscalls/futex_wake_single_owner.md b/zircon/docs/syscalls/futex_wake_single_owner.md
similarity index 100%
rename from docs/syscalls/futex_wake_single_owner.md
rename to zircon/docs/syscalls/futex_wake_single_owner.md
diff --git a/docs/syscalls/guest_create.md b/zircon/docs/syscalls/guest_create.md
similarity index 100%
rename from docs/syscalls/guest_create.md
rename to zircon/docs/syscalls/guest_create.md
diff --git a/docs/syscalls/guest_set_trap.md b/zircon/docs/syscalls/guest_set_trap.md
similarity index 100%
rename from docs/syscalls/guest_set_trap.md
rename to zircon/docs/syscalls/guest_set_trap.md
diff --git a/docs/syscalls/handle_close.md b/zircon/docs/syscalls/handle_close.md
similarity index 100%
rename from docs/syscalls/handle_close.md
rename to zircon/docs/syscalls/handle_close.md
diff --git a/docs/syscalls/handle_close_many.md b/zircon/docs/syscalls/handle_close_many.md
similarity index 100%
rename from docs/syscalls/handle_close_many.md
rename to zircon/docs/syscalls/handle_close_many.md
diff --git a/docs/syscalls/handle_duplicate.md b/zircon/docs/syscalls/handle_duplicate.md
similarity index 100%
rename from docs/syscalls/handle_duplicate.md
rename to zircon/docs/syscalls/handle_duplicate.md
diff --git a/docs/syscalls/handle_replace.md b/zircon/docs/syscalls/handle_replace.md
similarity index 100%
rename from docs/syscalls/handle_replace.md
rename to zircon/docs/syscalls/handle_replace.md
diff --git a/docs/syscalls/interrupt_ack.md b/zircon/docs/syscalls/interrupt_ack.md
similarity index 100%
rename from docs/syscalls/interrupt_ack.md
rename to zircon/docs/syscalls/interrupt_ack.md
diff --git a/docs/syscalls/interrupt_bind.md b/zircon/docs/syscalls/interrupt_bind.md
similarity index 100%
rename from docs/syscalls/interrupt_bind.md
rename to zircon/docs/syscalls/interrupt_bind.md
diff --git a/docs/syscalls/interrupt_bind_vcpu.md b/zircon/docs/syscalls/interrupt_bind_vcpu.md
similarity index 100%
rename from docs/syscalls/interrupt_bind_vcpu.md
rename to zircon/docs/syscalls/interrupt_bind_vcpu.md
diff --git a/docs/syscalls/interrupt_create.md b/zircon/docs/syscalls/interrupt_create.md
similarity index 100%
rename from docs/syscalls/interrupt_create.md
rename to zircon/docs/syscalls/interrupt_create.md
diff --git a/docs/syscalls/interrupt_destroy.md b/zircon/docs/syscalls/interrupt_destroy.md
similarity index 100%
rename from docs/syscalls/interrupt_destroy.md
rename to zircon/docs/syscalls/interrupt_destroy.md
diff --git a/docs/syscalls/interrupt_trigger.md b/zircon/docs/syscalls/interrupt_trigger.md
similarity index 100%
rename from docs/syscalls/interrupt_trigger.md
rename to zircon/docs/syscalls/interrupt_trigger.md
diff --git a/docs/syscalls/interrupt_wait.md b/zircon/docs/syscalls/interrupt_wait.md
similarity index 100%
rename from docs/syscalls/interrupt_wait.md
rename to zircon/docs/syscalls/interrupt_wait.md
diff --git a/docs/syscalls/iommu_create.md b/zircon/docs/syscalls/iommu_create.md
similarity index 100%
rename from docs/syscalls/iommu_create.md
rename to zircon/docs/syscalls/iommu_create.md
diff --git a/docs/syscalls/ioports_request.md b/zircon/docs/syscalls/ioports_request.md
similarity index 100%
rename from docs/syscalls/ioports_request.md
rename to zircon/docs/syscalls/ioports_request.md
diff --git a/docs/syscalls/job_create.md b/zircon/docs/syscalls/job_create.md
similarity index 100%
rename from docs/syscalls/job_create.md
rename to zircon/docs/syscalls/job_create.md
diff --git a/docs/syscalls/job_set_policy.md b/zircon/docs/syscalls/job_set_policy.md
similarity index 100%
rename from docs/syscalls/job_set_policy.md
rename to zircon/docs/syscalls/job_set_policy.md
diff --git a/docs/syscalls/ktrace_control.md b/zircon/docs/syscalls/ktrace_control.md
similarity index 100%
rename from docs/syscalls/ktrace_control.md
rename to zircon/docs/syscalls/ktrace_control.md
diff --git a/docs/syscalls/ktrace_read.md b/zircon/docs/syscalls/ktrace_read.md
similarity index 100%
rename from docs/syscalls/ktrace_read.md
rename to zircon/docs/syscalls/ktrace_read.md
diff --git a/docs/syscalls/ktrace_write.md b/zircon/docs/syscalls/ktrace_write.md
similarity index 100%
rename from docs/syscalls/ktrace_write.md
rename to zircon/docs/syscalls/ktrace_write.md
diff --git a/docs/syscalls/mtrace_control.md b/zircon/docs/syscalls/mtrace_control.md
similarity index 100%
rename from docs/syscalls/mtrace_control.md
rename to zircon/docs/syscalls/mtrace_control.md
diff --git a/docs/syscalls/nanosleep.md b/zircon/docs/syscalls/nanosleep.md
similarity index 100%
rename from docs/syscalls/nanosleep.md
rename to zircon/docs/syscalls/nanosleep.md
diff --git a/docs/syscalls/object_get_child.md b/zircon/docs/syscalls/object_get_child.md
similarity index 100%
rename from docs/syscalls/object_get_child.md
rename to zircon/docs/syscalls/object_get_child.md
diff --git a/docs/syscalls/object_get_cookie.md b/zircon/docs/syscalls/object_get_cookie.md
similarity index 100%
rename from docs/syscalls/object_get_cookie.md
rename to zircon/docs/syscalls/object_get_cookie.md
diff --git a/docs/syscalls/object_get_info.md b/zircon/docs/syscalls/object_get_info.md
similarity index 100%
rename from docs/syscalls/object_get_info.md
rename to zircon/docs/syscalls/object_get_info.md
diff --git a/docs/syscalls/object_get_property.md b/zircon/docs/syscalls/object_get_property.md
similarity index 100%
rename from docs/syscalls/object_get_property.md
rename to zircon/docs/syscalls/object_get_property.md
diff --git a/docs/syscalls/object_set_cookie.md b/zircon/docs/syscalls/object_set_cookie.md
similarity index 100%
rename from docs/syscalls/object_set_cookie.md
rename to zircon/docs/syscalls/object_set_cookie.md
diff --git a/docs/syscalls/object_set_profile.md b/zircon/docs/syscalls/object_set_profile.md
similarity index 100%
rename from docs/syscalls/object_set_profile.md
rename to zircon/docs/syscalls/object_set_profile.md
diff --git a/docs/syscalls/object_set_property.md b/zircon/docs/syscalls/object_set_property.md
similarity index 100%
rename from docs/syscalls/object_set_property.md
rename to zircon/docs/syscalls/object_set_property.md
diff --git a/docs/syscalls/object_signal.md b/zircon/docs/syscalls/object_signal.md
similarity index 100%
rename from docs/syscalls/object_signal.md
rename to zircon/docs/syscalls/object_signal.md
diff --git a/docs/syscalls/object_signal_peer.md b/zircon/docs/syscalls/object_signal_peer.md
similarity index 100%
rename from docs/syscalls/object_signal_peer.md
rename to zircon/docs/syscalls/object_signal_peer.md
diff --git a/docs/syscalls/object_wait_async.md b/zircon/docs/syscalls/object_wait_async.md
similarity index 100%
rename from docs/syscalls/object_wait_async.md
rename to zircon/docs/syscalls/object_wait_async.md
diff --git a/docs/syscalls/object_wait_many.md b/zircon/docs/syscalls/object_wait_many.md
similarity index 100%
rename from docs/syscalls/object_wait_many.md
rename to zircon/docs/syscalls/object_wait_many.md
diff --git a/docs/syscalls/object_wait_one.md b/zircon/docs/syscalls/object_wait_one.md
similarity index 100%
rename from docs/syscalls/object_wait_one.md
rename to zircon/docs/syscalls/object_wait_one.md
diff --git a/docs/syscalls/pager_create.md b/zircon/docs/syscalls/pager_create.md
similarity index 100%
rename from docs/syscalls/pager_create.md
rename to zircon/docs/syscalls/pager_create.md
diff --git a/docs/syscalls/pager_create_vmo.md b/zircon/docs/syscalls/pager_create_vmo.md
similarity index 100%
rename from docs/syscalls/pager_create_vmo.md
rename to zircon/docs/syscalls/pager_create_vmo.md
diff --git a/docs/syscalls/pc_firmware_tables.md b/zircon/docs/syscalls/pc_firmware_tables.md
similarity index 100%
rename from docs/syscalls/pc_firmware_tables.md
rename to zircon/docs/syscalls/pc_firmware_tables.md
diff --git a/docs/syscalls/pci_add_subtract_io_range.md b/zircon/docs/syscalls/pci_add_subtract_io_range.md
similarity index 100%
rename from docs/syscalls/pci_add_subtract_io_range.md
rename to zircon/docs/syscalls/pci_add_subtract_io_range.md
diff --git a/docs/syscalls/pci_cfg_pio_rw.md b/zircon/docs/syscalls/pci_cfg_pio_rw.md
similarity index 100%
rename from docs/syscalls/pci_cfg_pio_rw.md
rename to zircon/docs/syscalls/pci_cfg_pio_rw.md
diff --git a/docs/syscalls/pci_config_read.md b/zircon/docs/syscalls/pci_config_read.md
similarity index 100%
rename from docs/syscalls/pci_config_read.md
rename to zircon/docs/syscalls/pci_config_read.md
diff --git a/docs/syscalls/pci_config_write.md b/zircon/docs/syscalls/pci_config_write.md
similarity index 100%
rename from docs/syscalls/pci_config_write.md
rename to zircon/docs/syscalls/pci_config_write.md
diff --git a/docs/syscalls/pci_enable_bus_master.md b/zircon/docs/syscalls/pci_enable_bus_master.md
similarity index 100%
rename from docs/syscalls/pci_enable_bus_master.md
rename to zircon/docs/syscalls/pci_enable_bus_master.md
diff --git a/docs/syscalls/pci_get_bar.md b/zircon/docs/syscalls/pci_get_bar.md
similarity index 100%
rename from docs/syscalls/pci_get_bar.md
rename to zircon/docs/syscalls/pci_get_bar.md
diff --git a/docs/syscalls/pci_get_nth_device.md b/zircon/docs/syscalls/pci_get_nth_device.md
similarity index 100%
rename from docs/syscalls/pci_get_nth_device.md
rename to zircon/docs/syscalls/pci_get_nth_device.md
diff --git a/docs/syscalls/pci_init.md b/zircon/docs/syscalls/pci_init.md
similarity index 100%
rename from docs/syscalls/pci_init.md
rename to zircon/docs/syscalls/pci_init.md
diff --git a/docs/syscalls/pci_map_interrupt.md b/zircon/docs/syscalls/pci_map_interrupt.md
similarity index 100%
rename from docs/syscalls/pci_map_interrupt.md
rename to zircon/docs/syscalls/pci_map_interrupt.md
diff --git a/docs/syscalls/pci_query_irq_mode.md b/zircon/docs/syscalls/pci_query_irq_mode.md
similarity index 100%
rename from docs/syscalls/pci_query_irq_mode.md
rename to zircon/docs/syscalls/pci_query_irq_mode.md
diff --git a/docs/syscalls/pci_reset_device.md b/zircon/docs/syscalls/pci_reset_device.md
similarity index 100%
rename from docs/syscalls/pci_reset_device.md
rename to zircon/docs/syscalls/pci_reset_device.md
diff --git a/docs/syscalls/pci_set_irq_mode.md b/zircon/docs/syscalls/pci_set_irq_mode.md
similarity index 100%
rename from docs/syscalls/pci_set_irq_mode.md
rename to zircon/docs/syscalls/pci_set_irq_mode.md
diff --git a/docs/syscalls/pmt_unpin.md b/zircon/docs/syscalls/pmt_unpin.md
similarity index 100%
rename from docs/syscalls/pmt_unpin.md
rename to zircon/docs/syscalls/pmt_unpin.md
diff --git a/docs/syscalls/port_cancel.md b/zircon/docs/syscalls/port_cancel.md
similarity index 100%
rename from docs/syscalls/port_cancel.md
rename to zircon/docs/syscalls/port_cancel.md
diff --git a/docs/syscalls/port_create.md b/zircon/docs/syscalls/port_create.md
similarity index 100%
rename from docs/syscalls/port_create.md
rename to zircon/docs/syscalls/port_create.md
diff --git a/docs/syscalls/port_queue.md b/zircon/docs/syscalls/port_queue.md
similarity index 100%
rename from docs/syscalls/port_queue.md
rename to zircon/docs/syscalls/port_queue.md
diff --git a/docs/syscalls/port_wait.md b/zircon/docs/syscalls/port_wait.md
similarity index 100%
rename from docs/syscalls/port_wait.md
rename to zircon/docs/syscalls/port_wait.md
diff --git a/docs/syscalls/process_create.md b/zircon/docs/syscalls/process_create.md
similarity index 100%
rename from docs/syscalls/process_create.md
rename to zircon/docs/syscalls/process_create.md
diff --git a/docs/syscalls/process_exit.md b/zircon/docs/syscalls/process_exit.md
similarity index 100%
rename from docs/syscalls/process_exit.md
rename to zircon/docs/syscalls/process_exit.md
diff --git a/docs/syscalls/process_read_memory.md b/zircon/docs/syscalls/process_read_memory.md
similarity index 100%
rename from docs/syscalls/process_read_memory.md
rename to zircon/docs/syscalls/process_read_memory.md
diff --git a/docs/syscalls/process_start.md b/zircon/docs/syscalls/process_start.md
similarity index 100%
rename from docs/syscalls/process_start.md
rename to zircon/docs/syscalls/process_start.md
diff --git a/docs/syscalls/process_write_memory.md b/zircon/docs/syscalls/process_write_memory.md
similarity index 100%
rename from docs/syscalls/process_write_memory.md
rename to zircon/docs/syscalls/process_write_memory.md
diff --git a/docs/syscalls/profile_create.md b/zircon/docs/syscalls/profile_create.md
similarity index 100%
rename from docs/syscalls/profile_create.md
rename to zircon/docs/syscalls/profile_create.md
diff --git a/docs/syscalls/resource_create.md b/zircon/docs/syscalls/resource_create.md
similarity index 100%
rename from docs/syscalls/resource_create.md
rename to zircon/docs/syscalls/resource_create.md
diff --git a/docs/syscalls/smc_call.md b/zircon/docs/syscalls/smc_call.md
similarity index 100%
rename from docs/syscalls/smc_call.md
rename to zircon/docs/syscalls/smc_call.md
diff --git a/docs/syscalls/socket_accept.md b/zircon/docs/syscalls/socket_accept.md
similarity index 100%
rename from docs/syscalls/socket_accept.md
rename to zircon/docs/syscalls/socket_accept.md
diff --git a/docs/syscalls/socket_create.md b/zircon/docs/syscalls/socket_create.md
similarity index 100%
rename from docs/syscalls/socket_create.md
rename to zircon/docs/syscalls/socket_create.md
diff --git a/docs/syscalls/socket_read.md b/zircon/docs/syscalls/socket_read.md
similarity index 100%
rename from docs/syscalls/socket_read.md
rename to zircon/docs/syscalls/socket_read.md
diff --git a/docs/syscalls/socket_share.md b/zircon/docs/syscalls/socket_share.md
similarity index 100%
rename from docs/syscalls/socket_share.md
rename to zircon/docs/syscalls/socket_share.md
diff --git a/docs/syscalls/socket_shutdown.md b/zircon/docs/syscalls/socket_shutdown.md
similarity index 100%
rename from docs/syscalls/socket_shutdown.md
rename to zircon/docs/syscalls/socket_shutdown.md
diff --git a/docs/syscalls/socket_write.md b/zircon/docs/syscalls/socket_write.md
similarity index 100%
rename from docs/syscalls/socket_write.md
rename to zircon/docs/syscalls/socket_write.md
diff --git a/docs/syscalls/syscall_test_0.md b/zircon/docs/syscalls/syscall_test_0.md
similarity index 100%
rename from docs/syscalls/syscall_test_0.md
rename to zircon/docs/syscalls/syscall_test_0.md
diff --git a/docs/syscalls/syscall_test_1.md b/zircon/docs/syscalls/syscall_test_1.md
similarity index 100%
rename from docs/syscalls/syscall_test_1.md
rename to zircon/docs/syscalls/syscall_test_1.md
diff --git a/docs/syscalls/syscall_test_2.md b/zircon/docs/syscalls/syscall_test_2.md
similarity index 100%
rename from docs/syscalls/syscall_test_2.md
rename to zircon/docs/syscalls/syscall_test_2.md
diff --git a/docs/syscalls/syscall_test_3.md b/zircon/docs/syscalls/syscall_test_3.md
similarity index 100%
rename from docs/syscalls/syscall_test_3.md
rename to zircon/docs/syscalls/syscall_test_3.md
diff --git a/docs/syscalls/syscall_test_4.md b/zircon/docs/syscalls/syscall_test_4.md
similarity index 100%
rename from docs/syscalls/syscall_test_4.md
rename to zircon/docs/syscalls/syscall_test_4.md
diff --git a/docs/syscalls/syscall_test_5.md b/zircon/docs/syscalls/syscall_test_5.md
similarity index 100%
rename from docs/syscalls/syscall_test_5.md
rename to zircon/docs/syscalls/syscall_test_5.md
diff --git a/docs/syscalls/syscall_test_6.md b/zircon/docs/syscalls/syscall_test_6.md
similarity index 100%
rename from docs/syscalls/syscall_test_6.md
rename to zircon/docs/syscalls/syscall_test_6.md
diff --git a/docs/syscalls/syscall_test_7.md b/zircon/docs/syscalls/syscall_test_7.md
similarity index 100%
rename from docs/syscalls/syscall_test_7.md
rename to zircon/docs/syscalls/syscall_test_7.md
diff --git a/docs/syscalls/syscall_test_8.md b/zircon/docs/syscalls/syscall_test_8.md
similarity index 100%
rename from docs/syscalls/syscall_test_8.md
rename to zircon/docs/syscalls/syscall_test_8.md
diff --git a/docs/syscalls/syscall_test_wrapper.md b/zircon/docs/syscalls/syscall_test_wrapper.md
similarity index 100%
rename from docs/syscalls/syscall_test_wrapper.md
rename to zircon/docs/syscalls/syscall_test_wrapper.md
diff --git a/docs/syscalls/system_get_dcache_line_size.md b/zircon/docs/syscalls/system_get_dcache_line_size.md
similarity index 100%
rename from docs/syscalls/system_get_dcache_line_size.md
rename to zircon/docs/syscalls/system_get_dcache_line_size.md
diff --git a/docs/syscalls/system_get_features.md b/zircon/docs/syscalls/system_get_features.md
similarity index 100%
rename from docs/syscalls/system_get_features.md
rename to zircon/docs/syscalls/system_get_features.md
diff --git a/docs/syscalls/system_get_num_cpus.md b/zircon/docs/syscalls/system_get_num_cpus.md
similarity index 100%
rename from docs/syscalls/system_get_num_cpus.md
rename to zircon/docs/syscalls/system_get_num_cpus.md
diff --git a/docs/syscalls/system_get_physmem.md b/zircon/docs/syscalls/system_get_physmem.md
similarity index 100%
rename from docs/syscalls/system_get_physmem.md
rename to zircon/docs/syscalls/system_get_physmem.md
diff --git a/docs/syscalls/system_get_version.md b/zircon/docs/syscalls/system_get_version.md
similarity index 100%
rename from docs/syscalls/system_get_version.md
rename to zircon/docs/syscalls/system_get_version.md
diff --git a/docs/syscalls/system_mexec.md b/zircon/docs/syscalls/system_mexec.md
similarity index 100%
rename from docs/syscalls/system_mexec.md
rename to zircon/docs/syscalls/system_mexec.md
diff --git a/docs/syscalls/system_mexec_payload_get.md b/zircon/docs/syscalls/system_mexec_payload_get.md
similarity index 100%
rename from docs/syscalls/system_mexec_payload_get.md
rename to zircon/docs/syscalls/system_mexec_payload_get.md
diff --git a/docs/syscalls/system_powerctl.md b/zircon/docs/syscalls/system_powerctl.md
similarity index 100%
rename from docs/syscalls/system_powerctl.md
rename to zircon/docs/syscalls/system_powerctl.md
diff --git a/docs/syscalls/task_bind_exception_port.md b/zircon/docs/syscalls/task_bind_exception_port.md
similarity index 100%
rename from docs/syscalls/task_bind_exception_port.md
rename to zircon/docs/syscalls/task_bind_exception_port.md
diff --git a/docs/syscalls/task_kill.md b/zircon/docs/syscalls/task_kill.md
similarity index 100%
rename from docs/syscalls/task_kill.md
rename to zircon/docs/syscalls/task_kill.md
diff --git a/docs/syscalls/task_resume_from_exception.md b/zircon/docs/syscalls/task_resume_from_exception.md
similarity index 100%
rename from docs/syscalls/task_resume_from_exception.md
rename to zircon/docs/syscalls/task_resume_from_exception.md
diff --git a/docs/syscalls/task_suspend.md b/zircon/docs/syscalls/task_suspend.md
similarity index 100%
rename from docs/syscalls/task_suspend.md
rename to zircon/docs/syscalls/task_suspend.md
diff --git a/docs/syscalls/task_suspend_token.md b/zircon/docs/syscalls/task_suspend_token.md
similarity index 100%
rename from docs/syscalls/task_suspend_token.md
rename to zircon/docs/syscalls/task_suspend_token.md
diff --git a/docs/syscalls/thread_create.md b/zircon/docs/syscalls/thread_create.md
similarity index 100%
rename from docs/syscalls/thread_create.md
rename to zircon/docs/syscalls/thread_create.md
diff --git a/docs/syscalls/thread_exit.md b/zircon/docs/syscalls/thread_exit.md
similarity index 100%
rename from docs/syscalls/thread_exit.md
rename to zircon/docs/syscalls/thread_exit.md
diff --git a/docs/syscalls/thread_read_state.md b/zircon/docs/syscalls/thread_read_state.md
similarity index 100%
rename from docs/syscalls/thread_read_state.md
rename to zircon/docs/syscalls/thread_read_state.md
diff --git a/docs/syscalls/thread_set_priority.md b/zircon/docs/syscalls/thread_set_priority.md
similarity index 100%
rename from docs/syscalls/thread_set_priority.md
rename to zircon/docs/syscalls/thread_set_priority.md
diff --git a/docs/syscalls/thread_start.md b/zircon/docs/syscalls/thread_start.md
similarity index 100%
rename from docs/syscalls/thread_start.md
rename to zircon/docs/syscalls/thread_start.md
diff --git a/docs/syscalls/thread_write_state.md b/zircon/docs/syscalls/thread_write_state.md
similarity index 100%
rename from docs/syscalls/thread_write_state.md
rename to zircon/docs/syscalls/thread_write_state.md
diff --git a/docs/syscalls/ticks_get.md b/zircon/docs/syscalls/ticks_get.md
similarity index 100%
rename from docs/syscalls/ticks_get.md
rename to zircon/docs/syscalls/ticks_get.md
diff --git a/docs/syscalls/ticks_per_second.md b/zircon/docs/syscalls/ticks_per_second.md
similarity index 100%
rename from docs/syscalls/ticks_per_second.md
rename to zircon/docs/syscalls/ticks_per_second.md
diff --git a/docs/syscalls/timer_cancel.md b/zircon/docs/syscalls/timer_cancel.md
similarity index 100%
rename from docs/syscalls/timer_cancel.md
rename to zircon/docs/syscalls/timer_cancel.md
diff --git a/docs/syscalls/timer_create.md b/zircon/docs/syscalls/timer_create.md
similarity index 100%
rename from docs/syscalls/timer_create.md
rename to zircon/docs/syscalls/timer_create.md
diff --git a/docs/syscalls/timer_set.md b/zircon/docs/syscalls/timer_set.md
similarity index 100%
rename from docs/syscalls/timer_set.md
rename to zircon/docs/syscalls/timer_set.md
diff --git a/docs/syscalls/vcpu_create.md b/zircon/docs/syscalls/vcpu_create.md
similarity index 100%
rename from docs/syscalls/vcpu_create.md
rename to zircon/docs/syscalls/vcpu_create.md
diff --git a/docs/syscalls/vcpu_interrupt.md b/zircon/docs/syscalls/vcpu_interrupt.md
similarity index 100%
rename from docs/syscalls/vcpu_interrupt.md
rename to zircon/docs/syscalls/vcpu_interrupt.md
diff --git a/docs/syscalls/vcpu_read_state.md b/zircon/docs/syscalls/vcpu_read_state.md
similarity index 100%
rename from docs/syscalls/vcpu_read_state.md
rename to zircon/docs/syscalls/vcpu_read_state.md
diff --git a/docs/syscalls/vcpu_resume.md b/zircon/docs/syscalls/vcpu_resume.md
similarity index 100%
rename from docs/syscalls/vcpu_resume.md
rename to zircon/docs/syscalls/vcpu_resume.md
diff --git a/docs/syscalls/vcpu_write_state.md b/zircon/docs/syscalls/vcpu_write_state.md
similarity index 100%
rename from docs/syscalls/vcpu_write_state.md
rename to zircon/docs/syscalls/vcpu_write_state.md
diff --git a/docs/syscalls/vmar_allocate.md b/zircon/docs/syscalls/vmar_allocate.md
similarity index 100%
rename from docs/syscalls/vmar_allocate.md
rename to zircon/docs/syscalls/vmar_allocate.md
diff --git a/docs/syscalls/vmar_allocate_old.md b/zircon/docs/syscalls/vmar_allocate_old.md
similarity index 100%
rename from docs/syscalls/vmar_allocate_old.md
rename to zircon/docs/syscalls/vmar_allocate_old.md
diff --git a/docs/syscalls/vmar_destroy.md b/zircon/docs/syscalls/vmar_destroy.md
similarity index 100%
rename from docs/syscalls/vmar_destroy.md
rename to zircon/docs/syscalls/vmar_destroy.md
diff --git a/docs/syscalls/vmar_map.md b/zircon/docs/syscalls/vmar_map.md
similarity index 100%
rename from docs/syscalls/vmar_map.md
rename to zircon/docs/syscalls/vmar_map.md
diff --git a/docs/syscalls/vmar_map_old.md b/zircon/docs/syscalls/vmar_map_old.md
similarity index 100%
rename from docs/syscalls/vmar_map_old.md
rename to zircon/docs/syscalls/vmar_map_old.md
diff --git a/docs/syscalls/vmar_protect.md b/zircon/docs/syscalls/vmar_protect.md
similarity index 100%
rename from docs/syscalls/vmar_protect.md
rename to zircon/docs/syscalls/vmar_protect.md
diff --git a/docs/syscalls/vmar_protect_old.md b/zircon/docs/syscalls/vmar_protect_old.md
similarity index 100%
rename from docs/syscalls/vmar_protect_old.md
rename to zircon/docs/syscalls/vmar_protect_old.md
diff --git a/docs/syscalls/vmar_unmap.md b/zircon/docs/syscalls/vmar_unmap.md
similarity index 100%
rename from docs/syscalls/vmar_unmap.md
rename to zircon/docs/syscalls/vmar_unmap.md
diff --git a/docs/syscalls/vmar_unmap_handle_close_thread_exit.md b/zircon/docs/syscalls/vmar_unmap_handle_close_thread_exit.md
similarity index 100%
rename from docs/syscalls/vmar_unmap_handle_close_thread_exit.md
rename to zircon/docs/syscalls/vmar_unmap_handle_close_thread_exit.md
diff --git a/docs/syscalls/vmo_clone.md b/zircon/docs/syscalls/vmo_clone.md
similarity index 100%
rename from docs/syscalls/vmo_clone.md
rename to zircon/docs/syscalls/vmo_clone.md
diff --git a/docs/syscalls/vmo_create.md b/zircon/docs/syscalls/vmo_create.md
similarity index 100%
rename from docs/syscalls/vmo_create.md
rename to zircon/docs/syscalls/vmo_create.md
diff --git a/docs/syscalls/vmo_create_contiguous.md b/zircon/docs/syscalls/vmo_create_contiguous.md
similarity index 100%
rename from docs/syscalls/vmo_create_contiguous.md
rename to zircon/docs/syscalls/vmo_create_contiguous.md
diff --git a/docs/syscalls/vmo_create_physical.md b/zircon/docs/syscalls/vmo_create_physical.md
similarity index 100%
rename from docs/syscalls/vmo_create_physical.md
rename to zircon/docs/syscalls/vmo_create_physical.md
diff --git a/docs/syscalls/vmo_get_size.md b/zircon/docs/syscalls/vmo_get_size.md
similarity index 100%
rename from docs/syscalls/vmo_get_size.md
rename to zircon/docs/syscalls/vmo_get_size.md
diff --git a/docs/syscalls/vmo_op_range.md b/zircon/docs/syscalls/vmo_op_range.md
similarity index 100%
rename from docs/syscalls/vmo_op_range.md
rename to zircon/docs/syscalls/vmo_op_range.md
diff --git a/docs/syscalls/vmo_read.md b/zircon/docs/syscalls/vmo_read.md
similarity index 100%
rename from docs/syscalls/vmo_read.md
rename to zircon/docs/syscalls/vmo_read.md
diff --git a/docs/syscalls/vmo_replace_as_executable.md b/zircon/docs/syscalls/vmo_replace_as_executable.md
similarity index 100%
rename from docs/syscalls/vmo_replace_as_executable.md
rename to zircon/docs/syscalls/vmo_replace_as_executable.md
diff --git a/docs/syscalls/vmo_set_cache_policy.md b/zircon/docs/syscalls/vmo_set_cache_policy.md
similarity index 100%
rename from docs/syscalls/vmo_set_cache_policy.md
rename to zircon/docs/syscalls/vmo_set_cache_policy.md
diff --git a/docs/syscalls/vmo_set_size.md b/zircon/docs/syscalls/vmo_set_size.md
similarity index 100%
rename from docs/syscalls/vmo_set_size.md
rename to zircon/docs/syscalls/vmo_set_size.md
diff --git a/docs/syscalls/vmo_write.md b/zircon/docs/syscalls/vmo_write.md
similarity index 100%
rename from docs/syscalls/vmo_write.md
rename to zircon/docs/syscalls/vmo_write.md
diff --git a/docs/sysret_problem.md b/zircon/docs/sysret_problem.md
similarity index 100%
rename from docs/sysret_problem.md
rename to zircon/docs/sysret_problem.md
diff --git a/docs/targets/acer12.md b/zircon/docs/targets/acer12.md
similarity index 100%
rename from docs/targets/acer12.md
rename to zircon/docs/targets/acer12.md
diff --git a/docs/targets/hikey960.md b/zircon/docs/targets/hikey960.md
similarity index 100%
rename from docs/targets/hikey960.md
rename to zircon/docs/targets/hikey960.md
diff --git a/docs/targets/imx8mevk.md b/zircon/docs/targets/imx8mevk.md
similarity index 100%
rename from docs/targets/imx8mevk.md
rename to zircon/docs/targets/imx8mevk.md
diff --git a/docs/targets/khadas-vim.md b/zircon/docs/targets/khadas-vim.md
similarity index 100%
rename from docs/targets/khadas-vim.md
rename to zircon/docs/targets/khadas-vim.md
diff --git a/docs/targets/nuc.md b/zircon/docs/targets/nuc.md
similarity index 100%
rename from docs/targets/nuc.md
rename to zircon/docs/targets/nuc.md
diff --git a/docs/targets/toulouse.md b/zircon/docs/targets/toulouse.md
similarity index 100%
rename from docs/targets/toulouse.md
rename to zircon/docs/targets/toulouse.md
diff --git a/docs/targets/usb_setup.md b/zircon/docs/targets/usb_setup.md
similarity index 100%
rename from docs/targets/usb_setup.md
rename to zircon/docs/targets/usb_setup.md
diff --git a/docs/testing.md b/zircon/docs/testing.md
similarity index 100%
rename from docs/testing.md
rename to zircon/docs/testing.md
diff --git a/docs/thread_annotations.md b/zircon/docs/thread_annotations.md
similarity index 100%
rename from docs/thread_annotations.md
rename to zircon/docs/thread_annotations.md
diff --git a/docs/time.md b/zircon/docs/time.md
similarity index 100%
rename from docs/time.md
rename to zircon/docs/time.md
diff --git a/docs/timer_slack.md b/zircon/docs/timer_slack.md
similarity index 100%
rename from docs/timer_slack.md
rename to zircon/docs/timer_slack.md
diff --git a/docs/tls.md b/zircon/docs/tls.md
similarity index 100%
rename from docs/tls.md
rename to zircon/docs/tls.md
diff --git a/docs/tracing/design.md b/zircon/docs/tracing/design.md
similarity index 100%
rename from docs/tracing/design.md
rename to zircon/docs/tracing/design.md
diff --git a/docs/tracing/trace_format.md b/zircon/docs/tracing/trace_format.md
similarity index 100%
rename from docs/tracing/trace_format.md
rename to zircon/docs/tracing/trace_format.md
diff --git a/docs/userboot.md b/zircon/docs/userboot.md
similarity index 100%
rename from docs/userboot.md
rename to zircon/docs/userboot.md
diff --git a/docs/vdso.md b/zircon/docs/vdso.md
similarity index 100%
rename from docs/vdso.md
rename to zircon/docs/vdso.md
diff --git a/docs/zx_and_lk.md b/zircon/docs/zx_and_lk.md
similarity index 100%
rename from docs/zx_and_lk.md
rename to zircon/docs/zx_and_lk.md
diff --git a/docs/zxcrypt.md b/zircon/docs/zxcrypt.md
similarity index 100%
rename from docs/zxcrypt.md
rename to zircon/docs/zxcrypt.md
diff --git a/kernel/LICENSE b/zircon/kernel/LICENSE
similarity index 100%
rename from kernel/LICENSE
rename to zircon/kernel/LICENSE
diff --git a/kernel/MAINTAINERS b/zircon/kernel/MAINTAINERS
similarity index 100%
rename from kernel/MAINTAINERS
rename to zircon/kernel/MAINTAINERS
diff --git a/kernel/arch/arm64/arch.cpp b/zircon/kernel/arch/arm64/arch.cpp
similarity index 100%
rename from kernel/arch/arm64/arch.cpp
rename to zircon/kernel/arch/arm64/arch.cpp
diff --git a/kernel/arch/arm64/asm.S b/zircon/kernel/arch/arm64/asm.S
similarity index 100%
rename from kernel/arch/arm64/asm.S
rename to zircon/kernel/arch/arm64/asm.S
diff --git a/kernel/arch/arm64/boot-mmu.cpp b/zircon/kernel/arch/arm64/boot-mmu.cpp
similarity index 100%
rename from kernel/arch/arm64/boot-mmu.cpp
rename to zircon/kernel/arch/arm64/boot-mmu.cpp
diff --git a/kernel/arch/arm64/cache-ops.S b/zircon/kernel/arch/arm64/cache-ops.S
similarity index 100%
rename from kernel/arch/arm64/cache-ops.S
rename to zircon/kernel/arch/arm64/cache-ops.S
diff --git a/kernel/arch/arm64/debugger.cpp b/zircon/kernel/arch/arm64/debugger.cpp
similarity index 100%
rename from kernel/arch/arm64/debugger.cpp
rename to zircon/kernel/arch/arm64/debugger.cpp
diff --git a/kernel/arch/arm64/exceptions.S b/zircon/kernel/arch/arm64/exceptions.S
similarity index 100%
rename from kernel/arch/arm64/exceptions.S
rename to zircon/kernel/arch/arm64/exceptions.S
diff --git a/kernel/arch/arm64/exceptions_c.cpp b/zircon/kernel/arch/arm64/exceptions_c.cpp
similarity index 100%
rename from kernel/arch/arm64/exceptions_c.cpp
rename to zircon/kernel/arch/arm64/exceptions_c.cpp
diff --git a/kernel/arch/arm64/feature.cpp b/zircon/kernel/arch/arm64/feature.cpp
similarity index 100%
rename from kernel/arch/arm64/feature.cpp
rename to zircon/kernel/arch/arm64/feature.cpp
diff --git a/kernel/arch/arm64/fpu.cpp b/zircon/kernel/arch/arm64/fpu.cpp
similarity index 100%
rename from kernel/arch/arm64/fpu.cpp
rename to zircon/kernel/arch/arm64/fpu.cpp
diff --git a/kernel/arch/arm64/hypervisor/MAINTAINERS b/zircon/kernel/arch/arm64/hypervisor/MAINTAINERS
similarity index 100%
rename from kernel/arch/arm64/hypervisor/MAINTAINERS
rename to zircon/kernel/arch/arm64/hypervisor/MAINTAINERS
diff --git a/kernel/arch/arm64/hypervisor/el2.S b/zircon/kernel/arch/arm64/hypervisor/el2.S
similarity index 100%
rename from kernel/arch/arm64/hypervisor/el2.S
rename to zircon/kernel/arch/arm64/hypervisor/el2.S
diff --git a/kernel/arch/arm64/hypervisor/el2_cpu_state.cpp b/zircon/kernel/arch/arm64/hypervisor/el2_cpu_state.cpp
similarity index 100%
rename from kernel/arch/arm64/hypervisor/el2_cpu_state.cpp
rename to zircon/kernel/arch/arm64/hypervisor/el2_cpu_state.cpp
diff --git a/kernel/arch/arm64/hypervisor/el2_cpu_state_priv.h b/zircon/kernel/arch/arm64/hypervisor/el2_cpu_state_priv.h
similarity index 100%
rename from kernel/arch/arm64/hypervisor/el2_cpu_state_priv.h
rename to zircon/kernel/arch/arm64/hypervisor/el2_cpu_state_priv.h
diff --git a/kernel/arch/arm64/hypervisor/gic/el2.S b/zircon/kernel/arch/arm64/hypervisor/gic/el2.S
similarity index 100%
rename from kernel/arch/arm64/hypervisor/gic/el2.S
rename to zircon/kernel/arch/arm64/hypervisor/gic/el2.S
diff --git a/kernel/arch/arm64/hypervisor/gic/gicv2.cpp b/zircon/kernel/arch/arm64/hypervisor/gic/gicv2.cpp
similarity index 100%
rename from kernel/arch/arm64/hypervisor/gic/gicv2.cpp
rename to zircon/kernel/arch/arm64/hypervisor/gic/gicv2.cpp
diff --git a/kernel/arch/arm64/hypervisor/gic/gicv3.cpp b/zircon/kernel/arch/arm64/hypervisor/gic/gicv3.cpp
similarity index 100%
rename from kernel/arch/arm64/hypervisor/gic/gicv3.cpp
rename to zircon/kernel/arch/arm64/hypervisor/gic/gicv3.cpp
diff --git a/kernel/arch/arm64/hypervisor/guest.cpp b/zircon/kernel/arch/arm64/hypervisor/guest.cpp
similarity index 100%
rename from kernel/arch/arm64/hypervisor/guest.cpp
rename to zircon/kernel/arch/arm64/hypervisor/guest.cpp
diff --git a/kernel/arch/arm64/hypervisor/rules.mk b/zircon/kernel/arch/arm64/hypervisor/rules.mk
similarity index 100%
rename from kernel/arch/arm64/hypervisor/rules.mk
rename to zircon/kernel/arch/arm64/hypervisor/rules.mk
diff --git a/kernel/arch/arm64/hypervisor/vcpu.cpp b/zircon/kernel/arch/arm64/hypervisor/vcpu.cpp
similarity index 100%
rename from kernel/arch/arm64/hypervisor/vcpu.cpp
rename to zircon/kernel/arch/arm64/hypervisor/vcpu.cpp
diff --git a/kernel/arch/arm64/hypervisor/vmexit.cpp b/zircon/kernel/arch/arm64/hypervisor/vmexit.cpp
similarity index 100%
rename from kernel/arch/arm64/hypervisor/vmexit.cpp
rename to zircon/kernel/arch/arm64/hypervisor/vmexit.cpp
diff --git a/kernel/arch/arm64/hypervisor/vmexit_priv.h b/zircon/kernel/arch/arm64/hypervisor/vmexit_priv.h
similarity index 100%
rename from kernel/arch/arm64/hypervisor/vmexit_priv.h
rename to zircon/kernel/arch/arm64/hypervisor/vmexit_priv.h
diff --git a/kernel/arch/arm64/image.S b/zircon/kernel/arch/arm64/image.S
similarity index 100%
rename from kernel/arch/arm64/image.S
rename to zircon/kernel/arch/arm64/image.S
diff --git a/kernel/arch/arm64/include/arch/arch_ops.h b/zircon/kernel/arch/arm64/include/arch/arch_ops.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arch_ops.h
rename to zircon/kernel/arch/arm64/include/arch/arch_ops.h
diff --git a/kernel/arch/arm64/include/arch/arch_thread.h b/zircon/kernel/arch/arm64/include/arch/arch_thread.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arch_thread.h
rename to zircon/kernel/arch/arm64/include/arch/arch_thread.h
diff --git a/kernel/arch/arm64/include/arch/arm64.h b/zircon/kernel/arch/arm64/include/arch/arm64.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64.h
rename to zircon/kernel/arch/arm64/include/arch/arm64.h
diff --git a/kernel/arch/arm64/include/arch/arm64/exceptions.h b/zircon/kernel/arch/arm64/include/arch/arm64/exceptions.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/exceptions.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/exceptions.h
diff --git a/kernel/arch/arm64/include/arch/arm64/feature.h b/zircon/kernel/arch/arm64/include/arch/arm64/feature.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/feature.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/feature.h
diff --git a/kernel/arch/arm64/include/arch/arm64/hypervisor/el2_state.h b/zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/el2_state.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/hypervisor/el2_state.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/el2_state.h
diff --git a/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/el2.h b/zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/el2.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/hypervisor/gic/el2.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/el2.h
diff --git a/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv2.h b/zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv2.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv2.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv2.h
diff --git a/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv3.h b/zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv3.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv3.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/hypervisor/gic/gicv3.h
diff --git a/kernel/arch/arm64/include/arch/arm64/interrupt.h b/zircon/kernel/arch/arm64/include/arch/arm64/interrupt.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/interrupt.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/interrupt.h
diff --git a/kernel/arch/arm64/include/arch/arm64/mmu.h b/zircon/kernel/arch/arm64/include/arch/arm64/mmu.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/mmu.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/mmu.h
diff --git a/kernel/arch/arm64/include/arch/arm64/mp.h b/zircon/kernel/arch/arm64/include/arch/arm64/mp.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/mp.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/mp.h
diff --git a/kernel/arch/arm64/include/arch/arm64/periphmap.h b/zircon/kernel/arch/arm64/include/arch/arm64/periphmap.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/periphmap.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/periphmap.h
diff --git a/kernel/arch/arm64/include/arch/arm64/registers.h b/zircon/kernel/arch/arm64/include/arch/arm64/registers.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/registers.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/registers.h
diff --git a/kernel/arch/arm64/include/arch/arm64/smccc.h b/zircon/kernel/arch/arm64/include/arch/arm64/smccc.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/smccc.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/smccc.h
diff --git a/kernel/arch/arm64/include/arch/arm64/user_copy.h b/zircon/kernel/arch/arm64/include/arch/arm64/user_copy.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/arm64/user_copy.h
rename to zircon/kernel/arch/arm64/include/arch/arm64/user_copy.h
diff --git a/kernel/arch/arm64/include/arch/asm_macros.h b/zircon/kernel/arch/arm64/include/arch/asm_macros.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/asm_macros.h
rename to zircon/kernel/arch/arm64/include/arch/asm_macros.h
diff --git a/kernel/arch/arm64/include/arch/aspace.h b/zircon/kernel/arch/arm64/include/arch/aspace.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/aspace.h
rename to zircon/kernel/arch/arm64/include/arch/aspace.h
diff --git a/kernel/arch/arm64/include/arch/current_thread.h b/zircon/kernel/arch/arm64/include/arch/current_thread.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/current_thread.h
rename to zircon/kernel/arch/arm64/include/arch/current_thread.h
diff --git a/kernel/arch/arm64/include/arch/defines.h b/zircon/kernel/arch/arm64/include/arch/defines.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/defines.h
rename to zircon/kernel/arch/arm64/include/arch/defines.h
diff --git a/kernel/arch/arm64/include/arch/hypervisor.h b/zircon/kernel/arch/arm64/include/arch/hypervisor.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/hypervisor.h
rename to zircon/kernel/arch/arm64/include/arch/hypervisor.h
diff --git a/kernel/arch/arm64/include/arch/spinlock.h b/zircon/kernel/arch/arm64/include/arch/spinlock.h
similarity index 100%
rename from kernel/arch/arm64/include/arch/spinlock.h
rename to zircon/kernel/arch/arm64/include/arch/spinlock.h
diff --git a/kernel/arch/arm64/mexec.S b/zircon/kernel/arch/arm64/mexec.S
similarity index 100%
rename from kernel/arch/arm64/mexec.S
rename to zircon/kernel/arch/arm64/mexec.S
diff --git a/kernel/arch/arm64/mmu.cpp b/zircon/kernel/arch/arm64/mmu.cpp
similarity index 100%
rename from kernel/arch/arm64/mmu.cpp
rename to zircon/kernel/arch/arm64/mmu.cpp
diff --git a/kernel/arch/arm64/mp.cpp b/zircon/kernel/arch/arm64/mp.cpp
similarity index 100%
rename from kernel/arch/arm64/mp.cpp
rename to zircon/kernel/arch/arm64/mp.cpp
diff --git a/kernel/arch/arm64/periphmap.cpp b/zircon/kernel/arch/arm64/periphmap.cpp
similarity index 100%
rename from kernel/arch/arm64/periphmap.cpp
rename to zircon/kernel/arch/arm64/periphmap.cpp
diff --git a/kernel/arch/arm64/registers.cpp b/zircon/kernel/arch/arm64/registers.cpp
similarity index 100%
rename from kernel/arch/arm64/registers.cpp
rename to zircon/kernel/arch/arm64/registers.cpp
diff --git a/kernel/arch/arm64/rules.mk b/zircon/kernel/arch/arm64/rules.mk
similarity index 100%
rename from kernel/arch/arm64/rules.mk
rename to zircon/kernel/arch/arm64/rules.mk
diff --git a/kernel/arch/arm64/smccc.S b/zircon/kernel/arch/arm64/smccc.S
similarity index 100%
rename from kernel/arch/arm64/smccc.S
rename to zircon/kernel/arch/arm64/smccc.S
diff --git a/kernel/arch/arm64/spinlock.cpp b/zircon/kernel/arch/arm64/spinlock.cpp
similarity index 100%
rename from kernel/arch/arm64/spinlock.cpp
rename to zircon/kernel/arch/arm64/spinlock.cpp
diff --git a/kernel/arch/arm64/start.S b/zircon/kernel/arch/arm64/start.S
similarity index 100%
rename from kernel/arch/arm64/start.S
rename to zircon/kernel/arch/arm64/start.S
diff --git a/kernel/arch/arm64/sysreg.cpp b/zircon/kernel/arch/arm64/sysreg.cpp
similarity index 100%
rename from kernel/arch/arm64/sysreg.cpp
rename to zircon/kernel/arch/arm64/sysreg.cpp
diff --git a/kernel/arch/arm64/thread.cpp b/zircon/kernel/arch/arm64/thread.cpp
similarity index 100%
rename from kernel/arch/arm64/thread.cpp
rename to zircon/kernel/arch/arm64/thread.cpp
diff --git a/kernel/arch/arm64/toolchain.mk b/zircon/kernel/arch/arm64/toolchain.mk
similarity index 100%
rename from kernel/arch/arm64/toolchain.mk
rename to zircon/kernel/arch/arm64/toolchain.mk
diff --git a/kernel/arch/arm64/user_copy.S b/zircon/kernel/arch/arm64/user_copy.S
similarity index 100%
rename from kernel/arch/arm64/user_copy.S
rename to zircon/kernel/arch/arm64/user_copy.S
diff --git a/kernel/arch/arm64/user_copy_c.cpp b/zircon/kernel/arch/arm64/user_copy_c.cpp
similarity index 100%
rename from kernel/arch/arm64/user_copy_c.cpp
rename to zircon/kernel/arch/arm64/user_copy_c.cpp
diff --git a/kernel/arch/arm64/uspace_entry.S b/zircon/kernel/arch/arm64/uspace_entry.S
similarity index 100%
rename from kernel/arch/arm64/uspace_entry.S
rename to zircon/kernel/arch/arm64/uspace_entry.S
diff --git a/kernel/arch/x86/MAINTAINERS b/zircon/kernel/arch/x86/MAINTAINERS
similarity index 100%
rename from kernel/arch/x86/MAINTAINERS
rename to zircon/kernel/arch/x86/MAINTAINERS
diff --git a/kernel/arch/x86/acpi.S b/zircon/kernel/arch/x86/acpi.S
similarity index 100%
rename from kernel/arch/x86/acpi.S
rename to zircon/kernel/arch/x86/acpi.S
diff --git a/kernel/arch/x86/arch.cpp b/zircon/kernel/arch/x86/arch.cpp
similarity index 100%
rename from kernel/arch/x86/arch.cpp
rename to zircon/kernel/arch/x86/arch.cpp
diff --git a/kernel/arch/x86/asm.S b/zircon/kernel/arch/x86/asm.S
similarity index 100%
rename from kernel/arch/x86/asm.S
rename to zircon/kernel/arch/x86/asm.S
diff --git a/kernel/arch/x86/bootstrap16.cpp b/zircon/kernel/arch/x86/bootstrap16.cpp
similarity index 100%
rename from kernel/arch/x86/bootstrap16.cpp
rename to zircon/kernel/arch/x86/bootstrap16.cpp
diff --git a/kernel/arch/x86/cache.cpp b/zircon/kernel/arch/x86/cache.cpp
similarity index 100%
rename from kernel/arch/x86/cache.cpp
rename to zircon/kernel/arch/x86/cache.cpp
diff --git a/kernel/arch/x86/cpu_topology.cpp b/zircon/kernel/arch/x86/cpu_topology.cpp
similarity index 100%
rename from kernel/arch/x86/cpu_topology.cpp
rename to zircon/kernel/arch/x86/cpu_topology.cpp
diff --git a/kernel/arch/x86/cpuid/cpuid.cpp b/zircon/kernel/arch/x86/cpuid/cpuid.cpp
similarity index 100%
rename from kernel/arch/x86/cpuid/cpuid.cpp
rename to zircon/kernel/arch/x86/cpuid/cpuid.cpp
diff --git a/kernel/arch/x86/cpuid/cpuid_test.cpp b/zircon/kernel/arch/x86/cpuid/cpuid_test.cpp
similarity index 100%
rename from kernel/arch/x86/cpuid/cpuid_test.cpp
rename to zircon/kernel/arch/x86/cpuid/cpuid_test.cpp
diff --git a/kernel/arch/x86/cpuid/include/arch/x86/cpuid.h b/zircon/kernel/arch/x86/cpuid/include/arch/x86/cpuid.h
similarity index 100%
rename from kernel/arch/x86/cpuid/include/arch/x86/cpuid.h
rename to zircon/kernel/arch/x86/cpuid/include/arch/x86/cpuid.h
diff --git a/kernel/arch/x86/cpuid/rules.mk b/zircon/kernel/arch/x86/cpuid/rules.mk
similarity index 100%
rename from kernel/arch/x86/cpuid/rules.mk
rename to zircon/kernel/arch/x86/cpuid/rules.mk
diff --git a/kernel/arch/x86/debugger.cpp b/zircon/kernel/arch/x86/debugger.cpp
similarity index 100%
rename from kernel/arch/x86/debugger.cpp
rename to zircon/kernel/arch/x86/debugger.cpp
diff --git a/kernel/arch/x86/descriptor.cpp b/zircon/kernel/arch/x86/descriptor.cpp
similarity index 100%
rename from kernel/arch/x86/descriptor.cpp
rename to zircon/kernel/arch/x86/descriptor.cpp
diff --git a/kernel/arch/x86/exceptions.S b/zircon/kernel/arch/x86/exceptions.S
similarity index 100%
rename from kernel/arch/x86/exceptions.S
rename to zircon/kernel/arch/x86/exceptions.S
diff --git a/kernel/arch/x86/faults.cpp b/zircon/kernel/arch/x86/faults.cpp
similarity index 100%
rename from kernel/arch/x86/faults.cpp
rename to zircon/kernel/arch/x86/faults.cpp
diff --git a/kernel/arch/x86/feature.cpp b/zircon/kernel/arch/x86/feature.cpp
similarity index 100%
rename from kernel/arch/x86/feature.cpp
rename to zircon/kernel/arch/x86/feature.cpp
diff --git a/kernel/arch/x86/gdt.S b/zircon/kernel/arch/x86/gdt.S
similarity index 100%
rename from kernel/arch/x86/gdt.S
rename to zircon/kernel/arch/x86/gdt.S
diff --git a/kernel/arch/x86/hwp.cpp b/zircon/kernel/arch/x86/hwp.cpp
similarity index 100%
rename from kernel/arch/x86/hwp.cpp
rename to zircon/kernel/arch/x86/hwp.cpp
diff --git a/kernel/arch/x86/hypervisor/MAINTAINERS b/zircon/kernel/arch/x86/hypervisor/MAINTAINERS
similarity index 100%
rename from kernel/arch/x86/hypervisor/MAINTAINERS
rename to zircon/kernel/arch/x86/hypervisor/MAINTAINERS
diff --git a/kernel/arch/x86/hypervisor/guest.cpp b/zircon/kernel/arch/x86/hypervisor/guest.cpp
similarity index 100%
rename from kernel/arch/x86/hypervisor/guest.cpp
rename to zircon/kernel/arch/x86/hypervisor/guest.cpp
diff --git a/kernel/arch/x86/hypervisor/pvclock.cpp b/zircon/kernel/arch/x86/hypervisor/pvclock.cpp
similarity index 100%
rename from kernel/arch/x86/hypervisor/pvclock.cpp
rename to zircon/kernel/arch/x86/hypervisor/pvclock.cpp
diff --git a/kernel/arch/x86/hypervisor/pvclock_priv.h b/zircon/kernel/arch/x86/hypervisor/pvclock_priv.h
similarity index 100%
rename from kernel/arch/x86/hypervisor/pvclock_priv.h
rename to zircon/kernel/arch/x86/hypervisor/pvclock_priv.h
diff --git a/kernel/arch/x86/hypervisor/rules.mk b/zircon/kernel/arch/x86/hypervisor/rules.mk
similarity index 100%
rename from kernel/arch/x86/hypervisor/rules.mk
rename to zircon/kernel/arch/x86/hypervisor/rules.mk
diff --git a/kernel/arch/x86/hypervisor/vcpu.cpp b/zircon/kernel/arch/x86/hypervisor/vcpu.cpp
similarity index 100%
rename from kernel/arch/x86/hypervisor/vcpu.cpp
rename to zircon/kernel/arch/x86/hypervisor/vcpu.cpp
diff --git a/kernel/arch/x86/hypervisor/vcpu_priv.h b/zircon/kernel/arch/x86/hypervisor/vcpu_priv.h
similarity index 100%
rename from kernel/arch/x86/hypervisor/vcpu_priv.h
rename to zircon/kernel/arch/x86/hypervisor/vcpu_priv.h
diff --git a/kernel/arch/x86/hypervisor/vmexit.cpp b/zircon/kernel/arch/x86/hypervisor/vmexit.cpp
similarity index 100%
rename from kernel/arch/x86/hypervisor/vmexit.cpp
rename to zircon/kernel/arch/x86/hypervisor/vmexit.cpp
diff --git a/kernel/arch/x86/hypervisor/vmexit_priv.h b/zircon/kernel/arch/x86/hypervisor/vmexit_priv.h
similarity index 100%
rename from kernel/arch/x86/hypervisor/vmexit_priv.h
rename to zircon/kernel/arch/x86/hypervisor/vmexit_priv.h
diff --git a/kernel/arch/x86/hypervisor/vmx.S b/zircon/kernel/arch/x86/hypervisor/vmx.S
similarity index 100%
rename from kernel/arch/x86/hypervisor/vmx.S
rename to zircon/kernel/arch/x86/hypervisor/vmx.S
diff --git a/kernel/arch/x86/hypervisor/vmx_cpu_state.cpp b/zircon/kernel/arch/x86/hypervisor/vmx_cpu_state.cpp
similarity index 100%
rename from kernel/arch/x86/hypervisor/vmx_cpu_state.cpp
rename to zircon/kernel/arch/x86/hypervisor/vmx_cpu_state.cpp
diff --git a/kernel/arch/x86/hypervisor/vmx_cpu_state_priv.h b/zircon/kernel/arch/x86/hypervisor/vmx_cpu_state_priv.h
similarity index 100%
rename from kernel/arch/x86/hypervisor/vmx_cpu_state_priv.h
rename to zircon/kernel/arch/x86/hypervisor/vmx_cpu_state_priv.h
diff --git a/kernel/arch/x86/idt.cpp b/zircon/kernel/arch/x86/idt.cpp
similarity index 100%
rename from kernel/arch/x86/idt.cpp
rename to zircon/kernel/arch/x86/idt.cpp
diff --git a/kernel/arch/x86/image.S b/zircon/kernel/arch/x86/image.S
similarity index 100%
rename from kernel/arch/x86/image.S
rename to zircon/kernel/arch/x86/image.S
diff --git a/kernel/arch/x86/include/arch/arch_ops.h b/zircon/kernel/arch/x86/include/arch/arch_ops.h
similarity index 100%
rename from kernel/arch/x86/include/arch/arch_ops.h
rename to zircon/kernel/arch/x86/include/arch/arch_ops.h
diff --git a/kernel/arch/x86/include/arch/arch_thread.h b/zircon/kernel/arch/x86/include/arch/arch_thread.h
similarity index 100%
rename from kernel/arch/x86/include/arch/arch_thread.h
rename to zircon/kernel/arch/x86/include/arch/arch_thread.h
diff --git a/kernel/arch/x86/include/arch/asm_macros.h b/zircon/kernel/arch/x86/include/arch/asm_macros.h
similarity index 100%
rename from kernel/arch/x86/include/arch/asm_macros.h
rename to zircon/kernel/arch/x86/include/arch/asm_macros.h
diff --git a/kernel/arch/x86/include/arch/aspace.h b/zircon/kernel/arch/x86/include/arch/aspace.h
similarity index 100%
rename from kernel/arch/x86/include/arch/aspace.h
rename to zircon/kernel/arch/x86/include/arch/aspace.h
diff --git a/kernel/arch/x86/include/arch/current_thread.h b/zircon/kernel/arch/x86/include/arch/current_thread.h
similarity index 100%
rename from kernel/arch/x86/include/arch/current_thread.h
rename to zircon/kernel/arch/x86/include/arch/current_thread.h
diff --git a/kernel/arch/x86/include/arch/defines.h b/zircon/kernel/arch/x86/include/arch/defines.h
similarity index 100%
rename from kernel/arch/x86/include/arch/defines.h
rename to zircon/kernel/arch/x86/include/arch/defines.h
diff --git a/kernel/arch/x86/include/arch/hypervisor.h b/zircon/kernel/arch/x86/include/arch/hypervisor.h
similarity index 100%
rename from kernel/arch/x86/include/arch/hypervisor.h
rename to zircon/kernel/arch/x86/include/arch/hypervisor.h
diff --git a/kernel/arch/x86/include/arch/spinlock.h b/zircon/kernel/arch/x86/include/arch/spinlock.h
similarity index 100%
rename from kernel/arch/x86/include/arch/spinlock.h
rename to zircon/kernel/arch/x86/include/arch/spinlock.h
diff --git a/kernel/arch/x86/include/arch/x86.h b/zircon/kernel/arch/x86/include/arch/x86.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86.h
rename to zircon/kernel/arch/x86/include/arch/x86.h
diff --git a/kernel/arch/x86/include/arch/x86/acpi.h b/zircon/kernel/arch/x86/include/arch/x86/acpi.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/acpi.h
rename to zircon/kernel/arch/x86/include/arch/x86/acpi.h
diff --git a/kernel/arch/x86/include/arch/x86/apic.h b/zircon/kernel/arch/x86/include/arch/x86/apic.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/apic.h
rename to zircon/kernel/arch/x86/include/arch/x86/apic.h
diff --git a/kernel/arch/x86/include/arch/x86/asm.h b/zircon/kernel/arch/x86/include/arch/x86/asm.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/asm.h
rename to zircon/kernel/arch/x86/include/arch/x86/asm.h
diff --git a/kernel/arch/x86/include/arch/x86/bootstrap16.h b/zircon/kernel/arch/x86/include/arch/x86/bootstrap16.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/bootstrap16.h
rename to zircon/kernel/arch/x86/include/arch/x86/bootstrap16.h
diff --git a/kernel/arch/x86/include/arch/x86/cpu_topology.h b/zircon/kernel/arch/x86/include/arch/x86/cpu_topology.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/cpu_topology.h
rename to zircon/kernel/arch/x86/include/arch/x86/cpu_topology.h
diff --git a/kernel/arch/x86/include/arch/x86/descriptor.h b/zircon/kernel/arch/x86/include/arch/x86/descriptor.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/descriptor.h
rename to zircon/kernel/arch/x86/include/arch/x86/descriptor.h
diff --git a/kernel/arch/x86/include/arch/x86/feature.h b/zircon/kernel/arch/x86/include/arch/x86/feature.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/feature.h
rename to zircon/kernel/arch/x86/include/arch/x86/feature.h
diff --git a/kernel/arch/x86/include/arch/x86/general_regs.h b/zircon/kernel/arch/x86/include/arch/x86/general_regs.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/general_regs.h
rename to zircon/kernel/arch/x86/include/arch/x86/general_regs.h
diff --git a/kernel/arch/x86/include/arch/x86/idt.h b/zircon/kernel/arch/x86/include/arch/x86/idt.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/idt.h
rename to zircon/kernel/arch/x86/include/arch/x86/idt.h
diff --git a/kernel/arch/x86/include/arch/x86/interrupts.h b/zircon/kernel/arch/x86/include/arch/x86/interrupts.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/interrupts.h
rename to zircon/kernel/arch/x86/include/arch/x86/interrupts.h
diff --git a/kernel/arch/x86/include/arch/x86/ioport.h b/zircon/kernel/arch/x86/include/arch/x86/ioport.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/ioport.h
rename to zircon/kernel/arch/x86/include/arch/x86/ioport.h
diff --git a/kernel/arch/x86/include/arch/x86/mmu.h b/zircon/kernel/arch/x86/include/arch/x86/mmu.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/mmu.h
rename to zircon/kernel/arch/x86/include/arch/x86/mmu.h
diff --git a/kernel/arch/x86/include/arch/x86/mmu_mem_types.h b/zircon/kernel/arch/x86/include/arch/x86/mmu_mem_types.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/mmu_mem_types.h
rename to zircon/kernel/arch/x86/include/arch/x86/mmu_mem_types.h
diff --git a/kernel/arch/x86/include/arch/x86/mp.h b/zircon/kernel/arch/x86/include/arch/x86/mp.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/mp.h
rename to zircon/kernel/arch/x86/include/arch/x86/mp.h
diff --git a/kernel/arch/x86/include/arch/x86/perf_mon.h b/zircon/kernel/arch/x86/include/arch/x86/perf_mon.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/perf_mon.h
rename to zircon/kernel/arch/x86/include/arch/x86/perf_mon.h
diff --git a/kernel/arch/x86/include/arch/x86/proc_trace.h b/zircon/kernel/arch/x86/include/arch/x86/proc_trace.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/proc_trace.h
rename to zircon/kernel/arch/x86/include/arch/x86/proc_trace.h
diff --git a/kernel/arch/x86/include/arch/x86/pvclock.h b/zircon/kernel/arch/x86/include/arch/x86/pvclock.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/pvclock.h
rename to zircon/kernel/arch/x86/include/arch/x86/pvclock.h
diff --git a/kernel/arch/x86/include/arch/x86/registers.h b/zircon/kernel/arch/x86/include/arch/x86/registers.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/registers.h
rename to zircon/kernel/arch/x86/include/arch/x86/registers.h
diff --git a/kernel/arch/x86/include/arch/x86/timer_freq.h b/zircon/kernel/arch/x86/include/arch/x86/timer_freq.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/timer_freq.h
rename to zircon/kernel/arch/x86/include/arch/x86/timer_freq.h
diff --git a/kernel/arch/x86/include/arch/x86/tsc.h b/zircon/kernel/arch/x86/include/arch/x86/tsc.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/tsc.h
rename to zircon/kernel/arch/x86/include/arch/x86/tsc.h
diff --git a/kernel/arch/x86/include/arch/x86/user_copy.h b/zircon/kernel/arch/x86/include/arch/x86/user_copy.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/user_copy.h
rename to zircon/kernel/arch/x86/include/arch/x86/user_copy.h
diff --git a/kernel/arch/x86/include/arch/x86/vmx_state.h b/zircon/kernel/arch/x86/include/arch/x86/vmx_state.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/vmx_state.h
rename to zircon/kernel/arch/x86/include/arch/x86/vmx_state.h
diff --git a/kernel/arch/x86/include/arch/x86/x86intrin.h b/zircon/kernel/arch/x86/include/arch/x86/x86intrin.h
similarity index 100%
rename from kernel/arch/x86/include/arch/x86/x86intrin.h
rename to zircon/kernel/arch/x86/include/arch/x86/x86intrin.h
diff --git a/kernel/arch/x86/ioapic.cpp b/zircon/kernel/arch/x86/ioapic.cpp
similarity index 100%
rename from kernel/arch/x86/ioapic.cpp
rename to zircon/kernel/arch/x86/ioapic.cpp
diff --git a/kernel/arch/x86/ioport.cpp b/zircon/kernel/arch/x86/ioport.cpp
similarity index 100%
rename from kernel/arch/x86/ioport.cpp
rename to zircon/kernel/arch/x86/ioport.cpp
diff --git a/kernel/arch/x86/lapic.cpp b/zircon/kernel/arch/x86/lapic.cpp
similarity index 100%
rename from kernel/arch/x86/lapic.cpp
rename to zircon/kernel/arch/x86/lapic.cpp
diff --git a/kernel/arch/x86/mexec.S b/zircon/kernel/arch/x86/mexec.S
similarity index 100%
rename from kernel/arch/x86/mexec.S
rename to zircon/kernel/arch/x86/mexec.S
diff --git a/kernel/arch/x86/mmu.cpp b/zircon/kernel/arch/x86/mmu.cpp
similarity index 100%
rename from kernel/arch/x86/mmu.cpp
rename to zircon/kernel/arch/x86/mmu.cpp
diff --git a/kernel/arch/x86/mmu_mem_types.cpp b/zircon/kernel/arch/x86/mmu_mem_types.cpp
similarity index 100%
rename from kernel/arch/x86/mmu_mem_types.cpp
rename to zircon/kernel/arch/x86/mmu_mem_types.cpp
diff --git a/kernel/arch/x86/mmu_tests.cpp b/zircon/kernel/arch/x86/mmu_tests.cpp
similarity index 100%
rename from kernel/arch/x86/mmu_tests.cpp
rename to zircon/kernel/arch/x86/mmu_tests.cpp
diff --git a/kernel/arch/x86/mp.cpp b/zircon/kernel/arch/x86/mp.cpp
similarity index 100%
rename from kernel/arch/x86/mp.cpp
rename to zircon/kernel/arch/x86/mp.cpp
diff --git a/kernel/arch/x86/ops.S b/zircon/kernel/arch/x86/ops.S
similarity index 100%
rename from kernel/arch/x86/ops.S
rename to zircon/kernel/arch/x86/ops.S
diff --git a/kernel/arch/x86/page_tables/include/arch/x86/page_tables/constants.h b/zircon/kernel/arch/x86/page_tables/include/arch/x86/page_tables/constants.h
similarity index 100%
rename from kernel/arch/x86/page_tables/include/arch/x86/page_tables/constants.h
rename to zircon/kernel/arch/x86/page_tables/include/arch/x86/page_tables/constants.h
diff --git a/kernel/arch/x86/page_tables/include/arch/x86/page_tables/page_tables.h b/zircon/kernel/arch/x86/page_tables/include/arch/x86/page_tables/page_tables.h
similarity index 100%
rename from kernel/arch/x86/page_tables/include/arch/x86/page_tables/page_tables.h
rename to zircon/kernel/arch/x86/page_tables/include/arch/x86/page_tables/page_tables.h
diff --git a/kernel/arch/x86/page_tables/page_tables.cpp b/zircon/kernel/arch/x86/page_tables/page_tables.cpp
similarity index 100%
rename from kernel/arch/x86/page_tables/page_tables.cpp
rename to zircon/kernel/arch/x86/page_tables/page_tables.cpp
diff --git a/kernel/arch/x86/page_tables/rules.mk b/zircon/kernel/arch/x86/page_tables/rules.mk
similarity index 100%
rename from kernel/arch/x86/page_tables/rules.mk
rename to zircon/kernel/arch/x86/page_tables/rules.mk
diff --git a/kernel/arch/x86/perf_mon.cpp b/zircon/kernel/arch/x86/perf_mon.cpp
similarity index 100%
rename from kernel/arch/x86/perf_mon.cpp
rename to zircon/kernel/arch/x86/perf_mon.cpp
diff --git a/kernel/arch/x86/proc_trace.cpp b/zircon/kernel/arch/x86/proc_trace.cpp
similarity index 100%
rename from kernel/arch/x86/proc_trace.cpp
rename to zircon/kernel/arch/x86/proc_trace.cpp
diff --git a/kernel/arch/x86/pvclock.cpp b/zircon/kernel/arch/x86/pvclock.cpp
similarity index 100%
rename from kernel/arch/x86/pvclock.cpp
rename to zircon/kernel/arch/x86/pvclock.cpp
diff --git a/kernel/arch/x86/registers.cpp b/zircon/kernel/arch/x86/registers.cpp
similarity index 100%
rename from kernel/arch/x86/registers.cpp
rename to zircon/kernel/arch/x86/registers.cpp
diff --git a/kernel/arch/x86/rules.mk b/zircon/kernel/arch/x86/rules.mk
similarity index 100%
rename from kernel/arch/x86/rules.mk
rename to zircon/kernel/arch/x86/rules.mk
diff --git a/kernel/arch/x86/smp.cpp b/zircon/kernel/arch/x86/smp.cpp
similarity index 100%
rename from kernel/arch/x86/smp.cpp
rename to zircon/kernel/arch/x86/smp.cpp
diff --git a/kernel/arch/x86/start.S b/zircon/kernel/arch/x86/start.S
similarity index 100%
rename from kernel/arch/x86/start.S
rename to zircon/kernel/arch/x86/start.S
diff --git a/kernel/arch/x86/start16.S b/zircon/kernel/arch/x86/start16.S
similarity index 100%
rename from kernel/arch/x86/start16.S
rename to zircon/kernel/arch/x86/start16.S
diff --git a/kernel/arch/x86/syscall.S b/zircon/kernel/arch/x86/syscall.S
similarity index 100%
rename from kernel/arch/x86/syscall.S
rename to zircon/kernel/arch/x86/syscall.S
diff --git a/kernel/arch/x86/thread.cpp b/zircon/kernel/arch/x86/thread.cpp
similarity index 100%
rename from kernel/arch/x86/thread.cpp
rename to zircon/kernel/arch/x86/thread.cpp
diff --git a/kernel/arch/x86/timer_freq.cpp b/zircon/kernel/arch/x86/timer_freq.cpp
similarity index 100%
rename from kernel/arch/x86/timer_freq.cpp
rename to zircon/kernel/arch/x86/timer_freq.cpp
diff --git a/kernel/arch/x86/toolchain.mk b/zircon/kernel/arch/x86/toolchain.mk
similarity index 100%
rename from kernel/arch/x86/toolchain.mk
rename to zircon/kernel/arch/x86/toolchain.mk
diff --git a/kernel/arch/x86/tsc.cpp b/zircon/kernel/arch/x86/tsc.cpp
similarity index 100%
rename from kernel/arch/x86/tsc.cpp
rename to zircon/kernel/arch/x86/tsc.cpp
diff --git a/kernel/arch/x86/user_copy.S b/zircon/kernel/arch/x86/user_copy.S
similarity index 100%
rename from kernel/arch/x86/user_copy.S
rename to zircon/kernel/arch/x86/user_copy.S
diff --git a/kernel/arch/x86/user_copy.cpp b/zircon/kernel/arch/x86/user_copy.cpp
similarity index 100%
rename from kernel/arch/x86/user_copy.cpp
rename to zircon/kernel/arch/x86/user_copy.cpp
diff --git a/kernel/arch/x86/uspace_entry.S b/zircon/kernel/arch/x86/uspace_entry.S
similarity index 100%
rename from kernel/arch/x86/uspace_entry.S
rename to zircon/kernel/arch/x86/uspace_entry.S
diff --git a/kernel/dev/hdcp/amlogic_s912/hdcp.cpp b/zircon/kernel/dev/hdcp/amlogic_s912/hdcp.cpp
similarity index 100%
rename from kernel/dev/hdcp/amlogic_s912/hdcp.cpp
rename to zircon/kernel/dev/hdcp/amlogic_s912/hdcp.cpp
diff --git a/kernel/dev/hdcp/amlogic_s912/rules.mk b/zircon/kernel/dev/hdcp/amlogic_s912/rules.mk
similarity index 100%
rename from kernel/dev/hdcp/amlogic_s912/rules.mk
rename to zircon/kernel/dev/hdcp/amlogic_s912/rules.mk
diff --git a/kernel/dev/hw_rng/debug.cpp b/zircon/kernel/dev/hw_rng/debug.cpp
similarity index 100%
rename from kernel/dev/hw_rng/debug.cpp
rename to zircon/kernel/dev/hw_rng/debug.cpp
diff --git a/kernel/dev/hw_rng/include/dev/hw_rng.h b/zircon/kernel/dev/hw_rng/include/dev/hw_rng.h
similarity index 100%
rename from kernel/dev/hw_rng/include/dev/hw_rng.h
rename to zircon/kernel/dev/hw_rng/include/dev/hw_rng.h
diff --git a/kernel/dev/hw_rng/rules.mk b/zircon/kernel/dev/hw_rng/rules.mk
similarity index 100%
rename from kernel/dev/hw_rng/rules.mk
rename to zircon/kernel/dev/hw_rng/rules.mk
diff --git a/kernel/dev/intel_rng/intel-rng.cpp b/zircon/kernel/dev/intel_rng/intel-rng.cpp
similarity index 100%
rename from kernel/dev/intel_rng/intel-rng.cpp
rename to zircon/kernel/dev/intel_rng/intel-rng.cpp
diff --git a/kernel/dev/intel_rng/rules.mk b/zircon/kernel/dev/intel_rng/rules.mk
similarity index 100%
rename from kernel/dev/intel_rng/rules.mk
rename to zircon/kernel/dev/intel_rng/rules.mk
diff --git a/kernel/dev/interrupt/arm_gic/common/arm_gic_hw_interface.cpp b/zircon/kernel/dev/interrupt/arm_gic/common/arm_gic_hw_interface.cpp
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/common/arm_gic_hw_interface.cpp
rename to zircon/kernel/dev/interrupt/arm_gic/common/arm_gic_hw_interface.cpp
diff --git a/kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_common.h b/zircon/kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_common.h
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_common.h
rename to zircon/kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_common.h
diff --git a/kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_hw_interface.h b/zircon/kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_hw_interface.h
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_hw_interface.h
rename to zircon/kernel/dev/interrupt/arm_gic/common/include/dev/interrupt/arm_gic_hw_interface.h
diff --git a/kernel/dev/interrupt/arm_gic/common/rules.mk b/zircon/kernel/dev/interrupt/arm_gic/common/rules.mk
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/common/rules.mk
rename to zircon/kernel/dev/interrupt/arm_gic/common/rules.mk
diff --git a/kernel/dev/interrupt/arm_gic/v2/arm_gicv2.cpp b/zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2.cpp
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/arm_gicv2.cpp
rename to zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2.cpp
diff --git a/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m.cpp b/zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m.cpp
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/arm_gicv2m.cpp
rename to zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m.cpp
diff --git a/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_msi.cpp b/zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_msi.cpp
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_msi.cpp
rename to zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_msi.cpp
diff --git a/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_pcie.cpp b/zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_pcie.cpp
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_pcie.cpp
rename to zircon/kernel/dev/interrupt/arm_gic/v2/arm_gicv2m_pcie.cpp
diff --git a/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2_regs.h b/zircon/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2_regs.h
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2_regs.h
rename to zircon/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2_regs.h
diff --git a/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m.h b/zircon/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m.h
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m.h
rename to zircon/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m.h
diff --git a/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m_msi.h b/zircon/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m_msi.h
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m_msi.h
rename to zircon/kernel/dev/interrupt/arm_gic/v2/include/dev/interrupt/arm_gicv2m_msi.h
diff --git a/kernel/dev/interrupt/arm_gic/v2/rules.mk b/zircon/kernel/dev/interrupt/arm_gic/v2/rules.mk
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v2/rules.mk
rename to zircon/kernel/dev/interrupt/arm_gic/v2/rules.mk
diff --git a/kernel/dev/interrupt/arm_gic/v3/arm_gicv3.cpp b/zircon/kernel/dev/interrupt/arm_gic/v3/arm_gicv3.cpp
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v3/arm_gicv3.cpp
rename to zircon/kernel/dev/interrupt/arm_gic/v3/arm_gicv3.cpp
diff --git a/kernel/dev/interrupt/arm_gic/v3/arm_gicv3_pcie.cpp b/zircon/kernel/dev/interrupt/arm_gic/v3/arm_gicv3_pcie.cpp
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v3/arm_gicv3_pcie.cpp
rename to zircon/kernel/dev/interrupt/arm_gic/v3/arm_gicv3_pcie.cpp
diff --git a/kernel/dev/interrupt/arm_gic/v3/include/dev/interrupt/arm_gicv3_regs.h b/zircon/kernel/dev/interrupt/arm_gic/v3/include/dev/interrupt/arm_gicv3_regs.h
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v3/include/dev/interrupt/arm_gicv3_regs.h
rename to zircon/kernel/dev/interrupt/arm_gic/v3/include/dev/interrupt/arm_gicv3_regs.h
diff --git a/kernel/dev/interrupt/arm_gic/v3/rules.mk b/zircon/kernel/dev/interrupt/arm_gic/v3/rules.mk
similarity index 100%
rename from kernel/dev/interrupt/arm_gic/v3/rules.mk
rename to zircon/kernel/dev/interrupt/arm_gic/v3/rules.mk
diff --git a/kernel/dev/interrupt/include/dev/interrupt.h b/zircon/kernel/dev/interrupt/include/dev/interrupt.h
similarity index 100%
rename from kernel/dev/interrupt/include/dev/interrupt.h
rename to zircon/kernel/dev/interrupt/include/dev/interrupt.h
diff --git a/kernel/dev/interrupt/msi.cpp b/zircon/kernel/dev/interrupt/msi.cpp
similarity index 100%
rename from kernel/dev/interrupt/msi.cpp
rename to zircon/kernel/dev/interrupt/msi.cpp
diff --git a/kernel/dev/interrupt/rules.mk b/zircon/kernel/dev/interrupt/rules.mk
similarity index 100%
rename from kernel/dev/interrupt/rules.mk
rename to zircon/kernel/dev/interrupt/rules.mk
diff --git a/kernel/dev/iommu/dummy/dummy_iommu.cpp b/zircon/kernel/dev/iommu/dummy/dummy_iommu.cpp
similarity index 100%
rename from kernel/dev/iommu/dummy/dummy_iommu.cpp
rename to zircon/kernel/dev/iommu/dummy/dummy_iommu.cpp
diff --git a/kernel/dev/iommu/dummy/include/dev/iommu/dummy.h b/zircon/kernel/dev/iommu/dummy/include/dev/iommu/dummy.h
similarity index 100%
rename from kernel/dev/iommu/dummy/include/dev/iommu/dummy.h
rename to zircon/kernel/dev/iommu/dummy/include/dev/iommu/dummy.h
diff --git a/kernel/dev/iommu/dummy/rules.mk b/zircon/kernel/dev/iommu/dummy/rules.mk
similarity index 100%
rename from kernel/dev/iommu/dummy/rules.mk
rename to zircon/kernel/dev/iommu/dummy/rules.mk
diff --git a/kernel/dev/iommu/intel/context_table_state.cpp b/zircon/kernel/dev/iommu/intel/context_table_state.cpp
similarity index 100%
rename from kernel/dev/iommu/intel/context_table_state.cpp
rename to zircon/kernel/dev/iommu/intel/context_table_state.cpp
diff --git a/kernel/dev/iommu/intel/context_table_state.h b/zircon/kernel/dev/iommu/intel/context_table_state.h
similarity index 100%
rename from kernel/dev/iommu/intel/context_table_state.h
rename to zircon/kernel/dev/iommu/intel/context_table_state.h
diff --git a/kernel/dev/iommu/intel/device_context.cpp b/zircon/kernel/dev/iommu/intel/device_context.cpp
similarity index 100%
rename from kernel/dev/iommu/intel/device_context.cpp
rename to zircon/kernel/dev/iommu/intel/device_context.cpp
diff --git a/kernel/dev/iommu/intel/device_context.h b/zircon/kernel/dev/iommu/intel/device_context.h
similarity index 100%
rename from kernel/dev/iommu/intel/device_context.h
rename to zircon/kernel/dev/iommu/intel/device_context.h
diff --git a/kernel/dev/iommu/intel/domain_allocator.cpp b/zircon/kernel/dev/iommu/intel/domain_allocator.cpp
similarity index 100%
rename from kernel/dev/iommu/intel/domain_allocator.cpp
rename to zircon/kernel/dev/iommu/intel/domain_allocator.cpp
diff --git a/kernel/dev/iommu/intel/domain_allocator.h b/zircon/kernel/dev/iommu/intel/domain_allocator.h
similarity index 100%
rename from kernel/dev/iommu/intel/domain_allocator.h
rename to zircon/kernel/dev/iommu/intel/domain_allocator.h
diff --git a/kernel/dev/iommu/intel/hw.h b/zircon/kernel/dev/iommu/intel/hw.h
similarity index 100%
rename from kernel/dev/iommu/intel/hw.h
rename to zircon/kernel/dev/iommu/intel/hw.h
diff --git a/kernel/dev/iommu/intel/include/dev/iommu/intel.h b/zircon/kernel/dev/iommu/intel/include/dev/iommu/intel.h
similarity index 100%
rename from kernel/dev/iommu/intel/include/dev/iommu/intel.h
rename to zircon/kernel/dev/iommu/intel/include/dev/iommu/intel.h
diff --git a/kernel/dev/iommu/intel/intel_iommu.cpp b/zircon/kernel/dev/iommu/intel/intel_iommu.cpp
similarity index 100%
rename from kernel/dev/iommu/intel/intel_iommu.cpp
rename to zircon/kernel/dev/iommu/intel/intel_iommu.cpp
diff --git a/kernel/dev/iommu/intel/iommu_impl.cpp b/zircon/kernel/dev/iommu/intel/iommu_impl.cpp
similarity index 100%
rename from kernel/dev/iommu/intel/iommu_impl.cpp
rename to zircon/kernel/dev/iommu/intel/iommu_impl.cpp
diff --git a/kernel/dev/iommu/intel/iommu_impl.h b/zircon/kernel/dev/iommu/intel/iommu_impl.h
similarity index 100%
rename from kernel/dev/iommu/intel/iommu_impl.h
rename to zircon/kernel/dev/iommu/intel/iommu_impl.h
diff --git a/kernel/dev/iommu/intel/iommu_page.cpp b/zircon/kernel/dev/iommu/intel/iommu_page.cpp
similarity index 100%
rename from kernel/dev/iommu/intel/iommu_page.cpp
rename to zircon/kernel/dev/iommu/intel/iommu_page.cpp
diff --git a/kernel/dev/iommu/intel/iommu_page.h b/zircon/kernel/dev/iommu/intel/iommu_page.h
similarity index 100%
rename from kernel/dev/iommu/intel/iommu_page.h
rename to zircon/kernel/dev/iommu/intel/iommu_page.h
diff --git a/kernel/dev/iommu/intel/rules.mk b/zircon/kernel/dev/iommu/intel/rules.mk
similarity index 100%
rename from kernel/dev/iommu/intel/rules.mk
rename to zircon/kernel/dev/iommu/intel/rules.mk
diff --git a/kernel/dev/iommu/intel/second_level_pt.cpp b/zircon/kernel/dev/iommu/intel/second_level_pt.cpp
similarity index 100%
rename from kernel/dev/iommu/intel/second_level_pt.cpp
rename to zircon/kernel/dev/iommu/intel/second_level_pt.cpp
diff --git a/kernel/dev/iommu/intel/second_level_pt.h b/zircon/kernel/dev/iommu/intel/second_level_pt.h
similarity index 100%
rename from kernel/dev/iommu/intel/second_level_pt.h
rename to zircon/kernel/dev/iommu/intel/second_level_pt.h
diff --git a/kernel/dev/pcie/MAINTAINERS b/zircon/kernel/dev/pcie/MAINTAINERS
similarity index 100%
rename from kernel/dev/pcie/MAINTAINERS
rename to zircon/kernel/dev/pcie/MAINTAINERS
diff --git a/kernel/dev/pcie/address_provider/designware.cpp b/zircon/kernel/dev/pcie/address_provider/designware.cpp
similarity index 100%
rename from kernel/dev/pcie/address_provider/designware.cpp
rename to zircon/kernel/dev/pcie/address_provider/designware.cpp
diff --git a/kernel/dev/pcie/address_provider/ecam_region.cpp b/zircon/kernel/dev/pcie/address_provider/ecam_region.cpp
similarity index 100%
rename from kernel/dev/pcie/address_provider/ecam_region.cpp
rename to zircon/kernel/dev/pcie/address_provider/ecam_region.cpp
diff --git a/kernel/dev/pcie/address_provider/mmio.cpp b/zircon/kernel/dev/pcie/address_provider/mmio.cpp
similarity index 100%
rename from kernel/dev/pcie/address_provider/mmio.cpp
rename to zircon/kernel/dev/pcie/address_provider/mmio.cpp
diff --git a/kernel/dev/pcie/address_provider/pio.cpp b/zircon/kernel/dev/pcie/address_provider/pio.cpp
similarity index 100%
rename from kernel/dev/pcie/address_provider/pio.cpp
rename to zircon/kernel/dev/pcie/address_provider/pio.cpp
diff --git a/kernel/dev/pcie/debug.cpp b/zircon/kernel/dev/pcie/debug.cpp
similarity index 100%
rename from kernel/dev/pcie/debug.cpp
rename to zircon/kernel/dev/pcie/debug.cpp
diff --git a/kernel/dev/pcie/include/dev/address_provider/address_provider.h b/zircon/kernel/dev/pcie/include/dev/address_provider/address_provider.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/address_provider/address_provider.h
rename to zircon/kernel/dev/pcie/include/dev/address_provider/address_provider.h
diff --git a/kernel/dev/pcie/include/dev/address_provider/ecam_region.h b/zircon/kernel/dev/pcie/include/dev/address_provider/ecam_region.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/address_provider/ecam_region.h
rename to zircon/kernel/dev/pcie/include/dev/address_provider/ecam_region.h
diff --git a/kernel/dev/pcie/include/dev/pci_common.h b/zircon/kernel/dev/pcie/include/dev/pci_common.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pci_common.h
rename to zircon/kernel/dev/pcie/include/dev/pci_common.h
diff --git a/kernel/dev/pcie/include/dev/pci_config.h b/zircon/kernel/dev/pcie/include/dev/pci_config.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pci_config.h
rename to zircon/kernel/dev/pcie/include/dev/pci_config.h
diff --git a/kernel/dev/pcie/include/dev/pcie_bridge.h b/zircon/kernel/dev/pcie/include/dev/pcie_bridge.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_bridge.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_bridge.h
diff --git a/kernel/dev/pcie/include/dev/pcie_bus_driver.h b/zircon/kernel/dev/pcie/include/dev/pcie_bus_driver.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_bus_driver.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_bus_driver.h
diff --git a/kernel/dev/pcie/include/dev/pcie_caps.h b/zircon/kernel/dev/pcie/include/dev/pcie_caps.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_caps.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_caps.h
diff --git a/kernel/dev/pcie/include/dev/pcie_device.h b/zircon/kernel/dev/pcie/include/dev/pcie_device.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_device.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_device.h
diff --git a/kernel/dev/pcie/include/dev/pcie_irqs.h b/zircon/kernel/dev/pcie/include/dev/pcie_irqs.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_irqs.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_irqs.h
diff --git a/kernel/dev/pcie/include/dev/pcie_platform.h b/zircon/kernel/dev/pcie/include/dev/pcie_platform.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_platform.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_platform.h
diff --git a/kernel/dev/pcie/include/dev/pcie_ref_counted.h b/zircon/kernel/dev/pcie/include/dev/pcie_ref_counted.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_ref_counted.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_ref_counted.h
diff --git a/kernel/dev/pcie/include/dev/pcie_root.h b/zircon/kernel/dev/pcie/include/dev/pcie_root.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_root.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_root.h
diff --git a/kernel/dev/pcie/include/dev/pcie_upstream_node.h b/zircon/kernel/dev/pcie/include/dev/pcie_upstream_node.h
similarity index 100%
rename from kernel/dev/pcie/include/dev/pcie_upstream_node.h
rename to zircon/kernel/dev/pcie/include/dev/pcie_upstream_node.h
diff --git a/kernel/dev/pcie/pci_config.cpp b/zircon/kernel/dev/pcie/pci_config.cpp
similarity index 100%
rename from kernel/dev/pcie/pci_config.cpp
rename to zircon/kernel/dev/pcie/pci_config.cpp
diff --git a/kernel/dev/pcie/pcie_bridge.cpp b/zircon/kernel/dev/pcie/pcie_bridge.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_bridge.cpp
rename to zircon/kernel/dev/pcie/pcie_bridge.cpp
diff --git a/kernel/dev/pcie/pcie_bus_driver.cpp b/zircon/kernel/dev/pcie/pcie_bus_driver.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_bus_driver.cpp
rename to zircon/kernel/dev/pcie/pcie_bus_driver.cpp
diff --git a/kernel/dev/pcie/pcie_caps.cpp b/zircon/kernel/dev/pcie/pcie_caps.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_caps.cpp
rename to zircon/kernel/dev/pcie/pcie_caps.cpp
diff --git a/kernel/dev/pcie/pcie_device.cpp b/zircon/kernel/dev/pcie/pcie_device.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_device.cpp
rename to zircon/kernel/dev/pcie/pcie_device.cpp
diff --git a/kernel/dev/pcie/pcie_irqs.cpp b/zircon/kernel/dev/pcie/pcie_irqs.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_irqs.cpp
rename to zircon/kernel/dev/pcie/pcie_irqs.cpp
diff --git a/kernel/dev/pcie/pcie_quirks.cpp b/zircon/kernel/dev/pcie/pcie_quirks.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_quirks.cpp
rename to zircon/kernel/dev/pcie/pcie_quirks.cpp
diff --git a/kernel/dev/pcie/pcie_root.cpp b/zircon/kernel/dev/pcie/pcie_root.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_root.cpp
rename to zircon/kernel/dev/pcie/pcie_root.cpp
diff --git a/kernel/dev/pcie/pcie_upstream_node.cpp b/zircon/kernel/dev/pcie/pcie_upstream_node.cpp
similarity index 100%
rename from kernel/dev/pcie/pcie_upstream_node.cpp
rename to zircon/kernel/dev/pcie/pcie_upstream_node.cpp
diff --git a/kernel/dev/pcie/rules.mk b/zircon/kernel/dev/pcie/rules.mk
similarity index 100%
rename from kernel/dev/pcie/rules.mk
rename to zircon/kernel/dev/pcie/rules.mk
diff --git a/kernel/dev/pdev/include/pdev/driver.h b/zircon/kernel/dev/pdev/include/pdev/driver.h
similarity index 100%
rename from kernel/dev/pdev/include/pdev/driver.h
rename to zircon/kernel/dev/pdev/include/pdev/driver.h
diff --git a/kernel/dev/pdev/include/pdev/interrupt.h b/zircon/kernel/dev/pdev/include/pdev/interrupt.h
similarity index 100%
rename from kernel/dev/pdev/include/pdev/interrupt.h
rename to zircon/kernel/dev/pdev/include/pdev/interrupt.h
diff --git a/kernel/dev/pdev/include/pdev/pdev.h b/zircon/kernel/dev/pdev/include/pdev/pdev.h
similarity index 100%
rename from kernel/dev/pdev/include/pdev/pdev.h
rename to zircon/kernel/dev/pdev/include/pdev/pdev.h
diff --git a/kernel/dev/pdev/include/pdev/power.h b/zircon/kernel/dev/pdev/include/pdev/power.h
similarity index 100%
rename from kernel/dev/pdev/include/pdev/power.h
rename to zircon/kernel/dev/pdev/include/pdev/power.h
diff --git a/kernel/dev/pdev/include/pdev/uart.h b/zircon/kernel/dev/pdev/include/pdev/uart.h
similarity index 100%
rename from kernel/dev/pdev/include/pdev/uart.h
rename to zircon/kernel/dev/pdev/include/pdev/uart.h
diff --git a/kernel/dev/pdev/interrupt/interrupt.cpp b/zircon/kernel/dev/pdev/interrupt/interrupt.cpp
similarity index 100%
rename from kernel/dev/pdev/interrupt/interrupt.cpp
rename to zircon/kernel/dev/pdev/interrupt/interrupt.cpp
diff --git a/kernel/dev/pdev/interrupt/rules.mk b/zircon/kernel/dev/pdev/interrupt/rules.mk
similarity index 100%
rename from kernel/dev/pdev/interrupt/rules.mk
rename to zircon/kernel/dev/pdev/interrupt/rules.mk
diff --git a/kernel/dev/pdev/pdev.cpp b/zircon/kernel/dev/pdev/pdev.cpp
similarity index 100%
rename from kernel/dev/pdev/pdev.cpp
rename to zircon/kernel/dev/pdev/pdev.cpp
diff --git a/kernel/dev/pdev/power/power.cpp b/zircon/kernel/dev/pdev/power/power.cpp
similarity index 100%
rename from kernel/dev/pdev/power/power.cpp
rename to zircon/kernel/dev/pdev/power/power.cpp
diff --git a/kernel/dev/pdev/power/rules.mk b/zircon/kernel/dev/pdev/power/rules.mk
similarity index 100%
rename from kernel/dev/pdev/power/rules.mk
rename to zircon/kernel/dev/pdev/power/rules.mk
diff --git a/kernel/dev/pdev/rules.mk b/zircon/kernel/dev/pdev/rules.mk
similarity index 100%
rename from kernel/dev/pdev/rules.mk
rename to zircon/kernel/dev/pdev/rules.mk
diff --git a/kernel/dev/pdev/uart/rules.mk b/zircon/kernel/dev/pdev/uart/rules.mk
similarity index 100%
rename from kernel/dev/pdev/uart/rules.mk
rename to zircon/kernel/dev/pdev/uart/rules.mk
diff --git a/kernel/dev/pdev/uart/uart.cpp b/zircon/kernel/dev/pdev/uart/uart.cpp
similarity index 100%
rename from kernel/dev/pdev/uart/uart.cpp
rename to zircon/kernel/dev/pdev/uart/uart.cpp
diff --git a/kernel/dev/power/hisi/power.cpp b/zircon/kernel/dev/power/hisi/power.cpp
similarity index 100%
rename from kernel/dev/power/hisi/power.cpp
rename to zircon/kernel/dev/power/hisi/power.cpp
diff --git a/kernel/dev/power/hisi/rules.mk b/zircon/kernel/dev/power/hisi/rules.mk
similarity index 100%
rename from kernel/dev/power/hisi/rules.mk
rename to zircon/kernel/dev/power/hisi/rules.mk
diff --git a/kernel/dev/psci/include/dev/psci.h b/zircon/kernel/dev/psci/include/dev/psci.h
similarity index 100%
rename from kernel/dev/psci/include/dev/psci.h
rename to zircon/kernel/dev/psci/include/dev/psci.h
diff --git a/kernel/dev/psci/psci.cpp b/zircon/kernel/dev/psci/psci.cpp
similarity index 100%
rename from kernel/dev/psci/psci.cpp
rename to zircon/kernel/dev/psci/psci.cpp
diff --git a/kernel/dev/psci/rules.mk b/zircon/kernel/dev/psci/rules.mk
similarity index 100%
rename from kernel/dev/psci/rules.mk
rename to zircon/kernel/dev/psci/rules.mk
diff --git a/kernel/dev/timer/arm_generic/arm_generic_timer.cpp b/zircon/kernel/dev/timer/arm_generic/arm_generic_timer.cpp
similarity index 100%
rename from kernel/dev/timer/arm_generic/arm_generic_timer.cpp
rename to zircon/kernel/dev/timer/arm_generic/arm_generic_timer.cpp
diff --git a/kernel/dev/timer/arm_generic/include/dev/timer/arm_generic.h b/zircon/kernel/dev/timer/arm_generic/include/dev/timer/arm_generic.h
similarity index 100%
rename from kernel/dev/timer/arm_generic/include/dev/timer/arm_generic.h
rename to zircon/kernel/dev/timer/arm_generic/include/dev/timer/arm_generic.h
diff --git a/kernel/dev/timer/arm_generic/rules.mk b/zircon/kernel/dev/timer/arm_generic/rules.mk
similarity index 100%
rename from kernel/dev/timer/arm_generic/rules.mk
rename to zircon/kernel/dev/timer/arm_generic/rules.mk
diff --git a/kernel/dev/uart/amlogic_s905/rules.mk b/zircon/kernel/dev/uart/amlogic_s905/rules.mk
similarity index 100%
rename from kernel/dev/uart/amlogic_s905/rules.mk
rename to zircon/kernel/dev/uart/amlogic_s905/rules.mk
diff --git a/kernel/dev/uart/amlogic_s905/uart.cpp b/zircon/kernel/dev/uart/amlogic_s905/uart.cpp
similarity index 100%
rename from kernel/dev/uart/amlogic_s905/uart.cpp
rename to zircon/kernel/dev/uart/amlogic_s905/uart.cpp
diff --git a/kernel/dev/uart/msm/rules.mk b/zircon/kernel/dev/uart/msm/rules.mk
similarity index 100%
rename from kernel/dev/uart/msm/rules.mk
rename to zircon/kernel/dev/uart/msm/rules.mk
diff --git a/kernel/dev/uart/msm/uart.cpp b/zircon/kernel/dev/uart/msm/uart.cpp
similarity index 100%
rename from kernel/dev/uart/msm/uart.cpp
rename to zircon/kernel/dev/uart/msm/uart.cpp
diff --git a/kernel/dev/uart/mt8167/rules.mk b/zircon/kernel/dev/uart/mt8167/rules.mk
similarity index 100%
rename from kernel/dev/uart/mt8167/rules.mk
rename to zircon/kernel/dev/uart/mt8167/rules.mk
diff --git a/kernel/dev/uart/mt8167/uart.cpp b/zircon/kernel/dev/uart/mt8167/uart.cpp
similarity index 100%
rename from kernel/dev/uart/mt8167/uart.cpp
rename to zircon/kernel/dev/uart/mt8167/uart.cpp
diff --git a/kernel/dev/uart/nxp-imx/rules.mk b/zircon/kernel/dev/uart/nxp-imx/rules.mk
similarity index 100%
rename from kernel/dev/uart/nxp-imx/rules.mk
rename to zircon/kernel/dev/uart/nxp-imx/rules.mk
diff --git a/kernel/dev/uart/nxp-imx/uart.cpp b/zircon/kernel/dev/uart/nxp-imx/uart.cpp
similarity index 100%
rename from kernel/dev/uart/nxp-imx/uart.cpp
rename to zircon/kernel/dev/uart/nxp-imx/uart.cpp
diff --git a/kernel/dev/uart/pl011/rules.mk b/zircon/kernel/dev/uart/pl011/rules.mk
similarity index 100%
rename from kernel/dev/uart/pl011/rules.mk
rename to zircon/kernel/dev/uart/pl011/rules.mk
diff --git a/kernel/dev/uart/pl011/uart.cpp b/zircon/kernel/dev/uart/pl011/uart.cpp
similarity index 100%
rename from kernel/dev/uart/pl011/uart.cpp
rename to zircon/kernel/dev/uart/pl011/uart.cpp
diff --git a/kernel/dev/udisplay/include/dev/udisplay.h b/zircon/kernel/dev/udisplay/include/dev/udisplay.h
similarity index 100%
rename from kernel/dev/udisplay/include/dev/udisplay.h
rename to zircon/kernel/dev/udisplay/include/dev/udisplay.h
diff --git a/kernel/dev/udisplay/rules.mk b/zircon/kernel/dev/udisplay/rules.mk
similarity index 100%
rename from kernel/dev/udisplay/rules.mk
rename to zircon/kernel/dev/udisplay/rules.mk
diff --git a/kernel/dev/udisplay/udisplay.cpp b/zircon/kernel/dev/udisplay/udisplay.cpp
similarity index 100%
rename from kernel/dev/udisplay/udisplay.cpp
rename to zircon/kernel/dev/udisplay/udisplay.cpp
diff --git a/kernel/image.ld b/zircon/kernel/image.ld
similarity index 100%
rename from kernel/image.ld
rename to zircon/kernel/image.ld
diff --git a/kernel/include/arch.h b/zircon/kernel/include/arch.h
similarity index 100%
rename from kernel/include/arch.h
rename to zircon/kernel/include/arch.h
diff --git a/kernel/include/arch/debugger.h b/zircon/kernel/include/arch/debugger.h
similarity index 100%
rename from kernel/include/arch/debugger.h
rename to zircon/kernel/include/arch/debugger.h
diff --git a/kernel/include/arch/exception.h b/zircon/kernel/include/arch/exception.h
similarity index 100%
rename from kernel/include/arch/exception.h
rename to zircon/kernel/include/arch/exception.h
diff --git a/kernel/include/arch/mmu.h b/zircon/kernel/include/arch/mmu.h
similarity index 100%
rename from kernel/include/arch/mmu.h
rename to zircon/kernel/include/arch/mmu.h
diff --git a/kernel/include/arch/mp.h b/zircon/kernel/include/arch/mp.h
similarity index 100%
rename from kernel/include/arch/mp.h
rename to zircon/kernel/include/arch/mp.h
diff --git a/kernel/include/arch/ops.h b/zircon/kernel/include/arch/ops.h
similarity index 100%
rename from kernel/include/arch/ops.h
rename to zircon/kernel/include/arch/ops.h
diff --git a/kernel/include/arch/thread.h b/zircon/kernel/include/arch/thread.h
similarity index 100%
rename from kernel/include/arch/thread.h
rename to zircon/kernel/include/arch/thread.h
diff --git a/kernel/include/arch/user_copy.h b/zircon/kernel/include/arch/user_copy.h
similarity index 100%
rename from kernel/include/arch/user_copy.h
rename to zircon/kernel/include/arch/user_copy.h
diff --git a/kernel/include/arm_acle.h b/zircon/kernel/include/arm_acle.h
similarity index 100%
rename from kernel/include/arm_acle.h
rename to zircon/kernel/include/arm_acle.h
diff --git a/kernel/include/asm.h b/zircon/kernel/include/asm.h
similarity index 100%
rename from kernel/include/asm.h
rename to zircon/kernel/include/asm.h
diff --git a/kernel/include/bits.h b/zircon/kernel/include/bits.h
similarity index 100%
rename from kernel/include/bits.h
rename to zircon/kernel/include/bits.h
diff --git a/kernel/include/debug.h b/zircon/kernel/include/debug.h
similarity index 100%
rename from kernel/include/debug.h
rename to zircon/kernel/include/debug.h
diff --git a/kernel/include/dev/display.h b/zircon/kernel/include/dev/display.h
similarity index 100%
rename from kernel/include/dev/display.h
rename to zircon/kernel/include/dev/display.h
diff --git a/kernel/include/dev/iommu.h b/zircon/kernel/include/dev/iommu.h
similarity index 100%
rename from kernel/include/dev/iommu.h
rename to zircon/kernel/include/dev/iommu.h
diff --git a/kernel/include/dev/power.h b/zircon/kernel/include/dev/power.h
similarity index 100%
rename from kernel/include/dev/power.h
rename to zircon/kernel/include/dev/power.h
diff --git a/kernel/include/dev/uart.h b/zircon/kernel/include/dev/uart.h
similarity index 100%
rename from kernel/include/dev/uart.h
rename to zircon/kernel/include/dev/uart.h
diff --git a/kernel/include/err.h b/zircon/kernel/include/err.h
similarity index 100%
rename from kernel/include/err.h
rename to zircon/kernel/include/err.h
diff --git a/kernel/include/hidden.h b/zircon/kernel/include/hidden.h
similarity index 100%
rename from kernel/include/hidden.h
rename to zircon/kernel/include/hidden.h
diff --git a/kernel/include/kernel/align.h b/zircon/kernel/include/kernel/align.h
similarity index 100%
rename from kernel/include/kernel/align.h
rename to zircon/kernel/include/kernel/align.h
diff --git a/kernel/include/kernel/atomic.h b/zircon/kernel/include/kernel/atomic.h
similarity index 100%
rename from kernel/include/kernel/atomic.h
rename to zircon/kernel/include/kernel/atomic.h
diff --git a/kernel/include/kernel/auto_lock.h b/zircon/kernel/include/kernel/auto_lock.h
similarity index 100%
rename from kernel/include/kernel/auto_lock.h
rename to zircon/kernel/include/kernel/auto_lock.h
diff --git a/kernel/include/kernel/brwlock.h b/zircon/kernel/include/kernel/brwlock.h
similarity index 100%
rename from kernel/include/kernel/brwlock.h
rename to zircon/kernel/include/kernel/brwlock.h
diff --git a/kernel/include/kernel/cmdline.h b/zircon/kernel/include/kernel/cmdline.h
similarity index 100%
rename from kernel/include/kernel/cmdline.h
rename to zircon/kernel/include/kernel/cmdline.h
diff --git a/kernel/include/kernel/cpu.h b/zircon/kernel/include/kernel/cpu.h
similarity index 100%
rename from kernel/include/kernel/cpu.h
rename to zircon/kernel/include/kernel/cpu.h
diff --git a/kernel/include/kernel/deadline.h b/zircon/kernel/include/kernel/deadline.h
similarity index 100%
rename from kernel/include/kernel/deadline.h
rename to zircon/kernel/include/kernel/deadline.h
diff --git a/kernel/include/kernel/dpc.h b/zircon/kernel/include/kernel/dpc.h
similarity index 100%
rename from kernel/include/kernel/dpc.h
rename to zircon/kernel/include/kernel/dpc.h
diff --git a/kernel/include/kernel/event.h b/zircon/kernel/include/kernel/event.h
similarity index 100%
rename from kernel/include/kernel/event.h
rename to zircon/kernel/include/kernel/event.h
diff --git a/kernel/include/kernel/init.h b/zircon/kernel/include/kernel/init.h
similarity index 100%
rename from kernel/include/kernel/init.h
rename to zircon/kernel/include/kernel/init.h
diff --git a/kernel/include/kernel/interrupt.h b/zircon/kernel/include/kernel/interrupt.h
similarity index 100%
rename from kernel/include/kernel/interrupt.h
rename to zircon/kernel/include/kernel/interrupt.h
diff --git a/kernel/include/kernel/lockdep.h b/zircon/kernel/include/kernel/lockdep.h
similarity index 100%
rename from kernel/include/kernel/lockdep.h
rename to zircon/kernel/include/kernel/lockdep.h
diff --git a/kernel/include/kernel/mp.h b/zircon/kernel/include/kernel/mp.h
similarity index 100%
rename from kernel/include/kernel/mp.h
rename to zircon/kernel/include/kernel/mp.h
diff --git a/kernel/include/kernel/mutex.h b/zircon/kernel/include/kernel/mutex.h
similarity index 100%
rename from kernel/include/kernel/mutex.h
rename to zircon/kernel/include/kernel/mutex.h
diff --git a/kernel/include/kernel/percpu.h b/zircon/kernel/include/kernel/percpu.h
similarity index 100%
rename from kernel/include/kernel/percpu.h
rename to zircon/kernel/include/kernel/percpu.h
diff --git a/kernel/include/kernel/range_check.h b/zircon/kernel/include/kernel/range_check.h
similarity index 100%
rename from kernel/include/kernel/range_check.h
rename to zircon/kernel/include/kernel/range_check.h
diff --git a/kernel/include/kernel/sched.h b/zircon/kernel/include/kernel/sched.h
similarity index 100%
rename from kernel/include/kernel/sched.h
rename to zircon/kernel/include/kernel/sched.h
diff --git a/kernel/include/kernel/spinlock.h b/zircon/kernel/include/kernel/spinlock.h
similarity index 100%
rename from kernel/include/kernel/spinlock.h
rename to zircon/kernel/include/kernel/spinlock.h
diff --git a/kernel/include/kernel/stats.h b/zircon/kernel/include/kernel/stats.h
similarity index 100%
rename from kernel/include/kernel/stats.h
rename to zircon/kernel/include/kernel/stats.h
diff --git a/kernel/include/kernel/thread.h b/zircon/kernel/include/kernel/thread.h
similarity index 100%
rename from kernel/include/kernel/thread.h
rename to zircon/kernel/include/kernel/thread.h
diff --git a/kernel/include/kernel/thread_lock.h b/zircon/kernel/include/kernel/thread_lock.h
similarity index 100%
rename from kernel/include/kernel/thread_lock.h
rename to zircon/kernel/include/kernel/thread_lock.h
diff --git a/kernel/include/kernel/timer.h b/zircon/kernel/include/kernel/timer.h
similarity index 100%
rename from kernel/include/kernel/timer.h
rename to zircon/kernel/include/kernel/timer.h
diff --git a/kernel/include/kernel/wait.h b/zircon/kernel/include/kernel/wait.h
similarity index 100%
rename from kernel/include/kernel/wait.h
rename to zircon/kernel/include/kernel/wait.h
diff --git a/kernel/include/ktl/move.h b/zircon/kernel/include/ktl/move.h
similarity index 100%
rename from kernel/include/ktl/move.h
rename to zircon/kernel/include/ktl/move.h
diff --git a/kernel/include/ktl/unique_ptr.h b/zircon/kernel/include/ktl/unique_ptr.h
similarity index 100%
rename from kernel/include/ktl/unique_ptr.h
rename to zircon/kernel/include/ktl/unique_ptr.h
diff --git a/kernel/include/lib/ktrace.h b/zircon/kernel/include/lib/ktrace.h
similarity index 100%
rename from kernel/include/lib/ktrace.h
rename to zircon/kernel/include/lib/ktrace.h
diff --git a/kernel/include/lib/mtrace.h b/zircon/kernel/include/lib/mtrace.h
similarity index 100%
rename from kernel/include/lib/mtrace.h
rename to zircon/kernel/include/lib/mtrace.h
diff --git a/kernel/include/list.h b/zircon/kernel/include/list.h
similarity index 100%
rename from kernel/include/list.h
rename to zircon/kernel/include/list.h
diff --git a/kernel/include/lk/init.h b/zircon/kernel/include/lk/init.h
similarity index 100%
rename from kernel/include/lk/init.h
rename to zircon/kernel/include/lk/init.h
diff --git a/kernel/include/lk/main.h b/zircon/kernel/include/lk/main.h
similarity index 100%
rename from kernel/include/lk/main.h
rename to zircon/kernel/include/lk/main.h
diff --git a/kernel/include/mexec.h b/zircon/kernel/include/mexec.h
similarity index 100%
rename from kernel/include/mexec.h
rename to zircon/kernel/include/mexec.h
diff --git a/kernel/include/platform.h b/zircon/kernel/include/platform.h
similarity index 100%
rename from kernel/include/platform.h
rename to zircon/kernel/include/platform.h
diff --git a/kernel/include/platform/debug.h b/zircon/kernel/include/platform/debug.h
similarity index 100%
rename from kernel/include/platform/debug.h
rename to zircon/kernel/include/platform/debug.h
diff --git a/kernel/include/platform/timer.h b/zircon/kernel/include/platform/timer.h
similarity index 100%
rename from kernel/include/platform/timer.h
rename to zircon/kernel/include/platform/timer.h
diff --git a/kernel/include/pow2.h b/zircon/kernel/include/pow2.h
similarity index 100%
rename from kernel/include/pow2.h
rename to zircon/kernel/include/pow2.h
diff --git a/kernel/include/reg.h b/zircon/kernel/include/reg.h
similarity index 100%
rename from kernel/include/reg.h
rename to zircon/kernel/include/reg.h
diff --git a/kernel/include/sys/types.h b/zircon/kernel/include/sys/types.h
similarity index 100%
rename from kernel/include/sys/types.h
rename to zircon/kernel/include/sys/types.h
diff --git a/kernel/include/syscalls/syscalls.h b/zircon/kernel/include/syscalls/syscalls.h
similarity index 100%
rename from kernel/include/syscalls/syscalls.h
rename to zircon/kernel/include/syscalls/syscalls.h
diff --git a/kernel/include/target.h b/zircon/kernel/include/target.h
similarity index 100%
rename from kernel/include/target.h
rename to zircon/kernel/include/target.h
diff --git a/kernel/include/trace.h b/zircon/kernel/include/trace.h
similarity index 100%
rename from kernel/include/trace.h
rename to zircon/kernel/include/trace.h
diff --git a/kernel/kernel.ld b/zircon/kernel/kernel.ld
similarity index 100%
rename from kernel/kernel.ld
rename to zircon/kernel/kernel.ld
diff --git a/kernel/kernel/brwlock.cpp b/zircon/kernel/kernel/brwlock.cpp
similarity index 100%
rename from kernel/kernel/brwlock.cpp
rename to zircon/kernel/kernel/brwlock.cpp
diff --git a/kernel/kernel/cmdline.cpp b/zircon/kernel/kernel/cmdline.cpp
similarity index 100%
rename from kernel/kernel/cmdline.cpp
rename to zircon/kernel/kernel/cmdline.cpp
diff --git a/kernel/kernel/deadline.cpp b/zircon/kernel/kernel/deadline.cpp
similarity index 100%
rename from kernel/kernel/deadline.cpp
rename to zircon/kernel/kernel/deadline.cpp
diff --git a/kernel/kernel/debug.cpp b/zircon/kernel/kernel/debug.cpp
similarity index 100%
rename from kernel/kernel/debug.cpp
rename to zircon/kernel/kernel/debug.cpp
diff --git a/kernel/kernel/dpc.cpp b/zircon/kernel/kernel/dpc.cpp
similarity index 100%
rename from kernel/kernel/dpc.cpp
rename to zircon/kernel/kernel/dpc.cpp
diff --git a/kernel/kernel/event.cpp b/zircon/kernel/kernel/event.cpp
similarity index 100%
rename from kernel/kernel/event.cpp
rename to zircon/kernel/kernel/event.cpp
diff --git a/kernel/kernel/init.cpp b/zircon/kernel/kernel/init.cpp
similarity index 100%
rename from kernel/kernel/init.cpp
rename to zircon/kernel/kernel/init.cpp
diff --git a/kernel/kernel/mp.cpp b/zircon/kernel/kernel/mp.cpp
similarity index 100%
rename from kernel/kernel/mp.cpp
rename to zircon/kernel/kernel/mp.cpp
diff --git a/kernel/kernel/mutex.cpp b/zircon/kernel/kernel/mutex.cpp
similarity index 100%
rename from kernel/kernel/mutex.cpp
rename to zircon/kernel/kernel/mutex.cpp
diff --git a/kernel/kernel/percpu.cpp b/zircon/kernel/kernel/percpu.cpp
similarity index 100%
rename from kernel/kernel/percpu.cpp
rename to zircon/kernel/kernel/percpu.cpp
diff --git a/kernel/kernel/rules.mk b/zircon/kernel/kernel/rules.mk
similarity index 100%
rename from kernel/kernel/rules.mk
rename to zircon/kernel/kernel/rules.mk
diff --git a/kernel/kernel/sched.cpp b/zircon/kernel/kernel/sched.cpp
similarity index 100%
rename from kernel/kernel/sched.cpp
rename to zircon/kernel/kernel/sched.cpp
diff --git a/kernel/kernel/thread.cpp b/zircon/kernel/kernel/thread.cpp
similarity index 100%
rename from kernel/kernel/thread.cpp
rename to zircon/kernel/kernel/thread.cpp
diff --git a/kernel/kernel/timer.cpp b/zircon/kernel/kernel/timer.cpp
similarity index 100%
rename from kernel/kernel/timer.cpp
rename to zircon/kernel/kernel/timer.cpp
diff --git a/kernel/kernel/wait.cpp b/zircon/kernel/kernel/wait.cpp
similarity index 100%
rename from kernel/kernel/wait.cpp
rename to zircon/kernel/kernel/wait.cpp
diff --git a/kernel/lib/acpi_tables/acpi_tables.cpp b/zircon/kernel/lib/acpi_tables/acpi_tables.cpp
similarity index 100%
rename from kernel/lib/acpi_tables/acpi_tables.cpp
rename to zircon/kernel/lib/acpi_tables/acpi_tables.cpp
diff --git a/kernel/lib/acpi_tables/acpi_tables_test.cpp b/zircon/kernel/lib/acpi_tables/acpi_tables_test.cpp
similarity index 100%
rename from kernel/lib/acpi_tables/acpi_tables_test.cpp
rename to zircon/kernel/lib/acpi_tables/acpi_tables_test.cpp
diff --git a/kernel/lib/acpi_tables/include/lib/acpi_tables.h b/zircon/kernel/lib/acpi_tables/include/lib/acpi_tables.h
similarity index 100%
rename from kernel/lib/acpi_tables/include/lib/acpi_tables.h
rename to zircon/kernel/lib/acpi_tables/include/lib/acpi_tables.h
diff --git a/kernel/lib/acpi_tables/rules.mk b/zircon/kernel/lib/acpi_tables/rules.mk
similarity index 100%
rename from kernel/lib/acpi_tables/rules.mk
rename to zircon/kernel/lib/acpi_tables/rules.mk
diff --git a/kernel/lib/bitmap/rules.mk b/zircon/kernel/lib/bitmap/rules.mk
similarity index 100%
rename from kernel/lib/bitmap/rules.mk
rename to zircon/kernel/lib/bitmap/rules.mk
diff --git a/kernel/lib/cbuf/cbuf.cpp b/zircon/kernel/lib/cbuf/cbuf.cpp
similarity index 100%
rename from kernel/lib/cbuf/cbuf.cpp
rename to zircon/kernel/lib/cbuf/cbuf.cpp
diff --git a/kernel/lib/cbuf/include/lib/cbuf.h b/zircon/kernel/lib/cbuf/include/lib/cbuf.h
similarity index 100%
rename from kernel/lib/cbuf/include/lib/cbuf.h
rename to zircon/kernel/lib/cbuf/include/lib/cbuf.h
diff --git a/kernel/lib/cbuf/rules.mk b/zircon/kernel/lib/cbuf/rules.mk
similarity index 100%
rename from kernel/lib/cbuf/rules.mk
rename to zircon/kernel/lib/cbuf/rules.mk
diff --git a/kernel/lib/code_patching/code_patching.cpp b/zircon/kernel/lib/code_patching/code_patching.cpp
similarity index 100%
rename from kernel/lib/code_patching/code_patching.cpp
rename to zircon/kernel/lib/code_patching/code_patching.cpp
diff --git a/kernel/lib/code_patching/include/lib/code_patching.h b/zircon/kernel/lib/code_patching/include/lib/code_patching.h
similarity index 100%
rename from kernel/lib/code_patching/include/lib/code_patching.h
rename to zircon/kernel/lib/code_patching/include/lib/code_patching.h
diff --git a/kernel/lib/code_patching/rules.mk b/zircon/kernel/lib/code_patching/rules.mk
similarity index 100%
rename from kernel/lib/code_patching/rules.mk
rename to zircon/kernel/lib/code_patching/rules.mk
diff --git a/kernel/lib/console/console.cpp b/zircon/kernel/lib/console/console.cpp
similarity index 100%
rename from kernel/lib/console/console.cpp
rename to zircon/kernel/lib/console/console.cpp
diff --git a/kernel/lib/console/include/lib/console.h b/zircon/kernel/lib/console/include/lib/console.h
similarity index 100%
rename from kernel/lib/console/include/lib/console.h
rename to zircon/kernel/lib/console/include/lib/console.h
diff --git a/kernel/lib/console/rules.mk b/zircon/kernel/lib/console/rules.mk
similarity index 100%
rename from kernel/lib/console/rules.mk
rename to zircon/kernel/lib/console/rules.mk
diff --git a/kernel/lib/counters/counters.cpp b/zircon/kernel/lib/counters/counters.cpp
similarity index 100%
rename from kernel/lib/counters/counters.cpp
rename to zircon/kernel/lib/counters/counters.cpp
diff --git a/kernel/lib/counters/include/lib/counters.h b/zircon/kernel/lib/counters/include/lib/counters.h
similarity index 100%
rename from kernel/lib/counters/include/lib/counters.h
rename to zircon/kernel/lib/counters/include/lib/counters.h
diff --git a/kernel/lib/counters/rules.mk b/zircon/kernel/lib/counters/rules.mk
similarity index 100%
rename from kernel/lib/counters/rules.mk
rename to zircon/kernel/lib/counters/rules.mk
diff --git a/kernel/lib/crashlog/crashlog.cpp b/zircon/kernel/lib/crashlog/crashlog.cpp
similarity index 100%
rename from kernel/lib/crashlog/crashlog.cpp
rename to zircon/kernel/lib/crashlog/crashlog.cpp
diff --git a/kernel/lib/crashlog/include/lib/crashlog.h b/zircon/kernel/lib/crashlog/include/lib/crashlog.h
similarity index 100%
rename from kernel/lib/crashlog/include/lib/crashlog.h
rename to zircon/kernel/lib/crashlog/include/lib/crashlog.h
diff --git a/kernel/lib/crashlog/rules.mk b/zircon/kernel/lib/crashlog/rules.mk
similarity index 100%
rename from kernel/lib/crashlog/rules.mk
rename to zircon/kernel/lib/crashlog/rules.mk
diff --git a/kernel/lib/crypto/MAINTAINERS b/zircon/kernel/lib/crypto/MAINTAINERS
similarity index 100%
rename from kernel/lib/crypto/MAINTAINERS
rename to zircon/kernel/lib/crypto/MAINTAINERS
diff --git a/kernel/lib/crypto/entropy/collector.cpp b/zircon/kernel/lib/crypto/entropy/collector.cpp
similarity index 100%
rename from kernel/lib/crypto/entropy/collector.cpp
rename to zircon/kernel/lib/crypto/entropy/collector.cpp
diff --git a/kernel/lib/crypto/entropy/collector_unittest.cpp b/zircon/kernel/lib/crypto/entropy/collector_unittest.cpp
similarity index 100%
rename from kernel/lib/crypto/entropy/collector_unittest.cpp
rename to zircon/kernel/lib/crypto/entropy/collector_unittest.cpp
diff --git a/kernel/lib/crypto/entropy/hw_rng_collector.cpp b/zircon/kernel/lib/crypto/entropy/hw_rng_collector.cpp
similarity index 100%
rename from kernel/lib/crypto/entropy/hw_rng_collector.cpp
rename to zircon/kernel/lib/crypto/entropy/hw_rng_collector.cpp
diff --git a/kernel/lib/crypto/entropy/jitterentropy_collector.cpp b/zircon/kernel/lib/crypto/entropy/jitterentropy_collector.cpp
similarity index 100%
rename from kernel/lib/crypto/entropy/jitterentropy_collector.cpp
rename to zircon/kernel/lib/crypto/entropy/jitterentropy_collector.cpp
diff --git a/kernel/lib/crypto/entropy/quality_test.cpp b/zircon/kernel/lib/crypto/entropy/quality_test.cpp
similarity index 100%
rename from kernel/lib/crypto/entropy/quality_test.cpp
rename to zircon/kernel/lib/crypto/entropy/quality_test.cpp
diff --git a/kernel/lib/crypto/entropy/rules.mk b/zircon/kernel/lib/crypto/entropy/rules.mk
similarity index 100%
rename from kernel/lib/crypto/entropy/rules.mk
rename to zircon/kernel/lib/crypto/entropy/rules.mk
diff --git a/kernel/lib/crypto/global_prng.cpp b/zircon/kernel/lib/crypto/global_prng.cpp
similarity index 100%
rename from kernel/lib/crypto/global_prng.cpp
rename to zircon/kernel/lib/crypto/global_prng.cpp
diff --git a/kernel/lib/crypto/global_prng_unittest.cpp b/zircon/kernel/lib/crypto/global_prng_unittest.cpp
similarity index 100%
rename from kernel/lib/crypto/global_prng_unittest.cpp
rename to zircon/kernel/lib/crypto/global_prng_unittest.cpp
diff --git a/kernel/lib/crypto/include/lib/crypto/entropy/collector.h b/zircon/kernel/lib/crypto/include/lib/crypto/entropy/collector.h
similarity index 100%
rename from kernel/lib/crypto/include/lib/crypto/entropy/collector.h
rename to zircon/kernel/lib/crypto/include/lib/crypto/entropy/collector.h
diff --git a/kernel/lib/crypto/include/lib/crypto/entropy/hw_rng_collector.h b/zircon/kernel/lib/crypto/include/lib/crypto/entropy/hw_rng_collector.h
similarity index 100%
rename from kernel/lib/crypto/include/lib/crypto/entropy/hw_rng_collector.h
rename to zircon/kernel/lib/crypto/include/lib/crypto/entropy/hw_rng_collector.h
diff --git a/kernel/lib/crypto/include/lib/crypto/entropy/jitterentropy_collector.h b/zircon/kernel/lib/crypto/include/lib/crypto/entropy/jitterentropy_collector.h
similarity index 100%
rename from kernel/lib/crypto/include/lib/crypto/entropy/jitterentropy_collector.h
rename to zircon/kernel/lib/crypto/include/lib/crypto/entropy/jitterentropy_collector.h
diff --git a/kernel/lib/crypto/include/lib/crypto/entropy/quality_test.h b/zircon/kernel/lib/crypto/include/lib/crypto/entropy/quality_test.h
similarity index 100%
rename from kernel/lib/crypto/include/lib/crypto/entropy/quality_test.h
rename to zircon/kernel/lib/crypto/include/lib/crypto/entropy/quality_test.h
diff --git a/kernel/lib/crypto/include/lib/crypto/global_prng.h b/zircon/kernel/lib/crypto/include/lib/crypto/global_prng.h
similarity index 100%
rename from kernel/lib/crypto/include/lib/crypto/global_prng.h
rename to zircon/kernel/lib/crypto/include/lib/crypto/global_prng.h
diff --git a/kernel/lib/crypto/include/lib/crypto/prng.h b/zircon/kernel/lib/crypto/include/lib/crypto/prng.h
similarity index 100%
rename from kernel/lib/crypto/include/lib/crypto/prng.h
rename to zircon/kernel/lib/crypto/include/lib/crypto/prng.h
diff --git a/kernel/lib/crypto/prng.cpp b/zircon/kernel/lib/crypto/prng.cpp
similarity index 100%
rename from kernel/lib/crypto/prng.cpp
rename to zircon/kernel/lib/crypto/prng.cpp
diff --git a/kernel/lib/crypto/prng_unittest.cpp b/zircon/kernel/lib/crypto/prng_unittest.cpp
similarity index 100%
rename from kernel/lib/crypto/prng_unittest.cpp
rename to zircon/kernel/lib/crypto/prng_unittest.cpp
diff --git a/kernel/lib/crypto/rules.mk b/zircon/kernel/lib/crypto/rules.mk
similarity index 100%
rename from kernel/lib/crypto/rules.mk
rename to zircon/kernel/lib/crypto/rules.mk
diff --git a/kernel/lib/debug/debug.cpp b/zircon/kernel/lib/debug/debug.cpp
similarity index 100%
rename from kernel/lib/debug/debug.cpp
rename to zircon/kernel/lib/debug/debug.cpp
diff --git a/kernel/lib/debug/rules.mk b/zircon/kernel/lib/debug/rules.mk
similarity index 100%
rename from kernel/lib/debug/rules.mk
rename to zircon/kernel/lib/debug/rules.mk
diff --git a/kernel/lib/debugcommands/debugcommands.cpp b/zircon/kernel/lib/debugcommands/debugcommands.cpp
similarity index 100%
rename from kernel/lib/debugcommands/debugcommands.cpp
rename to zircon/kernel/lib/debugcommands/debugcommands.cpp
diff --git a/kernel/lib/debugcommands/rules.mk b/zircon/kernel/lib/debugcommands/rules.mk
similarity index 100%
rename from kernel/lib/debugcommands/rules.mk
rename to zircon/kernel/lib/debugcommands/rules.mk
diff --git a/kernel/lib/debuglog/debuglog.cpp b/zircon/kernel/lib/debuglog/debuglog.cpp
similarity index 100%
rename from kernel/lib/debuglog/debuglog.cpp
rename to zircon/kernel/lib/debuglog/debuglog.cpp
diff --git a/kernel/lib/debuglog/include/lib/debuglog.h b/zircon/kernel/lib/debuglog/include/lib/debuglog.h
similarity index 100%
rename from kernel/lib/debuglog/include/lib/debuglog.h
rename to zircon/kernel/lib/debuglog/include/lib/debuglog.h
diff --git a/kernel/lib/debuglog/rules.mk b/zircon/kernel/lib/debuglog/rules.mk
similarity index 100%
rename from kernel/lib/debuglog/rules.mk
rename to zircon/kernel/lib/debuglog/rules.mk
diff --git a/kernel/lib/explicit-memory/rules.mk b/zircon/kernel/lib/explicit-memory/rules.mk
similarity index 100%
rename from kernel/lib/explicit-memory/rules.mk
rename to zircon/kernel/lib/explicit-memory/rules.mk
diff --git a/kernel/lib/fbl/arena.cpp b/zircon/kernel/lib/fbl/arena.cpp
similarity index 100%
rename from kernel/lib/fbl/arena.cpp
rename to zircon/kernel/lib/fbl/arena.cpp
diff --git a/kernel/lib/fbl/arena_tests.cpp b/zircon/kernel/lib/fbl/arena_tests.cpp
similarity index 100%
rename from kernel/lib/fbl/arena_tests.cpp
rename to zircon/kernel/lib/fbl/arena_tests.cpp
diff --git a/kernel/lib/fbl/include/fbl/arena.h b/zircon/kernel/lib/fbl/include/fbl/arena.h
similarity index 100%
rename from kernel/lib/fbl/include/fbl/arena.h
rename to zircon/kernel/lib/fbl/include/fbl/arena.h
diff --git a/kernel/lib/fbl/include/fbl/atomic.h b/zircon/kernel/lib/fbl/include/fbl/atomic.h
similarity index 100%
rename from kernel/lib/fbl/include/fbl/atomic.h
rename to zircon/kernel/lib/fbl/include/fbl/atomic.h
diff --git a/kernel/lib/fbl/include/fbl/inline_array.h b/zircon/kernel/lib/fbl/include/fbl/inline_array.h
similarity index 100%
rename from kernel/lib/fbl/include/fbl/inline_array.h
rename to zircon/kernel/lib/fbl/include/fbl/inline_array.h
diff --git a/kernel/lib/fbl/include/fbl/name.h b/zircon/kernel/lib/fbl/include/fbl/name.h
similarity index 100%
rename from kernel/lib/fbl/include/fbl/name.h
rename to zircon/kernel/lib/fbl/include/fbl/name.h
diff --git a/kernel/lib/fbl/inline_array_tests.cpp b/zircon/kernel/lib/fbl/inline_array_tests.cpp
similarity index 100%
rename from kernel/lib/fbl/inline_array_tests.cpp
rename to zircon/kernel/lib/fbl/inline_array_tests.cpp
diff --git a/kernel/lib/fbl/name_tests.cpp b/zircon/kernel/lib/fbl/name_tests.cpp
similarity index 100%
rename from kernel/lib/fbl/name_tests.cpp
rename to zircon/kernel/lib/fbl/name_tests.cpp
diff --git a/kernel/lib/fbl/rules.mk b/zircon/kernel/lib/fbl/rules.mk
similarity index 100%
rename from kernel/lib/fbl/rules.mk
rename to zircon/kernel/lib/fbl/rules.mk
diff --git a/kernel/lib/fixed_point/fixed_point.cpp b/zircon/kernel/lib/fixed_point/fixed_point.cpp
similarity index 100%
rename from kernel/lib/fixed_point/fixed_point.cpp
rename to zircon/kernel/lib/fixed_point/fixed_point.cpp
diff --git a/kernel/lib/fixed_point/include/lib/fixed_point.h b/zircon/kernel/lib/fixed_point/include/lib/fixed_point.h
similarity index 100%
rename from kernel/lib/fixed_point/include/lib/fixed_point.h
rename to zircon/kernel/lib/fixed_point/include/lib/fixed_point.h
diff --git a/kernel/lib/fixed_point/include/lib/fixed_point_debug.h b/zircon/kernel/lib/fixed_point/include/lib/fixed_point_debug.h
similarity index 100%
rename from kernel/lib/fixed_point/include/lib/fixed_point_debug.h
rename to zircon/kernel/lib/fixed_point/include/lib/fixed_point_debug.h
diff --git a/kernel/lib/fixed_point/rules.mk b/zircon/kernel/lib/fixed_point/rules.mk
similarity index 100%
rename from kernel/lib/fixed_point/rules.mk
rename to zircon/kernel/lib/fixed_point/rules.mk
diff --git a/kernel/lib/gfx/gfx.cpp b/zircon/kernel/lib/gfx/gfx.cpp
similarity index 100%
rename from kernel/lib/gfx/gfx.cpp
rename to zircon/kernel/lib/gfx/gfx.cpp
diff --git a/kernel/lib/gfx/include/lib/gfx.h b/zircon/kernel/lib/gfx/include/lib/gfx.h
similarity index 100%
rename from kernel/lib/gfx/include/lib/gfx.h
rename to zircon/kernel/lib/gfx/include/lib/gfx.h
diff --git a/kernel/lib/gfx/rules.mk b/zircon/kernel/lib/gfx/rules.mk
similarity index 100%
rename from kernel/lib/gfx/rules.mk
rename to zircon/kernel/lib/gfx/rules.mk
diff --git a/kernel/lib/gfxconsole/gfxconsole.cpp b/zircon/kernel/lib/gfxconsole/gfxconsole.cpp
similarity index 100%
rename from kernel/lib/gfxconsole/gfxconsole.cpp
rename to zircon/kernel/lib/gfxconsole/gfxconsole.cpp
diff --git a/kernel/lib/gfxconsole/include/lib/gfxconsole.h b/zircon/kernel/lib/gfxconsole/include/lib/gfxconsole.h
similarity index 100%
rename from kernel/lib/gfxconsole/include/lib/gfxconsole.h
rename to zircon/kernel/lib/gfxconsole/include/lib/gfxconsole.h
diff --git a/kernel/lib/gfxconsole/rules.mk b/zircon/kernel/lib/gfxconsole/rules.mk
similarity index 100%
rename from kernel/lib/gfxconsole/rules.mk
rename to zircon/kernel/lib/gfxconsole/rules.mk
diff --git a/kernel/lib/header_tests/pow2_tests.cpp b/zircon/kernel/lib/header_tests/pow2_tests.cpp
similarity index 100%
rename from kernel/lib/header_tests/pow2_tests.cpp
rename to zircon/kernel/lib/header_tests/pow2_tests.cpp
diff --git a/kernel/lib/header_tests/rules.mk b/zircon/kernel/lib/header_tests/rules.mk
similarity index 100%
rename from kernel/lib/header_tests/rules.mk
rename to zircon/kernel/lib/header_tests/rules.mk
diff --git a/kernel/lib/heap/cmpctmalloc/cmpctmalloc.cpp b/zircon/kernel/lib/heap/cmpctmalloc/cmpctmalloc.cpp
similarity index 100%
rename from kernel/lib/heap/cmpctmalloc/cmpctmalloc.cpp
rename to zircon/kernel/lib/heap/cmpctmalloc/cmpctmalloc.cpp
diff --git a/kernel/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h b/zircon/kernel/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
similarity index 100%
rename from kernel/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
rename to zircon/kernel/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
diff --git a/kernel/lib/heap/cmpctmalloc/rules.mk b/zircon/kernel/lib/heap/cmpctmalloc/rules.mk
similarity index 100%
rename from kernel/lib/heap/cmpctmalloc/rules.mk
rename to zircon/kernel/lib/heap/cmpctmalloc/rules.mk
diff --git a/kernel/lib/heap/heap_wrapper.cpp b/zircon/kernel/lib/heap/heap_wrapper.cpp
similarity index 100%
rename from kernel/lib/heap/heap_wrapper.cpp
rename to zircon/kernel/lib/heap/heap_wrapper.cpp
diff --git a/kernel/lib/heap/include/lib/heap.h b/zircon/kernel/lib/heap/include/lib/heap.h
similarity index 100%
rename from kernel/lib/heap/include/lib/heap.h
rename to zircon/kernel/lib/heap/include/lib/heap.h
diff --git a/kernel/lib/heap/rules.mk b/zircon/kernel/lib/heap/rules.mk
similarity index 100%
rename from kernel/lib/heap/rules.mk
rename to zircon/kernel/lib/heap/rules.mk
diff --git a/kernel/lib/hwreg/rules.mk b/zircon/kernel/lib/hwreg/rules.mk
similarity index 100%
rename from kernel/lib/hwreg/rules.mk
rename to zircon/kernel/lib/hwreg/rules.mk
diff --git a/kernel/lib/hypervisor/MAINTAINERS b/zircon/kernel/lib/hypervisor/MAINTAINERS
similarity index 100%
rename from kernel/lib/hypervisor/MAINTAINERS
rename to zircon/kernel/lib/hypervisor/MAINTAINERS
diff --git a/kernel/lib/hypervisor/cpu.cpp b/zircon/kernel/lib/hypervisor/cpu.cpp
similarity index 100%
rename from kernel/lib/hypervisor/cpu.cpp
rename to zircon/kernel/lib/hypervisor/cpu.cpp
diff --git a/kernel/lib/hypervisor/guest_physical_address_space.cpp b/zircon/kernel/lib/hypervisor/guest_physical_address_space.cpp
similarity index 100%
rename from kernel/lib/hypervisor/guest_physical_address_space.cpp
rename to zircon/kernel/lib/hypervisor/guest_physical_address_space.cpp
diff --git a/kernel/lib/hypervisor/hypervisor_unittest.cpp b/zircon/kernel/lib/hypervisor/hypervisor_unittest.cpp
similarity index 100%
rename from kernel/lib/hypervisor/hypervisor_unittest.cpp
rename to zircon/kernel/lib/hypervisor/hypervisor_unittest.cpp
diff --git a/kernel/lib/hypervisor/include/hypervisor/cpu.h b/zircon/kernel/lib/hypervisor/include/hypervisor/cpu.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/cpu.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/cpu.h
diff --git a/kernel/lib/hypervisor/include/hypervisor/guest_physical_address_space.h b/zircon/kernel/lib/hypervisor/include/hypervisor/guest_physical_address_space.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/guest_physical_address_space.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/guest_physical_address_space.h
diff --git a/kernel/lib/hypervisor/include/hypervisor/id_allocator.h b/zircon/kernel/lib/hypervisor/include/hypervisor/id_allocator.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/id_allocator.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/id_allocator.h
diff --git a/kernel/lib/hypervisor/include/hypervisor/interrupt_tracker.h b/zircon/kernel/lib/hypervisor/include/hypervisor/interrupt_tracker.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/interrupt_tracker.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/interrupt_tracker.h
diff --git a/kernel/lib/hypervisor/include/hypervisor/ktrace.h b/zircon/kernel/lib/hypervisor/include/hypervisor/ktrace.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/ktrace.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/ktrace.h
diff --git a/kernel/lib/hypervisor/include/hypervisor/page.h b/zircon/kernel/lib/hypervisor/include/hypervisor/page.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/page.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/page.h
diff --git a/kernel/lib/hypervisor/include/hypervisor/state_invalidator.h b/zircon/kernel/lib/hypervisor/include/hypervisor/state_invalidator.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/state_invalidator.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/state_invalidator.h
diff --git a/kernel/lib/hypervisor/include/hypervisor/trap_map.h b/zircon/kernel/lib/hypervisor/include/hypervisor/trap_map.h
similarity index 100%
rename from kernel/lib/hypervisor/include/hypervisor/trap_map.h
rename to zircon/kernel/lib/hypervisor/include/hypervisor/trap_map.h
diff --git a/kernel/lib/hypervisor/ktrace.cpp b/zircon/kernel/lib/hypervisor/ktrace.cpp
similarity index 100%
rename from kernel/lib/hypervisor/ktrace.cpp
rename to zircon/kernel/lib/hypervisor/ktrace.cpp
diff --git a/kernel/lib/hypervisor/rules.mk b/zircon/kernel/lib/hypervisor/rules.mk
similarity index 100%
rename from kernel/lib/hypervisor/rules.mk
rename to zircon/kernel/lib/hypervisor/rules.mk
diff --git a/kernel/lib/hypervisor/trap_map.cpp b/zircon/kernel/lib/hypervisor/trap_map.cpp
similarity index 100%
rename from kernel/lib/hypervisor/trap_map.cpp
rename to zircon/kernel/lib/hypervisor/trap_map.cpp
diff --git a/kernel/lib/io/console.cpp b/zircon/kernel/lib/io/console.cpp
similarity index 100%
rename from kernel/lib/io/console.cpp
rename to zircon/kernel/lib/io/console.cpp
diff --git a/kernel/lib/io/include/lib/io.h b/zircon/kernel/lib/io/include/lib/io.h
similarity index 100%
rename from kernel/lib/io/include/lib/io.h
rename to zircon/kernel/lib/io/include/lib/io.h
diff --git a/kernel/lib/io/rules.mk b/zircon/kernel/lib/io/rules.mk
similarity index 100%
rename from kernel/lib/io/rules.mk
rename to zircon/kernel/lib/io/rules.mk
diff --git a/kernel/lib/ktrace/ktrace.cpp b/zircon/kernel/lib/ktrace/ktrace.cpp
similarity index 100%
rename from kernel/lib/ktrace/ktrace.cpp
rename to zircon/kernel/lib/ktrace/ktrace.cpp
diff --git a/kernel/lib/ktrace/rules.mk b/zircon/kernel/lib/ktrace/rules.mk
similarity index 100%
rename from kernel/lib/ktrace/rules.mk
rename to zircon/kernel/lib/ktrace/rules.mk
diff --git a/kernel/lib/libc/atexit.c b/zircon/kernel/lib/libc/atexit.c
similarity index 100%
rename from kernel/lib/libc/atexit.c
rename to zircon/kernel/lib/libc/atexit.c
diff --git a/kernel/lib/libc/atoi.c b/zircon/kernel/lib/libc/atoi.c
similarity index 100%
rename from kernel/lib/libc/atoi.c
rename to zircon/kernel/lib/libc/atoi.c
diff --git a/kernel/lib/libc/bsearch.c b/zircon/kernel/lib/libc/bsearch.c
similarity index 100%
rename from kernel/lib/libc/bsearch.c
rename to zircon/kernel/lib/libc/bsearch.c
diff --git a/kernel/lib/libc/ctype.c b/zircon/kernel/lib/libc/ctype.c
similarity index 100%
rename from kernel/lib/libc/ctype.c
rename to zircon/kernel/lib/libc/ctype.c
diff --git a/kernel/lib/libc/cxa_atexit.cpp b/zircon/kernel/lib/libc/cxa_atexit.cpp
similarity index 100%
rename from kernel/lib/libc/cxa_atexit.cpp
rename to zircon/kernel/lib/libc/cxa_atexit.cpp
diff --git a/kernel/lib/libc/eabi.c b/zircon/kernel/lib/libc/eabi.c
similarity index 100%
rename from kernel/lib/libc/eabi.c
rename to zircon/kernel/lib/libc/eabi.c
diff --git a/kernel/lib/libc/errno.c b/zircon/kernel/lib/libc/errno.c
similarity index 100%
rename from kernel/lib/libc/errno.c
rename to zircon/kernel/lib/libc/errno.c
diff --git a/kernel/lib/libc/include/assert.h b/zircon/kernel/lib/libc/include/assert.h
similarity index 100%
rename from kernel/lib/libc/include/assert.h
rename to zircon/kernel/lib/libc/include/assert.h
diff --git a/kernel/lib/libc/include/cstdlib b/zircon/kernel/lib/libc/include/cstdlib
similarity index 100%
rename from kernel/lib/libc/include/cstdlib
rename to zircon/kernel/lib/libc/include/cstdlib
diff --git a/kernel/lib/libc/include/ctype.h b/zircon/kernel/lib/libc/include/ctype.h
similarity index 100%
rename from kernel/lib/libc/include/ctype.h
rename to zircon/kernel/lib/libc/include/ctype.h
diff --git a/kernel/lib/libc/include/endian.h b/zircon/kernel/lib/libc/include/endian.h
similarity index 100%
rename from kernel/lib/libc/include/endian.h
rename to zircon/kernel/lib/libc/include/endian.h
diff --git a/kernel/lib/libc/include/errno.h b/zircon/kernel/lib/libc/include/errno.h
similarity index 100%
rename from kernel/lib/libc/include/errno.h
rename to zircon/kernel/lib/libc/include/errno.h
diff --git a/kernel/lib/libc/include/inttypes.h b/zircon/kernel/lib/libc/include/inttypes.h
similarity index 100%
rename from kernel/lib/libc/include/inttypes.h
rename to zircon/kernel/lib/libc/include/inttypes.h
diff --git a/kernel/lib/libc/include/iovec.h b/zircon/kernel/lib/libc/include/iovec.h
similarity index 100%
rename from kernel/lib/libc/include/iovec.h
rename to zircon/kernel/lib/libc/include/iovec.h
diff --git a/kernel/lib/libc/include/limits b/zircon/kernel/lib/libc/include/limits
similarity index 100%
rename from kernel/lib/libc/include/limits
rename to zircon/kernel/lib/libc/include/limits
diff --git a/kernel/lib/libc/include/limits.h b/zircon/kernel/lib/libc/include/limits.h
similarity index 100%
rename from kernel/lib/libc/include/limits.h
rename to zircon/kernel/lib/libc/include/limits.h
diff --git a/kernel/lib/libc/include/malloc.h b/zircon/kernel/lib/libc/include/malloc.h
similarity index 100%
rename from kernel/lib/libc/include/malloc.h
rename to zircon/kernel/lib/libc/include/malloc.h
diff --git a/kernel/lib/libc/include/printf.h b/zircon/kernel/lib/libc/include/printf.h
similarity index 100%
rename from kernel/lib/libc/include/printf.h
rename to zircon/kernel/lib/libc/include/printf.h
diff --git a/kernel/lib/libc/include/rand.h b/zircon/kernel/lib/libc/include/rand.h
similarity index 100%
rename from kernel/lib/libc/include/rand.h
rename to zircon/kernel/lib/libc/include/rand.h
diff --git a/kernel/lib/libc/include/stdint.h b/zircon/kernel/lib/libc/include/stdint.h
similarity index 100%
rename from kernel/lib/libc/include/stdint.h
rename to zircon/kernel/lib/libc/include/stdint.h
diff --git a/kernel/lib/libc/include/stdio.h b/zircon/kernel/lib/libc/include/stdio.h
similarity index 100%
rename from kernel/lib/libc/include/stdio.h
rename to zircon/kernel/lib/libc/include/stdio.h
diff --git a/kernel/lib/libc/include/stdlib.h b/zircon/kernel/lib/libc/include/stdlib.h
similarity index 100%
rename from kernel/lib/libc/include/stdlib.h
rename to zircon/kernel/lib/libc/include/stdlib.h
diff --git a/kernel/lib/libc/include/string.h b/zircon/kernel/lib/libc/include/string.h
similarity index 100%
rename from kernel/lib/libc/include/string.h
rename to zircon/kernel/lib/libc/include/string.h
diff --git a/kernel/lib/libc/include/wchar.h b/zircon/kernel/lib/libc/include/wchar.h
similarity index 100%
rename from kernel/lib/libc/include/wchar.h
rename to zircon/kernel/lib/libc/include/wchar.h
diff --git a/kernel/lib/libc/iovec.c b/zircon/kernel/lib/libc/iovec.c
similarity index 100%
rename from kernel/lib/libc/iovec.c
rename to zircon/kernel/lib/libc/iovec.c
diff --git a/kernel/lib/libc/printf.c b/zircon/kernel/lib/libc/printf.c
similarity index 100%
rename from kernel/lib/libc/printf.c
rename to zircon/kernel/lib/libc/printf.c
diff --git a/kernel/lib/libc/qsort.c b/zircon/kernel/lib/libc/qsort.c
similarity index 100%
rename from kernel/lib/libc/qsort.c
rename to zircon/kernel/lib/libc/qsort.c
diff --git a/kernel/lib/libc/rand.c b/zircon/kernel/lib/libc/rand.c
similarity index 100%
rename from kernel/lib/libc/rand.c
rename to zircon/kernel/lib/libc/rand.c
diff --git a/kernel/lib/libc/rules.mk b/zircon/kernel/lib/libc/rules.mk
similarity index 100%
rename from kernel/lib/libc/rules.mk
rename to zircon/kernel/lib/libc/rules.mk
diff --git a/kernel/lib/libc/stdio.c b/zircon/kernel/lib/libc/stdio.c
similarity index 100%
rename from kernel/lib/libc/stdio.c
rename to zircon/kernel/lib/libc/stdio.c
diff --git a/kernel/lib/libc/string/arch/arm64/rules.mk b/zircon/kernel/lib/libc/string/arch/arm64/rules.mk
similarity index 100%
rename from kernel/lib/libc/string/arch/arm64/rules.mk
rename to zircon/kernel/lib/libc/string/arch/arm64/rules.mk
diff --git a/kernel/lib/libc/string/arch/x86/memcpy.S b/zircon/kernel/lib/libc/string/arch/x86/memcpy.S
similarity index 100%
rename from kernel/lib/libc/string/arch/x86/memcpy.S
rename to zircon/kernel/lib/libc/string/arch/x86/memcpy.S
diff --git a/kernel/lib/libc/string/arch/x86/memset.S b/zircon/kernel/lib/libc/string/arch/x86/memset.S
similarity index 100%
rename from kernel/lib/libc/string/arch/x86/memset.S
rename to zircon/kernel/lib/libc/string/arch/x86/memset.S
diff --git a/kernel/lib/libc/string/arch/x86/rules.mk b/zircon/kernel/lib/libc/string/arch/x86/rules.mk
similarity index 100%
rename from kernel/lib/libc/string/arch/x86/rules.mk
rename to zircon/kernel/lib/libc/string/arch/x86/rules.mk
diff --git a/kernel/lib/libc/string/arch/x86/selector.cpp b/zircon/kernel/lib/libc/string/arch/x86/selector.cpp
similarity index 100%
rename from kernel/lib/libc/string/arch/x86/selector.cpp
rename to zircon/kernel/lib/libc/string/arch/x86/selector.cpp
diff --git a/kernel/lib/libc/string/arch/x86/tests.cpp b/zircon/kernel/lib/libc/string/arch/x86/tests.cpp
similarity index 100%
rename from kernel/lib/libc/string/arch/x86/tests.cpp
rename to zircon/kernel/lib/libc/string/arch/x86/tests.cpp
diff --git a/kernel/lib/libc/string/memchr.c b/zircon/kernel/lib/libc/string/memchr.c
similarity index 100%
rename from kernel/lib/libc/string/memchr.c
rename to zircon/kernel/lib/libc/string/memchr.c
diff --git a/kernel/lib/libc/string/memcmp.c b/zircon/kernel/lib/libc/string/memcmp.c
similarity index 100%
rename from kernel/lib/libc/string/memcmp.c
rename to zircon/kernel/lib/libc/string/memcmp.c
diff --git a/kernel/lib/libc/string/memcpy.c b/zircon/kernel/lib/libc/string/memcpy.c
similarity index 100%
rename from kernel/lib/libc/string/memcpy.c
rename to zircon/kernel/lib/libc/string/memcpy.c
diff --git a/kernel/lib/libc/string/memmove.c b/zircon/kernel/lib/libc/string/memmove.c
similarity index 100%
rename from kernel/lib/libc/string/memmove.c
rename to zircon/kernel/lib/libc/string/memmove.c
diff --git a/kernel/lib/libc/string/memscan.c b/zircon/kernel/lib/libc/string/memscan.c
similarity index 100%
rename from kernel/lib/libc/string/memscan.c
rename to zircon/kernel/lib/libc/string/memscan.c
diff --git a/kernel/lib/libc/string/memset.c b/zircon/kernel/lib/libc/string/memset.c
similarity index 100%
rename from kernel/lib/libc/string/memset.c
rename to zircon/kernel/lib/libc/string/memset.c
diff --git a/kernel/lib/libc/string/rules.mk b/zircon/kernel/lib/libc/string/rules.mk
similarity index 100%
rename from kernel/lib/libc/string/rules.mk
rename to zircon/kernel/lib/libc/string/rules.mk
diff --git a/kernel/lib/libc/string/strcat.c b/zircon/kernel/lib/libc/string/strcat.c
similarity index 100%
rename from kernel/lib/libc/string/strcat.c
rename to zircon/kernel/lib/libc/string/strcat.c
diff --git a/kernel/lib/libc/string/strchr.c b/zircon/kernel/lib/libc/string/strchr.c
similarity index 100%
rename from kernel/lib/libc/string/strchr.c
rename to zircon/kernel/lib/libc/string/strchr.c
diff --git a/kernel/lib/libc/string/strcmp.c b/zircon/kernel/lib/libc/string/strcmp.c
similarity index 100%
rename from kernel/lib/libc/string/strcmp.c
rename to zircon/kernel/lib/libc/string/strcmp.c
diff --git a/kernel/lib/libc/string/strcoll.c b/zircon/kernel/lib/libc/string/strcoll.c
similarity index 100%
rename from kernel/lib/libc/string/strcoll.c
rename to zircon/kernel/lib/libc/string/strcoll.c
diff --git a/kernel/lib/libc/string/strcpy.c b/zircon/kernel/lib/libc/string/strcpy.c
similarity index 100%
rename from kernel/lib/libc/string/strcpy.c
rename to zircon/kernel/lib/libc/string/strcpy.c
diff --git a/kernel/lib/libc/string/strlcat.c b/zircon/kernel/lib/libc/string/strlcat.c
similarity index 100%
rename from kernel/lib/libc/string/strlcat.c
rename to zircon/kernel/lib/libc/string/strlcat.c
diff --git a/kernel/lib/libc/string/strlcpy.c b/zircon/kernel/lib/libc/string/strlcpy.c
similarity index 100%
rename from kernel/lib/libc/string/strlcpy.c
rename to zircon/kernel/lib/libc/string/strlcpy.c
diff --git a/kernel/lib/libc/string/strlen.c b/zircon/kernel/lib/libc/string/strlen.c
similarity index 100%
rename from kernel/lib/libc/string/strlen.c
rename to zircon/kernel/lib/libc/string/strlen.c
diff --git a/kernel/lib/libc/string/strncat.c b/zircon/kernel/lib/libc/string/strncat.c
similarity index 100%
rename from kernel/lib/libc/string/strncat.c
rename to zircon/kernel/lib/libc/string/strncat.c
diff --git a/kernel/lib/libc/string/strncmp.c b/zircon/kernel/lib/libc/string/strncmp.c
similarity index 100%
rename from kernel/lib/libc/string/strncmp.c
rename to zircon/kernel/lib/libc/string/strncmp.c
diff --git a/kernel/lib/libc/string/strncpy.c b/zircon/kernel/lib/libc/string/strncpy.c
similarity index 100%
rename from kernel/lib/libc/string/strncpy.c
rename to zircon/kernel/lib/libc/string/strncpy.c
diff --git a/kernel/lib/libc/string/strnicmp.c b/zircon/kernel/lib/libc/string/strnicmp.c
similarity index 100%
rename from kernel/lib/libc/string/strnicmp.c
rename to zircon/kernel/lib/libc/string/strnicmp.c
diff --git a/kernel/lib/libc/string/strnlen.c b/zircon/kernel/lib/libc/string/strnlen.c
similarity index 100%
rename from kernel/lib/libc/string/strnlen.c
rename to zircon/kernel/lib/libc/string/strnlen.c
diff --git a/kernel/lib/libc/string/strpbrk.c b/zircon/kernel/lib/libc/string/strpbrk.c
similarity index 100%
rename from kernel/lib/libc/string/strpbrk.c
rename to zircon/kernel/lib/libc/string/strpbrk.c
diff --git a/kernel/lib/libc/string/strrchr.c b/zircon/kernel/lib/libc/string/strrchr.c
similarity index 100%
rename from kernel/lib/libc/string/strrchr.c
rename to zircon/kernel/lib/libc/string/strrchr.c
diff --git a/kernel/lib/libc/string/strspn.c b/zircon/kernel/lib/libc/string/strspn.c
similarity index 100%
rename from kernel/lib/libc/string/strspn.c
rename to zircon/kernel/lib/libc/string/strspn.c
diff --git a/kernel/lib/libc/string/strstr.c b/zircon/kernel/lib/libc/string/strstr.c
similarity index 100%
rename from kernel/lib/libc/string/strstr.c
rename to zircon/kernel/lib/libc/string/strstr.c
diff --git a/kernel/lib/libc/string/strtok.c b/zircon/kernel/lib/libc/string/strtok.c
similarity index 100%
rename from kernel/lib/libc/string/strtok.c
rename to zircon/kernel/lib/libc/string/strtok.c
diff --git a/kernel/lib/libc/string/strxfrm.c b/zircon/kernel/lib/libc/string/strxfrm.c
similarity index 100%
rename from kernel/lib/libc/string/strxfrm.c
rename to zircon/kernel/lib/libc/string/strxfrm.c
diff --git a/kernel/lib/libc/strtol.c b/zircon/kernel/lib/libc/strtol.c
similarity index 100%
rename from kernel/lib/libc/strtol.c
rename to zircon/kernel/lib/libc/strtol.c
diff --git a/kernel/lib/libc/strtoll.c b/zircon/kernel/lib/libc/strtoll.c
similarity index 100%
rename from kernel/lib/libc/strtoll.c
rename to zircon/kernel/lib/libc/strtoll.c
diff --git a/kernel/lib/lockdep/lock_dep.cpp b/zircon/kernel/lib/lockdep/lock_dep.cpp
similarity index 100%
rename from kernel/lib/lockdep/lock_dep.cpp
rename to zircon/kernel/lib/lockdep/lock_dep.cpp
diff --git a/kernel/lib/lockdep/rules.mk b/zircon/kernel/lib/lockdep/rules.mk
similarity index 100%
rename from kernel/lib/lockdep/rules.mk
rename to zircon/kernel/lib/lockdep/rules.mk
diff --git a/kernel/lib/memory_limit/MAINTAINERS b/zircon/kernel/lib/memory_limit/MAINTAINERS
similarity index 100%
rename from kernel/lib/memory_limit/MAINTAINERS
rename to zircon/kernel/lib/memory_limit/MAINTAINERS
diff --git a/kernel/lib/memory_limit/include/lib/memory_limit.h b/zircon/kernel/lib/memory_limit/include/lib/memory_limit.h
similarity index 100%
rename from kernel/lib/memory_limit/include/lib/memory_limit.h
rename to zircon/kernel/lib/memory_limit/include/lib/memory_limit.h
diff --git a/kernel/lib/memory_limit/memory_limit.cpp b/zircon/kernel/lib/memory_limit/memory_limit.cpp
similarity index 100%
rename from kernel/lib/memory_limit/memory_limit.cpp
rename to zircon/kernel/lib/memory_limit/memory_limit.cpp
diff --git a/kernel/lib/memory_limit/rules.mk b/zircon/kernel/lib/memory_limit/rules.mk
similarity index 100%
rename from kernel/lib/memory_limit/rules.mk
rename to zircon/kernel/lib/memory_limit/rules.mk
diff --git a/kernel/lib/mtrace/mtrace-ipt.cpp b/zircon/kernel/lib/mtrace/mtrace-ipt.cpp
similarity index 100%
rename from kernel/lib/mtrace/mtrace-ipt.cpp
rename to zircon/kernel/lib/mtrace/mtrace-ipt.cpp
diff --git a/kernel/lib/mtrace/mtrace-pmu.cpp b/zircon/kernel/lib/mtrace/mtrace-pmu.cpp
similarity index 100%
rename from kernel/lib/mtrace/mtrace-pmu.cpp
rename to zircon/kernel/lib/mtrace/mtrace-pmu.cpp
diff --git a/kernel/lib/mtrace/mtrace.cpp b/zircon/kernel/lib/mtrace/mtrace.cpp
similarity index 100%
rename from kernel/lib/mtrace/mtrace.cpp
rename to zircon/kernel/lib/mtrace/mtrace.cpp
diff --git a/kernel/lib/mtrace/rules.mk b/zircon/kernel/lib/mtrace/rules.mk
similarity index 100%
rename from kernel/lib/mtrace/rules.mk
rename to zircon/kernel/lib/mtrace/rules.mk
diff --git a/kernel/lib/oom/include/lib/oom.h b/zircon/kernel/lib/oom/include/lib/oom.h
similarity index 100%
rename from kernel/lib/oom/include/lib/oom.h
rename to zircon/kernel/lib/oom/include/lib/oom.h
diff --git a/kernel/lib/oom/oom.cpp b/zircon/kernel/lib/oom/oom.cpp
similarity index 100%
rename from kernel/lib/oom/oom.cpp
rename to zircon/kernel/lib/oom/oom.cpp
diff --git a/kernel/lib/oom/rules.mk b/zircon/kernel/lib/oom/rules.mk
similarity index 100%
rename from kernel/lib/oom/rules.mk
rename to zircon/kernel/lib/oom/rules.mk
diff --git a/kernel/lib/pci/MAINTAINERS b/zircon/kernel/lib/pci/MAINTAINERS
similarity index 100%
rename from kernel/lib/pci/MAINTAINERS
rename to zircon/kernel/lib/pci/MAINTAINERS
diff --git a/kernel/lib/pci/include/lib/pci/pio.h b/zircon/kernel/lib/pci/include/lib/pci/pio.h
similarity index 100%
rename from kernel/lib/pci/include/lib/pci/pio.h
rename to zircon/kernel/lib/pci/include/lib/pci/pio.h
diff --git a/kernel/lib/pci/pio.cpp b/zircon/kernel/lib/pci/pio.cpp
similarity index 100%
rename from kernel/lib/pci/pio.cpp
rename to zircon/kernel/lib/pci/pio.cpp
diff --git a/kernel/lib/pci/rules.mk b/zircon/kernel/lib/pci/rules.mk
similarity index 100%
rename from kernel/lib/pci/rules.mk
rename to zircon/kernel/lib/pci/rules.mk
diff --git a/kernel/lib/pow2_range_allocator/include/lib/pow2_range_allocator.h b/zircon/kernel/lib/pow2_range_allocator/include/lib/pow2_range_allocator.h
similarity index 100%
rename from kernel/lib/pow2_range_allocator/include/lib/pow2_range_allocator.h
rename to zircon/kernel/lib/pow2_range_allocator/include/lib/pow2_range_allocator.h
diff --git a/kernel/lib/pow2_range_allocator/pow2_range_allocator.cpp b/zircon/kernel/lib/pow2_range_allocator/pow2_range_allocator.cpp
similarity index 100%
rename from kernel/lib/pow2_range_allocator/pow2_range_allocator.cpp
rename to zircon/kernel/lib/pow2_range_allocator/pow2_range_allocator.cpp
diff --git a/kernel/lib/pow2_range_allocator/rules.mk b/zircon/kernel/lib/pow2_range_allocator/rules.mk
similarity index 100%
rename from kernel/lib/pow2_range_allocator/rules.mk
rename to zircon/kernel/lib/pow2_range_allocator/rules.mk
diff --git a/kernel/lib/pretty/rules.mk b/zircon/kernel/lib/pretty/rules.mk
similarity index 100%
rename from kernel/lib/pretty/rules.mk
rename to zircon/kernel/lib/pretty/rules.mk
diff --git a/kernel/lib/region-alloc/rules.mk b/zircon/kernel/lib/region-alloc/rules.mk
similarity index 100%
rename from kernel/lib/region-alloc/rules.mk
rename to zircon/kernel/lib/region-alloc/rules.mk
diff --git a/kernel/lib/smbios/rules.mk b/zircon/kernel/lib/smbios/rules.mk
similarity index 100%
rename from kernel/lib/smbios/rules.mk
rename to zircon/kernel/lib/smbios/rules.mk
diff --git a/kernel/lib/topology/include/lib/system-topology.h b/zircon/kernel/lib/topology/include/lib/system-topology.h
similarity index 100%
rename from kernel/lib/topology/include/lib/system-topology.h
rename to zircon/kernel/lib/topology/include/lib/system-topology.h
diff --git a/kernel/lib/topology/rules.mk b/zircon/kernel/lib/topology/rules.mk
similarity index 100%
rename from kernel/lib/topology/rules.mk
rename to zircon/kernel/lib/topology/rules.mk
diff --git a/kernel/lib/topology/system-topology.cpp b/zircon/kernel/lib/topology/system-topology.cpp
similarity index 100%
rename from kernel/lib/topology/system-topology.cpp
rename to zircon/kernel/lib/topology/system-topology.cpp
diff --git a/kernel/lib/topology/system-topology_test.cpp b/zircon/kernel/lib/topology/system-topology_test.cpp
similarity index 100%
rename from kernel/lib/topology/system-topology_test.cpp
rename to zircon/kernel/lib/topology/system-topology_test.cpp
diff --git a/kernel/lib/unittest/include/lib/unittest/unittest.h b/zircon/kernel/lib/unittest/include/lib/unittest/unittest.h
similarity index 100%
rename from kernel/lib/unittest/include/lib/unittest/unittest.h
rename to zircon/kernel/lib/unittest/include/lib/unittest/unittest.h
diff --git a/kernel/lib/unittest/include/lib/unittest/user_memory.h b/zircon/kernel/lib/unittest/include/lib/unittest/user_memory.h
similarity index 100%
rename from kernel/lib/unittest/include/lib/unittest/user_memory.h
rename to zircon/kernel/lib/unittest/include/lib/unittest/user_memory.h
diff --git a/kernel/lib/unittest/rules.mk b/zircon/kernel/lib/unittest/rules.mk
similarity index 100%
rename from kernel/lib/unittest/rules.mk
rename to zircon/kernel/lib/unittest/rules.mk
diff --git a/kernel/lib/unittest/unittest.cpp b/zircon/kernel/lib/unittest/unittest.cpp
similarity index 100%
rename from kernel/lib/unittest/unittest.cpp
rename to zircon/kernel/lib/unittest/unittest.cpp
diff --git a/kernel/lib/unittest/user_memory.cpp b/zircon/kernel/lib/unittest/user_memory.cpp
similarity index 100%
rename from kernel/lib/unittest/user_memory.cpp
rename to zircon/kernel/lib/unittest/user_memory.cpp
diff --git a/kernel/lib/user_copy/include/lib/user_copy/internal.h b/zircon/kernel/lib/user_copy/include/lib/user_copy/internal.h
similarity index 100%
rename from kernel/lib/user_copy/include/lib/user_copy/internal.h
rename to zircon/kernel/lib/user_copy/include/lib/user_copy/internal.h
diff --git a/kernel/lib/user_copy/include/lib/user_copy/user_ptr.h b/zircon/kernel/lib/user_copy/include/lib/user_copy/user_ptr.h
similarity index 100%
rename from kernel/lib/user_copy/include/lib/user_copy/user_ptr.h
rename to zircon/kernel/lib/user_copy/include/lib/user_copy/user_ptr.h
diff --git a/kernel/lib/user_copy/rules.mk b/zircon/kernel/lib/user_copy/rules.mk
similarity index 100%
rename from kernel/lib/user_copy/rules.mk
rename to zircon/kernel/lib/user_copy/rules.mk
diff --git a/kernel/lib/userboot/rules.mk b/zircon/kernel/lib/userboot/rules.mk
similarity index 100%
rename from kernel/lib/userboot/rules.mk
rename to zircon/kernel/lib/userboot/rules.mk
diff --git a/kernel/lib/userboot/userboot-image.S b/zircon/kernel/lib/userboot/userboot-image.S
similarity index 100%
rename from kernel/lib/userboot/userboot-image.S
rename to zircon/kernel/lib/userboot/userboot-image.S
diff --git a/kernel/lib/userboot/userboot.cpp b/zircon/kernel/lib/userboot/userboot.cpp
similarity index 100%
rename from kernel/lib/userboot/userboot.cpp
rename to zircon/kernel/lib/userboot/userboot.cpp
diff --git a/kernel/lib/vdso/include/lib/rodso-asm.h b/zircon/kernel/lib/vdso/include/lib/rodso-asm.h
similarity index 100%
rename from kernel/lib/vdso/include/lib/rodso-asm.h
rename to zircon/kernel/lib/vdso/include/lib/rodso-asm.h
diff --git a/kernel/lib/vdso/include/lib/rodso.h b/zircon/kernel/lib/vdso/include/lib/rodso.h
similarity index 100%
rename from kernel/lib/vdso/include/lib/rodso.h
rename to zircon/kernel/lib/vdso/include/lib/rodso.h
diff --git a/kernel/lib/vdso/include/lib/vdso-constants.h b/zircon/kernel/lib/vdso/include/lib/vdso-constants.h
similarity index 100%
rename from kernel/lib/vdso/include/lib/vdso-constants.h
rename to zircon/kernel/lib/vdso/include/lib/vdso-constants.h
diff --git a/kernel/lib/vdso/include/lib/vdso.h b/zircon/kernel/lib/vdso/include/lib/vdso.h
similarity index 100%
rename from kernel/lib/vdso/include/lib/vdso.h
rename to zircon/kernel/lib/vdso/include/lib/vdso.h
diff --git a/kernel/lib/vdso/rodso.cpp b/zircon/kernel/lib/vdso/rodso.cpp
similarity index 100%
rename from kernel/lib/vdso/rodso.cpp
rename to zircon/kernel/lib/vdso/rodso.cpp
diff --git a/kernel/lib/vdso/rules.mk b/zircon/kernel/lib/vdso/rules.mk
similarity index 100%
rename from kernel/lib/vdso/rules.mk
rename to zircon/kernel/lib/vdso/rules.mk
diff --git a/kernel/lib/vdso/vdso-image.S b/zircon/kernel/lib/vdso/vdso-image.S
similarity index 100%
rename from kernel/lib/vdso/vdso-image.S
rename to zircon/kernel/lib/vdso/vdso-image.S
diff --git a/kernel/lib/vdso/vdso.cpp b/zircon/kernel/lib/vdso/vdso.cpp
similarity index 100%
rename from kernel/lib/vdso/vdso.cpp
rename to zircon/kernel/lib/vdso/vdso.cpp
diff --git a/kernel/lib/version/buildid.sh b/zircon/kernel/lib/version/buildid.sh
similarity index 100%
rename from kernel/lib/version/buildid.sh
rename to zircon/kernel/lib/version/buildid.sh
diff --git a/kernel/lib/version/include/lib/version.h b/zircon/kernel/lib/version/include/lib/version.h
similarity index 100%
rename from kernel/lib/version/include/lib/version.h
rename to zircon/kernel/lib/version/include/lib/version.h
diff --git a/kernel/lib/version/rules.mk b/zircon/kernel/lib/version/rules.mk
similarity index 100%
rename from kernel/lib/version/rules.mk
rename to zircon/kernel/lib/version/rules.mk
diff --git a/kernel/lib/version/version.cpp b/zircon/kernel/lib/version/version.cpp
similarity index 100%
rename from kernel/lib/version/version.cpp
rename to zircon/kernel/lib/version/version.cpp
diff --git a/kernel/lib/watchdog/include/lib/watchdog.h b/zircon/kernel/lib/watchdog/include/lib/watchdog.h
similarity index 100%
rename from kernel/lib/watchdog/include/lib/watchdog.h
rename to zircon/kernel/lib/watchdog/include/lib/watchdog.h
diff --git a/kernel/lib/watchdog/rules.mk b/zircon/kernel/lib/watchdog/rules.mk
similarity index 100%
rename from kernel/lib/watchdog/rules.mk
rename to zircon/kernel/lib/watchdog/rules.mk
diff --git a/kernel/lib/watchdog/watchdog.cpp b/zircon/kernel/lib/watchdog/watchdog.cpp
similarity index 100%
rename from kernel/lib/watchdog/watchdog.cpp
rename to zircon/kernel/lib/watchdog/watchdog.cpp
diff --git a/kernel/lib/zbi/rules.mk b/zircon/kernel/lib/zbi/rules.mk
similarity index 100%
rename from kernel/lib/zbi/rules.mk
rename to zircon/kernel/lib/zbi/rules.mk
diff --git a/kernel/lib/zircon-internal/rules.mk b/zircon/kernel/lib/zircon-internal/rules.mk
similarity index 100%
rename from kernel/lib/zircon-internal/rules.mk
rename to zircon/kernel/lib/zircon-internal/rules.mk
diff --git a/kernel/lib/zxcpp/rules.mk b/zircon/kernel/lib/zxcpp/rules.mk
similarity index 100%
rename from kernel/lib/zxcpp/rules.mk
rename to zircon/kernel/lib/zxcpp/rules.mk
diff --git a/kernel/object/buffer_chain.cpp b/zircon/kernel/object/buffer_chain.cpp
similarity index 100%
rename from kernel/object/buffer_chain.cpp
rename to zircon/kernel/object/buffer_chain.cpp
diff --git a/kernel/object/buffer_chain_tests.cpp b/zircon/kernel/object/buffer_chain_tests.cpp
similarity index 100%
rename from kernel/object/buffer_chain_tests.cpp
rename to zircon/kernel/object/buffer_chain_tests.cpp
diff --git a/kernel/object/bus_transaction_initiator_dispatcher.cpp b/zircon/kernel/object/bus_transaction_initiator_dispatcher.cpp
similarity index 100%
rename from kernel/object/bus_transaction_initiator_dispatcher.cpp
rename to zircon/kernel/object/bus_transaction_initiator_dispatcher.cpp
diff --git a/kernel/object/channel_dispatcher.cpp b/zircon/kernel/object/channel_dispatcher.cpp
similarity index 100%
rename from kernel/object/channel_dispatcher.cpp
rename to zircon/kernel/object/channel_dispatcher.cpp
diff --git a/kernel/object/diagnostics.cpp b/zircon/kernel/object/diagnostics.cpp
similarity index 100%
rename from kernel/object/diagnostics.cpp
rename to zircon/kernel/object/diagnostics.cpp
diff --git a/kernel/object/dispatcher.cpp b/zircon/kernel/object/dispatcher.cpp
similarity index 100%
rename from kernel/object/dispatcher.cpp
rename to zircon/kernel/object/dispatcher.cpp
diff --git a/kernel/object/event_dispatcher.cpp b/zircon/kernel/object/event_dispatcher.cpp
similarity index 100%
rename from kernel/object/event_dispatcher.cpp
rename to zircon/kernel/object/event_dispatcher.cpp
diff --git a/kernel/object/event_pair_dispatcher.cpp b/zircon/kernel/object/event_pair_dispatcher.cpp
similarity index 100%
rename from kernel/object/event_pair_dispatcher.cpp
rename to zircon/kernel/object/event_pair_dispatcher.cpp
diff --git a/kernel/object/exception.cpp b/zircon/kernel/object/exception.cpp
similarity index 100%
rename from kernel/object/exception.cpp
rename to zircon/kernel/object/exception.cpp
diff --git a/kernel/object/excp_port.cpp b/zircon/kernel/object/excp_port.cpp
similarity index 100%
rename from kernel/object/excp_port.cpp
rename to zircon/kernel/object/excp_port.cpp
diff --git a/kernel/object/fifo_dispatcher.cpp b/zircon/kernel/object/fifo_dispatcher.cpp
similarity index 100%
rename from kernel/object/fifo_dispatcher.cpp
rename to zircon/kernel/object/fifo_dispatcher.cpp
diff --git a/kernel/object/futex_context.cpp b/zircon/kernel/object/futex_context.cpp
similarity index 100%
rename from kernel/object/futex_context.cpp
rename to zircon/kernel/object/futex_context.cpp
diff --git a/kernel/object/futex_node.cpp b/zircon/kernel/object/futex_node.cpp
similarity index 100%
rename from kernel/object/futex_node.cpp
rename to zircon/kernel/object/futex_node.cpp
diff --git a/kernel/object/glue.cpp b/zircon/kernel/object/glue.cpp
similarity index 100%
rename from kernel/object/glue.cpp
rename to zircon/kernel/object/glue.cpp
diff --git a/kernel/object/guest_dispatcher.cpp b/zircon/kernel/object/guest_dispatcher.cpp
similarity index 100%
rename from kernel/object/guest_dispatcher.cpp
rename to zircon/kernel/object/guest_dispatcher.cpp
diff --git a/kernel/object/handle.cpp b/zircon/kernel/object/handle.cpp
similarity index 100%
rename from kernel/object/handle.cpp
rename to zircon/kernel/object/handle.cpp
diff --git a/kernel/object/include/object/buffer_chain.h b/zircon/kernel/object/include/object/buffer_chain.h
similarity index 100%
rename from kernel/object/include/object/buffer_chain.h
rename to zircon/kernel/object/include/object/buffer_chain.h
diff --git a/kernel/object/include/object/bus_transaction_initiator_dispatcher.h b/zircon/kernel/object/include/object/bus_transaction_initiator_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/bus_transaction_initiator_dispatcher.h
rename to zircon/kernel/object/include/object/bus_transaction_initiator_dispatcher.h
diff --git a/kernel/object/include/object/channel_dispatcher.h b/zircon/kernel/object/include/object/channel_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/channel_dispatcher.h
rename to zircon/kernel/object/include/object/channel_dispatcher.h
diff --git a/kernel/object/include/object/diagnostics.h b/zircon/kernel/object/include/object/diagnostics.h
similarity index 100%
rename from kernel/object/include/object/diagnostics.h
rename to zircon/kernel/object/include/object/diagnostics.h
diff --git a/kernel/object/include/object/dispatcher.h b/zircon/kernel/object/include/object/dispatcher.h
similarity index 100%
rename from kernel/object/include/object/dispatcher.h
rename to zircon/kernel/object/include/object/dispatcher.h
diff --git a/kernel/object/include/object/event_dispatcher.h b/zircon/kernel/object/include/object/event_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/event_dispatcher.h
rename to zircon/kernel/object/include/object/event_dispatcher.h
diff --git a/kernel/object/include/object/event_pair_dispatcher.h b/zircon/kernel/object/include/object/event_pair_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/event_pair_dispatcher.h
rename to zircon/kernel/object/include/object/event_pair_dispatcher.h
diff --git a/kernel/object/include/object/excp_port.h b/zircon/kernel/object/include/object/excp_port.h
similarity index 100%
rename from kernel/object/include/object/excp_port.h
rename to zircon/kernel/object/include/object/excp_port.h
diff --git a/kernel/object/include/object/fifo_dispatcher.h b/zircon/kernel/object/include/object/fifo_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/fifo_dispatcher.h
rename to zircon/kernel/object/include/object/fifo_dispatcher.h
diff --git a/kernel/object/include/object/futex_context.h b/zircon/kernel/object/include/object/futex_context.h
similarity index 100%
rename from kernel/object/include/object/futex_context.h
rename to zircon/kernel/object/include/object/futex_context.h
diff --git a/kernel/object/include/object/futex_node.h b/zircon/kernel/object/include/object/futex_node.h
similarity index 100%
rename from kernel/object/include/object/futex_node.h
rename to zircon/kernel/object/include/object/futex_node.h
diff --git a/kernel/object/include/object/guest_dispatcher.h b/zircon/kernel/object/include/object/guest_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/guest_dispatcher.h
rename to zircon/kernel/object/include/object/guest_dispatcher.h
diff --git a/kernel/object/include/object/handle.h b/zircon/kernel/object/include/object/handle.h
similarity index 100%
rename from kernel/object/include/object/handle.h
rename to zircon/kernel/object/include/object/handle.h
diff --git a/kernel/object/include/object/interrupt_dispatcher.h b/zircon/kernel/object/include/object/interrupt_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/interrupt_dispatcher.h
rename to zircon/kernel/object/include/object/interrupt_dispatcher.h
diff --git a/kernel/object/include/object/interrupt_event_dispatcher.h b/zircon/kernel/object/include/object/interrupt_event_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/interrupt_event_dispatcher.h
rename to zircon/kernel/object/include/object/interrupt_event_dispatcher.h
diff --git a/kernel/object/include/object/iommu_dispatcher.h b/zircon/kernel/object/include/object/iommu_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/iommu_dispatcher.h
rename to zircon/kernel/object/include/object/iommu_dispatcher.h
diff --git a/kernel/object/include/object/job_dispatcher.h b/zircon/kernel/object/include/object/job_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/job_dispatcher.h
rename to zircon/kernel/object/include/object/job_dispatcher.h
diff --git a/kernel/object/include/object/job_policy.h b/zircon/kernel/object/include/object/job_policy.h
similarity index 100%
rename from kernel/object/include/object/job_policy.h
rename to zircon/kernel/object/include/object/job_policy.h
diff --git a/kernel/object/include/object/log_dispatcher.h b/zircon/kernel/object/include/object/log_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/log_dispatcher.h
rename to zircon/kernel/object/include/object/log_dispatcher.h
diff --git a/kernel/object/include/object/mbuf.h b/zircon/kernel/object/include/object/mbuf.h
similarity index 100%
rename from kernel/object/include/object/mbuf.h
rename to zircon/kernel/object/include/object/mbuf.h
diff --git a/kernel/object/include/object/message_packet.h b/zircon/kernel/object/include/object/message_packet.h
similarity index 100%
rename from kernel/object/include/object/message_packet.h
rename to zircon/kernel/object/include/object/message_packet.h
diff --git a/kernel/object/include/object/pager_dispatcher.h b/zircon/kernel/object/include/object/pager_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/pager_dispatcher.h
rename to zircon/kernel/object/include/object/pager_dispatcher.h
diff --git a/kernel/object/include/object/pci_device_dispatcher.h b/zircon/kernel/object/include/object/pci_device_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/pci_device_dispatcher.h
rename to zircon/kernel/object/include/object/pci_device_dispatcher.h
diff --git a/kernel/object/include/object/pci_interrupt_dispatcher.h b/zircon/kernel/object/include/object/pci_interrupt_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/pci_interrupt_dispatcher.h
rename to zircon/kernel/object/include/object/pci_interrupt_dispatcher.h
diff --git a/kernel/object/include/object/pinned_memory_token_dispatcher.h b/zircon/kernel/object/include/object/pinned_memory_token_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/pinned_memory_token_dispatcher.h
rename to zircon/kernel/object/include/object/pinned_memory_token_dispatcher.h
diff --git a/kernel/object/include/object/port_dispatcher.h b/zircon/kernel/object/include/object/port_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/port_dispatcher.h
rename to zircon/kernel/object/include/object/port_dispatcher.h
diff --git a/kernel/object/include/object/process_dispatcher.h b/zircon/kernel/object/include/object/process_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/process_dispatcher.h
rename to zircon/kernel/object/include/object/process_dispatcher.h
diff --git a/kernel/object/include/object/profile_dispatcher.h b/zircon/kernel/object/include/object/profile_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/profile_dispatcher.h
rename to zircon/kernel/object/include/object/profile_dispatcher.h
diff --git a/kernel/object/include/object/resource.h b/zircon/kernel/object/include/object/resource.h
similarity index 100%
rename from kernel/object/include/object/resource.h
rename to zircon/kernel/object/include/object/resource.h
diff --git a/kernel/object/include/object/resource_dispatcher.h b/zircon/kernel/object/include/object/resource_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/resource_dispatcher.h
rename to zircon/kernel/object/include/object/resource_dispatcher.h
diff --git a/kernel/object/include/object/semaphore.h b/zircon/kernel/object/include/object/semaphore.h
similarity index 100%
rename from kernel/object/include/object/semaphore.h
rename to zircon/kernel/object/include/object/semaphore.h
diff --git a/kernel/object/include/object/socket_dispatcher.h b/zircon/kernel/object/include/object/socket_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/socket_dispatcher.h
rename to zircon/kernel/object/include/object/socket_dispatcher.h
diff --git a/kernel/object/include/object/state_observer.h b/zircon/kernel/object/include/object/state_observer.h
similarity index 100%
rename from kernel/object/include/object/state_observer.h
rename to zircon/kernel/object/include/object/state_observer.h
diff --git a/kernel/object/include/object/suspend_token_dispatcher.h b/zircon/kernel/object/include/object/suspend_token_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/suspend_token_dispatcher.h
rename to zircon/kernel/object/include/object/suspend_token_dispatcher.h
diff --git a/kernel/object/include/object/thread_dispatcher.h b/zircon/kernel/object/include/object/thread_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/thread_dispatcher.h
rename to zircon/kernel/object/include/object/thread_dispatcher.h
diff --git a/kernel/object/include/object/thread_state.h b/zircon/kernel/object/include/object/thread_state.h
similarity index 100%
rename from kernel/object/include/object/thread_state.h
rename to zircon/kernel/object/include/object/thread_state.h
diff --git a/kernel/object/include/object/timer_dispatcher.h b/zircon/kernel/object/include/object/timer_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/timer_dispatcher.h
rename to zircon/kernel/object/include/object/timer_dispatcher.h
diff --git a/kernel/object/include/object/tls_slots.h b/zircon/kernel/object/include/object/tls_slots.h
similarity index 100%
rename from kernel/object/include/object/tls_slots.h
rename to zircon/kernel/object/include/object/tls_slots.h
diff --git a/kernel/object/include/object/vcpu_dispatcher.h b/zircon/kernel/object/include/object/vcpu_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/vcpu_dispatcher.h
rename to zircon/kernel/object/include/object/vcpu_dispatcher.h
diff --git a/kernel/object/include/object/virtual_interrupt_dispatcher.h b/zircon/kernel/object/include/object/virtual_interrupt_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/virtual_interrupt_dispatcher.h
rename to zircon/kernel/object/include/object/virtual_interrupt_dispatcher.h
diff --git a/kernel/object/include/object/vm_address_region_dispatcher.h b/zircon/kernel/object/include/object/vm_address_region_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/vm_address_region_dispatcher.h
rename to zircon/kernel/object/include/object/vm_address_region_dispatcher.h
diff --git a/kernel/object/include/object/vm_object_dispatcher.h b/zircon/kernel/object/include/object/vm_object_dispatcher.h
similarity index 100%
rename from kernel/object/include/object/vm_object_dispatcher.h
rename to zircon/kernel/object/include/object/vm_object_dispatcher.h
diff --git a/kernel/object/include/object/wait_state_observer.h b/zircon/kernel/object/include/object/wait_state_observer.h
similarity index 100%
rename from kernel/object/include/object/wait_state_observer.h
rename to zircon/kernel/object/include/object/wait_state_observer.h
diff --git a/kernel/object/interrupt_dispatcher.cpp b/zircon/kernel/object/interrupt_dispatcher.cpp
similarity index 100%
rename from kernel/object/interrupt_dispatcher.cpp
rename to zircon/kernel/object/interrupt_dispatcher.cpp
diff --git a/kernel/object/interrupt_event_dispatcher.cpp b/zircon/kernel/object/interrupt_event_dispatcher.cpp
similarity index 100%
rename from kernel/object/interrupt_event_dispatcher.cpp
rename to zircon/kernel/object/interrupt_event_dispatcher.cpp
diff --git a/kernel/object/iommu_dispatcher.cpp b/zircon/kernel/object/iommu_dispatcher.cpp
similarity index 100%
rename from kernel/object/iommu_dispatcher.cpp
rename to zircon/kernel/object/iommu_dispatcher.cpp
diff --git a/kernel/object/job_dispatcher.cpp b/zircon/kernel/object/job_dispatcher.cpp
similarity index 100%
rename from kernel/object/job_dispatcher.cpp
rename to zircon/kernel/object/job_dispatcher.cpp
diff --git a/kernel/object/job_policy.cpp b/zircon/kernel/object/job_policy.cpp
similarity index 100%
rename from kernel/object/job_policy.cpp
rename to zircon/kernel/object/job_policy.cpp
diff --git a/kernel/object/job_policy_tests.cpp b/zircon/kernel/object/job_policy_tests.cpp
similarity index 100%
rename from kernel/object/job_policy_tests.cpp
rename to zircon/kernel/object/job_policy_tests.cpp
diff --git a/kernel/object/log_dispatcher.cpp b/zircon/kernel/object/log_dispatcher.cpp
similarity index 100%
rename from kernel/object/log_dispatcher.cpp
rename to zircon/kernel/object/log_dispatcher.cpp
diff --git a/kernel/object/mbuf.cpp b/zircon/kernel/object/mbuf.cpp
similarity index 100%
rename from kernel/object/mbuf.cpp
rename to zircon/kernel/object/mbuf.cpp
diff --git a/kernel/object/mbuf_tests.cpp b/zircon/kernel/object/mbuf_tests.cpp
similarity index 100%
rename from kernel/object/mbuf_tests.cpp
rename to zircon/kernel/object/mbuf_tests.cpp
diff --git a/kernel/object/message_packet.cpp b/zircon/kernel/object/message_packet.cpp
similarity index 100%
rename from kernel/object/message_packet.cpp
rename to zircon/kernel/object/message_packet.cpp
diff --git a/kernel/object/message_packet_tests.cpp b/zircon/kernel/object/message_packet_tests.cpp
similarity index 100%
rename from kernel/object/message_packet_tests.cpp
rename to zircon/kernel/object/message_packet_tests.cpp
diff --git a/kernel/object/pager_dispatcher.cpp b/zircon/kernel/object/pager_dispatcher.cpp
similarity index 100%
rename from kernel/object/pager_dispatcher.cpp
rename to zircon/kernel/object/pager_dispatcher.cpp
diff --git a/kernel/object/pci_device_dispatcher.cpp b/zircon/kernel/object/pci_device_dispatcher.cpp
similarity index 100%
rename from kernel/object/pci_device_dispatcher.cpp
rename to zircon/kernel/object/pci_device_dispatcher.cpp
diff --git a/kernel/object/pci_interrupt_dispatcher.cpp b/zircon/kernel/object/pci_interrupt_dispatcher.cpp
similarity index 100%
rename from kernel/object/pci_interrupt_dispatcher.cpp
rename to zircon/kernel/object/pci_interrupt_dispatcher.cpp
diff --git a/kernel/object/pinned_memory_token_dispatcher.cpp b/zircon/kernel/object/pinned_memory_token_dispatcher.cpp
similarity index 100%
rename from kernel/object/pinned_memory_token_dispatcher.cpp
rename to zircon/kernel/object/pinned_memory_token_dispatcher.cpp
diff --git a/kernel/object/port_dispatcher.cpp b/zircon/kernel/object/port_dispatcher.cpp
similarity index 100%
rename from kernel/object/port_dispatcher.cpp
rename to zircon/kernel/object/port_dispatcher.cpp
diff --git a/kernel/object/process_dispatcher.cpp b/zircon/kernel/object/process_dispatcher.cpp
similarity index 100%
rename from kernel/object/process_dispatcher.cpp
rename to zircon/kernel/object/process_dispatcher.cpp
diff --git a/kernel/object/profile_dispatcher.cpp b/zircon/kernel/object/profile_dispatcher.cpp
similarity index 100%
rename from kernel/object/profile_dispatcher.cpp
rename to zircon/kernel/object/profile_dispatcher.cpp
diff --git a/kernel/object/resource.cpp b/zircon/kernel/object/resource.cpp
similarity index 100%
rename from kernel/object/resource.cpp
rename to zircon/kernel/object/resource.cpp
diff --git a/kernel/object/resource_dispatcher.cpp b/zircon/kernel/object/resource_dispatcher.cpp
similarity index 100%
rename from kernel/object/resource_dispatcher.cpp
rename to zircon/kernel/object/resource_dispatcher.cpp
diff --git a/kernel/object/rules.mk b/zircon/kernel/object/rules.mk
similarity index 100%
rename from kernel/object/rules.mk
rename to zircon/kernel/object/rules.mk
diff --git a/kernel/object/semaphore.cpp b/zircon/kernel/object/semaphore.cpp
similarity index 100%
rename from kernel/object/semaphore.cpp
rename to zircon/kernel/object/semaphore.cpp
diff --git a/kernel/object/socket_dispatcher.cpp b/zircon/kernel/object/socket_dispatcher.cpp
similarity index 100%
rename from kernel/object/socket_dispatcher.cpp
rename to zircon/kernel/object/socket_dispatcher.cpp
diff --git a/kernel/object/state_tracker_tests.cpp b/zircon/kernel/object/state_tracker_tests.cpp
similarity index 100%
rename from kernel/object/state_tracker_tests.cpp
rename to zircon/kernel/object/state_tracker_tests.cpp
diff --git a/kernel/object/suspend_token_dispatcher.cpp b/zircon/kernel/object/suspend_token_dispatcher.cpp
similarity index 100%
rename from kernel/object/suspend_token_dispatcher.cpp
rename to zircon/kernel/object/suspend_token_dispatcher.cpp
diff --git a/kernel/object/thread_dispatcher.cpp b/zircon/kernel/object/thread_dispatcher.cpp
similarity index 100%
rename from kernel/object/thread_dispatcher.cpp
rename to zircon/kernel/object/thread_dispatcher.cpp
diff --git a/kernel/object/timer_dispatcher.cpp b/zircon/kernel/object/timer_dispatcher.cpp
similarity index 100%
rename from kernel/object/timer_dispatcher.cpp
rename to zircon/kernel/object/timer_dispatcher.cpp
diff --git a/kernel/object/vcpu_dispatcher.cpp b/zircon/kernel/object/vcpu_dispatcher.cpp
similarity index 100%
rename from kernel/object/vcpu_dispatcher.cpp
rename to zircon/kernel/object/vcpu_dispatcher.cpp
diff --git a/kernel/object/virtual_interrupt_dispatcher.cpp b/zircon/kernel/object/virtual_interrupt_dispatcher.cpp
similarity index 100%
rename from kernel/object/virtual_interrupt_dispatcher.cpp
rename to zircon/kernel/object/virtual_interrupt_dispatcher.cpp
diff --git a/kernel/object/vm_address_region_dispatcher.cpp b/zircon/kernel/object/vm_address_region_dispatcher.cpp
similarity index 100%
rename from kernel/object/vm_address_region_dispatcher.cpp
rename to zircon/kernel/object/vm_address_region_dispatcher.cpp
diff --git a/kernel/object/vm_object_dispatcher.cpp b/zircon/kernel/object/vm_object_dispatcher.cpp
similarity index 100%
rename from kernel/object/vm_object_dispatcher.cpp
rename to zircon/kernel/object/vm_object_dispatcher.cpp
diff --git a/kernel/object/wait_state_observer.cpp b/zircon/kernel/object/wait_state_observer.cpp
similarity index 100%
rename from kernel/object/wait_state_observer.cpp
rename to zircon/kernel/object/wait_state_observer.cpp
diff --git a/kernel/platform/debug.cpp b/zircon/kernel/platform/debug.cpp
similarity index 100%
rename from kernel/platform/debug.cpp
rename to zircon/kernel/platform/debug.cpp
diff --git a/kernel/platform/generic-arm/platform.cpp b/zircon/kernel/platform/generic-arm/platform.cpp
similarity index 100%
rename from kernel/platform/generic-arm/platform.cpp
rename to zircon/kernel/platform/generic-arm/platform.cpp
diff --git a/kernel/platform/generic-arm/rules.mk b/zircon/kernel/platform/generic-arm/rules.mk
similarity index 100%
rename from kernel/platform/generic-arm/rules.mk
rename to zircon/kernel/platform/generic-arm/rules.mk
diff --git a/kernel/platform/init.cpp b/zircon/kernel/platform/init.cpp
similarity index 100%
rename from kernel/platform/init.cpp
rename to zircon/kernel/platform/init.cpp
diff --git a/kernel/platform/pc/MAINTAINERS b/zircon/kernel/platform/pc/MAINTAINERS
similarity index 100%
rename from kernel/platform/pc/MAINTAINERS
rename to zircon/kernel/platform/pc/MAINTAINERS
diff --git a/kernel/platform/pc/console.cpp b/zircon/kernel/platform/pc/console.cpp
similarity index 100%
rename from kernel/platform/pc/console.cpp
rename to zircon/kernel/platform/pc/console.cpp
diff --git a/kernel/platform/pc/debug.cpp b/zircon/kernel/platform/pc/debug.cpp
similarity index 100%
rename from kernel/platform/pc/debug.cpp
rename to zircon/kernel/platform/pc/debug.cpp
diff --git a/kernel/platform/pc/hpet.cpp b/zircon/kernel/platform/pc/hpet.cpp
similarity index 100%
rename from kernel/platform/pc/hpet.cpp
rename to zircon/kernel/platform/pc/hpet.cpp
diff --git a/kernel/platform/pc/include/platform/console.h b/zircon/kernel/platform/pc/include/platform/console.h
similarity index 100%
rename from kernel/platform/pc/include/platform/console.h
rename to zircon/kernel/platform/pc/include/platform/console.h
diff --git a/kernel/platform/pc/include/platform/keyboard.h b/zircon/kernel/platform/pc/include/platform/keyboard.h
similarity index 100%
rename from kernel/platform/pc/include/platform/keyboard.h
rename to zircon/kernel/platform/pc/include/platform/keyboard.h
diff --git a/kernel/platform/pc/include/platform/pc.h b/zircon/kernel/platform/pc/include/platform/pc.h
similarity index 100%
rename from kernel/platform/pc/include/platform/pc.h
rename to zircon/kernel/platform/pc/include/platform/pc.h
diff --git a/kernel/platform/pc/include/platform/pc/bootloader.h b/zircon/kernel/platform/pc/include/platform/pc/bootloader.h
similarity index 100%
rename from kernel/platform/pc/include/platform/pc/bootloader.h
rename to zircon/kernel/platform/pc/include/platform/pc/bootloader.h
diff --git a/kernel/platform/pc/include/platform/pc/hpet.h b/zircon/kernel/platform/pc/include/platform/pc/hpet.h
similarity index 100%
rename from kernel/platform/pc/include/platform/pc/hpet.h
rename to zircon/kernel/platform/pc/include/platform/pc/hpet.h
diff --git a/kernel/platform/pc/include/platform/pc/iomap.h b/zircon/kernel/platform/pc/include/platform/pc/iomap.h
similarity index 100%
rename from kernel/platform/pc/include/platform/pc/iomap.h
rename to zircon/kernel/platform/pc/include/platform/pc/iomap.h
diff --git a/kernel/platform/pc/include/platform/pc/smbios.h b/zircon/kernel/platform/pc/include/platform/pc/smbios.h
similarity index 100%
rename from kernel/platform/pc/include/platform/pc/smbios.h
rename to zircon/kernel/platform/pc/include/platform/pc/smbios.h
diff --git a/kernel/platform/pc/include/platform/pc/timer.h b/zircon/kernel/platform/pc/include/platform/pc/timer.h
similarity index 100%
rename from kernel/platform/pc/include/platform/pc/timer.h
rename to zircon/kernel/platform/pc/include/platform/pc/timer.h
diff --git a/kernel/platform/pc/include/platform/pic.h b/zircon/kernel/platform/pc/include/platform/pic.h
similarity index 100%
rename from kernel/platform/pc/include/platform/pic.h
rename to zircon/kernel/platform/pc/include/platform/pic.h
diff --git a/kernel/platform/pc/interrupts.cpp b/zircon/kernel/platform/pc/interrupts.cpp
similarity index 100%
rename from kernel/platform/pc/interrupts.cpp
rename to zircon/kernel/platform/pc/interrupts.cpp
diff --git a/kernel/platform/pc/keyboard.cpp b/zircon/kernel/platform/pc/keyboard.cpp
similarity index 100%
rename from kernel/platform/pc/keyboard.cpp
rename to zircon/kernel/platform/pc/keyboard.cpp
diff --git a/kernel/platform/pc/memory.cpp b/zircon/kernel/platform/pc/memory.cpp
similarity index 100%
rename from kernel/platform/pc/memory.cpp
rename to zircon/kernel/platform/pc/memory.cpp
diff --git a/kernel/platform/pc/pcie_quirks.cpp b/zircon/kernel/platform/pc/pcie_quirks.cpp
similarity index 100%
rename from kernel/platform/pc/pcie_quirks.cpp
rename to zircon/kernel/platform/pc/pcie_quirks.cpp
diff --git a/kernel/platform/pc/pic.cpp b/zircon/kernel/platform/pc/pic.cpp
similarity index 100%
rename from kernel/platform/pc/pic.cpp
rename to zircon/kernel/platform/pc/pic.cpp
diff --git a/kernel/platform/pc/platform.cpp b/zircon/kernel/platform/pc/platform.cpp
similarity index 100%
rename from kernel/platform/pc/platform.cpp
rename to zircon/kernel/platform/pc/platform.cpp
diff --git a/kernel/platform/pc/platform_p.h b/zircon/kernel/platform/pc/platform_p.h
similarity index 100%
rename from kernel/platform/pc/platform_p.h
rename to zircon/kernel/platform/pc/platform_p.h
diff --git a/kernel/platform/pc/platform_pcie.cpp b/zircon/kernel/platform/pc/platform_pcie.cpp
similarity index 100%
rename from kernel/platform/pc/platform_pcie.cpp
rename to zircon/kernel/platform/pc/platform_pcie.cpp
diff --git a/kernel/platform/pc/power.cpp b/zircon/kernel/platform/pc/power.cpp
similarity index 100%
rename from kernel/platform/pc/power.cpp
rename to zircon/kernel/platform/pc/power.cpp
diff --git a/kernel/platform/pc/rules.mk b/zircon/kernel/platform/pc/rules.mk
similarity index 100%
rename from kernel/platform/pc/rules.mk
rename to zircon/kernel/platform/pc/rules.mk
diff --git a/kernel/platform/pc/smbios.cpp b/zircon/kernel/platform/pc/smbios.cpp
similarity index 100%
rename from kernel/platform/pc/smbios.cpp
rename to zircon/kernel/platform/pc/smbios.cpp
diff --git a/kernel/platform/pc/timer.cpp b/zircon/kernel/platform/pc/timer.cpp
similarity index 100%
rename from kernel/platform/pc/timer.cpp
rename to zircon/kernel/platform/pc/timer.cpp
diff --git a/kernel/platform/power.cpp b/zircon/kernel/platform/power.cpp
similarity index 100%
rename from kernel/platform/power.cpp
rename to zircon/kernel/platform/power.cpp
diff --git a/kernel/platform/rules.mk b/zircon/kernel/platform/rules.mk
similarity index 100%
rename from kernel/platform/rules.mk
rename to zircon/kernel/platform/rules.mk
diff --git a/kernel/project/arm64.mk b/zircon/kernel/project/arm64.mk
similarity index 100%
rename from kernel/project/arm64.mk
rename to zircon/kernel/project/arm64.mk
diff --git a/kernel/project/virtual/generate_manifest.sh b/zircon/kernel/project/virtual/generate_manifest.sh
similarity index 100%
rename from kernel/project/virtual/generate_manifest.sh
rename to zircon/kernel/project/virtual/generate_manifest.sh
diff --git a/kernel/project/virtual/test.mk b/zircon/kernel/project/virtual/test.mk
similarity index 100%
rename from kernel/project/virtual/test.mk
rename to zircon/kernel/project/virtual/test.mk
diff --git a/kernel/project/virtual/user.mk b/zircon/kernel/project/virtual/user.mk
similarity index 100%
rename from kernel/project/virtual/user.mk
rename to zircon/kernel/project/virtual/user.mk
diff --git a/kernel/project/x64.mk b/zircon/kernel/project/x64.mk
similarity index 100%
rename from kernel/project/x64.mk
rename to zircon/kernel/project/x64.mk
diff --git a/kernel/syscalls/channel.cpp b/zircon/kernel/syscalls/channel.cpp
similarity index 100%
rename from kernel/syscalls/channel.cpp
rename to zircon/kernel/syscalls/channel.cpp
diff --git a/kernel/syscalls/ddk.cpp b/zircon/kernel/syscalls/ddk.cpp
similarity index 100%
rename from kernel/syscalls/ddk.cpp
rename to zircon/kernel/syscalls/ddk.cpp
diff --git a/kernel/syscalls/ddk_arm64.cpp b/zircon/kernel/syscalls/ddk_arm64.cpp
similarity index 100%
rename from kernel/syscalls/ddk_arm64.cpp
rename to zircon/kernel/syscalls/ddk_arm64.cpp
diff --git a/kernel/syscalls/ddk_pci.cpp b/zircon/kernel/syscalls/ddk_pci.cpp
similarity index 100%
rename from kernel/syscalls/ddk_pci.cpp
rename to zircon/kernel/syscalls/ddk_pci.cpp
diff --git a/kernel/syscalls/ddk_priv.h b/zircon/kernel/syscalls/ddk_priv.h
similarity index 100%
rename from kernel/syscalls/ddk_priv.h
rename to zircon/kernel/syscalls/ddk_priv.h
diff --git a/kernel/syscalls/ddk_x86.cpp b/zircon/kernel/syscalls/ddk_x86.cpp
similarity index 100%
rename from kernel/syscalls/ddk_x86.cpp
rename to zircon/kernel/syscalls/ddk_x86.cpp
diff --git a/kernel/syscalls/debug.cpp b/zircon/kernel/syscalls/debug.cpp
similarity index 100%
rename from kernel/syscalls/debug.cpp
rename to zircon/kernel/syscalls/debug.cpp
diff --git a/kernel/syscalls/exceptions.cpp b/zircon/kernel/syscalls/exceptions.cpp
similarity index 100%
rename from kernel/syscalls/exceptions.cpp
rename to zircon/kernel/syscalls/exceptions.cpp
diff --git a/kernel/syscalls/fifo.cpp b/zircon/kernel/syscalls/fifo.cpp
similarity index 100%
rename from kernel/syscalls/fifo.cpp
rename to zircon/kernel/syscalls/fifo.cpp
diff --git a/kernel/syscalls/futex.cpp b/zircon/kernel/syscalls/futex.cpp
similarity index 100%
rename from kernel/syscalls/futex.cpp
rename to zircon/kernel/syscalls/futex.cpp
diff --git a/kernel/syscalls/handle_ops.cpp b/zircon/kernel/syscalls/handle_ops.cpp
similarity index 100%
rename from kernel/syscalls/handle_ops.cpp
rename to zircon/kernel/syscalls/handle_ops.cpp
diff --git a/kernel/syscalls/hypervisor.cpp b/zircon/kernel/syscalls/hypervisor.cpp
similarity index 100%
rename from kernel/syscalls/hypervisor.cpp
rename to zircon/kernel/syscalls/hypervisor.cpp
diff --git a/kernel/syscalls/object.cpp b/zircon/kernel/syscalls/object.cpp
similarity index 100%
rename from kernel/syscalls/object.cpp
rename to zircon/kernel/syscalls/object.cpp
diff --git a/kernel/syscalls/object_wait.cpp b/zircon/kernel/syscalls/object_wait.cpp
similarity index 100%
rename from kernel/syscalls/object_wait.cpp
rename to zircon/kernel/syscalls/object_wait.cpp
diff --git a/kernel/syscalls/pager.cpp b/zircon/kernel/syscalls/pager.cpp
similarity index 100%
rename from kernel/syscalls/pager.cpp
rename to zircon/kernel/syscalls/pager.cpp
diff --git a/kernel/syscalls/port.cpp b/zircon/kernel/syscalls/port.cpp
similarity index 100%
rename from kernel/syscalls/port.cpp
rename to zircon/kernel/syscalls/port.cpp
diff --git a/kernel/syscalls/priv.h b/zircon/kernel/syscalls/priv.h
similarity index 100%
rename from kernel/syscalls/priv.h
rename to zircon/kernel/syscalls/priv.h
diff --git a/kernel/syscalls/profile.cpp b/zircon/kernel/syscalls/profile.cpp
similarity index 100%
rename from kernel/syscalls/profile.cpp
rename to zircon/kernel/syscalls/profile.cpp
diff --git a/kernel/syscalls/resource.cpp b/zircon/kernel/syscalls/resource.cpp
similarity index 100%
rename from kernel/syscalls/resource.cpp
rename to zircon/kernel/syscalls/resource.cpp
diff --git a/kernel/syscalls/rules.mk b/zircon/kernel/syscalls/rules.mk
similarity index 100%
rename from kernel/syscalls/rules.mk
rename to zircon/kernel/syscalls/rules.mk
diff --git a/kernel/syscalls/socket.cpp b/zircon/kernel/syscalls/socket.cpp
similarity index 100%
rename from kernel/syscalls/socket.cpp
rename to zircon/kernel/syscalls/socket.cpp
diff --git a/kernel/syscalls/syscalls.cpp b/zircon/kernel/syscalls/syscalls.cpp
similarity index 100%
rename from kernel/syscalls/syscalls.cpp
rename to zircon/kernel/syscalls/syscalls.cpp
diff --git a/kernel/syscalls/system.cpp b/zircon/kernel/syscalls/system.cpp
similarity index 100%
rename from kernel/syscalls/system.cpp
rename to zircon/kernel/syscalls/system.cpp
diff --git a/kernel/syscalls/system_arm64.cpp b/zircon/kernel/syscalls/system_arm64.cpp
similarity index 100%
rename from kernel/syscalls/system_arm64.cpp
rename to zircon/kernel/syscalls/system_arm64.cpp
diff --git a/kernel/syscalls/system_priv.h b/zircon/kernel/syscalls/system_priv.h
similarity index 100%
rename from kernel/syscalls/system_priv.h
rename to zircon/kernel/syscalls/system_priv.h
diff --git a/kernel/syscalls/system_x86.cpp b/zircon/kernel/syscalls/system_x86.cpp
similarity index 100%
rename from kernel/syscalls/system_x86.cpp
rename to zircon/kernel/syscalls/system_x86.cpp
diff --git a/kernel/syscalls/task.cpp b/zircon/kernel/syscalls/task.cpp
similarity index 100%
rename from kernel/syscalls/task.cpp
rename to zircon/kernel/syscalls/task.cpp
diff --git a/kernel/syscalls/test.cpp b/zircon/kernel/syscalls/test.cpp
similarity index 100%
rename from kernel/syscalls/test.cpp
rename to zircon/kernel/syscalls/test.cpp
diff --git a/kernel/syscalls/timer.cpp b/zircon/kernel/syscalls/timer.cpp
similarity index 100%
rename from kernel/syscalls/timer.cpp
rename to zircon/kernel/syscalls/timer.cpp
diff --git a/kernel/syscalls/vmar.cpp b/zircon/kernel/syscalls/vmar.cpp
similarity index 100%
rename from kernel/syscalls/vmar.cpp
rename to zircon/kernel/syscalls/vmar.cpp
diff --git a/kernel/syscalls/vmo.cpp b/zircon/kernel/syscalls/vmo.cpp
similarity index 100%
rename from kernel/syscalls/vmo.cpp
rename to zircon/kernel/syscalls/vmo.cpp
diff --git a/kernel/syscalls/zircon.cpp b/zircon/kernel/syscalls/zircon.cpp
similarity index 100%
rename from kernel/syscalls/zircon.cpp
rename to zircon/kernel/syscalls/zircon.cpp
diff --git a/kernel/target/all-boards.list b/zircon/kernel/target/all-boards.list
similarity index 100%
rename from kernel/target/all-boards.list
rename to zircon/kernel/target/all-boards.list
diff --git a/kernel/target/arm64/board/cleo/boot-shim-config.h b/zircon/kernel/target/arm64/board/cleo/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/cleo/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/cleo/boot-shim-config.h
diff --git a/kernel/target/arm64/board/cleo/package-image.sh b/zircon/kernel/target/arm64/board/cleo/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/cleo/package-image.sh
rename to zircon/kernel/target/arm64/board/cleo/package-image.sh
diff --git a/kernel/target/arm64/board/cleo/rules.mk b/zircon/kernel/target/arm64/board/cleo/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/cleo/rules.mk
rename to zircon/kernel/target/arm64/board/cleo/rules.mk
diff --git a/kernel/target/arm64/board/eagle/boot-shim-config.h b/zircon/kernel/target/arm64/board/eagle/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/eagle/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/eagle/boot-shim-config.h
diff --git a/kernel/target/arm64/board/eagle/eagle.dtb b/zircon/kernel/target/arm64/board/eagle/eagle.dtb
similarity index 100%
rename from kernel/target/arm64/board/eagle/eagle.dtb
rename to zircon/kernel/target/arm64/board/eagle/eagle.dtb
diff --git a/kernel/target/arm64/board/eagle/package-image.sh b/zircon/kernel/target/arm64/board/eagle/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/eagle/package-image.sh
rename to zircon/kernel/target/arm64/board/eagle/package-image.sh
diff --git a/kernel/target/arm64/board/eagle/rules.mk b/zircon/kernel/target/arm64/board/eagle/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/eagle/rules.mk
rename to zircon/kernel/target/arm64/board/eagle/rules.mk
diff --git a/kernel/target/arm64/board/hikey960/boot-shim-config.h b/zircon/kernel/target/arm64/board/hikey960/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/hikey960/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/hikey960/boot-shim-config.h
diff --git a/kernel/target/arm64/board/hikey960/package-image.sh b/zircon/kernel/target/arm64/board/hikey960/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/hikey960/package-image.sh
rename to zircon/kernel/target/arm64/board/hikey960/package-image.sh
diff --git a/kernel/target/arm64/board/hikey960/rules.mk b/zircon/kernel/target/arm64/board/hikey960/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/hikey960/rules.mk
rename to zircon/kernel/target/arm64/board/hikey960/rules.mk
diff --git a/kernel/target/arm64/board/imx8mevk/boot-shim-config.h b/zircon/kernel/target/arm64/board/imx8mevk/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/imx8mevk/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/imx8mevk/boot-shim-config.h
diff --git a/kernel/target/arm64/board/imx8mevk/package-image.sh b/zircon/kernel/target/arm64/board/imx8mevk/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/imx8mevk/package-image.sh
rename to zircon/kernel/target/arm64/board/imx8mevk/package-image.sh
diff --git a/kernel/target/arm64/board/imx8mevk/rules.mk b/zircon/kernel/target/arm64/board/imx8mevk/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/imx8mevk/rules.mk
rename to zircon/kernel/target/arm64/board/imx8mevk/rules.mk
diff --git a/kernel/target/arm64/board/imx8mmevk/boot-shim-config.h b/zircon/kernel/target/arm64/board/imx8mmevk/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/imx8mmevk/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/imx8mmevk/boot-shim-config.h
diff --git a/kernel/target/arm64/board/imx8mmevk/package-image.sh b/zircon/kernel/target/arm64/board/imx8mmevk/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/imx8mmevk/package-image.sh
rename to zircon/kernel/target/arm64/board/imx8mmevk/package-image.sh
diff --git a/kernel/target/arm64/board/imx8mmevk/rules.mk b/zircon/kernel/target/arm64/board/imx8mmevk/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/imx8mmevk/rules.mk
rename to zircon/kernel/target/arm64/board/imx8mmevk/rules.mk
diff --git a/kernel/target/arm64/board/kirin970/boot-shim-config.h b/zircon/kernel/target/arm64/board/kirin970/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/kirin970/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/kirin970/boot-shim-config.h
diff --git a/kernel/target/arm64/board/kirin970/package-image.sh b/zircon/kernel/target/arm64/board/kirin970/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/kirin970/package-image.sh
rename to zircon/kernel/target/arm64/board/kirin970/package-image.sh
diff --git a/kernel/target/arm64/board/kirin970/rules.mk b/zircon/kernel/target/arm64/board/kirin970/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/kirin970/rules.mk
rename to zircon/kernel/target/arm64/board/kirin970/rules.mk
diff --git a/kernel/target/arm64/board/msm8x53-som/boot-shim-config.h b/zircon/kernel/target/arm64/board/msm8x53-som/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/msm8x53-som/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/msm8x53-som/boot-shim-config.h
diff --git a/kernel/target/arm64/board/msm8x53-som/device-tree.dtb b/zircon/kernel/target/arm64/board/msm8x53-som/device-tree.dtb
similarity index 100%
rename from kernel/target/arm64/board/msm8x53-som/device-tree.dtb
rename to zircon/kernel/target/arm64/board/msm8x53-som/device-tree.dtb
diff --git a/kernel/target/arm64/board/msm8x53-som/device-tree.dts b/zircon/kernel/target/arm64/board/msm8x53-som/device-tree.dts
similarity index 100%
rename from kernel/target/arm64/board/msm8x53-som/device-tree.dts
rename to zircon/kernel/target/arm64/board/msm8x53-som/device-tree.dts
diff --git a/kernel/target/arm64/board/msm8x53-som/package-image.sh b/zircon/kernel/target/arm64/board/msm8x53-som/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/msm8x53-som/package-image.sh
rename to zircon/kernel/target/arm64/board/msm8x53-som/package-image.sh
diff --git a/kernel/target/arm64/board/msm8x53-som/partition-table.img b/zircon/kernel/target/arm64/board/msm8x53-som/partition-table.img
similarity index 100%
rename from kernel/target/arm64/board/msm8x53-som/partition-table.img
rename to zircon/kernel/target/arm64/board/msm8x53-som/partition-table.img
diff --git a/kernel/target/arm64/board/msm8x53-som/rules.mk b/zircon/kernel/target/arm64/board/msm8x53-som/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/msm8x53-som/rules.mk
rename to zircon/kernel/target/arm64/board/msm8x53-som/rules.mk
diff --git a/kernel/target/arm64/board/msm8x53-som/update-device-tree.sh b/zircon/kernel/target/arm64/board/msm8x53-som/update-device-tree.sh
similarity index 100%
rename from kernel/target/arm64/board/msm8x53-som/update-device-tree.sh
rename to zircon/kernel/target/arm64/board/msm8x53-som/update-device-tree.sh
diff --git a/kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h b/zircon/kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/mt8167s_ref/boot-shim-config.h
diff --git a/kernel/target/arm64/board/mt8167s_ref/package-image.sh b/zircon/kernel/target/arm64/board/mt8167s_ref/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/mt8167s_ref/package-image.sh
rename to zircon/kernel/target/arm64/board/mt8167s_ref/package-image.sh
diff --git a/kernel/target/arm64/board/mt8167s_ref/rules.mk b/zircon/kernel/target/arm64/board/mt8167s_ref/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/mt8167s_ref/rules.mk
rename to zircon/kernel/target/arm64/board/mt8167s_ref/rules.mk
diff --git a/kernel/target/arm64/board/qemu/boot-shim-config.h b/zircon/kernel/target/arm64/board/qemu/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/qemu/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/qemu/boot-shim-config.h
diff --git a/kernel/target/arm64/board/qemu/rules.mk b/zircon/kernel/target/arm64/board/qemu/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/qemu/rules.mk
rename to zircon/kernel/target/arm64/board/qemu/rules.mk
diff --git a/kernel/target/arm64/board/sherlock/boot-shim-config.h b/zircon/kernel/target/arm64/board/sherlock/boot-shim-config.h
similarity index 100%
rename from kernel/target/arm64/board/sherlock/boot-shim-config.h
rename to zircon/kernel/target/arm64/board/sherlock/boot-shim-config.h
diff --git a/kernel/target/arm64/board/sherlock/package-image.sh b/zircon/kernel/target/arm64/board/sherlock/package-image.sh
similarity index 100%
rename from kernel/target/arm64/board/sherlock/package-image.sh
rename to zircon/kernel/target/arm64/board/sherlock/package-image.sh
diff --git a/kernel/target/arm64/board/sherlock/rules.mk b/zircon/kernel/target/arm64/board/sherlock/rules.mk
similarity index 100%
rename from kernel/target/arm64/board/sherlock/rules.mk
rename to zircon/kernel/target/arm64/board/sherlock/rules.mk
diff --git a/kernel/target/arm64/board/vim2/firmware/logo.img b/zircon/kernel/target/arm64/board/vim2/firmware/logo.img
similarity index 100%
rename from kernel/target/arm64/board/vim2/firmware/logo.img
rename to zircon/kernel/target/arm64/board/vim2/firmware/logo.img
diff --git a/kernel/target/arm64/boot-shim/boot-shim.S b/zircon/kernel/target/arm64/boot-shim/boot-shim.S
similarity index 100%
rename from kernel/target/arm64/boot-shim/boot-shim.S
rename to zircon/kernel/target/arm64/boot-shim/boot-shim.S
diff --git a/kernel/target/arm64/boot-shim/boot-shim.c b/zircon/kernel/target/arm64/boot-shim/boot-shim.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/boot-shim.c
rename to zircon/kernel/target/arm64/boot-shim/boot-shim.c
diff --git a/kernel/target/arm64/boot-shim/boot-shim.h b/zircon/kernel/target/arm64/boot-shim/boot-shim.h
similarity index 100%
rename from kernel/target/arm64/boot-shim/boot-shim.h
rename to zircon/kernel/target/arm64/boot-shim/boot-shim.h
diff --git a/kernel/target/arm64/boot-shim/boot-shim.ld b/zircon/kernel/target/arm64/boot-shim/boot-shim.ld
similarity index 100%
rename from kernel/target/arm64/boot-shim/boot-shim.ld
rename to zircon/kernel/target/arm64/boot-shim/boot-shim.ld
diff --git a/kernel/target/arm64/boot-shim/cleo-uart.c b/zircon/kernel/target/arm64/boot-shim/cleo-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/cleo-uart.c
rename to zircon/kernel/target/arm64/boot-shim/cleo-uart.c
diff --git a/kernel/target/arm64/boot-shim/debug.c b/zircon/kernel/target/arm64/boot-shim/debug.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/debug.c
rename to zircon/kernel/target/arm64/boot-shim/debug.c
diff --git a/kernel/target/arm64/boot-shim/debug.h b/zircon/kernel/target/arm64/boot-shim/debug.h
similarity index 100%
rename from kernel/target/arm64/boot-shim/debug.h
rename to zircon/kernel/target/arm64/boot-shim/debug.h
diff --git a/kernel/target/arm64/boot-shim/devicetree.c b/zircon/kernel/target/arm64/boot-shim/devicetree.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/devicetree.c
rename to zircon/kernel/target/arm64/boot-shim/devicetree.c
diff --git a/kernel/target/arm64/boot-shim/devicetree.h b/zircon/kernel/target/arm64/boot-shim/devicetree.h
similarity index 100%
rename from kernel/target/arm64/boot-shim/devicetree.h
rename to zircon/kernel/target/arm64/boot-shim/devicetree.h
diff --git a/kernel/target/arm64/boot-shim/eagle-uart.c b/zircon/kernel/target/arm64/boot-shim/eagle-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/eagle-uart.c
rename to zircon/kernel/target/arm64/boot-shim/eagle-uart.c
diff --git a/kernel/target/arm64/boot-shim/hikey960-uart.c b/zircon/kernel/target/arm64/boot-shim/hikey960-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/hikey960-uart.c
rename to zircon/kernel/target/arm64/boot-shim/hikey960-uart.c
diff --git a/kernel/target/arm64/boot-shim/imx8mevk-uart.c b/zircon/kernel/target/arm64/boot-shim/imx8mevk-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/imx8mevk-uart.c
rename to zircon/kernel/target/arm64/boot-shim/imx8mevk-uart.c
diff --git a/kernel/target/arm64/boot-shim/imx8mmevk-uart.c b/zircon/kernel/target/arm64/boot-shim/imx8mmevk-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/imx8mmevk-uart.c
rename to zircon/kernel/target/arm64/boot-shim/imx8mmevk-uart.c
diff --git a/kernel/target/arm64/boot-shim/kirin970-uart.c b/zircon/kernel/target/arm64/boot-shim/kirin970-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/kirin970-uart.c
rename to zircon/kernel/target/arm64/boot-shim/kirin970-uart.c
diff --git a/kernel/target/arm64/boot-shim/msm8x53-som-uart.c b/zircon/kernel/target/arm64/boot-shim/msm8x53-som-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/msm8x53-som-uart.c
rename to zircon/kernel/target/arm64/boot-shim/msm8x53-som-uart.c
diff --git a/kernel/target/arm64/boot-shim/mt8167s_ref-uart.c b/zircon/kernel/target/arm64/boot-shim/mt8167s_ref-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/mt8167s_ref-uart.c
rename to zircon/kernel/target/arm64/boot-shim/mt8167s_ref-uart.c
diff --git a/kernel/target/arm64/boot-shim/qemu-uart.c b/zircon/kernel/target/arm64/boot-shim/qemu-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/qemu-uart.c
rename to zircon/kernel/target/arm64/boot-shim/qemu-uart.c
diff --git a/kernel/target/arm64/boot-shim/rules.mk b/zircon/kernel/target/arm64/boot-shim/rules.mk
similarity index 100%
rename from kernel/target/arm64/boot-shim/rules.mk
rename to zircon/kernel/target/arm64/boot-shim/rules.mk
diff --git a/kernel/target/arm64/boot-shim/sherlock-uart.c b/zircon/kernel/target/arm64/boot-shim/sherlock-uart.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/sherlock-uart.c
rename to zircon/kernel/target/arm64/boot-shim/sherlock-uart.c
diff --git a/kernel/target/arm64/boot-shim/util.c b/zircon/kernel/target/arm64/boot-shim/util.c
similarity index 100%
rename from kernel/target/arm64/boot-shim/util.c
rename to zircon/kernel/target/arm64/boot-shim/util.c
diff --git a/kernel/target/arm64/boot-shim/util.h b/zircon/kernel/target/arm64/boot-shim/util.h
similarity index 100%
rename from kernel/target/arm64/boot-shim/util.h
rename to zircon/kernel/target/arm64/boot-shim/util.h
diff --git a/kernel/target/arm64/dtb/dummy-device-tree.dtb b/zircon/kernel/target/arm64/dtb/dummy-device-tree.dtb
similarity index 100%
rename from kernel/target/arm64/dtb/dummy-device-tree.dtb
rename to zircon/kernel/target/arm64/dtb/dummy-device-tree.dtb
diff --git a/kernel/target/arm64/dtb/dummy-device-tree.dts b/zircon/kernel/target/arm64/dtb/dummy-device-tree.dts
similarity index 100%
rename from kernel/target/arm64/dtb/dummy-device-tree.dts
rename to zircon/kernel/target/arm64/dtb/dummy-device-tree.dts
diff --git a/kernel/target/arm64/dtb/update-device-tree.sh b/zircon/kernel/target/arm64/dtb/update-device-tree.sh
similarity index 100%
rename from kernel/target/arm64/dtb/update-device-tree.sh
rename to zircon/kernel/target/arm64/dtb/update-device-tree.sh
diff --git a/kernel/target/arm64/rules.mk b/zircon/kernel/target/arm64/rules.mk
similarity index 100%
rename from kernel/target/arm64/rules.mk
rename to zircon/kernel/target/arm64/rules.mk
diff --git a/kernel/target/init.cpp b/zircon/kernel/target/init.cpp
similarity index 100%
rename from kernel/target/init.cpp
rename to zircon/kernel/target/init.cpp
diff --git a/kernel/target/pc/empty.cpp b/zircon/kernel/target/pc/empty.cpp
similarity index 100%
rename from kernel/target/pc/empty.cpp
rename to zircon/kernel/target/pc/empty.cpp
diff --git a/kernel/target/pc/multiboot/README.md b/zircon/kernel/target/pc/multiboot/README.md
similarity index 100%
rename from kernel/target/pc/multiboot/README.md
rename to zircon/kernel/target/pc/multiboot/README.md
diff --git a/kernel/target/pc/multiboot/multiboot-main.c b/zircon/kernel/target/pc/multiboot/multiboot-main.c
similarity index 100%
rename from kernel/target/pc/multiboot/multiboot-main.c
rename to zircon/kernel/target/pc/multiboot/multiboot-main.c
diff --git a/kernel/target/pc/multiboot/multiboot-start.S b/zircon/kernel/target/pc/multiboot/multiboot-start.S
similarity index 100%
rename from kernel/target/pc/multiboot/multiboot-start.S
rename to zircon/kernel/target/pc/multiboot/multiboot-start.S
diff --git a/kernel/target/pc/multiboot/multiboot.ld b/zircon/kernel/target/pc/multiboot/multiboot.ld
similarity index 100%
rename from kernel/target/pc/multiboot/multiboot.ld
rename to zircon/kernel/target/pc/multiboot/multiboot.ld
diff --git a/kernel/target/pc/multiboot/paging.c b/zircon/kernel/target/pc/multiboot/paging.c
similarity index 100%
rename from kernel/target/pc/multiboot/paging.c
rename to zircon/kernel/target/pc/multiboot/paging.c
diff --git a/kernel/target/pc/multiboot/rules.mk b/zircon/kernel/target/pc/multiboot/rules.mk
similarity index 100%
rename from kernel/target/pc/multiboot/rules.mk
rename to zircon/kernel/target/pc/multiboot/rules.mk
diff --git a/kernel/target/pc/multiboot/trampoline.c b/zircon/kernel/target/pc/multiboot/trampoline.c
similarity index 100%
rename from kernel/target/pc/multiboot/trampoline.c
rename to zircon/kernel/target/pc/multiboot/trampoline.c
diff --git a/kernel/target/pc/multiboot/trampoline.h b/zircon/kernel/target/pc/multiboot/trampoline.h
similarity index 100%
rename from kernel/target/pc/multiboot/trampoline.h
rename to zircon/kernel/target/pc/multiboot/trampoline.h
diff --git a/kernel/target/pc/multiboot/util.c b/zircon/kernel/target/pc/multiboot/util.c
similarity index 100%
rename from kernel/target/pc/multiboot/util.c
rename to zircon/kernel/target/pc/multiboot/util.c
diff --git a/kernel/target/pc/rules.mk b/zircon/kernel/target/pc/rules.mk
similarity index 100%
rename from kernel/target/pc/rules.mk
rename to zircon/kernel/target/pc/rules.mk
diff --git a/kernel/target/rules.mk b/zircon/kernel/target/rules.mk
similarity index 100%
rename from kernel/target/rules.mk
rename to zircon/kernel/target/rules.mk
diff --git a/kernel/tests/alloc_checker_tests.cpp b/zircon/kernel/tests/alloc_checker_tests.cpp
similarity index 100%
rename from kernel/tests/alloc_checker_tests.cpp
rename to zircon/kernel/tests/alloc_checker_tests.cpp
diff --git a/kernel/tests/benchmarks.cpp b/zircon/kernel/tests/benchmarks.cpp
similarity index 100%
rename from kernel/tests/benchmarks.cpp
rename to zircon/kernel/tests/benchmarks.cpp
diff --git a/kernel/tests/brwlock_tests.cpp b/zircon/kernel/tests/brwlock_tests.cpp
similarity index 100%
rename from kernel/tests/brwlock_tests.cpp
rename to zircon/kernel/tests/brwlock_tests.cpp
diff --git a/kernel/tests/cache_tests.cpp b/zircon/kernel/tests/cache_tests.cpp
similarity index 100%
rename from kernel/tests/cache_tests.cpp
rename to zircon/kernel/tests/cache_tests.cpp
diff --git a/kernel/tests/clock_tests.cpp b/zircon/kernel/tests/clock_tests.cpp
similarity index 100%
rename from kernel/tests/clock_tests.cpp
rename to zircon/kernel/tests/clock_tests.cpp
diff --git a/kernel/tests/fibo.cpp b/zircon/kernel/tests/fibo.cpp
similarity index 100%
rename from kernel/tests/fibo.cpp
rename to zircon/kernel/tests/fibo.cpp
diff --git a/kernel/tests/lock_dep_tests.cpp b/zircon/kernel/tests/lock_dep_tests.cpp
similarity index 100%
rename from kernel/tests/lock_dep_tests.cpp
rename to zircon/kernel/tests/lock_dep_tests.cpp
diff --git a/kernel/tests/mem_tests.cpp b/zircon/kernel/tests/mem_tests.cpp
similarity index 100%
rename from kernel/tests/mem_tests.cpp
rename to zircon/kernel/tests/mem_tests.cpp
diff --git a/kernel/tests/mp_hotplug_tests.cpp b/zircon/kernel/tests/mp_hotplug_tests.cpp
similarity index 100%
rename from kernel/tests/mp_hotplug_tests.cpp
rename to zircon/kernel/tests/mp_hotplug_tests.cpp
diff --git a/kernel/tests/preempt_disable_tests.cpp b/zircon/kernel/tests/preempt_disable_tests.cpp
similarity index 100%
rename from kernel/tests/preempt_disable_tests.cpp
rename to zircon/kernel/tests/preempt_disable_tests.cpp
diff --git a/kernel/tests/printf_tests.cpp b/zircon/kernel/tests/printf_tests.cpp
similarity index 100%
rename from kernel/tests/printf_tests.cpp
rename to zircon/kernel/tests/printf_tests.cpp
diff --git a/kernel/tests/resource_tests.cpp b/zircon/kernel/tests/resource_tests.cpp
similarity index 100%
rename from kernel/tests/resource_tests.cpp
rename to zircon/kernel/tests/resource_tests.cpp
diff --git a/kernel/tests/rules.mk b/zircon/kernel/tests/rules.mk
similarity index 100%
rename from kernel/tests/rules.mk
rename to zircon/kernel/tests/rules.mk
diff --git a/kernel/tests/sleep_tests.cpp b/zircon/kernel/tests/sleep_tests.cpp
similarity index 100%
rename from kernel/tests/sleep_tests.cpp
rename to zircon/kernel/tests/sleep_tests.cpp
diff --git a/kernel/tests/string_tests.cpp b/zircon/kernel/tests/string_tests.cpp
similarity index 100%
rename from kernel/tests/string_tests.cpp
rename to zircon/kernel/tests/string_tests.cpp
diff --git a/kernel/tests/sync_ipi_tests.cpp b/zircon/kernel/tests/sync_ipi_tests.cpp
similarity index 100%
rename from kernel/tests/sync_ipi_tests.cpp
rename to zircon/kernel/tests/sync_ipi_tests.cpp
diff --git a/kernel/tests/tests.cpp b/zircon/kernel/tests/tests.cpp
similarity index 100%
rename from kernel/tests/tests.cpp
rename to zircon/kernel/tests/tests.cpp
diff --git a/kernel/tests/tests.h b/zircon/kernel/tests/tests.h
similarity index 100%
rename from kernel/tests/tests.h
rename to zircon/kernel/tests/tests.h
diff --git a/kernel/tests/thread_tests.cpp b/zircon/kernel/tests/thread_tests.cpp
similarity index 100%
rename from kernel/tests/thread_tests.cpp
rename to zircon/kernel/tests/thread_tests.cpp
diff --git a/kernel/tests/timer_tests.cpp b/zircon/kernel/tests/timer_tests.cpp
similarity index 100%
rename from kernel/tests/timer_tests.cpp
rename to zircon/kernel/tests/timer_tests.cpp
diff --git a/kernel/tests/uart_tests.cpp b/zircon/kernel/tests/uart_tests.cpp
similarity index 100%
rename from kernel/tests/uart_tests.cpp
rename to zircon/kernel/tests/uart_tests.cpp
diff --git a/kernel/top/init.cpp b/zircon/kernel/top/init.cpp
similarity index 100%
rename from kernel/top/init.cpp
rename to zircon/kernel/top/init.cpp
diff --git a/kernel/top/main.cpp b/zircon/kernel/top/main.cpp
similarity index 100%
rename from kernel/top/main.cpp
rename to zircon/kernel/top/main.cpp
diff --git a/kernel/top/rules.mk b/zircon/kernel/top/rules.mk
similarity index 100%
rename from kernel/top/rules.mk
rename to zircon/kernel/top/rules.mk
diff --git a/kernel/vm/bootalloc.cpp b/zircon/kernel/vm/bootalloc.cpp
similarity index 100%
rename from kernel/vm/bootalloc.cpp
rename to zircon/kernel/vm/bootalloc.cpp
diff --git a/kernel/vm/bootreserve.cpp b/zircon/kernel/vm/bootreserve.cpp
similarity index 100%
rename from kernel/vm/bootreserve.cpp
rename to zircon/kernel/vm/bootreserve.cpp
diff --git a/kernel/vm/include/vm/arch_vm_aspace.h b/zircon/kernel/vm/include/vm/arch_vm_aspace.h
similarity index 100%
rename from kernel/vm/include/vm/arch_vm_aspace.h
rename to zircon/kernel/vm/include/vm/arch_vm_aspace.h
diff --git a/kernel/vm/include/vm/bootalloc.h b/zircon/kernel/vm/include/vm/bootalloc.h
similarity index 100%
rename from kernel/vm/include/vm/bootalloc.h
rename to zircon/kernel/vm/include/vm/bootalloc.h
diff --git a/kernel/vm/include/vm/bootreserve.h b/zircon/kernel/vm/include/vm/bootreserve.h
similarity index 100%
rename from kernel/vm/include/vm/bootreserve.h
rename to zircon/kernel/vm/include/vm/bootreserve.h
diff --git a/kernel/vm/include/vm/fault.h b/zircon/kernel/vm/include/vm/fault.h
similarity index 100%
rename from kernel/vm/include/vm/fault.h
rename to zircon/kernel/vm/include/vm/fault.h
diff --git a/kernel/vm/include/vm/init.h b/zircon/kernel/vm/include/vm/init.h
similarity index 100%
rename from kernel/vm/include/vm/init.h
rename to zircon/kernel/vm/include/vm/init.h
diff --git a/kernel/vm/include/vm/kstack.h b/zircon/kernel/vm/include/vm/kstack.h
similarity index 100%
rename from kernel/vm/include/vm/kstack.h
rename to zircon/kernel/vm/include/vm/kstack.h
diff --git a/kernel/vm/include/vm/page.h b/zircon/kernel/vm/include/vm/page.h
similarity index 100%
rename from kernel/vm/include/vm/page.h
rename to zircon/kernel/vm/include/vm/page.h
diff --git a/kernel/vm/include/vm/page_source.h b/zircon/kernel/vm/include/vm/page_source.h
similarity index 100%
rename from kernel/vm/include/vm/page_source.h
rename to zircon/kernel/vm/include/vm/page_source.h
diff --git a/kernel/vm/include/vm/physmap.h b/zircon/kernel/vm/include/vm/physmap.h
similarity index 100%
rename from kernel/vm/include/vm/physmap.h
rename to zircon/kernel/vm/include/vm/physmap.h
diff --git a/kernel/vm/include/vm/pinned_vm_object.h b/zircon/kernel/vm/include/vm/pinned_vm_object.h
similarity index 100%
rename from kernel/vm/include/vm/pinned_vm_object.h
rename to zircon/kernel/vm/include/vm/pinned_vm_object.h
diff --git a/kernel/vm/include/vm/pmm.h b/zircon/kernel/vm/include/vm/pmm.h
similarity index 100%
rename from kernel/vm/include/vm/pmm.h
rename to zircon/kernel/vm/include/vm/pmm.h
diff --git a/kernel/vm/include/vm/vm.h b/zircon/kernel/vm/include/vm/vm.h
similarity index 100%
rename from kernel/vm/include/vm/vm.h
rename to zircon/kernel/vm/include/vm/vm.h
diff --git a/kernel/vm/include/vm/vm_address_region.h b/zircon/kernel/vm/include/vm/vm_address_region.h
similarity index 100%
rename from kernel/vm/include/vm/vm_address_region.h
rename to zircon/kernel/vm/include/vm/vm_address_region.h
diff --git a/kernel/vm/include/vm/vm_aspace.h b/zircon/kernel/vm/include/vm/vm_aspace.h
similarity index 100%
rename from kernel/vm/include/vm/vm_aspace.h
rename to zircon/kernel/vm/include/vm/vm_aspace.h
diff --git a/kernel/vm/include/vm/vm_object.h b/zircon/kernel/vm/include/vm/vm_object.h
similarity index 100%
rename from kernel/vm/include/vm/vm_object.h
rename to zircon/kernel/vm/include/vm/vm_object.h
diff --git a/kernel/vm/include/vm/vm_object_paged.h b/zircon/kernel/vm/include/vm/vm_object_paged.h
similarity index 100%
rename from kernel/vm/include/vm/vm_object_paged.h
rename to zircon/kernel/vm/include/vm/vm_object_paged.h
diff --git a/kernel/vm/include/vm/vm_object_physical.h b/zircon/kernel/vm/include/vm/vm_object_physical.h
similarity index 100%
rename from kernel/vm/include/vm/vm_object_physical.h
rename to zircon/kernel/vm/include/vm/vm_object_physical.h
diff --git a/kernel/vm/include/vm/vm_page_list.h b/zircon/kernel/vm/include/vm/vm_page_list.h
similarity index 100%
rename from kernel/vm/include/vm/vm_page_list.h
rename to zircon/kernel/vm/include/vm/vm_page_list.h
diff --git a/kernel/vm/kstack.cpp b/zircon/kernel/vm/kstack.cpp
similarity index 100%
rename from kernel/vm/kstack.cpp
rename to zircon/kernel/vm/kstack.cpp
diff --git a/kernel/vm/page.cpp b/zircon/kernel/vm/page.cpp
similarity index 100%
rename from kernel/vm/page.cpp
rename to zircon/kernel/vm/page.cpp
diff --git a/kernel/vm/page_source.cpp b/zircon/kernel/vm/page_source.cpp
similarity index 100%
rename from kernel/vm/page_source.cpp
rename to zircon/kernel/vm/page_source.cpp
diff --git a/kernel/vm/pinned_vm_object.cpp b/zircon/kernel/vm/pinned_vm_object.cpp
similarity index 100%
rename from kernel/vm/pinned_vm_object.cpp
rename to zircon/kernel/vm/pinned_vm_object.cpp
diff --git a/kernel/vm/pmm.cpp b/zircon/kernel/vm/pmm.cpp
similarity index 100%
rename from kernel/vm/pmm.cpp
rename to zircon/kernel/vm/pmm.cpp
diff --git a/kernel/vm/pmm_arena.cpp b/zircon/kernel/vm/pmm_arena.cpp
similarity index 100%
rename from kernel/vm/pmm_arena.cpp
rename to zircon/kernel/vm/pmm_arena.cpp
diff --git a/kernel/vm/pmm_arena.h b/zircon/kernel/vm/pmm_arena.h
similarity index 100%
rename from kernel/vm/pmm_arena.h
rename to zircon/kernel/vm/pmm_arena.h
diff --git a/kernel/vm/pmm_node.cpp b/zircon/kernel/vm/pmm_node.cpp
similarity index 100%
rename from kernel/vm/pmm_node.cpp
rename to zircon/kernel/vm/pmm_node.cpp
diff --git a/kernel/vm/pmm_node.h b/zircon/kernel/vm/pmm_node.h
similarity index 100%
rename from kernel/vm/pmm_node.h
rename to zircon/kernel/vm/pmm_node.h
diff --git a/kernel/vm/rules.mk b/zircon/kernel/vm/rules.mk
similarity index 100%
rename from kernel/vm/rules.mk
rename to zircon/kernel/vm/rules.mk
diff --git a/kernel/vm/vm.cpp b/zircon/kernel/vm/vm.cpp
similarity index 100%
rename from kernel/vm/vm.cpp
rename to zircon/kernel/vm/vm.cpp
diff --git a/kernel/vm/vm_address_region.cpp b/zircon/kernel/vm/vm_address_region.cpp
similarity index 100%
rename from kernel/vm/vm_address_region.cpp
rename to zircon/kernel/vm/vm_address_region.cpp
diff --git a/kernel/vm/vm_address_region_or_mapping.cpp b/zircon/kernel/vm/vm_address_region_or_mapping.cpp
similarity index 100%
rename from kernel/vm/vm_address_region_or_mapping.cpp
rename to zircon/kernel/vm/vm_address_region_or_mapping.cpp
diff --git a/kernel/vm/vm_aspace.cpp b/zircon/kernel/vm/vm_aspace.cpp
similarity index 100%
rename from kernel/vm/vm_aspace.cpp
rename to zircon/kernel/vm/vm_aspace.cpp
diff --git a/kernel/vm/vm_mapping.cpp b/zircon/kernel/vm/vm_mapping.cpp
similarity index 100%
rename from kernel/vm/vm_mapping.cpp
rename to zircon/kernel/vm/vm_mapping.cpp
diff --git a/kernel/vm/vm_object.cpp b/zircon/kernel/vm/vm_object.cpp
similarity index 100%
rename from kernel/vm/vm_object.cpp
rename to zircon/kernel/vm/vm_object.cpp
diff --git a/kernel/vm/vm_object_paged.cpp b/zircon/kernel/vm/vm_object_paged.cpp
similarity index 100%
rename from kernel/vm/vm_object_paged.cpp
rename to zircon/kernel/vm/vm_object_paged.cpp
diff --git a/kernel/vm/vm_object_physical.cpp b/zircon/kernel/vm/vm_object_physical.cpp
similarity index 100%
rename from kernel/vm/vm_object_physical.cpp
rename to zircon/kernel/vm/vm_object_physical.cpp
diff --git a/kernel/vm/vm_page_list.cpp b/zircon/kernel/vm/vm_page_list.cpp
similarity index 100%
rename from kernel/vm/vm_page_list.cpp
rename to zircon/kernel/vm/vm_page_list.cpp
diff --git a/kernel/vm/vm_priv.h b/zircon/kernel/vm/vm_priv.h
similarity index 100%
rename from kernel/vm/vm_priv.h
rename to zircon/kernel/vm/vm_priv.h
diff --git a/kernel/vm/vm_unittest.cpp b/zircon/kernel/vm/vm_unittest.cpp
similarity index 100%
rename from kernel/vm/vm_unittest.cpp
rename to zircon/kernel/vm/vm_unittest.cpp
diff --git a/kernel/vm/vmm.cpp b/zircon/kernel/vm/vmm.cpp
similarity index 100%
rename from kernel/vm/vmm.cpp
rename to zircon/kernel/vm/vmm.cpp
diff --git a/make/MAINTAINERS b/zircon/make/MAINTAINERS
similarity index 100%
rename from make/MAINTAINERS
rename to zircon/make/MAINTAINERS
diff --git a/make/abigen.mk b/zircon/make/abigen.mk
similarity index 100%
rename from make/abigen.mk
rename to zircon/make/abigen.mk
diff --git a/make/bcompile.mk b/zircon/make/bcompile.mk
similarity index 100%
rename from make/bcompile.mk
rename to zircon/make/bcompile.mk
diff --git a/make/build.mk b/zircon/make/build.mk
similarity index 100%
rename from make/build.mk
rename to zircon/make/build.mk
diff --git a/make/compile.mk b/zircon/make/compile.mk
similarity index 100%
rename from make/compile.mk
rename to zircon/make/compile.mk
diff --git a/make/ecompile.mk b/zircon/make/ecompile.mk
similarity index 100%
rename from make/ecompile.mk
rename to zircon/make/ecompile.mk
diff --git a/make/engine.mk b/zircon/make/engine.mk
similarity index 100%
rename from make/engine.mk
rename to zircon/make/engine.mk
diff --git a/make/fcompile.mk b/zircon/make/fcompile.mk
similarity index 100%
rename from make/fcompile.mk
rename to zircon/make/fcompile.mk
diff --git a/make/hcompile.mk b/zircon/make/hcompile.mk
similarity index 100%
rename from make/hcompile.mk
rename to zircon/make/hcompile.mk
diff --git a/make/help.mk b/zircon/make/help.mk
similarity index 100%
rename from make/help.mk
rename to zircon/make/help.mk
diff --git a/make/include-diagram.txt b/zircon/make/include-diagram.txt
similarity index 100%
rename from make/include-diagram.txt
rename to zircon/make/include-diagram.txt
diff --git a/make/macros.mk b/zircon/make/macros.mk
similarity index 100%
rename from make/macros.mk
rename to zircon/make/macros.mk
diff --git a/make/module-banjo.mk b/zircon/make/module-banjo.mk
similarity index 100%
rename from make/module-banjo.mk
rename to zircon/make/module-banjo.mk
diff --git a/make/module-driver.mk b/zircon/make/module-driver.mk
similarity index 100%
rename from make/module-driver.mk
rename to zircon/make/module-driver.mk
diff --git a/make/module-drivertest.mk b/zircon/make/module-drivertest.mk
similarity index 100%
rename from make/module-drivertest.mk
rename to zircon/make/module-drivertest.mk
diff --git a/make/module-efilib.mk b/zircon/make/module-efilib.mk
similarity index 100%
rename from make/module-efilib.mk
rename to zircon/make/module-efilib.mk
diff --git a/make/module-fidl.mk b/zircon/make/module-fidl.mk
similarity index 100%
rename from make/module-fidl.mk
rename to zircon/make/module-fidl.mk
diff --git a/make/module-fuzztest.mk b/zircon/make/module-fuzztest.mk
similarity index 100%
rename from make/module-fuzztest.mk
rename to zircon/make/module-fuzztest.mk
diff --git a/make/module-hostapp.mk b/zircon/make/module-hostapp.mk
similarity index 100%
rename from make/module-hostapp.mk
rename to zircon/make/module-hostapp.mk
diff --git a/make/module-hostlib.mk b/zircon/make/module-hostlib.mk
similarity index 100%
rename from make/module-hostlib.mk
rename to zircon/make/module-hostlib.mk
diff --git a/make/module-hosttest.mk b/zircon/make/module-hosttest.mk
similarity index 100%
rename from make/module-hosttest.mk
rename to zircon/make/module-hosttest.mk
diff --git a/make/module-userapp.mk b/zircon/make/module-userapp.mk
similarity index 100%
rename from make/module-userapp.mk
rename to zircon/make/module-userapp.mk
diff --git a/make/module-userlib.mk b/zircon/make/module-userlib.mk
similarity index 100%
rename from make/module-userlib.mk
rename to zircon/make/module-userlib.mk
diff --git a/make/module-usertest.mk b/zircon/make/module-usertest.mk
similarity index 100%
rename from make/module-usertest.mk
rename to zircon/make/module-usertest.mk
diff --git a/make/module.mk b/zircon/make/module.mk
similarity index 100%
rename from make/module.mk
rename to zircon/make/module.mk
diff --git a/make/recurse.mk b/zircon/make/recurse.mk
similarity index 100%
rename from make/recurse.mk
rename to zircon/make/recurse.mk
diff --git a/make/sysroot.mk b/zircon/make/sysroot.mk
similarity index 100%
rename from make/sysroot.mk
rename to zircon/make/sysroot.mk
diff --git a/make/ucompile.mk b/zircon/make/ucompile.mk
similarity index 100%
rename from make/ucompile.mk
rename to zircon/make/ucompile.mk
diff --git a/makefile b/zircon/makefile
similarity index 100%
rename from makefile
rename to zircon/makefile
diff --git a/navbar.md b/zircon/navbar.md
similarity index 100%
rename from navbar.md
rename to zircon/navbar.md
diff --git a/prebuilt/MAINTAINERS b/zircon/prebuilt/MAINTAINERS
similarity index 100%
rename from prebuilt/MAINTAINERS
rename to zircon/prebuilt/MAINTAINERS
diff --git a/prebuilt/images/syscfg_a.bin b/zircon/prebuilt/images/syscfg_a.bin
similarity index 100%
rename from prebuilt/images/syscfg_a.bin
rename to zircon/prebuilt/images/syscfg_a.bin
diff --git a/prebuilt/images/syscfg_b.bin b/zircon/prebuilt/images/syscfg_b.bin
similarity index 100%
rename from prebuilt/images/syscfg_b.bin
rename to zircon/prebuilt/images/syscfg_b.bin
diff --git a/prebuilt/images/syscfg_r.bin b/zircon/prebuilt/images/syscfg_r.bin
similarity index 100%
rename from prebuilt/images/syscfg_r.bin
rename to zircon/prebuilt/images/syscfg_r.bin
diff --git a/prebuilt/zircon.ensure b/zircon/prebuilt/zircon.ensure
similarity index 100%
rename from prebuilt/zircon.ensure
rename to zircon/prebuilt/zircon.ensure
diff --git a/prebuilt/zircon.versions b/zircon/prebuilt/zircon.versions
similarity index 100%
rename from prebuilt/zircon.versions
rename to zircon/prebuilt/zircon.versions
diff --git a/prebuilt/zircon_internal.ensure b/zircon/prebuilt/zircon_internal.ensure
similarity index 100%
rename from prebuilt/zircon_internal.ensure
rename to zircon/prebuilt/zircon_internal.ensure
diff --git a/public/MAINTAINERS b/zircon/public/MAINTAINERS
similarity index 100%
rename from public/MAINTAINERS
rename to zircon/public/MAINTAINERS
diff --git a/public/README.md b/zircon/public/README.md
similarity index 100%
rename from public/README.md
rename to zircon/public/README.md
diff --git a/scripts/LICENSE b/zircon/scripts/LICENSE
similarity index 100%
rename from scripts/LICENSE
rename to zircon/scripts/LICENSE
diff --git a/scripts/MAINTAINERS b/zircon/scripts/MAINTAINERS
similarity index 100%
rename from scripts/MAINTAINERS
rename to zircon/scripts/MAINTAINERS
diff --git a/scripts/analyze-zircon b/zircon/scripts/analyze-zircon
similarity index 100%
rename from scripts/analyze-zircon
rename to zircon/scripts/analyze-zircon
diff --git a/scripts/bisect-helper-arm64 b/zircon/scripts/bisect-helper-arm64
similarity index 100%
rename from scripts/bisect-helper-arm64
rename to zircon/scripts/bisect-helper-arm64
diff --git a/scripts/bisect-helper-x64 b/zircon/scripts/bisect-helper-x64
similarity index 100%
rename from scripts/bisect-helper-x64
rename to zircon/scripts/bisect-helper-x64
diff --git a/scripts/bisect-prebuilts-arm64 b/zircon/scripts/bisect-prebuilts-arm64
similarity index 100%
rename from scripts/bisect-prebuilts-arm64
rename to zircon/scripts/bisect-prebuilts-arm64
diff --git a/scripts/bisect-prebuilts-x64 b/zircon/scripts/bisect-prebuilts-x64
similarity index 100%
rename from scripts/bisect-prebuilts-x64
rename to zircon/scripts/bisect-prebuilts-x64
diff --git a/scripts/build-all-zircon b/zircon/scripts/build-all-zircon
similarity index 100%
rename from scripts/build-all-zircon
rename to zircon/scripts/build-all-zircon
diff --git a/scripts/build-zircon b/zircon/scripts/build-zircon
similarity index 100%
rename from scripts/build-zircon
rename to zircon/scripts/build-zircon
diff --git a/scripts/build-zircon-arm64 b/zircon/scripts/build-zircon-arm64
similarity index 100%
rename from scripts/build-zircon-arm64
rename to zircon/scripts/build-zircon-arm64
diff --git a/scripts/build-zircon-x64 b/zircon/scripts/build-zircon-x64
similarity index 100%
rename from scripts/build-zircon-x64
rename to zircon/scripts/build-zircon-x64
diff --git a/scripts/buildall b/zircon/scripts/buildall
similarity index 100%
rename from scripts/buildall
rename to zircon/scripts/buildall
diff --git a/scripts/clang-fmt b/zircon/scripts/clang-fmt
similarity index 100%
rename from scripts/clang-fmt
rename to zircon/scripts/clang-fmt
diff --git a/scripts/do-cppcheck b/zircon/scripts/do-cppcheck
similarity index 100%
rename from scripts/do-cppcheck
rename to zircon/scripts/do-cppcheck
diff --git a/scripts/download-prebuilt b/zircon/scripts/download-prebuilt
similarity index 100%
rename from scripts/download-prebuilt
rename to zircon/scripts/download-prebuilt
diff --git a/scripts/dso-abi.h b/zircon/scripts/dso-abi.h
similarity index 100%
rename from scripts/dso-abi.h
rename to zircon/scripts/dso-abi.h
diff --git a/scripts/dso_handle.ld b/zircon/scripts/dso_handle.ld
similarity index 100%
rename from scripts/dso_handle.ld
rename to zircon/scripts/dso_handle.ld
diff --git a/scripts/entropy-test/jitterentropy/test-basic-config b/zircon/scripts/entropy-test/jitterentropy/test-basic-config
similarity index 100%
rename from scripts/entropy-test/jitterentropy/test-basic-config
rename to zircon/scripts/entropy-test/jitterentropy/test-basic-config
diff --git a/scripts/entropy-test/jitterentropy/test-tunable-config b/zircon/scripts/entropy-test/jitterentropy/test-tunable-config
similarity index 100%
rename from scripts/entropy-test/jitterentropy/test-tunable-config
rename to zircon/scripts/entropy-test/jitterentropy/test-tunable-config
diff --git a/scripts/entropy-test/make-parallel b/zircon/scripts/entropy-test/make-parallel
similarity index 100%
rename from scripts/entropy-test/make-parallel
rename to zircon/scripts/entropy-test/make-parallel
diff --git a/scripts/entropy-test/repeat-boot-test b/zircon/scripts/entropy-test/repeat-boot-test
similarity index 100%
rename from scripts/entropy-test/repeat-boot-test
rename to zircon/scripts/entropy-test/repeat-boot-test
diff --git a/scripts/entropy-test/run-boot-test b/zircon/scripts/entropy-test/run-boot-test
similarity index 100%
rename from scripts/entropy-test/run-boot-test
rename to zircon/scripts/entropy-test/run-boot-test
diff --git a/scripts/fastboot-flash b/zircon/scripts/fastboot-flash
similarity index 100%
rename from scripts/fastboot-flash
rename to zircon/scripts/fastboot-flash
diff --git a/scripts/fastboot-flash-android b/zircon/scripts/fastboot-flash-android
similarity index 100%
rename from scripts/fastboot-flash-android
rename to zircon/scripts/fastboot-flash-android
diff --git a/scripts/flash-avb b/zircon/scripts/flash-avb
similarity index 100%
rename from scripts/flash-avb
rename to zircon/scripts/flash-avb
diff --git a/scripts/flash-cleo b/zircon/scripts/flash-cleo
similarity index 100%
rename from scripts/flash-cleo
rename to zircon/scripts/flash-cleo
diff --git a/scripts/flash-eagle b/zircon/scripts/flash-eagle
similarity index 100%
rename from scripts/flash-eagle
rename to zircon/scripts/flash-eagle
diff --git a/scripts/flash-hikey b/zircon/scripts/flash-hikey
similarity index 100%
rename from scripts/flash-hikey
rename to zircon/scripts/flash-hikey
diff --git a/scripts/flash-imx8mevk b/zircon/scripts/flash-imx8mevk
similarity index 100%
rename from scripts/flash-imx8mevk
rename to zircon/scripts/flash-imx8mevk
diff --git a/scripts/flash-imx8mmevk b/zircon/scripts/flash-imx8mmevk
similarity index 100%
rename from scripts/flash-imx8mmevk
rename to zircon/scripts/flash-imx8mmevk
diff --git a/scripts/flash-kirin970 b/zircon/scripts/flash-kirin970
similarity index 100%
rename from scripts/flash-kirin970
rename to zircon/scripts/flash-kirin970
diff --git a/scripts/flash-madrone b/zircon/scripts/flash-madrone
similarity index 100%
rename from scripts/flash-madrone
rename to zircon/scripts/flash-madrone
diff --git a/scripts/flash-msm8x53-som b/zircon/scripts/flash-msm8x53-som
similarity index 100%
rename from scripts/flash-msm8x53-som
rename to zircon/scripts/flash-msm8x53-som
diff --git a/scripts/flash-mt8167s_ref b/zircon/scripts/flash-mt8167s_ref
similarity index 100%
rename from scripts/flash-mt8167s_ref
rename to zircon/scripts/flash-mt8167s_ref
diff --git a/scripts/flash-vim2 b/zircon/scripts/flash-vim2
similarity index 100%
rename from scripts/flash-vim2
rename to zircon/scripts/flash-vim2
diff --git a/scripts/gen-kaslr-fixups.sh b/zircon/scripts/gen-kaslr-fixups.sh
similarity index 100%
rename from scripts/gen-kaslr-fixups.sh
rename to zircon/scripts/gen-kaslr-fixups.sh
diff --git a/scripts/gen-rodso-code.sh b/zircon/scripts/gen-rodso-code.sh
similarity index 100%
rename from scripts/gen-rodso-code.sh
rename to zircon/scripts/gen-rodso-code.sh
diff --git a/scripts/gen-vdso-valid-sysret.sh b/zircon/scripts/gen-vdso-valid-sysret.sh
similarity index 100%
rename from scripts/gen-vdso-valid-sysret.sh
rename to zircon/scripts/gen-vdso-valid-sysret.sh
diff --git a/scripts/get-build-id b/zircon/scripts/get-build-id
similarity index 100%
rename from scripts/get-build-id
rename to zircon/scripts/get-build-id
diff --git a/scripts/git-version.sh b/zircon/scripts/git-version.sh
similarity index 100%
rename from scripts/git-version.sh
rename to zircon/scripts/git-version.sh
diff --git a/scripts/linux-gather-system-info b/zircon/scripts/linux-gather-system-info
similarity index 100%
rename from scripts/linux-gather-system-info
rename to zircon/scripts/linux-gather-system-info
diff --git a/scripts/make-etags b/zircon/scripts/make-etags
similarity index 100%
rename from scripts/make-etags
rename to zircon/scripts/make-etags
diff --git a/scripts/make-markdown b/zircon/scripts/make-markdown
similarity index 100%
rename from scripts/make-markdown
rename to zircon/scripts/make-markdown
diff --git a/scripts/make-parallel b/zircon/scripts/make-parallel
similarity index 100%
rename from scripts/make-parallel
rename to zircon/scripts/make-parallel
diff --git a/scripts/make-release b/zircon/scripts/make-release
similarity index 100%
rename from scripts/make-release
rename to zircon/scripts/make-release
diff --git a/scripts/make-zircon-x64-grub b/zircon/scripts/make-zircon-x64-grub
similarity index 100%
rename from scripts/make-zircon-x64-grub
rename to zircon/scripts/make-zircon-x64-grub
diff --git a/scripts/merkleroot b/zircon/scripts/merkleroot
similarity index 100%
rename from scripts/merkleroot
rename to zircon/scripts/merkleroot
diff --git a/scripts/netboot-zircon b/zircon/scripts/netboot-zircon
similarity index 100%
rename from scripts/netboot-zircon
rename to zircon/scripts/netboot-zircon
diff --git a/scripts/netcmd b/zircon/scripts/netcmd
similarity index 100%
rename from scripts/netcmd
rename to zircon/scripts/netcmd
diff --git a/scripts/old-symbolize b/zircon/scripts/old-symbolize
similarity index 100%
rename from scripts/old-symbolize
rename to zircon/scripts/old-symbolize
diff --git a/scripts/package-image.sh b/zircon/scripts/package-image.sh
similarity index 100%
rename from scripts/package-image.sh
rename to zircon/scripts/package-image.sh
diff --git a/scripts/qemu-ifup-macos b/zircon/scripts/qemu-ifup-macos
similarity index 100%
rename from scripts/qemu-ifup-macos
rename to zircon/scripts/qemu-ifup-macos
diff --git a/scripts/rodso.ld b/zircon/scripts/rodso.ld
similarity index 100%
rename from scripts/rodso.ld
rename to zircon/scripts/rodso.ld
diff --git a/scripts/run-clang-tidy b/zircon/scripts/run-clang-tidy
similarity index 100%
rename from scripts/run-clang-tidy
rename to zircon/scripts/run-clang-tidy
diff --git a/scripts/run-zircon b/zircon/scripts/run-zircon
similarity index 100%
rename from scripts/run-zircon
rename to zircon/scripts/run-zircon
diff --git a/scripts/run-zircon-arm64 b/zircon/scripts/run-zircon-arm64
similarity index 100%
rename from scripts/run-zircon-arm64
rename to zircon/scripts/run-zircon-arm64
diff --git a/scripts/run-zircon-x64 b/zircon/scripts/run-zircon-x64
similarity index 100%
rename from scripts/run-zircon-x64
rename to zircon/scripts/run-zircon-x64
diff --git a/scripts/shlib-symbols b/zircon/scripts/shlib-symbols
similarity index 100%
rename from scripts/shlib-symbols
rename to zircon/scripts/shlib-symbols
diff --git a/scripts/symbolize b/zircon/scripts/symbolize
similarity index 100%
rename from scripts/symbolize
rename to zircon/scripts/symbolize
diff --git a/scripts/tagit b/zircon/scripts/tagit
similarity index 100%
rename from scripts/tagit
rename to zircon/scripts/tagit
diff --git a/scripts/toolpaths.default b/zircon/scripts/toolpaths.default
similarity index 100%
rename from scripts/toolpaths.default
rename to zircon/scripts/toolpaths.default
diff --git a/scripts/travis-builds.sh b/zircon/scripts/travis-builds.sh
similarity index 100%
rename from scripts/travis-builds.sh
rename to zircon/scripts/travis-builds.sh
diff --git a/scripts/update-docs-from-abigen b/zircon/scripts/update-docs-from-abigen
similarity index 100%
rename from scripts/update-docs-from-abigen
rename to zircon/scripts/update-docs-from-abigen
diff --git a/scripts/zircon.elf-gdb.py b/zircon/scripts/zircon.elf-gdb.py
similarity index 100%
rename from scripts/zircon.elf-gdb.py
rename to zircon/scripts/zircon.elf-gdb.py
diff --git a/system/LICENSE b/zircon/system/LICENSE
similarity index 100%
rename from system/LICENSE
rename to zircon/system/LICENSE
diff --git a/system/banjo/ddk-driver/driver.banjo b/zircon/system/banjo/ddk-driver/driver.banjo
similarity index 100%
rename from system/banjo/ddk-driver/driver.banjo
rename to zircon/system/banjo/ddk-driver/driver.banjo
diff --git a/system/banjo/ddk-driver/rules.mk b/zircon/system/banjo/ddk-driver/rules.mk
similarity index 100%
rename from system/banjo/ddk-driver/rules.mk
rename to zircon/system/banjo/ddk-driver/rules.mk
diff --git a/system/banjo/ddk-physiter/phys-iter.banjo b/zircon/system/banjo/ddk-physiter/phys-iter.banjo
similarity index 100%
rename from system/banjo/ddk-physiter/phys-iter.banjo
rename to zircon/system/banjo/ddk-physiter/phys-iter.banjo
diff --git a/system/banjo/ddk-physiter/rules.mk b/zircon/system/banjo/ddk-physiter/rules.mk
similarity index 100%
rename from system/banjo/ddk-physiter/rules.mk
rename to zircon/system/banjo/ddk-physiter/rules.mk
diff --git a/system/banjo/ddk-protocol-acpi/acpi.banjo b/zircon/system/banjo/ddk-protocol-acpi/acpi.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-acpi/acpi.banjo
rename to zircon/system/banjo/ddk-protocol-acpi/acpi.banjo
diff --git a/system/banjo/ddk-protocol-acpi/rules.mk b/zircon/system/banjo/ddk-protocol-acpi/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-acpi/rules.mk
rename to zircon/system/banjo/ddk-protocol-acpi/rules.mk
diff --git a/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo b/zircon/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo
rename to zircon/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo
diff --git a/system/banjo/ddk-protocol-amlogiccanvas/rules.mk b/zircon/system/banjo/ddk-protocol-amlogiccanvas/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-amlogiccanvas/rules.mk
rename to zircon/system/banjo/ddk-protocol-amlogiccanvas/rules.mk
diff --git a/system/banjo/ddk-protocol-badblock/bad-block.banjo b/zircon/system/banjo/ddk-protocol-badblock/bad-block.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-badblock/bad-block.banjo
rename to zircon/system/banjo/ddk-protocol-badblock/bad-block.banjo
diff --git a/system/banjo/ddk-protocol-badblock/rules.mk b/zircon/system/banjo/ddk-protocol-badblock/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-badblock/rules.mk
rename to zircon/system/banjo/ddk-protocol-badblock/rules.mk
diff --git a/system/banjo/ddk-protocol-block-partition/partition.banjo b/zircon/system/banjo/ddk-protocol-block-partition/partition.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-block-partition/partition.banjo
rename to zircon/system/banjo/ddk-protocol-block-partition/partition.banjo
diff --git a/system/banjo/ddk-protocol-block-partition/rules.mk b/zircon/system/banjo/ddk-protocol-block-partition/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-block-partition/rules.mk
rename to zircon/system/banjo/ddk-protocol-block-partition/rules.mk
diff --git a/system/banjo/ddk-protocol-block-volume/rules.mk b/zircon/system/banjo/ddk-protocol-block-volume/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-block-volume/rules.mk
rename to zircon/system/banjo/ddk-protocol-block-volume/rules.mk
diff --git a/system/banjo/ddk-protocol-block-volume/volume.banjo b/zircon/system/banjo/ddk-protocol-block-volume/volume.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-block-volume/volume.banjo
rename to zircon/system/banjo/ddk-protocol-block-volume/volume.banjo
diff --git a/system/banjo/ddk-protocol-block/block.banjo b/zircon/system/banjo/ddk-protocol-block/block.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-block/block.banjo
rename to zircon/system/banjo/ddk-protocol-block/block.banjo
diff --git a/system/banjo/ddk-protocol-block/rules.mk b/zircon/system/banjo/ddk-protocol-block/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-block/rules.mk
rename to zircon/system/banjo/ddk-protocol-block/rules.mk
diff --git a/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo b/zircon/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo
rename to zircon/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo
diff --git a/system/banjo/ddk-protocol-bt-gattsvc/rules.mk b/zircon/system/banjo/ddk-protocol-bt-gattsvc/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-bt-gattsvc/rules.mk
rename to zircon/system/banjo/ddk-protocol-bt-gattsvc/rules.mk
diff --git a/system/banjo/ddk-protocol-bt-hci/bt-hci.banjo b/zircon/system/banjo/ddk-protocol-bt-hci/bt-hci.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-bt-hci/bt-hci.banjo
rename to zircon/system/banjo/ddk-protocol-bt-hci/bt-hci.banjo
diff --git a/system/banjo/ddk-protocol-bt-hci/rules.mk b/zircon/system/banjo/ddk-protocol-bt-hci/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-bt-hci/rules.mk
rename to zircon/system/banjo/ddk-protocol-bt-hci/rules.mk
diff --git a/system/banjo/ddk-protocol-clk/clk.banjo b/zircon/system/banjo/ddk-protocol-clk/clk.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-clk/clk.banjo
rename to zircon/system/banjo/ddk-protocol-clk/clk.banjo
diff --git a/system/banjo/ddk-protocol-clk/rules.mk b/zircon/system/banjo/ddk-protocol-clk/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-clk/rules.mk
rename to zircon/system/banjo/ddk-protocol-clk/rules.mk
diff --git a/system/banjo/ddk-protocol-display-controller/display-controller.banjo b/zircon/system/banjo/ddk-protocol-display-controller/display-controller.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-display-controller/display-controller.banjo
rename to zircon/system/banjo/ddk-protocol-display-controller/display-controller.banjo
diff --git a/system/banjo/ddk-protocol-display-controller/rules.mk b/zircon/system/banjo/ddk-protocol-display-controller/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-display-controller/rules.mk
rename to zircon/system/banjo/ddk-protocol-display-controller/rules.mk
diff --git a/system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo b/zircon/system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo
rename to zircon/system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo
diff --git a/system/banjo/ddk-protocol-ethernet-board/rules.mk b/zircon/system/banjo/ddk-protocol-ethernet-board/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-ethernet-board/rules.mk
rename to zircon/system/banjo/ddk-protocol-ethernet-board/rules.mk
diff --git a/system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo b/zircon/system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo
rename to zircon/system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo
diff --git a/system/banjo/ddk-protocol-ethernet-mac/rules.mk b/zircon/system/banjo/ddk-protocol-ethernet-mac/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-ethernet-mac/rules.mk
rename to zircon/system/banjo/ddk-protocol-ethernet-mac/rules.mk
diff --git a/system/banjo/ddk-protocol-ethernet/ethernet.banjo b/zircon/system/banjo/ddk-protocol-ethernet/ethernet.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-ethernet/ethernet.banjo
rename to zircon/system/banjo/ddk-protocol-ethernet/ethernet.banjo
diff --git a/system/banjo/ddk-protocol-ethernet/rules.mk b/zircon/system/banjo/ddk-protocol-ethernet/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-ethernet/rules.mk
rename to zircon/system/banjo/ddk-protocol-ethernet/rules.mk
diff --git a/system/banjo/ddk-protocol-gpio/gpio.banjo b/zircon/system/banjo/ddk-protocol-gpio/gpio.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-gpio/gpio.banjo
rename to zircon/system/banjo/ddk-protocol-gpio/gpio.banjo
diff --git a/system/banjo/ddk-protocol-gpio/rules.mk b/zircon/system/banjo/ddk-protocol-gpio/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-gpio/rules.mk
rename to zircon/system/banjo/ddk-protocol-gpio/rules.mk
diff --git a/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo b/zircon/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo
rename to zircon/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo
diff --git a/system/banjo/ddk-protocol-gpioimpl/rules.mk b/zircon/system/banjo/ddk-protocol-gpioimpl/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-gpioimpl/rules.mk
rename to zircon/system/banjo/ddk-protocol-gpioimpl/rules.mk
diff --git a/system/banjo/ddk-protocol-hidbus/hidbus.banjo b/zircon/system/banjo/ddk-protocol-hidbus/hidbus.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-hidbus/hidbus.banjo
rename to zircon/system/banjo/ddk-protocol-hidbus/hidbus.banjo
diff --git a/system/banjo/ddk-protocol-hidbus/rules.mk b/zircon/system/banjo/ddk-protocol-hidbus/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-hidbus/rules.mk
rename to zircon/system/banjo/ddk-protocol-hidbus/rules.mk
diff --git a/system/banjo/ddk-protocol-i2c/i2c.banjo b/zircon/system/banjo/ddk-protocol-i2c/i2c.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-i2c/i2c.banjo
rename to zircon/system/banjo/ddk-protocol-i2c/i2c.banjo
diff --git a/system/banjo/ddk-protocol-i2c/rules.mk b/zircon/system/banjo/ddk-protocol-i2c/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-i2c/rules.mk
rename to zircon/system/banjo/ddk-protocol-i2c/rules.mk
diff --git a/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo b/zircon/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo
rename to zircon/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo
diff --git a/system/banjo/ddk-protocol-i2cimpl/rules.mk b/zircon/system/banjo/ddk-protocol-i2cimpl/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-i2cimpl/rules.mk
rename to zircon/system/banjo/ddk-protocol-i2cimpl/rules.mk
diff --git a/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo b/zircon/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo
rename to zircon/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo
diff --git a/system/banjo/ddk-protocol-intelgpucore/rules.mk b/zircon/system/banjo/ddk-protocol-intelgpucore/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-intelgpucore/rules.mk
rename to zircon/system/banjo/ddk-protocol-intelgpucore/rules.mk
diff --git a/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo b/zircon/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo
rename to zircon/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo
diff --git a/system/banjo/ddk-protocol-intelhda-codec/rules.mk b/zircon/system/banjo/ddk-protocol-intelhda-codec/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-intelhda-codec/rules.mk
rename to zircon/system/banjo/ddk-protocol-intelhda-codec/rules.mk
diff --git a/system/banjo/ddk-protocol-intelhda-dsp/intel-hda-dsp.banjo b/zircon/system/banjo/ddk-protocol-intelhda-dsp/intel-hda-dsp.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-intelhda-dsp/intel-hda-dsp.banjo
rename to zircon/system/banjo/ddk-protocol-intelhda-dsp/intel-hda-dsp.banjo
diff --git a/system/banjo/ddk-protocol-intelhda-dsp/rules.mk b/zircon/system/banjo/ddk-protocol-intelhda-dsp/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-intelhda-dsp/rules.mk
rename to zircon/system/banjo/ddk-protocol-intelhda-dsp/rules.mk
diff --git a/system/banjo/ddk-protocol-iommu/iommu.banjo b/zircon/system/banjo/ddk-protocol-iommu/iommu.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-iommu/iommu.banjo
rename to zircon/system/banjo/ddk-protocol-iommu/iommu.banjo
diff --git a/system/banjo/ddk-protocol-iommu/rules.mk b/zircon/system/banjo/ddk-protocol-iommu/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-iommu/rules.mk
rename to zircon/system/banjo/ddk-protocol-iommu/rules.mk
diff --git a/system/banjo/ddk-protocol-isp/isp.banjo b/zircon/system/banjo/ddk-protocol-isp/isp.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-isp/isp.banjo
rename to zircon/system/banjo/ddk-protocol-isp/isp.banjo
diff --git a/system/banjo/ddk-protocol-isp/rules.mk b/zircon/system/banjo/ddk-protocol-isp/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-isp/rules.mk
rename to zircon/system/banjo/ddk-protocol-isp/rules.mk
diff --git a/system/banjo/ddk-protocol-ispimpl/isp-impl.banjo b/zircon/system/banjo/ddk-protocol-ispimpl/isp-impl.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-ispimpl/isp-impl.banjo
rename to zircon/system/banjo/ddk-protocol-ispimpl/isp-impl.banjo
diff --git a/system/banjo/ddk-protocol-ispimpl/rules.mk b/zircon/system/banjo/ddk-protocol-ispimpl/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-ispimpl/rules.mk
rename to zircon/system/banjo/ddk-protocol-ispimpl/rules.mk
diff --git a/system/banjo/ddk-protocol-mailbox/mailbox.banjo b/zircon/system/banjo/ddk-protocol-mailbox/mailbox.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-mailbox/mailbox.banjo
rename to zircon/system/banjo/ddk-protocol-mailbox/mailbox.banjo
diff --git a/system/banjo/ddk-protocol-mailbox/rules.mk b/zircon/system/banjo/ddk-protocol-mailbox/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-mailbox/rules.mk
rename to zircon/system/banjo/ddk-protocol-mailbox/rules.mk
diff --git a/system/banjo/ddk-protocol-mipicsi/mipicsi.banjo b/zircon/system/banjo/ddk-protocol-mipicsi/mipicsi.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-mipicsi/mipicsi.banjo
rename to zircon/system/banjo/ddk-protocol-mipicsi/mipicsi.banjo
diff --git a/system/banjo/ddk-protocol-mipicsi/rules.mk b/zircon/system/banjo/ddk-protocol-mipicsi/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-mipicsi/rules.mk
rename to zircon/system/banjo/ddk-protocol-mipicsi/rules.mk
diff --git a/system/banjo/ddk-protocol-nand/nand.banjo b/zircon/system/banjo/ddk-protocol-nand/nand.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-nand/nand.banjo
rename to zircon/system/banjo/ddk-protocol-nand/nand.banjo
diff --git a/system/banjo/ddk-protocol-nand/rules.mk b/zircon/system/banjo/ddk-protocol-nand/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-nand/rules.mk
rename to zircon/system/banjo/ddk-protocol-nand/rules.mk
diff --git a/system/banjo/ddk-protocol-pci/pci.banjo b/zircon/system/banjo/ddk-protocol-pci/pci.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-pci/pci.banjo
rename to zircon/system/banjo/ddk-protocol-pci/pci.banjo
diff --git a/system/banjo/ddk-protocol-pci/rules.mk b/zircon/system/banjo/ddk-protocol-pci/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-pci/rules.mk
rename to zircon/system/banjo/ddk-protocol-pci/rules.mk
diff --git a/system/banjo/ddk-protocol-pciroot/pciroot.banjo b/zircon/system/banjo/ddk-protocol-pciroot/pciroot.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-pciroot/pciroot.banjo
rename to zircon/system/banjo/ddk-protocol-pciroot/pciroot.banjo
diff --git a/system/banjo/ddk-protocol-pciroot/rules.mk b/zircon/system/banjo/ddk-protocol-pciroot/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-pciroot/rules.mk
rename to zircon/system/banjo/ddk-protocol-pciroot/rules.mk
diff --git a/system/banjo/ddk-protocol-platform-bus/platform-bus.banjo b/zircon/system/banjo/ddk-protocol-platform-bus/platform-bus.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-platform-bus/platform-bus.banjo
rename to zircon/system/banjo/ddk-protocol-platform-bus/platform-bus.banjo
diff --git a/system/banjo/ddk-protocol-platform-bus/rules.mk b/zircon/system/banjo/ddk-protocol-platform-bus/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-platform-bus/rules.mk
rename to zircon/system/banjo/ddk-protocol-platform-bus/rules.mk
diff --git a/system/banjo/ddk-protocol-platform-device/platform-device.banjo b/zircon/system/banjo/ddk-protocol-platform-device/platform-device.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-platform-device/platform-device.banjo
rename to zircon/system/banjo/ddk-protocol-platform-device/platform-device.banjo
diff --git a/system/banjo/ddk-protocol-platform-device/rules.mk b/zircon/system/banjo/ddk-protocol-platform-device/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-platform-device/rules.mk
rename to zircon/system/banjo/ddk-protocol-platform-device/rules.mk
diff --git a/system/banjo/ddk-protocol-platform-proxy/platform-proxy.banjo b/zircon/system/banjo/ddk-protocol-platform-proxy/platform-proxy.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-platform-proxy/platform-proxy.banjo
rename to zircon/system/banjo/ddk-protocol-platform-proxy/platform-proxy.banjo
diff --git a/system/banjo/ddk-protocol-platform-proxy/rules.mk b/zircon/system/banjo/ddk-protocol-platform-proxy/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-platform-proxy/rules.mk
rename to zircon/system/banjo/ddk-protocol-platform-proxy/rules.mk
diff --git a/system/banjo/ddk-protocol-rawnand/rawnand.banjo b/zircon/system/banjo/ddk-protocol-rawnand/rawnand.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-rawnand/rawnand.banjo
rename to zircon/system/banjo/ddk-protocol-rawnand/rawnand.banjo
diff --git a/system/banjo/ddk-protocol-rawnand/rules.mk b/zircon/system/banjo/ddk-protocol-rawnand/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-rawnand/rules.mk
rename to zircon/system/banjo/ddk-protocol-rawnand/rules.mk
diff --git a/system/banjo/ddk-protocol-scpi/rules.mk b/zircon/system/banjo/ddk-protocol-scpi/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-scpi/rules.mk
rename to zircon/system/banjo/ddk-protocol-scpi/rules.mk
diff --git a/system/banjo/ddk-protocol-scpi/scpi.banjo b/zircon/system/banjo/ddk-protocol-scpi/scpi.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-scpi/scpi.banjo
rename to zircon/system/banjo/ddk-protocol-scpi/scpi.banjo
diff --git a/system/banjo/ddk-protocol-sdhci/rules.mk b/zircon/system/banjo/ddk-protocol-sdhci/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-sdhci/rules.mk
rename to zircon/system/banjo/ddk-protocol-sdhci/rules.mk
diff --git a/system/banjo/ddk-protocol-sdhci/sdhci.banjo b/zircon/system/banjo/ddk-protocol-sdhci/sdhci.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-sdhci/sdhci.banjo
rename to zircon/system/banjo/ddk-protocol-sdhci/sdhci.banjo
diff --git a/system/banjo/ddk-protocol-sdio/rules.mk b/zircon/system/banjo/ddk-protocol-sdio/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-sdio/rules.mk
rename to zircon/system/banjo/ddk-protocol-sdio/rules.mk
diff --git a/system/banjo/ddk-protocol-sdio/sdio.banjo b/zircon/system/banjo/ddk-protocol-sdio/sdio.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-sdio/sdio.banjo
rename to zircon/system/banjo/ddk-protocol-sdio/sdio.banjo
diff --git a/system/banjo/ddk-protocol-sdmmc/rules.mk b/zircon/system/banjo/ddk-protocol-sdmmc/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-sdmmc/rules.mk
rename to zircon/system/banjo/ddk-protocol-sdmmc/rules.mk
diff --git a/system/banjo/ddk-protocol-sdmmc/sdmmc.banjo b/zircon/system/banjo/ddk-protocol-sdmmc/sdmmc.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-sdmmc/sdmmc.banjo
rename to zircon/system/banjo/ddk-protocol-sdmmc/sdmmc.banjo
diff --git a/system/banjo/ddk-protocol-serial/rules.mk b/zircon/system/banjo/ddk-protocol-serial/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-serial/rules.mk
rename to zircon/system/banjo/ddk-protocol-serial/rules.mk
diff --git a/system/banjo/ddk-protocol-serial/serial.banjo b/zircon/system/banjo/ddk-protocol-serial/serial.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-serial/serial.banjo
rename to zircon/system/banjo/ddk-protocol-serial/serial.banjo
diff --git a/system/banjo/ddk-protocol-serialimpl/rules.mk b/zircon/system/banjo/ddk-protocol-serialimpl/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-serialimpl/rules.mk
rename to zircon/system/banjo/ddk-protocol-serialimpl/rules.mk
diff --git a/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo b/zircon/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-serialimpl/serial-impl.banjo
rename to zircon/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo
diff --git a/system/banjo/ddk-protocol-sysmem/rules.mk b/zircon/system/banjo/ddk-protocol-sysmem/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-sysmem/rules.mk
rename to zircon/system/banjo/ddk-protocol-sysmem/rules.mk
diff --git a/system/banjo/ddk-protocol-sysmem/sysmem.banjo b/zircon/system/banjo/ddk-protocol-sysmem/sysmem.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-sysmem/sysmem.banjo
rename to zircon/system/banjo/ddk-protocol-sysmem/sysmem.banjo
diff --git a/system/banjo/ddk-protocol-test/rules.mk b/zircon/system/banjo/ddk-protocol-test/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-test/rules.mk
rename to zircon/system/banjo/ddk-protocol-test/rules.mk
diff --git a/system/banjo/ddk-protocol-test/test.banjo b/zircon/system/banjo/ddk-protocol-test/test.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-test/test.banjo
rename to zircon/system/banjo/ddk-protocol-test/test.banjo
diff --git a/system/banjo/ddk-protocol-usb-bus/rules.mk b/zircon/system/banjo/ddk-protocol-usb-bus/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-bus/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-bus/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-bus/usb-bus.banjo b/zircon/system/banjo/ddk-protocol-usb-bus/usb-bus.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-bus/usb-bus.banjo
rename to zircon/system/banjo/ddk-protocol-usb-bus/usb-bus.banjo
diff --git a/system/banjo/ddk-protocol-usb-composite/rules.mk b/zircon/system/banjo/ddk-protocol-usb-composite/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-composite/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-composite/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-composite/usb-composite.banjo b/zircon/system/banjo/ddk-protocol-usb-composite/usb-composite.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-composite/usb-composite.banjo
rename to zircon/system/banjo/ddk-protocol-usb-composite/usb-composite.banjo
diff --git a/system/banjo/ddk-protocol-usb-dci/rules.mk b/zircon/system/banjo/ddk-protocol-usb-dci/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-dci/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-dci/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-dci/usb-dci.banjo b/zircon/system/banjo/ddk-protocol-usb-dci/usb-dci.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-dci/usb-dci.banjo
rename to zircon/system/banjo/ddk-protocol-usb-dci/usb-dci.banjo
diff --git a/system/banjo/ddk-protocol-usb-function/rules.mk b/zircon/system/banjo/ddk-protocol-usb-function/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-function/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-function/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-function/usb-function.banjo b/zircon/system/banjo/ddk-protocol-usb-function/usb-function.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-function/usb-function.banjo
rename to zircon/system/banjo/ddk-protocol-usb-function/usb-function.banjo
diff --git a/system/banjo/ddk-protocol-usb-hci/rules.mk b/zircon/system/banjo/ddk-protocol-usb-hci/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-hci/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-hci/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-hci/usb-hci.banjo b/zircon/system/banjo/ddk-protocol-usb-hci/usb-hci.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-hci/usb-hci.banjo
rename to zircon/system/banjo/ddk-protocol-usb-hci/usb-hci.banjo
diff --git a/system/banjo/ddk-protocol-usb-hub/rules.mk b/zircon/system/banjo/ddk-protocol-usb-hub/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-hub/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-hub/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-hub/usb-hub.banjo b/zircon/system/banjo/ddk-protocol-usb-hub/usb-hub.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-hub/usb-hub.banjo
rename to zircon/system/banjo/ddk-protocol-usb-hub/usb-hub.banjo
diff --git a/system/banjo/ddk-protocol-usb-modeswitch/rules.mk b/zircon/system/banjo/ddk-protocol-usb-modeswitch/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-modeswitch/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-modeswitch/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo b/zircon/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo
rename to zircon/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo
diff --git a/system/banjo/ddk-protocol-usb-request/rules.mk b/zircon/system/banjo/ddk-protocol-usb-request/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb-request/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb-request/rules.mk
diff --git a/system/banjo/ddk-protocol-usb-request/usb-request.banjo b/zircon/system/banjo/ddk-protocol-usb-request/usb-request.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb-request/usb-request.banjo
rename to zircon/system/banjo/ddk-protocol-usb-request/usb-request.banjo
diff --git a/system/banjo/ddk-protocol-usb/rules.mk b/zircon/system/banjo/ddk-protocol-usb/rules.mk
similarity index 100%
rename from system/banjo/ddk-protocol-usb/rules.mk
rename to zircon/system/banjo/ddk-protocol-usb/rules.mk
diff --git a/system/banjo/ddk-protocol-usb/usb.banjo b/zircon/system/banjo/ddk-protocol-usb/usb.banjo
similarity index 100%
rename from system/banjo/ddk-protocol-usb/usb.banjo
rename to zircon/system/banjo/ddk-protocol-usb/usb.banjo
diff --git a/system/banjo/zircon-device-audio/audio.banjo b/zircon/system/banjo/zircon-device-audio/audio.banjo
similarity index 100%
rename from system/banjo/zircon-device-audio/audio.banjo
rename to zircon/system/banjo/zircon-device-audio/audio.banjo
diff --git a/system/banjo/zircon-device-audio/rules.mk b/zircon/system/banjo/zircon-device-audio/rules.mk
similarity index 100%
rename from system/banjo/zircon-device-audio/rules.mk
rename to zircon/system/banjo/zircon-device-audio/rules.mk
diff --git a/system/banjo/zircon-device-block/block.banjo b/zircon/system/banjo/zircon-device-block/block.banjo
similarity index 100%
rename from system/banjo/zircon-device-block/block.banjo
rename to zircon/system/banjo/zircon-device-block/block.banjo
diff --git a/system/banjo/zircon-device-block/rules.mk b/zircon/system/banjo/zircon-device-block/rules.mk
similarity index 100%
rename from system/banjo/zircon-device-block/rules.mk
rename to zircon/system/banjo/zircon-device-block/rules.mk
diff --git a/system/banjo/zircon-device-nand/nand.banjo b/zircon/system/banjo/zircon-device-nand/nand.banjo
similarity index 100%
rename from system/banjo/zircon-device-nand/nand.banjo
rename to zircon/system/banjo/zircon-device-nand/nand.banjo
diff --git a/system/banjo/zircon-device-nand/rules.mk b/zircon/system/banjo/zircon-device-nand/rules.mk
similarity index 100%
rename from system/banjo/zircon-device-nand/rules.mk
rename to zircon/system/banjo/zircon-device-nand/rules.mk
diff --git a/system/banjo/zircon-hw-pci/hwpci.banjo b/zircon/system/banjo/zircon-hw-pci/hwpci.banjo
similarity index 100%
rename from system/banjo/zircon-hw-pci/hwpci.banjo
rename to zircon/system/banjo/zircon-hw-pci/hwpci.banjo
diff --git a/system/banjo/zircon-hw-pci/rules.mk b/zircon/system/banjo/zircon-hw-pci/rules.mk
similarity index 100%
rename from system/banjo/zircon-hw-pci/rules.mk
rename to zircon/system/banjo/zircon-hw-pci/rules.mk
diff --git a/system/banjo/zircon-hw-usb-hub/rules.mk b/zircon/system/banjo/zircon-hw-usb-hub/rules.mk
similarity index 100%
rename from system/banjo/zircon-hw-usb-hub/rules.mk
rename to zircon/system/banjo/zircon-hw-usb-hub/rules.mk
diff --git a/system/banjo/zircon-hw-usb-hub/usb-hub.banjo b/zircon/system/banjo/zircon-hw-usb-hub/usb-hub.banjo
similarity index 100%
rename from system/banjo/zircon-hw-usb-hub/usb-hub.banjo
rename to zircon/system/banjo/zircon-hw-usb-hub/usb-hub.banjo
diff --git a/system/banjo/zircon-hw-usb/rules.mk b/zircon/system/banjo/zircon-hw-usb/rules.mk
similarity index 100%
rename from system/banjo/zircon-hw-usb/rules.mk
rename to zircon/system/banjo/zircon-hw-usb/rules.mk
diff --git a/system/banjo/zircon-hw-usb/usb.banjo b/zircon/system/banjo/zircon-hw-usb/usb.banjo
similarity index 100%
rename from system/banjo/zircon-hw-usb/usb.banjo
rename to zircon/system/banjo/zircon-hw-usb/usb.banjo
diff --git a/system/banjo/zircon-syscalls-pci/pci.banjo b/zircon/system/banjo/zircon-syscalls-pci/pci.banjo
similarity index 100%
rename from system/banjo/zircon-syscalls-pci/pci.banjo
rename to zircon/system/banjo/zircon-syscalls-pci/pci.banjo
diff --git a/system/banjo/zircon-syscalls-pci/rules.mk b/zircon/system/banjo/zircon-syscalls-pci/rules.mk
similarity index 100%
rename from system/banjo/zircon-syscalls-pci/rules.mk
rename to zircon/system/banjo/zircon-syscalls-pci/rules.mk
diff --git a/system/core/MAINTAINERS b/zircon/system/core/MAINTAINERS
similarity index 100%
rename from system/core/MAINTAINERS
rename to zircon/system/core/MAINTAINERS
diff --git a/system/core/bootsvc/TESTING b/zircon/system/core/bootsvc/TESTING
similarity index 100%
rename from system/core/bootsvc/TESTING
rename to zircon/system/core/bootsvc/TESTING
diff --git a/system/core/bootsvc/bootfs-loader-service.cpp b/zircon/system/core/bootsvc/bootfs-loader-service.cpp
similarity index 100%
rename from system/core/bootsvc/bootfs-loader-service.cpp
rename to zircon/system/core/bootsvc/bootfs-loader-service.cpp
diff --git a/system/core/bootsvc/bootfs-loader-service.h b/zircon/system/core/bootsvc/bootfs-loader-service.h
similarity index 100%
rename from system/core/bootsvc/bootfs-loader-service.h
rename to zircon/system/core/bootsvc/bootfs-loader-service.h
diff --git a/system/core/bootsvc/bootfs-service.cpp b/zircon/system/core/bootsvc/bootfs-service.cpp
similarity index 100%
rename from system/core/bootsvc/bootfs-service.cpp
rename to zircon/system/core/bootsvc/bootfs-service.cpp
diff --git a/system/core/bootsvc/bootfs-service.h b/zircon/system/core/bootsvc/bootfs-service.h
similarity index 100%
rename from system/core/bootsvc/bootfs-service.h
rename to zircon/system/core/bootsvc/bootfs-service.h
diff --git a/system/core/bootsvc/integration-test.cpp b/zircon/system/core/bootsvc/integration-test.cpp
similarity index 100%
rename from system/core/bootsvc/integration-test.cpp
rename to zircon/system/core/bootsvc/integration-test.cpp
diff --git a/system/core/bootsvc/main.cpp b/zircon/system/core/bootsvc/main.cpp
similarity index 100%
rename from system/core/bootsvc/main.cpp
rename to zircon/system/core/bootsvc/main.cpp
diff --git a/system/core/bootsvc/rules.mk b/zircon/system/core/bootsvc/rules.mk
similarity index 100%
rename from system/core/bootsvc/rules.mk
rename to zircon/system/core/bootsvc/rules.mk
diff --git a/system/core/bootsvc/util.cpp b/zircon/system/core/bootsvc/util.cpp
similarity index 100%
rename from system/core/bootsvc/util.cpp
rename to zircon/system/core/bootsvc/util.cpp
diff --git a/system/core/bootsvc/util.h b/zircon/system/core/bootsvc/util.h
similarity index 100%
rename from system/core/bootsvc/util.h
rename to zircon/system/core/bootsvc/util.h
diff --git a/system/core/devmgr/devhost/api.cpp b/zircon/system/core/devmgr/devhost/api.cpp
similarity index 100%
rename from system/core/devmgr/devhost/api.cpp
rename to zircon/system/core/devmgr/devhost/api.cpp
diff --git a/system/core/devmgr/devhost/core.cpp b/zircon/system/core/devmgr/devhost/core.cpp
similarity index 100%
rename from system/core/devmgr/devhost/core.cpp
rename to zircon/system/core/devmgr/devhost/core.cpp
diff --git a/system/core/devmgr/devhost/devhost.cpp b/zircon/system/core/devmgr/devhost/devhost.cpp
similarity index 100%
rename from system/core/devmgr/devhost/devhost.cpp
rename to zircon/system/core/devmgr/devhost/devhost.cpp
diff --git a/system/core/devmgr/devhost/devhost.h b/zircon/system/core/devmgr/devhost/devhost.h
similarity index 100%
rename from system/core/devmgr/devhost/devhost.h
rename to zircon/system/core/devmgr/devhost/devhost.h
diff --git a/system/core/devmgr/devhost/device-internal.h b/zircon/system/core/devmgr/devhost/device-internal.h
similarity index 100%
rename from system/core/devmgr/devhost/device-internal.h
rename to zircon/system/core/devmgr/devhost/device-internal.h
diff --git a/system/core/devmgr/devhost/lock.h b/zircon/system/core/devmgr/devhost/lock.h
similarity index 100%
rename from system/core/devmgr/devhost/lock.h
rename to zircon/system/core/devmgr/devhost/lock.h
diff --git a/system/core/devmgr/devhost/main.cpp b/zircon/system/core/devmgr/devhost/main.cpp
similarity index 100%
rename from system/core/devmgr/devhost/main.cpp
rename to zircon/system/core/devmgr/devhost/main.cpp
diff --git a/system/core/devmgr/devhost/main.h b/zircon/system/core/devmgr/devhost/main.h
similarity index 100%
rename from system/core/devmgr/devhost/main.h
rename to zircon/system/core/devmgr/devhost/main.h
diff --git a/system/core/devmgr/devhost/rpc-server.cpp b/zircon/system/core/devmgr/devhost/rpc-server.cpp
similarity index 100%
rename from system/core/devmgr/devhost/rpc-server.cpp
rename to zircon/system/core/devmgr/devhost/rpc-server.cpp
diff --git a/system/core/devmgr/devhost/tracing.cpp b/zircon/system/core/devmgr/devhost/tracing.cpp
similarity index 100%
rename from system/core/devmgr/devhost/tracing.cpp
rename to zircon/system/core/devmgr/devhost/tracing.cpp
diff --git a/system/core/devmgr/devhost/tracing.h b/zircon/system/core/devmgr/devhost/tracing.h
similarity index 100%
rename from system/core/devmgr/devhost/tracing.h
rename to zircon/system/core/devmgr/devhost/tracing.h
diff --git a/system/core/devmgr/devhost/zx-device.cpp b/zircon/system/core/devmgr/devhost/zx-device.cpp
similarity index 100%
rename from system/core/devmgr/devhost/zx-device.cpp
rename to zircon/system/core/devmgr/devhost/zx-device.cpp
diff --git a/system/core/devmgr/devmgr/binding.cpp b/zircon/system/core/devmgr/devmgr/binding.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/binding.cpp
rename to zircon/system/core/devmgr/devmgr/binding.cpp
diff --git a/system/core/devmgr/devmgr/coordinator-test.cpp b/zircon/system/core/devmgr/devmgr/coordinator-test.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/coordinator-test.cpp
rename to zircon/system/core/devmgr/devmgr/coordinator-test.cpp
diff --git a/system/core/devmgr/devmgr/coordinator.cpp b/zircon/system/core/devmgr/devmgr/coordinator.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/coordinator.cpp
rename to zircon/system/core/devmgr/devmgr/coordinator.cpp
diff --git a/system/core/devmgr/devmgr/coordinator.h b/zircon/system/core/devmgr/devmgr/coordinator.h
similarity index 100%
rename from system/core/devmgr/devmgr/coordinator.h
rename to zircon/system/core/devmgr/devmgr/coordinator.h
diff --git a/system/core/devmgr/devmgr/devfs.cpp b/zircon/system/core/devmgr/devmgr/devfs.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/devfs.cpp
rename to zircon/system/core/devmgr/devmgr/devfs.cpp
diff --git a/system/core/devmgr/devmgr/devhost-loader-service.cpp b/zircon/system/core/devmgr/devmgr/devhost-loader-service.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/devhost-loader-service.cpp
rename to zircon/system/core/devmgr/devmgr/devhost-loader-service.cpp
diff --git a/system/core/devmgr/devmgr/devhost-loader-service.h b/zircon/system/core/devmgr/devmgr/devhost-loader-service.h
similarity index 100%
rename from system/core/devmgr/devmgr/devhost-loader-service.h
rename to zircon/system/core/devmgr/devmgr/devhost-loader-service.h
diff --git a/system/core/devmgr/devmgr/device.cpp b/zircon/system/core/devmgr/devmgr/device.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/device.cpp
rename to zircon/system/core/devmgr/devmgr/device.cpp
diff --git a/system/core/devmgr/devmgr/device.h b/zircon/system/core/devmgr/devmgr/device.h
similarity index 100%
rename from system/core/devmgr/devmgr/device.h
rename to zircon/system/core/devmgr/devmgr/device.h
diff --git a/system/core/devmgr/devmgr/devmgr.h b/zircon/system/core/devmgr/devmgr/devmgr.h
similarity index 100%
rename from system/core/devmgr/devmgr/devmgr.h
rename to zircon/system/core/devmgr/devmgr/devmgr.h
diff --git a/system/core/devmgr/devmgr/driver.cpp b/zircon/system/core/devmgr/devmgr/driver.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/driver.cpp
rename to zircon/system/core/devmgr/devmgr/driver.cpp
diff --git a/system/core/devmgr/devmgr/driver.h b/zircon/system/core/devmgr/devmgr/driver.h
similarity index 100%
rename from system/core/devmgr/devmgr/driver.h
rename to zircon/system/core/devmgr/devmgr/driver.h
diff --git a/system/core/devmgr/devmgr/fidl.cpp b/zircon/system/core/devmgr/devmgr/fidl.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/fidl.cpp
rename to zircon/system/core/devmgr/devmgr/fidl.cpp
diff --git a/system/core/devmgr/devmgr/main.cpp b/zircon/system/core/devmgr/devmgr/main.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/main.cpp
rename to zircon/system/core/devmgr/devmgr/main.cpp
diff --git a/system/core/devmgr/devmgr/metadata.h b/zircon/system/core/devmgr/devmgr/metadata.h
similarity index 100%
rename from system/core/devmgr/devmgr/metadata.h
rename to zircon/system/core/devmgr/devmgr/metadata.h
diff --git a/system/core/devmgr/devmgr/test-main.cpp b/zircon/system/core/devmgr/devmgr/test-main.cpp
similarity index 100%
rename from system/core/devmgr/devmgr/test-main.cpp
rename to zircon/system/core/devmgr/devmgr/test-main.cpp
diff --git a/system/core/devmgr/dmctl/dmctl.cpp b/zircon/system/core/devmgr/dmctl/dmctl.cpp
similarity index 100%
rename from system/core/devmgr/dmctl/dmctl.cpp
rename to zircon/system/core/devmgr/dmctl/dmctl.cpp
diff --git a/system/core/devmgr/fshost/block-watcher.cpp b/zircon/system/core/devmgr/fshost/block-watcher.cpp
similarity index 100%
rename from system/core/devmgr/fshost/block-watcher.cpp
rename to zircon/system/core/devmgr/fshost/block-watcher.cpp
diff --git a/system/core/devmgr/fshost/fshost.h b/zircon/system/core/devmgr/fshost/fshost.h
similarity index 100%
rename from system/core/devmgr/fshost/fshost.h
rename to zircon/system/core/devmgr/fshost/fshost.h
diff --git a/system/core/devmgr/fshost/main.cpp b/zircon/system/core/devmgr/fshost/main.cpp
similarity index 100%
rename from system/core/devmgr/fshost/main.cpp
rename to zircon/system/core/devmgr/fshost/main.cpp
diff --git a/system/core/devmgr/fshost/vfs-rpc.cpp b/zircon/system/core/devmgr/fshost/vfs-rpc.cpp
similarity index 100%
rename from system/core/devmgr/fshost/vfs-rpc.cpp
rename to zircon/system/core/devmgr/fshost/vfs-rpc.cpp
diff --git a/system/core/devmgr/rules.mk b/zircon/system/core/devmgr/rules.mk
similarity index 100%
rename from system/core/devmgr/rules.mk
rename to zircon/system/core/devmgr/rules.mk
diff --git a/system/core/devmgr/shared/async-loop-owned-rpc-handler.h b/zircon/system/core/devmgr/shared/async-loop-owned-rpc-handler.h
similarity index 100%
rename from system/core/devmgr/shared/async-loop-owned-rpc-handler.h
rename to zircon/system/core/devmgr/shared/async-loop-owned-rpc-handler.h
diff --git a/system/core/devmgr/shared/env.cpp b/zircon/system/core/devmgr/shared/env.cpp
similarity index 100%
rename from system/core/devmgr/shared/env.cpp
rename to zircon/system/core/devmgr/shared/env.cpp
diff --git a/system/core/devmgr/shared/env.h b/zircon/system/core/devmgr/shared/env.h
similarity index 100%
rename from system/core/devmgr/shared/env.h
rename to zircon/system/core/devmgr/shared/env.h
diff --git a/system/core/devmgr/shared/fdio.cpp b/zircon/system/core/devmgr/shared/fdio.cpp
similarity index 100%
rename from system/core/devmgr/shared/fdio.cpp
rename to zircon/system/core/devmgr/shared/fdio.cpp
diff --git a/system/core/devmgr/shared/fdio.h b/zircon/system/core/devmgr/shared/fdio.h
similarity index 100%
rename from system/core/devmgr/shared/fdio.h
rename to zircon/system/core/devmgr/shared/fdio.h
diff --git a/system/core/devmgr/shared/fidl_txn.h b/zircon/system/core/devmgr/shared/fidl_txn.h
similarity index 100%
rename from system/core/devmgr/shared/fidl_txn.h
rename to zircon/system/core/devmgr/shared/fidl_txn.h
diff --git a/system/core/devmgr/shared/log.h b/zircon/system/core/devmgr/shared/log.h
similarity index 100%
rename from system/core/devmgr/shared/log.h
rename to zircon/system/core/devmgr/shared/log.h
diff --git a/system/core/netsvc/debuglog.cpp b/zircon/system/core/netsvc/debuglog.cpp
similarity index 100%
rename from system/core/netsvc/debuglog.cpp
rename to zircon/system/core/netsvc/debuglog.cpp
diff --git a/system/core/netsvc/device_id.cpp b/zircon/system/core/netsvc/device_id.cpp
similarity index 100%
rename from system/core/netsvc/device_id.cpp
rename to zircon/system/core/netsvc/device_id.cpp
diff --git a/system/core/netsvc/device_id.h b/zircon/system/core/netsvc/device_id.h
similarity index 100%
rename from system/core/netsvc/device_id.h
rename to zircon/system/core/netsvc/device_id.h
diff --git a/system/core/netsvc/eff_short_wordlist_1.h b/zircon/system/core/netsvc/eff_short_wordlist_1.h
similarity index 100%
rename from system/core/netsvc/eff_short_wordlist_1.h
rename to zircon/system/core/netsvc/eff_short_wordlist_1.h
diff --git a/system/core/netsvc/netboot.cpp b/zircon/system/core/netsvc/netboot.cpp
similarity index 100%
rename from system/core/netsvc/netboot.cpp
rename to zircon/system/core/netsvc/netboot.cpp
diff --git a/system/core/netsvc/netfile.cpp b/zircon/system/core/netsvc/netfile.cpp
similarity index 100%
rename from system/core/netsvc/netfile.cpp
rename to zircon/system/core/netsvc/netfile.cpp
diff --git a/system/core/netsvc/netsvc.cpp b/zircon/system/core/netsvc/netsvc.cpp
similarity index 100%
rename from system/core/netsvc/netsvc.cpp
rename to zircon/system/core/netsvc/netsvc.cpp
diff --git a/system/core/netsvc/netsvc.h b/zircon/system/core/netsvc/netsvc.h
similarity index 100%
rename from system/core/netsvc/netsvc.h
rename to zircon/system/core/netsvc/netsvc.h
diff --git a/system/core/netsvc/rules.mk b/zircon/system/core/netsvc/rules.mk
similarity index 100%
rename from system/core/netsvc/rules.mk
rename to zircon/system/core/netsvc/rules.mk
diff --git a/system/core/netsvc/tftp.cpp b/zircon/system/core/netsvc/tftp.cpp
similarity index 100%
rename from system/core/netsvc/tftp.cpp
rename to zircon/system/core/netsvc/tftp.cpp
diff --git a/system/core/netsvc/zbi.cpp b/zircon/system/core/netsvc/zbi.cpp
similarity index 100%
rename from system/core/netsvc/zbi.cpp
rename to zircon/system/core/netsvc/zbi.cpp
diff --git a/system/core/netsvc/zbi.h b/zircon/system/core/netsvc/zbi.h
similarity index 100%
rename from system/core/netsvc/zbi.h
rename to zircon/system/core/netsvc/zbi.h
diff --git a/system/core/pwrbtn-monitor/pwrbtn-monitor.cpp b/zircon/system/core/pwrbtn-monitor/pwrbtn-monitor.cpp
similarity index 100%
rename from system/core/pwrbtn-monitor/pwrbtn-monitor.cpp
rename to zircon/system/core/pwrbtn-monitor/pwrbtn-monitor.cpp
diff --git a/system/core/pwrbtn-monitor/rules.mk b/zircon/system/core/pwrbtn-monitor/rules.mk
similarity index 100%
rename from system/core/pwrbtn-monitor/rules.mk
rename to zircon/system/core/pwrbtn-monitor/rules.mk
diff --git a/system/core/svchost/MAINTAINERS b/zircon/system/core/svchost/MAINTAINERS
similarity index 100%
rename from system/core/svchost/MAINTAINERS
rename to zircon/system/core/svchost/MAINTAINERS
diff --git a/system/core/svchost/crashsvc.cpp b/zircon/system/core/svchost/crashsvc.cpp
similarity index 100%
rename from system/core/svchost/crashsvc.cpp
rename to zircon/system/core/svchost/crashsvc.cpp
diff --git a/system/core/svchost/rules.mk b/zircon/system/core/svchost/rules.mk
similarity index 100%
rename from system/core/svchost/rules.mk
rename to zircon/system/core/svchost/rules.mk
diff --git a/system/core/svchost/svchost.cpp b/zircon/system/core/svchost/svchost.cpp
similarity index 100%
rename from system/core/svchost/svchost.cpp
rename to zircon/system/core/svchost/svchost.cpp
diff --git a/system/core/svchost/sysmem.cpp b/zircon/system/core/svchost/sysmem.cpp
similarity index 100%
rename from system/core/svchost/sysmem.cpp
rename to zircon/system/core/svchost/sysmem.cpp
diff --git a/system/core/svchost/sysmem.h b/zircon/system/core/svchost/sysmem.h
similarity index 100%
rename from system/core/svchost/sysmem.h
rename to zircon/system/core/svchost/sysmem.h
diff --git a/system/core/userboot/MAINTAINERS b/zircon/system/core/userboot/MAINTAINERS
similarity index 100%
rename from system/core/userboot/MAINTAINERS
rename to zircon/system/core/userboot/MAINTAINERS
diff --git a/system/core/userboot/bootdata.c b/zircon/system/core/userboot/bootdata.c
similarity index 100%
rename from system/core/userboot/bootdata.c
rename to zircon/system/core/userboot/bootdata.c
diff --git a/system/core/userboot/bootdata.h b/zircon/system/core/userboot/bootdata.h
similarity index 100%
rename from system/core/userboot/bootdata.h
rename to zircon/system/core/userboot/bootdata.h
diff --git a/system/core/userboot/bootfs.c b/zircon/system/core/userboot/bootfs.c
similarity index 100%
rename from system/core/userboot/bootfs.c
rename to zircon/system/core/userboot/bootfs.c
diff --git a/system/core/userboot/bootfs.h b/zircon/system/core/userboot/bootfs.h
similarity index 100%
rename from system/core/userboot/bootfs.h
rename to zircon/system/core/userboot/bootfs.h
diff --git a/system/core/userboot/loader-service.c b/zircon/system/core/userboot/loader-service.c
similarity index 100%
rename from system/core/userboot/loader-service.c
rename to zircon/system/core/userboot/loader-service.c
diff --git a/system/core/userboot/loader-service.h b/zircon/system/core/userboot/loader-service.h
similarity index 100%
rename from system/core/userboot/loader-service.h
rename to zircon/system/core/userboot/loader-service.h
diff --git a/system/core/userboot/option.c b/zircon/system/core/userboot/option.c
similarity index 100%
rename from system/core/userboot/option.c
rename to zircon/system/core/userboot/option.c
diff --git a/system/core/userboot/option.h b/zircon/system/core/userboot/option.h
similarity index 100%
rename from system/core/userboot/option.h
rename to zircon/system/core/userboot/option.h
diff --git a/system/core/userboot/rules.mk b/zircon/system/core/userboot/rules.mk
similarity index 100%
rename from system/core/userboot/rules.mk
rename to zircon/system/core/userboot/rules.mk
diff --git a/system/core/userboot/start.c b/zircon/system/core/userboot/start.c
similarity index 100%
rename from system/core/userboot/start.c
rename to zircon/system/core/userboot/start.c
diff --git a/system/core/userboot/userboot-elf.c b/zircon/system/core/userboot/userboot-elf.c
similarity index 100%
rename from system/core/userboot/userboot-elf.c
rename to zircon/system/core/userboot/userboot-elf.c
diff --git a/system/core/userboot/userboot-elf.h b/zircon/system/core/userboot/userboot-elf.h
similarity index 100%
rename from system/core/userboot/userboot-elf.h
rename to zircon/system/core/userboot/userboot-elf.h
diff --git a/system/core/userboot/util.c b/zircon/system/core/userboot/util.c
similarity index 100%
rename from system/core/userboot/util.c
rename to zircon/system/core/userboot/util.c
diff --git a/system/core/userboot/util.h b/zircon/system/core/userboot/util.h
similarity index 100%
rename from system/core/userboot/util.h
rename to zircon/system/core/userboot/util.h
diff --git a/system/core/userboot/vdso-syms.ld.h b/zircon/system/core/userboot/vdso-syms.ld.h
similarity index 100%
rename from system/core/userboot/vdso-syms.ld.h
rename to zircon/system/core/userboot/vdso-syms.ld.h
diff --git a/system/core/virtcon/keyboard-test.cpp b/zircon/system/core/virtcon/keyboard-test.cpp
similarity index 100%
rename from system/core/virtcon/keyboard-test.cpp
rename to zircon/system/core/virtcon/keyboard-test.cpp
diff --git a/system/core/virtcon/keyboard-vt100.cpp b/zircon/system/core/virtcon/keyboard-vt100.cpp
similarity index 100%
rename from system/core/virtcon/keyboard-vt100.cpp
rename to zircon/system/core/virtcon/keyboard-vt100.cpp
diff --git a/system/core/virtcon/keyboard-vt100.h b/zircon/system/core/virtcon/keyboard-vt100.h
similarity index 100%
rename from system/core/virtcon/keyboard-vt100.h
rename to zircon/system/core/virtcon/keyboard-vt100.h
diff --git a/system/core/virtcon/keyboard.cpp b/zircon/system/core/virtcon/keyboard.cpp
similarity index 100%
rename from system/core/virtcon/keyboard.cpp
rename to zircon/system/core/virtcon/keyboard.cpp
diff --git a/system/core/virtcon/keyboard.h b/zircon/system/core/virtcon/keyboard.h
similarity index 100%
rename from system/core/virtcon/keyboard.h
rename to zircon/system/core/virtcon/keyboard.h
diff --git a/system/core/virtcon/main.cpp b/zircon/system/core/virtcon/main.cpp
similarity index 100%
rename from system/core/virtcon/main.cpp
rename to zircon/system/core/virtcon/main.cpp
diff --git a/system/core/virtcon/rules.mk b/zircon/system/core/virtcon/rules.mk
similarity index 100%
rename from system/core/virtcon/rules.mk
rename to zircon/system/core/virtcon/rules.mk
diff --git a/system/core/virtcon/textcon-test.cpp b/zircon/system/core/virtcon/textcon-test.cpp
similarity index 100%
rename from system/core/virtcon/textcon-test.cpp
rename to zircon/system/core/virtcon/textcon-test.cpp
diff --git a/system/core/virtcon/textcon.cpp b/zircon/system/core/virtcon/textcon.cpp
similarity index 100%
rename from system/core/virtcon/textcon.cpp
rename to zircon/system/core/virtcon/textcon.cpp
diff --git a/system/core/virtcon/textcon.h b/zircon/system/core/virtcon/textcon.h
similarity index 100%
rename from system/core/virtcon/textcon.h
rename to zircon/system/core/virtcon/textcon.h
diff --git a/system/core/virtcon/vc-device.cpp b/zircon/system/core/virtcon/vc-device.cpp
similarity index 100%
rename from system/core/virtcon/vc-device.cpp
rename to zircon/system/core/virtcon/vc-device.cpp
diff --git a/system/core/virtcon/vc-display.cpp b/zircon/system/core/virtcon/vc-display.cpp
similarity index 100%
rename from system/core/virtcon/vc-display.cpp
rename to zircon/system/core/virtcon/vc-display.cpp
diff --git a/system/core/virtcon/vc-gfx.cpp b/zircon/system/core/virtcon/vc-gfx.cpp
similarity index 100%
rename from system/core/virtcon/vc-gfx.cpp
rename to zircon/system/core/virtcon/vc-gfx.cpp
diff --git a/system/core/virtcon/vc-input.cpp b/zircon/system/core/virtcon/vc-input.cpp
similarity index 100%
rename from system/core/virtcon/vc-input.cpp
rename to zircon/system/core/virtcon/vc-input.cpp
diff --git a/system/core/virtcon/vc.h b/zircon/system/core/virtcon/vc.h
similarity index 100%
rename from system/core/virtcon/vc.h
rename to zircon/system/core/virtcon/vc.h
diff --git a/system/dev/MAINTAINERS b/zircon/system/dev/MAINTAINERS
similarity index 100%
rename from system/dev/MAINTAINERS
rename to zircon/system/dev/MAINTAINERS
diff --git a/system/dev/audio/astro-pdm-input/audio-stream-in.cpp b/zircon/system/dev/audio/astro-pdm-input/audio-stream-in.cpp
similarity index 100%
rename from system/dev/audio/astro-pdm-input/audio-stream-in.cpp
rename to zircon/system/dev/audio/astro-pdm-input/audio-stream-in.cpp
diff --git a/system/dev/audio/astro-pdm-input/audio-stream-in.h b/zircon/system/dev/audio/astro-pdm-input/audio-stream-in.h
similarity index 100%
rename from system/dev/audio/astro-pdm-input/audio-stream-in.h
rename to zircon/system/dev/audio/astro-pdm-input/audio-stream-in.h
diff --git a/system/dev/audio/astro-pdm-input/rules.mk b/zircon/system/dev/audio/astro-pdm-input/rules.mk
similarity index 100%
rename from system/dev/audio/astro-pdm-input/rules.mk
rename to zircon/system/dev/audio/astro-pdm-input/rules.mk
diff --git a/system/dev/audio/astro-tdm-output/audio-stream-out.cpp b/zircon/system/dev/audio/astro-tdm-output/audio-stream-out.cpp
similarity index 100%
rename from system/dev/audio/astro-tdm-output/audio-stream-out.cpp
rename to zircon/system/dev/audio/astro-tdm-output/audio-stream-out.cpp
diff --git a/system/dev/audio/astro-tdm-output/audio-stream-out.h b/zircon/system/dev/audio/astro-tdm-output/audio-stream-out.h
similarity index 100%
rename from system/dev/audio/astro-tdm-output/audio-stream-out.h
rename to zircon/system/dev/audio/astro-tdm-output/audio-stream-out.h
diff --git a/system/dev/audio/astro-tdm-output/binding.c b/zircon/system/dev/audio/astro-tdm-output/binding.c
similarity index 100%
rename from system/dev/audio/astro-tdm-output/binding.c
rename to zircon/system/dev/audio/astro-tdm-output/binding.c
diff --git a/system/dev/audio/astro-tdm-output/rules.mk b/zircon/system/dev/audio/astro-tdm-output/rules.mk
similarity index 100%
rename from system/dev/audio/astro-tdm-output/rules.mk
rename to zircon/system/dev/audio/astro-tdm-output/rules.mk
diff --git a/system/dev/audio/astro-tdm-output/tas27xx.cpp b/zircon/system/dev/audio/astro-tdm-output/tas27xx.cpp
similarity index 100%
rename from system/dev/audio/astro-tdm-output/tas27xx.cpp
rename to zircon/system/dev/audio/astro-tdm-output/tas27xx.cpp
diff --git a/system/dev/audio/astro-tdm-output/tas27xx.h b/zircon/system/dev/audio/astro-tdm-output/tas27xx.h
similarity index 100%
rename from system/dev/audio/astro-tdm-output/tas27xx.h
rename to zircon/system/dev/audio/astro-tdm-output/tas27xx.h
diff --git a/system/dev/audio/gauss-pdm-input/a113-audio-device.c b/zircon/system/dev/audio/gauss-pdm-input/a113-audio-device.c
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/a113-audio-device.c
rename to zircon/system/dev/audio/gauss-pdm-input/a113-audio-device.c
diff --git a/system/dev/audio/gauss-pdm-input/a113-audio-device.h b/zircon/system/dev/audio/gauss-pdm-input/a113-audio-device.h
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/a113-audio-device.h
rename to zircon/system/dev/audio/gauss-pdm-input/a113-audio-device.h
diff --git a/system/dev/audio/gauss-pdm-input/a113-audio-regs.h b/zircon/system/dev/audio/gauss-pdm-input/a113-audio-regs.h
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/a113-audio-regs.h
rename to zircon/system/dev/audio/gauss-pdm-input/a113-audio-regs.h
diff --git a/system/dev/audio/gauss-pdm-input/a113-ddr.c b/zircon/system/dev/audio/gauss-pdm-input/a113-ddr.c
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/a113-ddr.c
rename to zircon/system/dev/audio/gauss-pdm-input/a113-ddr.c
diff --git a/system/dev/audio/gauss-pdm-input/a113-ddr.h b/zircon/system/dev/audio/gauss-pdm-input/a113-ddr.h
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/a113-ddr.h
rename to zircon/system/dev/audio/gauss-pdm-input/a113-ddr.h
diff --git a/system/dev/audio/gauss-pdm-input/a113-pdm.c b/zircon/system/dev/audio/gauss-pdm-input/a113-pdm.c
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/a113-pdm.c
rename to zircon/system/dev/audio/gauss-pdm-input/a113-pdm.c
diff --git a/system/dev/audio/gauss-pdm-input/a113-pdm.h b/zircon/system/dev/audio/gauss-pdm-input/a113-pdm.h
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/a113-pdm.h
rename to zircon/system/dev/audio/gauss-pdm-input/a113-pdm.h
diff --git a/system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.cpp b/zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.cpp
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.cpp
rename to zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.cpp
diff --git a/system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.h b/zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.h
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.h
rename to zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input-stream.h
diff --git a/system/dev/audio/gauss-pdm-input/gauss-pdm-input.c b/zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input.c
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/gauss-pdm-input.c
rename to zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input.c
diff --git a/system/dev/audio/gauss-pdm-input/gauss-pdm-input.h b/zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input.h
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/gauss-pdm-input.h
rename to zircon/system/dev/audio/gauss-pdm-input/gauss-pdm-input.h
diff --git a/system/dev/audio/gauss-pdm-input/rules.mk b/zircon/system/dev/audio/gauss-pdm-input/rules.mk
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/rules.mk
rename to zircon/system/dev/audio/gauss-pdm-input/rules.mk
diff --git a/system/dev/audio/gauss-pdm-input/vmo_helper.cpp b/zircon/system/dev/audio/gauss-pdm-input/vmo_helper.cpp
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/vmo_helper.cpp
rename to zircon/system/dev/audio/gauss-pdm-input/vmo_helper.cpp
diff --git a/system/dev/audio/gauss-pdm-input/vmo_helper.h b/zircon/system/dev/audio/gauss-pdm-input/vmo_helper.h
similarity index 100%
rename from system/dev/audio/gauss-pdm-input/vmo_helper.h
rename to zircon/system/dev/audio/gauss-pdm-input/vmo_helper.h
diff --git a/system/dev/audio/gauss-tdm/gauss-tdm-out.c b/zircon/system/dev/audio/gauss-tdm/gauss-tdm-out.c
similarity index 100%
rename from system/dev/audio/gauss-tdm/gauss-tdm-out.c
rename to zircon/system/dev/audio/gauss-tdm/gauss-tdm-out.c
diff --git a/system/dev/audio/gauss-tdm/gauss-tdm-stream.cpp b/zircon/system/dev/audio/gauss-tdm/gauss-tdm-stream.cpp
similarity index 100%
rename from system/dev/audio/gauss-tdm/gauss-tdm-stream.cpp
rename to zircon/system/dev/audio/gauss-tdm/gauss-tdm-stream.cpp
diff --git a/system/dev/audio/gauss-tdm/rules.mk b/zircon/system/dev/audio/gauss-tdm/rules.mk
similarity index 100%
rename from system/dev/audio/gauss-tdm/rules.mk
rename to zircon/system/dev/audio/gauss-tdm/rules.mk
diff --git a/system/dev/audio/gauss-tdm/tas57xx.cpp b/zircon/system/dev/audio/gauss-tdm/tas57xx.cpp
similarity index 100%
rename from system/dev/audio/gauss-tdm/tas57xx.cpp
rename to zircon/system/dev/audio/gauss-tdm/tas57xx.cpp
diff --git a/system/dev/audio/gauss-tdm/tas57xx.h b/zircon/system/dev/audio/gauss-tdm/tas57xx.h
similarity index 100%
rename from system/dev/audio/gauss-tdm/tas57xx.h
rename to zircon/system/dev/audio/gauss-tdm/tas57xx.h
diff --git a/system/dev/audio/gauss-tdm/tdm-audio-stream.h b/zircon/system/dev/audio/gauss-tdm/tdm-audio-stream.h
similarity index 100%
rename from system/dev/audio/gauss-tdm/tdm-audio-stream.h
rename to zircon/system/dev/audio/gauss-tdm/tdm-audio-stream.h
diff --git a/system/dev/audio/intel-hda/codecs/qemu/binding.c b/zircon/system/dev/audio/intel-hda/codecs/qemu/binding.c
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/qemu/binding.c
rename to zircon/system/dev/audio/intel-hda/codecs/qemu/binding.c
diff --git a/system/dev/audio/intel-hda/codecs/qemu/debug-logging.h b/zircon/system/dev/audio/intel-hda/codecs/qemu/debug-logging.h
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/qemu/debug-logging.h
rename to zircon/system/dev/audio/intel-hda/codecs/qemu/debug-logging.h
diff --git a/system/dev/audio/intel-hda/codecs/qemu/qemu-codec.cpp b/zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-codec.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/qemu/qemu-codec.cpp
rename to zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-codec.cpp
diff --git a/system/dev/audio/intel-hda/codecs/qemu/qemu-codec.h b/zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-codec.h
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/qemu/qemu-codec.h
rename to zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-codec.h
diff --git a/system/dev/audio/intel-hda/codecs/qemu/qemu-stream.cpp b/zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-stream.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/qemu/qemu-stream.cpp
rename to zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-stream.cpp
diff --git a/system/dev/audio/intel-hda/codecs/qemu/qemu-stream.h b/zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-stream.h
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/qemu/qemu-stream.h
rename to zircon/system/dev/audio/intel-hda/codecs/qemu/qemu-stream.h
diff --git a/system/dev/audio/intel-hda/codecs/qemu/rules.mk b/zircon/system/dev/audio/intel-hda/codecs/qemu/rules.mk
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/qemu/rules.mk
rename to zircon/system/dev/audio/intel-hda/codecs/qemu/rules.mk
diff --git a/system/dev/audio/intel-hda/codecs/realtek/binding.c b/zircon/system/dev/audio/intel-hda/codecs/realtek/binding.c
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/binding.c
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/binding.c
diff --git a/system/dev/audio/intel-hda/codecs/realtek/debug-logging.h b/zircon/system/dev/audio/intel-hda/codecs/realtek/debug-logging.h
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/debug-logging.h
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/debug-logging.h
diff --git a/system/dev/audio/intel-hda/codecs/realtek/realtek-codec.cpp b/zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-codec.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/realtek-codec.cpp
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-codec.cpp
diff --git a/system/dev/audio/intel-hda/codecs/realtek/realtek-codec.h b/zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-codec.h
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/realtek-codec.h
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-codec.h
diff --git a/system/dev/audio/intel-hda/codecs/realtek/realtek-stream.cpp b/zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-stream.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/realtek-stream.cpp
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-stream.cpp
diff --git a/system/dev/audio/intel-hda/codecs/realtek/realtek-stream.h b/zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-stream.h
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/realtek-stream.h
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/realtek-stream.h
diff --git a/system/dev/audio/intel-hda/codecs/realtek/rules.mk b/zircon/system/dev/audio/intel-hda/codecs/realtek/rules.mk
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/rules.mk
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/rules.mk
diff --git a/system/dev/audio/intel-hda/codecs/realtek/utils.h b/zircon/system/dev/audio/intel-hda/codecs/realtek/utils.h
similarity index 100%
rename from system/dev/audio/intel-hda/codecs/realtek/utils.h
rename to zircon/system/dev/audio/intel-hda/codecs/realtek/utils.h
diff --git a/system/dev/audio/intel-hda/controller/binding.c b/zircon/system/dev/audio/intel-hda/controller/binding.c
similarity index 100%
rename from system/dev/audio/intel-hda/controller/binding.c
rename to zircon/system/dev/audio/intel-hda/controller/binding.c
diff --git a/system/dev/audio/intel-hda/controller/binding.h b/zircon/system/dev/audio/intel-hda/controller/binding.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/binding.h
rename to zircon/system/dev/audio/intel-hda/controller/binding.h
diff --git a/system/dev/audio/intel-hda/controller/codec-cmd-job.cpp b/zircon/system/dev/audio/intel-hda/controller/codec-cmd-job.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/codec-cmd-job.cpp
rename to zircon/system/dev/audio/intel-hda/controller/codec-cmd-job.cpp
diff --git a/system/dev/audio/intel-hda/controller/codec-cmd-job.h b/zircon/system/dev/audio/intel-hda/controller/codec-cmd-job.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/codec-cmd-job.h
rename to zircon/system/dev/audio/intel-hda/controller/codec-cmd-job.h
diff --git a/system/dev/audio/intel-hda/controller/debug-logging.h b/zircon/system/dev/audio/intel-hda/controller/debug-logging.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/debug-logging.h
rename to zircon/system/dev/audio/intel-hda/controller/debug-logging.h
diff --git a/system/dev/audio/intel-hda/controller/debug.cpp b/zircon/system/dev/audio/intel-hda/controller/debug.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/debug.cpp
rename to zircon/system/dev/audio/intel-hda/controller/debug.cpp
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-codec.cpp b/zircon/system/dev/audio/intel-hda/controller/intel-hda-codec.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-codec.cpp
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-codec.cpp
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-codec.h b/zircon/system/dev/audio/intel-hda/controller/intel-hda-codec.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-codec.h
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-codec.h
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-controller-init.cpp b/zircon/system/dev/audio/intel-hda/controller/intel-hda-controller-init.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-controller-init.cpp
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-controller-init.cpp
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-controller.cpp b/zircon/system/dev/audio/intel-hda/controller/intel-hda-controller.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-controller.cpp
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-controller.cpp
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-controller.h b/zircon/system/dev/audio/intel-hda/controller/intel-hda-controller.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-controller.h
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-controller.h
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-dsp.cpp b/zircon/system/dev/audio/intel-hda/controller/intel-hda-dsp.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-dsp.cpp
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-dsp.cpp
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-dsp.h b/zircon/system/dev/audio/intel-hda/controller/intel-hda-dsp.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-dsp.h
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-dsp.h
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-irq.cpp b/zircon/system/dev/audio/intel-hda/controller/intel-hda-irq.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-irq.cpp
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-irq.cpp
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-stream.cpp b/zircon/system/dev/audio/intel-hda/controller/intel-hda-stream.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-stream.cpp
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-stream.cpp
diff --git a/system/dev/audio/intel-hda/controller/intel-hda-stream.h b/zircon/system/dev/audio/intel-hda/controller/intel-hda-stream.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/intel-hda-stream.h
rename to zircon/system/dev/audio/intel-hda/controller/intel-hda-stream.h
diff --git a/system/dev/audio/intel-hda/controller/rules.mk b/zircon/system/dev/audio/intel-hda/controller/rules.mk
similarity index 100%
rename from system/dev/audio/intel-hda/controller/rules.mk
rename to zircon/system/dev/audio/intel-hda/controller/rules.mk
diff --git a/system/dev/audio/intel-hda/controller/utils.cpp b/zircon/system/dev/audio/intel-hda/controller/utils.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/controller/utils.cpp
rename to zircon/system/dev/audio/intel-hda/controller/utils.cpp
diff --git a/system/dev/audio/intel-hda/controller/utils.h b/zircon/system/dev/audio/intel-hda/controller/utils.h
similarity index 100%
rename from system/dev/audio/intel-hda/controller/utils.h
rename to zircon/system/dev/audio/intel-hda/controller/utils.h
diff --git a/system/dev/audio/intel-hda/dsp/binding.c b/zircon/system/dev/audio/intel-hda/dsp/binding.c
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/binding.c
rename to zircon/system/dev/audio/intel-hda/dsp/binding.c
diff --git a/system/dev/audio/intel-hda/dsp/binding.h b/zircon/system/dev/audio/intel-hda/dsp/binding.h
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/binding.h
rename to zircon/system/dev/audio/intel-hda/dsp/binding.h
diff --git a/system/dev/audio/intel-hda/dsp/debug-logging.h b/zircon/system/dev/audio/intel-hda/dsp/debug-logging.h
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/debug-logging.h
rename to zircon/system/dev/audio/intel-hda/dsp/debug-logging.h
diff --git a/system/dev/audio/intel-hda/dsp/debug.cpp b/zircon/system/dev/audio/intel-hda/dsp/debug.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/debug.cpp
rename to zircon/system/dev/audio/intel-hda/dsp/debug.cpp
diff --git a/system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp b/zircon/system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp
rename to zircon/system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp
diff --git a/system/dev/audio/intel-hda/dsp/intel-audio-dsp.h b/zircon/system/dev/audio/intel-hda/dsp/intel-audio-dsp.h
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-audio-dsp.h
rename to zircon/system/dev/audio/intel-hda/dsp/intel-audio-dsp.h
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.cpp b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.cpp
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.cpp
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.h b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.h
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.h
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-code-loader.h
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-ipc.cpp b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-ipc.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-ipc.cpp
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-ipc.cpp
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-ipc.h b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-ipc.h
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-ipc.h
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-ipc.h
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-stream.cpp b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-stream.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-stream.cpp
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-stream.cpp
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-stream.h b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-stream.h
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-stream.h
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-stream.h
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-topology.cpp b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-topology.cpp
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-topology.cpp
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-topology.cpp
diff --git a/system/dev/audio/intel-hda/dsp/intel-dsp-topology.h b/zircon/system/dev/audio/intel-hda/dsp/intel-dsp-topology.h
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/intel-dsp-topology.h
rename to zircon/system/dev/audio/intel-hda/dsp/intel-dsp-topology.h
diff --git a/system/dev/audio/intel-hda/dsp/rules.mk b/zircon/system/dev/audio/intel-hda/dsp/rules.mk
similarity index 100%
rename from system/dev/audio/intel-hda/dsp/rules.mk
rename to zircon/system/dev/audio/intel-hda/dsp/rules.mk
diff --git a/system/dev/audio/intel-hda/rules.mk b/zircon/system/dev/audio/intel-hda/rules.mk
similarity index 100%
rename from system/dev/audio/intel-hda/rules.mk
rename to zircon/system/dev/audio/intel-hda/rules.mk
diff --git a/system/dev/audio/lib/rules.mk b/zircon/system/dev/audio/lib/rules.mk
similarity index 100%
rename from system/dev/audio/lib/rules.mk
rename to zircon/system/dev/audio/lib/rules.mk
diff --git a/system/dev/audio/lib/simple-audio-stream/README.md b/zircon/system/dev/audio/lib/simple-audio-stream/README.md
similarity index 100%
rename from system/dev/audio/lib/simple-audio-stream/README.md
rename to zircon/system/dev/audio/lib/simple-audio-stream/README.md
diff --git a/system/dev/audio/lib/simple-audio-stream/include/lib/simple-audio-stream/simple-audio-stream.h b/zircon/system/dev/audio/lib/simple-audio-stream/include/lib/simple-audio-stream/simple-audio-stream.h
similarity index 100%
rename from system/dev/audio/lib/simple-audio-stream/include/lib/simple-audio-stream/simple-audio-stream.h
rename to zircon/system/dev/audio/lib/simple-audio-stream/include/lib/simple-audio-stream/simple-audio-stream.h
diff --git a/system/dev/audio/lib/simple-audio-stream/rules.mk b/zircon/system/dev/audio/lib/simple-audio-stream/rules.mk
similarity index 100%
rename from system/dev/audio/lib/simple-audio-stream/rules.mk
rename to zircon/system/dev/audio/lib/simple-audio-stream/rules.mk
diff --git a/system/dev/audio/lib/simple-audio-stream/simple-audio-stream.cpp b/zircon/system/dev/audio/lib/simple-audio-stream/simple-audio-stream.cpp
similarity index 100%
rename from system/dev/audio/lib/simple-audio-stream/simple-audio-stream.cpp
rename to zircon/system/dev/audio/lib/simple-audio-stream/simple-audio-stream.cpp
diff --git a/system/dev/audio/mt8167-tdm-input/audio-stream-in.cpp b/zircon/system/dev/audio/mt8167-tdm-input/audio-stream-in.cpp
similarity index 100%
rename from system/dev/audio/mt8167-tdm-input/audio-stream-in.cpp
rename to zircon/system/dev/audio/mt8167-tdm-input/audio-stream-in.cpp
diff --git a/system/dev/audio/mt8167-tdm-input/audio-stream-in.h b/zircon/system/dev/audio/mt8167-tdm-input/audio-stream-in.h
similarity index 100%
rename from system/dev/audio/mt8167-tdm-input/audio-stream-in.h
rename to zircon/system/dev/audio/mt8167-tdm-input/audio-stream-in.h
diff --git a/system/dev/audio/mt8167-tdm-input/rules.mk b/zircon/system/dev/audio/mt8167-tdm-input/rules.mk
similarity index 100%
rename from system/dev/audio/mt8167-tdm-input/rules.mk
rename to zircon/system/dev/audio/mt8167-tdm-input/rules.mk
diff --git a/system/dev/audio/mt8167-tdm-input/tlv320adc.cpp b/zircon/system/dev/audio/mt8167-tdm-input/tlv320adc.cpp
similarity index 100%
rename from system/dev/audio/mt8167-tdm-input/tlv320adc.cpp
rename to zircon/system/dev/audio/mt8167-tdm-input/tlv320adc.cpp
diff --git a/system/dev/audio/mt8167-tdm-input/tlv320adc.h b/zircon/system/dev/audio/mt8167-tdm-input/tlv320adc.h
similarity index 100%
rename from system/dev/audio/mt8167-tdm-input/tlv320adc.h
rename to zircon/system/dev/audio/mt8167-tdm-input/tlv320adc.h
diff --git a/system/dev/audio/mt8167-tdm-output/audio-stream-out.cpp b/zircon/system/dev/audio/mt8167-tdm-output/audio-stream-out.cpp
similarity index 100%
rename from system/dev/audio/mt8167-tdm-output/audio-stream-out.cpp
rename to zircon/system/dev/audio/mt8167-tdm-output/audio-stream-out.cpp
diff --git a/system/dev/audio/mt8167-tdm-output/audio-stream-out.h b/zircon/system/dev/audio/mt8167-tdm-output/audio-stream-out.h
similarity index 100%
rename from system/dev/audio/mt8167-tdm-output/audio-stream-out.h
rename to zircon/system/dev/audio/mt8167-tdm-output/audio-stream-out.h
diff --git a/system/dev/audio/mt8167-tdm-output/rules.mk b/zircon/system/dev/audio/mt8167-tdm-output/rules.mk
similarity index 100%
rename from system/dev/audio/mt8167-tdm-output/rules.mk
rename to zircon/system/dev/audio/mt8167-tdm-output/rules.mk
diff --git a/system/dev/audio/mt8167-tdm-output/tas5782.cpp b/zircon/system/dev/audio/mt8167-tdm-output/tas5782.cpp
similarity index 100%
rename from system/dev/audio/mt8167-tdm-output/tas5782.cpp
rename to zircon/system/dev/audio/mt8167-tdm-output/tas5782.cpp
diff --git a/system/dev/audio/mt8167-tdm-output/tas5782.h b/zircon/system/dev/audio/mt8167-tdm-output/tas5782.h
similarity index 100%
rename from system/dev/audio/mt8167-tdm-output/tas5782.h
rename to zircon/system/dev/audio/mt8167-tdm-output/tas5782.h
diff --git a/system/dev/audio/sherlock-pdm-input/audio-stream-in.cpp b/zircon/system/dev/audio/sherlock-pdm-input/audio-stream-in.cpp
similarity index 100%
rename from system/dev/audio/sherlock-pdm-input/audio-stream-in.cpp
rename to zircon/system/dev/audio/sherlock-pdm-input/audio-stream-in.cpp
diff --git a/system/dev/audio/sherlock-pdm-input/audio-stream-in.h b/zircon/system/dev/audio/sherlock-pdm-input/audio-stream-in.h
similarity index 100%
rename from system/dev/audio/sherlock-pdm-input/audio-stream-in.h
rename to zircon/system/dev/audio/sherlock-pdm-input/audio-stream-in.h
diff --git a/system/dev/audio/sherlock-pdm-input/binding.c b/zircon/system/dev/audio/sherlock-pdm-input/binding.c
similarity index 100%
rename from system/dev/audio/sherlock-pdm-input/binding.c
rename to zircon/system/dev/audio/sherlock-pdm-input/binding.c
diff --git a/system/dev/audio/sherlock-pdm-input/rules.mk b/zircon/system/dev/audio/sherlock-pdm-input/rules.mk
similarity index 100%
rename from system/dev/audio/sherlock-pdm-input/rules.mk
rename to zircon/system/dev/audio/sherlock-pdm-input/rules.mk
diff --git a/system/dev/audio/sherlock-tdm-output/audio-stream-out.cpp b/zircon/system/dev/audio/sherlock-tdm-output/audio-stream-out.cpp
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/audio-stream-out.cpp
rename to zircon/system/dev/audio/sherlock-tdm-output/audio-stream-out.cpp
diff --git a/system/dev/audio/sherlock-tdm-output/audio-stream-out.h b/zircon/system/dev/audio/sherlock-tdm-output/audio-stream-out.h
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/audio-stream-out.h
rename to zircon/system/dev/audio/sherlock-tdm-output/audio-stream-out.h
diff --git a/system/dev/audio/sherlock-tdm-output/binding.c b/zircon/system/dev/audio/sherlock-tdm-output/binding.c
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/binding.c
rename to zircon/system/dev/audio/sherlock-tdm-output/binding.c
diff --git a/system/dev/audio/sherlock-tdm-output/rules.mk b/zircon/system/dev/audio/sherlock-tdm-output/rules.mk
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/rules.mk
rename to zircon/system/dev/audio/sherlock-tdm-output/rules.mk
diff --git a/system/dev/audio/sherlock-tdm-output/tas5720.cpp b/zircon/system/dev/audio/sherlock-tdm-output/tas5720.cpp
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/tas5720.cpp
rename to zircon/system/dev/audio/sherlock-tdm-output/tas5720.cpp
diff --git a/system/dev/audio/sherlock-tdm-output/tas5720.h b/zircon/system/dev/audio/sherlock-tdm-output/tas5720.h
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/tas5720.h
rename to zircon/system/dev/audio/sherlock-tdm-output/tas5720.h
diff --git a/system/dev/audio/sherlock-tdm-output/tas5760.cpp b/zircon/system/dev/audio/sherlock-tdm-output/tas5760.cpp
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/tas5760.cpp
rename to zircon/system/dev/audio/sherlock-tdm-output/tas5760.cpp
diff --git a/system/dev/audio/sherlock-tdm-output/tas5760.h b/zircon/system/dev/audio/sherlock-tdm-output/tas5760.h
similarity index 100%
rename from system/dev/audio/sherlock-tdm-output/tas5760.h
rename to zircon/system/dev/audio/sherlock-tdm-output/tas5760.h
diff --git a/system/dev/audio/usb-audio/debug-logging.h b/zircon/system/dev/audio/usb-audio/debug-logging.h
similarity index 100%
rename from system/dev/audio/usb-audio/debug-logging.h
rename to zircon/system/dev/audio/usb-audio/debug-logging.h
diff --git a/system/dev/audio/usb-audio/midi.c b/zircon/system/dev/audio/usb-audio/midi.c
similarity index 100%
rename from system/dev/audio/usb-audio/midi.c
rename to zircon/system/dev/audio/usb-audio/midi.c
diff --git a/system/dev/audio/usb-audio/midi.h b/zircon/system/dev/audio/usb-audio/midi.h
similarity index 100%
rename from system/dev/audio/usb-audio/midi.h
rename to zircon/system/dev/audio/usb-audio/midi.h
diff --git a/system/dev/audio/usb-audio/rules.mk b/zircon/system/dev/audio/usb-audio/rules.mk
similarity index 100%
rename from system/dev/audio/usb-audio/rules.mk
rename to zircon/system/dev/audio/usb-audio/rules.mk
diff --git a/system/dev/audio/usb-audio/usb-audio-control-interface.cpp b/zircon/system/dev/audio/usb-audio/usb-audio-control-interface.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-control-interface.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio-control-interface.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio-control-interface.h b/zircon/system/dev/audio/usb-audio/usb-audio-control-interface.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-control-interface.h
rename to zircon/system/dev/audio/usb-audio/usb-audio-control-interface.h
diff --git a/system/dev/audio/usb-audio/usb-audio-descriptors.cpp b/zircon/system/dev/audio/usb-audio/usb-audio-descriptors.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-descriptors.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio-descriptors.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio-descriptors.h b/zircon/system/dev/audio/usb-audio/usb-audio-descriptors.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-descriptors.h
rename to zircon/system/dev/audio/usb-audio/usb-audio-descriptors.h
diff --git a/system/dev/audio/usb-audio/usb-audio-device.cpp b/zircon/system/dev/audio/usb-audio/usb-audio-device.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-device.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio-device.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio-device.h b/zircon/system/dev/audio/usb-audio/usb-audio-device.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-device.h
rename to zircon/system/dev/audio/usb-audio/usb-audio-device.h
diff --git a/system/dev/audio/usb-audio/usb-audio-path.cpp b/zircon/system/dev/audio/usb-audio/usb-audio-path.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-path.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio-path.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio-path.h b/zircon/system/dev/audio/usb-audio/usb-audio-path.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-path.h
rename to zircon/system/dev/audio/usb-audio/usb-audio-path.h
diff --git a/system/dev/audio/usb-audio/usb-audio-stream-interface.cpp b/zircon/system/dev/audio/usb-audio/usb-audio-stream-interface.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-stream-interface.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio-stream-interface.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio-stream-interface.h b/zircon/system/dev/audio/usb-audio/usb-audio-stream-interface.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-stream-interface.h
rename to zircon/system/dev/audio/usb-audio/usb-audio-stream-interface.h
diff --git a/system/dev/audio/usb-audio/usb-audio-stream.cpp b/zircon/system/dev/audio/usb-audio/usb-audio-stream.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-stream.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio-stream.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio-stream.h b/zircon/system/dev/audio/usb-audio/usb-audio-stream.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-stream.h
rename to zircon/system/dev/audio/usb-audio/usb-audio-stream.h
diff --git a/system/dev/audio/usb-audio/usb-audio-units.cpp b/zircon/system/dev/audio/usb-audio/usb-audio-units.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-units.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio-units.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio-units.h b/zircon/system/dev/audio/usb-audio/usb-audio-units.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio-units.h
rename to zircon/system/dev/audio/usb-audio/usb-audio-units.h
diff --git a/system/dev/audio/usb-audio/usb-audio.cpp b/zircon/system/dev/audio/usb-audio/usb-audio.cpp
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio.cpp
rename to zircon/system/dev/audio/usb-audio/usb-audio.cpp
diff --git a/system/dev/audio/usb-audio/usb-audio.h b/zircon/system/dev/audio/usb-audio/usb-audio.h
similarity index 100%
rename from system/dev/audio/usb-audio/usb-audio.h
rename to zircon/system/dev/audio/usb-audio/usb-audio.h
diff --git a/system/dev/audio/usb-audio/usb-midi-sink.c b/zircon/system/dev/audio/usb-audio/usb-midi-sink.c
similarity index 100%
rename from system/dev/audio/usb-audio/usb-midi-sink.c
rename to zircon/system/dev/audio/usb-audio/usb-midi-sink.c
diff --git a/system/dev/audio/usb-audio/usb-midi-source.c b/zircon/system/dev/audio/usb-audio/usb-midi-source.c
similarity index 100%
rename from system/dev/audio/usb-audio/usb-midi-source.c
rename to zircon/system/dev/audio/usb-audio/usb-midi-source.c
diff --git a/system/dev/backlight/sg-micro/rules.mk b/zircon/system/dev/backlight/sg-micro/rules.mk
similarity index 100%
rename from system/dev/backlight/sg-micro/rules.mk
rename to zircon/system/dev/backlight/sg-micro/rules.mk
diff --git a/system/dev/backlight/sg-micro/sgm37603a-test.cpp b/zircon/system/dev/backlight/sg-micro/sgm37603a-test.cpp
similarity index 100%
rename from system/dev/backlight/sg-micro/sgm37603a-test.cpp
rename to zircon/system/dev/backlight/sg-micro/sgm37603a-test.cpp
diff --git a/system/dev/backlight/sg-micro/sgm37603a.cpp b/zircon/system/dev/backlight/sg-micro/sgm37603a.cpp
similarity index 100%
rename from system/dev/backlight/sg-micro/sgm37603a.cpp
rename to zircon/system/dev/backlight/sg-micro/sgm37603a.cpp
diff --git a/system/dev/backlight/sg-micro/sgm37603a.h b/zircon/system/dev/backlight/sg-micro/sgm37603a.h
similarity index 100%
rename from system/dev/backlight/sg-micro/sgm37603a.h
rename to zircon/system/dev/backlight/sg-micro/sgm37603a.h
diff --git a/system/dev/backlight/ti-lp8556/rules.mk b/zircon/system/dev/backlight/ti-lp8556/rules.mk
similarity index 100%
rename from system/dev/backlight/ti-lp8556/rules.mk
rename to zircon/system/dev/backlight/ti-lp8556/rules.mk
diff --git a/system/dev/backlight/ti-lp8556/ti-lp8556.cpp b/zircon/system/dev/backlight/ti-lp8556/ti-lp8556.cpp
similarity index 100%
rename from system/dev/backlight/ti-lp8556/ti-lp8556.cpp
rename to zircon/system/dev/backlight/ti-lp8556/ti-lp8556.cpp
diff --git a/system/dev/backlight/ti-lp8556/ti-lp8556.h b/zircon/system/dev/backlight/ti-lp8556/ti-lp8556.h
similarity index 100%
rename from system/dev/backlight/ti-lp8556/ti-lp8556.h
rename to zircon/system/dev/backlight/ti-lp8556/ti-lp8556.h
diff --git a/system/dev/block/ahci/ahci.c b/zircon/system/dev/block/ahci/ahci.c
similarity index 100%
rename from system/dev/block/ahci/ahci.c
rename to zircon/system/dev/block/ahci/ahci.c
diff --git a/system/dev/block/ahci/ahci.h b/zircon/system/dev/block/ahci/ahci.h
similarity index 100%
rename from system/dev/block/ahci/ahci.h
rename to zircon/system/dev/block/ahci/ahci.h
diff --git a/system/dev/block/ahci/rules.mk b/zircon/system/dev/block/ahci/rules.mk
similarity index 100%
rename from system/dev/block/ahci/rules.mk
rename to zircon/system/dev/block/ahci/rules.mk
diff --git a/system/dev/block/ahci/sata.c b/zircon/system/dev/block/ahci/sata.c
similarity index 100%
rename from system/dev/block/ahci/sata.c
rename to zircon/system/dev/block/ahci/sata.c
diff --git a/system/dev/block/ahci/sata.h b/zircon/system/dev/block/ahci/sata.h
similarity index 100%
rename from system/dev/block/ahci/sata.h
rename to zircon/system/dev/block/ahci/sata.h
diff --git a/system/dev/block/aml-sd-emmc/aml-sd-emmc.cpp b/zircon/system/dev/block/aml-sd-emmc/aml-sd-emmc.cpp
similarity index 100%
rename from system/dev/block/aml-sd-emmc/aml-sd-emmc.cpp
rename to zircon/system/dev/block/aml-sd-emmc/aml-sd-emmc.cpp
diff --git a/system/dev/block/aml-sd-emmc/rules.mk b/zircon/system/dev/block/aml-sd-emmc/rules.mk
similarity index 100%
rename from system/dev/block/aml-sd-emmc/rules.mk
rename to zircon/system/dev/block/aml-sd-emmc/rules.mk
diff --git a/system/dev/block/block/block.cpp b/zircon/system/dev/block/block/block.cpp
similarity index 100%
rename from system/dev/block/block/block.cpp
rename to zircon/system/dev/block/block/block.cpp
diff --git a/system/dev/block/block/rules.mk b/zircon/system/dev/block/block/rules.mk
similarity index 100%
rename from system/dev/block/block/rules.mk
rename to zircon/system/dev/block/block/rules.mk
diff --git a/system/dev/block/block/server-manager.cpp b/zircon/system/dev/block/block/server-manager.cpp
similarity index 100%
rename from system/dev/block/block/server-manager.cpp
rename to zircon/system/dev/block/block/server-manager.cpp
diff --git a/system/dev/block/block/server-manager.h b/zircon/system/dev/block/block/server-manager.h
similarity index 100%
rename from system/dev/block/block/server-manager.h
rename to zircon/system/dev/block/block/server-manager.h
diff --git a/system/dev/block/block/server.cpp b/zircon/system/dev/block/block/server.cpp
similarity index 100%
rename from system/dev/block/block/server.cpp
rename to zircon/system/dev/block/block/server.cpp
diff --git a/system/dev/block/block/server.h b/zircon/system/dev/block/block/server.h
similarity index 100%
rename from system/dev/block/block/server.h
rename to zircon/system/dev/block/block/server.h
diff --git a/system/dev/block/block/txn-group.cpp b/zircon/system/dev/block/block/txn-group.cpp
similarity index 100%
rename from system/dev/block/block/txn-group.cpp
rename to zircon/system/dev/block/block/txn-group.cpp
diff --git a/system/dev/block/block/txn-group.h b/zircon/system/dev/block/block/txn-group.h
similarity index 100%
rename from system/dev/block/block/txn-group.h
rename to zircon/system/dev/block/block/txn-group.h
diff --git a/system/dev/block/bootpart/bootpart.c b/zircon/system/dev/block/bootpart/bootpart.c
similarity index 100%
rename from system/dev/block/bootpart/bootpart.c
rename to zircon/system/dev/block/bootpart/bootpart.c
diff --git a/system/dev/block/bootpart/rules.mk b/zircon/system/dev/block/bootpart/rules.mk
similarity index 100%
rename from system/dev/block/bootpart/rules.mk
rename to zircon/system/dev/block/bootpart/rules.mk
diff --git a/system/dev/block/ftl/bind.cpp b/zircon/system/dev/block/ftl/bind.cpp
similarity index 100%
rename from system/dev/block/ftl/bind.cpp
rename to zircon/system/dev/block/ftl/bind.cpp
diff --git a/system/dev/block/ftl/block_device.cpp b/zircon/system/dev/block/ftl/block_device.cpp
similarity index 100%
rename from system/dev/block/ftl/block_device.cpp
rename to zircon/system/dev/block/ftl/block_device.cpp
diff --git a/system/dev/block/ftl/block_device.h b/zircon/system/dev/block/ftl/block_device.h
similarity index 100%
rename from system/dev/block/ftl/block_device.h
rename to zircon/system/dev/block/ftl/block_device.h
diff --git a/system/dev/block/ftl/nand_driver.cpp b/zircon/system/dev/block/ftl/nand_driver.cpp
similarity index 100%
rename from system/dev/block/ftl/nand_driver.cpp
rename to zircon/system/dev/block/ftl/nand_driver.cpp
diff --git a/system/dev/block/ftl/nand_driver.h b/zircon/system/dev/block/ftl/nand_driver.h
similarity index 100%
rename from system/dev/block/ftl/nand_driver.h
rename to zircon/system/dev/block/ftl/nand_driver.h
diff --git a/system/dev/block/ftl/nand_operation.cpp b/zircon/system/dev/block/ftl/nand_operation.cpp
similarity index 100%
rename from system/dev/block/ftl/nand_operation.cpp
rename to zircon/system/dev/block/ftl/nand_operation.cpp
diff --git a/system/dev/block/ftl/nand_operation.h b/zircon/system/dev/block/ftl/nand_operation.h
similarity index 100%
rename from system/dev/block/ftl/nand_operation.h
rename to zircon/system/dev/block/ftl/nand_operation.h
diff --git a/system/dev/block/ftl/oob_doubler.cpp b/zircon/system/dev/block/ftl/oob_doubler.cpp
similarity index 100%
rename from system/dev/block/ftl/oob_doubler.cpp
rename to zircon/system/dev/block/ftl/oob_doubler.cpp
diff --git a/system/dev/block/ftl/oob_doubler.h b/zircon/system/dev/block/ftl/oob_doubler.h
similarity index 100%
rename from system/dev/block/ftl/oob_doubler.h
rename to zircon/system/dev/block/ftl/oob_doubler.h
diff --git a/system/dev/block/ftl/rules.mk b/zircon/system/dev/block/ftl/rules.mk
similarity index 100%
rename from system/dev/block/ftl/rules.mk
rename to zircon/system/dev/block/ftl/rules.mk
diff --git a/system/dev/block/ftl/test/block_device_test.cpp b/zircon/system/dev/block/ftl/test/block_device_test.cpp
similarity index 100%
rename from system/dev/block/ftl/test/block_device_test.cpp
rename to zircon/system/dev/block/ftl/test/block_device_test.cpp
diff --git a/system/dev/block/ftl/test/driver-test.cpp b/zircon/system/dev/block/ftl/test/driver-test.cpp
similarity index 100%
rename from system/dev/block/ftl/test/driver-test.cpp
rename to zircon/system/dev/block/ftl/test/driver-test.cpp
diff --git a/system/dev/block/ftl/test/ftl-shell.cpp b/zircon/system/dev/block/ftl/test/ftl-shell.cpp
similarity index 100%
rename from system/dev/block/ftl/test/ftl-shell.cpp
rename to zircon/system/dev/block/ftl/test/ftl-shell.cpp
diff --git a/system/dev/block/ftl/test/ftl-shell.h b/zircon/system/dev/block/ftl/test/ftl-shell.h
similarity index 100%
rename from system/dev/block/ftl/test/ftl-shell.h
rename to zircon/system/dev/block/ftl/test/ftl-shell.h
diff --git a/system/dev/block/ftl/test/ftl-test.cpp b/zircon/system/dev/block/ftl/test/ftl-test.cpp
similarity index 100%
rename from system/dev/block/ftl/test/ftl-test.cpp
rename to zircon/system/dev/block/ftl/test/ftl-test.cpp
diff --git a/system/dev/block/ftl/test/main.cpp b/zircon/system/dev/block/ftl/test/main.cpp
similarity index 100%
rename from system/dev/block/ftl/test/main.cpp
rename to zircon/system/dev/block/ftl/test/main.cpp
diff --git a/system/dev/block/ftl/test/nand_driver_test.cpp b/zircon/system/dev/block/ftl/test/nand_driver_test.cpp
similarity index 100%
rename from system/dev/block/ftl/test/nand_driver_test.cpp
rename to zircon/system/dev/block/ftl/test/nand_driver_test.cpp
diff --git a/system/dev/block/ftl/test/nand_operation_test.cpp b/zircon/system/dev/block/ftl/test/nand_operation_test.cpp
similarity index 100%
rename from system/dev/block/ftl/test/nand_operation_test.cpp
rename to zircon/system/dev/block/ftl/test/nand_operation_test.cpp
diff --git a/system/dev/block/ftl/test/ndm-ram-driver.cpp b/zircon/system/dev/block/ftl/test/ndm-ram-driver.cpp
similarity index 100%
rename from system/dev/block/ftl/test/ndm-ram-driver.cpp
rename to zircon/system/dev/block/ftl/test/ndm-ram-driver.cpp
diff --git a/system/dev/block/ftl/test/ndm-ram-driver.h b/zircon/system/dev/block/ftl/test/ndm-ram-driver.h
similarity index 100%
rename from system/dev/block/ftl/test/ndm-ram-driver.h
rename to zircon/system/dev/block/ftl/test/ndm-ram-driver.h
diff --git a/system/dev/block/ftl/test/oob_doubler_test.cpp b/zircon/system/dev/block/ftl/test/oob_doubler_test.cpp
similarity index 100%
rename from system/dev/block/ftl/test/oob_doubler_test.cpp
rename to zircon/system/dev/block/ftl/test/oob_doubler_test.cpp
diff --git a/system/dev/block/fvm/fvm-private.h b/zircon/system/dev/block/fvm/fvm-private.h
similarity index 100%
rename from system/dev/block/fvm/fvm-private.h
rename to zircon/system/dev/block/fvm/fvm-private.h
diff --git a/system/dev/block/fvm/fvm.c b/zircon/system/dev/block/fvm/fvm.c
similarity index 100%
rename from system/dev/block/fvm/fvm.c
rename to zircon/system/dev/block/fvm/fvm.c
diff --git a/system/dev/block/fvm/fvm.cpp b/zircon/system/dev/block/fvm/fvm.cpp
similarity index 100%
rename from system/dev/block/fvm/fvm.cpp
rename to zircon/system/dev/block/fvm/fvm.cpp
diff --git a/system/dev/block/fvm/rules.mk b/zircon/system/dev/block/fvm/rules.mk
similarity index 100%
rename from system/dev/block/fvm/rules.mk
rename to zircon/system/dev/block/fvm/rules.mk
diff --git a/system/dev/block/fvm/slice-extent.cpp b/zircon/system/dev/block/fvm/slice-extent.cpp
similarity index 100%
rename from system/dev/block/fvm/slice-extent.cpp
rename to zircon/system/dev/block/fvm/slice-extent.cpp
diff --git a/system/dev/block/fvm/slice-extent.h b/zircon/system/dev/block/fvm/slice-extent.h
similarity index 100%
rename from system/dev/block/fvm/slice-extent.h
rename to zircon/system/dev/block/fvm/slice-extent.h
diff --git a/system/dev/block/fvm/test/main.cpp b/zircon/system/dev/block/fvm/test/main.cpp
similarity index 100%
rename from system/dev/block/fvm/test/main.cpp
rename to zircon/system/dev/block/fvm/test/main.cpp
diff --git a/system/dev/block/fvm/test/slice-extent-test.cpp b/zircon/system/dev/block/fvm/test/slice-extent-test.cpp
similarity index 100%
rename from system/dev/block/fvm/test/slice-extent-test.cpp
rename to zircon/system/dev/block/fvm/test/slice-extent-test.cpp
diff --git a/system/dev/block/fvm/vpartition.cpp b/zircon/system/dev/block/fvm/vpartition.cpp
similarity index 100%
rename from system/dev/block/fvm/vpartition.cpp
rename to zircon/system/dev/block/fvm/vpartition.cpp
diff --git a/system/dev/block/fvm/vpartition.h b/zircon/system/dev/block/fvm/vpartition.h
similarity index 100%
rename from system/dev/block/fvm/vpartition.h
rename to zircon/system/dev/block/fvm/vpartition.h
diff --git a/system/dev/block/gpt/gpt.cpp b/zircon/system/dev/block/gpt/gpt.cpp
similarity index 100%
rename from system/dev/block/gpt/gpt.cpp
rename to zircon/system/dev/block/gpt/gpt.cpp
diff --git a/system/dev/block/gpt/rules.mk b/zircon/system/dev/block/gpt/rules.mk
similarity index 100%
rename from system/dev/block/gpt/rules.mk
rename to zircon/system/dev/block/gpt/rules.mk
diff --git a/system/dev/block/hisi-ufs/hisi-ufs.c b/zircon/system/dev/block/hisi-ufs/hisi-ufs.c
similarity index 100%
rename from system/dev/block/hisi-ufs/hisi-ufs.c
rename to zircon/system/dev/block/hisi-ufs/hisi-ufs.c
diff --git a/system/dev/block/hisi-ufs/rules.mk b/zircon/system/dev/block/hisi-ufs/rules.mk
similarity index 100%
rename from system/dev/block/hisi-ufs/rules.mk
rename to zircon/system/dev/block/hisi-ufs/rules.mk
diff --git a/system/dev/block/hisi-ufs/ufs-common.c b/zircon/system/dev/block/hisi-ufs/ufs-common.c
similarity index 100%
rename from system/dev/block/hisi-ufs/ufs-common.c
rename to zircon/system/dev/block/hisi-ufs/ufs-common.c
diff --git a/system/dev/block/hisi-ufs/ufs.h b/zircon/system/dev/block/hisi-ufs/ufs.h
similarity index 100%
rename from system/dev/block/hisi-ufs/ufs.h
rename to zircon/system/dev/block/hisi-ufs/ufs.h
diff --git a/system/dev/block/imx-sdhci/imx-sdhci.c b/zircon/system/dev/block/imx-sdhci/imx-sdhci.c
similarity index 100%
rename from system/dev/block/imx-sdhci/imx-sdhci.c
rename to zircon/system/dev/block/imx-sdhci/imx-sdhci.c
diff --git a/system/dev/block/imx-sdhci/imx-sdhci.h b/zircon/system/dev/block/imx-sdhci/imx-sdhci.h
similarity index 100%
rename from system/dev/block/imx-sdhci/imx-sdhci.h
rename to zircon/system/dev/block/imx-sdhci/imx-sdhci.h
diff --git a/system/dev/block/imx-sdhci/rules.mk b/zircon/system/dev/block/imx-sdhci/rules.mk
similarity index 100%
rename from system/dev/block/imx-sdhci/rules.mk
rename to zircon/system/dev/block/imx-sdhci/rules.mk
diff --git a/system/dev/block/mbr/mbr.c b/zircon/system/dev/block/mbr/mbr.c
similarity index 100%
rename from system/dev/block/mbr/mbr.c
rename to zircon/system/dev/block/mbr/mbr.c
diff --git a/system/dev/block/mbr/rules.mk b/zircon/system/dev/block/mbr/rules.mk
similarity index 100%
rename from system/dev/block/mbr/rules.mk
rename to zircon/system/dev/block/mbr/rules.mk
diff --git a/system/dev/block/mtk-sdmmc/dma_descriptors.h b/zircon/system/dev/block/mtk-sdmmc/dma_descriptors.h
similarity index 100%
rename from system/dev/block/mtk-sdmmc/dma_descriptors.h
rename to zircon/system/dev/block/mtk-sdmmc/dma_descriptors.h
diff --git a/system/dev/block/mtk-sdmmc/mtk-sdmmc-reg.h b/zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc-reg.h
similarity index 100%
rename from system/dev/block/mtk-sdmmc/mtk-sdmmc-reg.h
rename to zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc-reg.h
diff --git a/system/dev/block/mtk-sdmmc/mtk-sdmmc-test.cpp b/zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc-test.cpp
similarity index 100%
rename from system/dev/block/mtk-sdmmc/mtk-sdmmc-test.cpp
rename to zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc-test.cpp
diff --git a/system/dev/block/mtk-sdmmc/mtk-sdmmc.cpp b/zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc.cpp
similarity index 100%
rename from system/dev/block/mtk-sdmmc/mtk-sdmmc.cpp
rename to zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc.cpp
diff --git a/system/dev/block/mtk-sdmmc/mtk-sdmmc.h b/zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc.h
similarity index 100%
rename from system/dev/block/mtk-sdmmc/mtk-sdmmc.h
rename to zircon/system/dev/block/mtk-sdmmc/mtk-sdmmc.h
diff --git a/system/dev/block/mtk-sdmmc/rules.mk b/zircon/system/dev/block/mtk-sdmmc/rules.mk
similarity index 100%
rename from system/dev/block/mtk-sdmmc/rules.mk
rename to zircon/system/dev/block/mtk-sdmmc/rules.mk
diff --git a/system/dev/block/mtk-sdmmc/test-overrides.cpp b/zircon/system/dev/block/mtk-sdmmc/test-overrides.cpp
similarity index 100%
rename from system/dev/block/mtk-sdmmc/test-overrides.cpp
rename to zircon/system/dev/block/mtk-sdmmc/test-overrides.cpp
diff --git a/system/dev/block/nvme/nvme-hw.h b/zircon/system/dev/block/nvme/nvme-hw.h
similarity index 100%
rename from system/dev/block/nvme/nvme-hw.h
rename to zircon/system/dev/block/nvme/nvme-hw.h
diff --git a/system/dev/block/nvme/nvme.c b/zircon/system/dev/block/nvme/nvme.c
similarity index 100%
rename from system/dev/block/nvme/nvme.c
rename to zircon/system/dev/block/nvme/nvme.c
diff --git a/system/dev/block/nvme/rules.mk b/zircon/system/dev/block/nvme/rules.mk
similarity index 100%
rename from system/dev/block/nvme/rules.mk
rename to zircon/system/dev/block/nvme/rules.mk
diff --git a/system/dev/block/pci-sdhci/pci-sdhci.c b/zircon/system/dev/block/pci-sdhci/pci-sdhci.c
similarity index 100%
rename from system/dev/block/pci-sdhci/pci-sdhci.c
rename to zircon/system/dev/block/pci-sdhci/pci-sdhci.c
diff --git a/system/dev/block/pci-sdhci/rules.mk b/zircon/system/dev/block/pci-sdhci/rules.mk
similarity index 100%
rename from system/dev/block/pci-sdhci/rules.mk
rename to zircon/system/dev/block/pci-sdhci/rules.mk
diff --git a/system/dev/block/ramdisk/ramdisk-controller.cpp b/zircon/system/dev/block/ramdisk/ramdisk-controller.cpp
similarity index 100%
rename from system/dev/block/ramdisk/ramdisk-controller.cpp
rename to zircon/system/dev/block/ramdisk/ramdisk-controller.cpp
diff --git a/system/dev/block/ramdisk/ramdisk.cpp b/zircon/system/dev/block/ramdisk/ramdisk.cpp
similarity index 100%
rename from system/dev/block/ramdisk/ramdisk.cpp
rename to zircon/system/dev/block/ramdisk/ramdisk.cpp
diff --git a/system/dev/block/ramdisk/ramdisk.h b/zircon/system/dev/block/ramdisk/ramdisk.h
similarity index 100%
rename from system/dev/block/ramdisk/ramdisk.h
rename to zircon/system/dev/block/ramdisk/ramdisk.h
diff --git a/system/dev/block/ramdisk/rules.mk b/zircon/system/dev/block/ramdisk/rules.mk
similarity index 100%
rename from system/dev/block/ramdisk/rules.mk
rename to zircon/system/dev/block/ramdisk/rules.mk
diff --git a/system/dev/block/ramdisk/transaction.h b/zircon/system/dev/block/ramdisk/transaction.h
similarity index 100%
rename from system/dev/block/ramdisk/transaction.h
rename to zircon/system/dev/block/ramdisk/transaction.h
diff --git a/system/dev/block/sdhci/rules.mk b/zircon/system/dev/block/sdhci/rules.mk
similarity index 100%
rename from system/dev/block/sdhci/rules.mk
rename to zircon/system/dev/block/sdhci/rules.mk
diff --git a/system/dev/block/sdhci/sdhci.c b/zircon/system/dev/block/sdhci/sdhci.c
similarity index 100%
rename from system/dev/block/sdhci/sdhci.c
rename to zircon/system/dev/block/sdhci/sdhci.c
diff --git a/system/dev/block/sdmmc/mmc.c b/zircon/system/dev/block/sdmmc/mmc.c
similarity index 100%
rename from system/dev/block/sdmmc/mmc.c
rename to zircon/system/dev/block/sdmmc/mmc.c
diff --git a/system/dev/block/sdmmc/ops.c b/zircon/system/dev/block/sdmmc/ops.c
similarity index 100%
rename from system/dev/block/sdmmc/ops.c
rename to zircon/system/dev/block/sdmmc/ops.c
diff --git a/system/dev/block/sdmmc/rules.mk b/zircon/system/dev/block/sdmmc/rules.mk
similarity index 100%
rename from system/dev/block/sdmmc/rules.mk
rename to zircon/system/dev/block/sdmmc/rules.mk
diff --git a/system/dev/block/sdmmc/sd.c b/zircon/system/dev/block/sdmmc/sd.c
similarity index 100%
rename from system/dev/block/sdmmc/sd.c
rename to zircon/system/dev/block/sdmmc/sd.c
diff --git a/system/dev/block/sdmmc/sdio-interrupts.c b/zircon/system/dev/block/sdmmc/sdio-interrupts.c
similarity index 100%
rename from system/dev/block/sdmmc/sdio-interrupts.c
rename to zircon/system/dev/block/sdmmc/sdio-interrupts.c
diff --git a/system/dev/block/sdmmc/sdio.c b/zircon/system/dev/block/sdmmc/sdio.c
similarity index 100%
rename from system/dev/block/sdmmc/sdio.c
rename to zircon/system/dev/block/sdmmc/sdio.c
diff --git a/system/dev/block/sdmmc/sdio.h b/zircon/system/dev/block/sdmmc/sdio.h
similarity index 100%
rename from system/dev/block/sdmmc/sdio.h
rename to zircon/system/dev/block/sdmmc/sdio.h
diff --git a/system/dev/block/sdmmc/sdmmc.c b/zircon/system/dev/block/sdmmc/sdmmc.c
similarity index 100%
rename from system/dev/block/sdmmc/sdmmc.c
rename to zircon/system/dev/block/sdmmc/sdmmc.c
diff --git a/system/dev/block/sdmmc/sdmmc.h b/zircon/system/dev/block/sdmmc/sdmmc.h
similarity index 100%
rename from system/dev/block/sdmmc/sdmmc.h
rename to zircon/system/dev/block/sdmmc/sdmmc.h
diff --git a/system/dev/block/ums-function/rules.mk b/zircon/system/dev/block/ums-function/rules.mk
similarity index 100%
rename from system/dev/block/ums-function/rules.mk
rename to zircon/system/dev/block/ums-function/rules.mk
diff --git a/system/dev/block/ums-function/ums-function.c b/zircon/system/dev/block/ums-function/ums-function.c
similarity index 100%
rename from system/dev/block/ums-function/ums-function.c
rename to zircon/system/dev/block/ums-function/ums-function.c
diff --git a/system/dev/block/usb-mass-storage/block.cpp b/zircon/system/dev/block/usb-mass-storage/block.cpp
similarity index 100%
rename from system/dev/block/usb-mass-storage/block.cpp
rename to zircon/system/dev/block/usb-mass-storage/block.cpp
diff --git a/system/dev/block/usb-mass-storage/block.h b/zircon/system/dev/block/usb-mass-storage/block.h
similarity index 100%
rename from system/dev/block/usb-mass-storage/block.h
rename to zircon/system/dev/block/usb-mass-storage/block.h
diff --git a/system/dev/block/usb-mass-storage/rules.mk b/zircon/system/dev/block/usb-mass-storage/rules.mk
similarity index 100%
rename from system/dev/block/usb-mass-storage/rules.mk
rename to zircon/system/dev/block/usb-mass-storage/rules.mk
diff --git a/system/dev/block/usb-mass-storage/tests/block.cpp b/zircon/system/dev/block/usb-mass-storage/tests/block.cpp
similarity index 100%
rename from system/dev/block/usb-mass-storage/tests/block.cpp
rename to zircon/system/dev/block/usb-mass-storage/tests/block.cpp
diff --git a/system/dev/block/usb-mass-storage/tests/main.c b/zircon/system/dev/block/usb-mass-storage/tests/main.c
similarity index 100%
rename from system/dev/block/usb-mass-storage/tests/main.c
rename to zircon/system/dev/block/usb-mass-storage/tests/main.c
diff --git a/system/dev/block/usb-mass-storage/tests/usb-mass-storage.cpp b/zircon/system/dev/block/usb-mass-storage/tests/usb-mass-storage.cpp
similarity index 100%
rename from system/dev/block/usb-mass-storage/tests/usb-mass-storage.cpp
rename to zircon/system/dev/block/usb-mass-storage/tests/usb-mass-storage.cpp
diff --git a/system/dev/block/usb-mass-storage/usb-mass-storage.cpp b/zircon/system/dev/block/usb-mass-storage/usb-mass-storage.cpp
similarity index 100%
rename from system/dev/block/usb-mass-storage/usb-mass-storage.cpp
rename to zircon/system/dev/block/usb-mass-storage/usb-mass-storage.cpp
diff --git a/system/dev/block/usb-mass-storage/usb-mass-storage.h b/zircon/system/dev/block/usb-mass-storage/usb-mass-storage.h
similarity index 100%
rename from system/dev/block/usb-mass-storage/usb-mass-storage.h
rename to zircon/system/dev/block/usb-mass-storage/usb-mass-storage.h
diff --git a/system/dev/block/zxcrypt/binding.c b/zircon/system/dev/block/zxcrypt/binding.c
similarity index 100%
rename from system/dev/block/zxcrypt/binding.c
rename to zircon/system/dev/block/zxcrypt/binding.c
diff --git a/system/dev/block/zxcrypt/debug.h b/zircon/system/dev/block/zxcrypt/debug.h
similarity index 100%
rename from system/dev/block/zxcrypt/debug.h
rename to zircon/system/dev/block/zxcrypt/debug.h
diff --git a/system/dev/block/zxcrypt/device.cpp b/zircon/system/dev/block/zxcrypt/device.cpp
similarity index 100%
rename from system/dev/block/zxcrypt/device.cpp
rename to zircon/system/dev/block/zxcrypt/device.cpp
diff --git a/system/dev/block/zxcrypt/device.h b/zircon/system/dev/block/zxcrypt/device.h
similarity index 100%
rename from system/dev/block/zxcrypt/device.h
rename to zircon/system/dev/block/zxcrypt/device.h
diff --git a/system/dev/block/zxcrypt/extra.cpp b/zircon/system/dev/block/zxcrypt/extra.cpp
similarity index 100%
rename from system/dev/block/zxcrypt/extra.cpp
rename to zircon/system/dev/block/zxcrypt/extra.cpp
diff --git a/system/dev/block/zxcrypt/extra.h b/zircon/system/dev/block/zxcrypt/extra.h
similarity index 100%
rename from system/dev/block/zxcrypt/extra.h
rename to zircon/system/dev/block/zxcrypt/extra.h
diff --git a/system/dev/block/zxcrypt/rules.mk b/zircon/system/dev/block/zxcrypt/rules.mk
similarity index 100%
rename from system/dev/block/zxcrypt/rules.mk
rename to zircon/system/dev/block/zxcrypt/rules.mk
diff --git a/system/dev/block/zxcrypt/worker.cpp b/zircon/system/dev/block/zxcrypt/worker.cpp
similarity index 100%
rename from system/dev/block/zxcrypt/worker.cpp
rename to zircon/system/dev/block/zxcrypt/worker.cpp
diff --git a/system/dev/block/zxcrypt/worker.h b/zircon/system/dev/block/zxcrypt/worker.h
similarity index 100%
rename from system/dev/block/zxcrypt/worker.h
rename to zircon/system/dev/block/zxcrypt/worker.h
diff --git a/system/dev/bluetooth/bt-hci-broadcom/bt-hci-broadcom.c b/zircon/system/dev/bluetooth/bt-hci-broadcom/bt-hci-broadcom.c
similarity index 100%
rename from system/dev/bluetooth/bt-hci-broadcom/bt-hci-broadcom.c
rename to zircon/system/dev/bluetooth/bt-hci-broadcom/bt-hci-broadcom.c
diff --git a/system/dev/bluetooth/bt-hci-broadcom/rules.mk b/zircon/system/dev/bluetooth/bt-hci-broadcom/rules.mk
similarity index 100%
rename from system/dev/bluetooth/bt-hci-broadcom/rules.mk
rename to zircon/system/dev/bluetooth/bt-hci-broadcom/rules.mk
diff --git a/system/dev/bluetooth/bt-transport-uart/bt-transport-uart.c b/zircon/system/dev/bluetooth/bt-transport-uart/bt-transport-uart.c
similarity index 100%
rename from system/dev/bluetooth/bt-transport-uart/bt-transport-uart.c
rename to zircon/system/dev/bluetooth/bt-transport-uart/bt-transport-uart.c
diff --git a/system/dev/bluetooth/bt-transport-uart/rules.mk b/zircon/system/dev/bluetooth/bt-transport-uart/rules.mk
similarity index 100%
rename from system/dev/bluetooth/bt-transport-uart/rules.mk
rename to zircon/system/dev/bluetooth/bt-transport-uart/rules.mk
diff --git a/system/dev/bluetooth/bt-transport-usb/bt-transport-usb.c b/zircon/system/dev/bluetooth/bt-transport-usb/bt-transport-usb.c
similarity index 100%
rename from system/dev/bluetooth/bt-transport-usb/bt-transport-usb.c
rename to zircon/system/dev/bluetooth/bt-transport-usb/bt-transport-usb.c
diff --git a/system/dev/bluetooth/bt-transport-usb/rules.mk b/zircon/system/dev/bluetooth/bt-transport-usb/rules.mk
similarity index 100%
rename from system/dev/bluetooth/bt-transport-usb/rules.mk
rename to zircon/system/dev/bluetooth/bt-transport-usb/rules.mk
diff --git a/system/dev/board/astro/astro-audio.c b/zircon/system/dev/board/astro/astro-audio.c
similarity index 100%
rename from system/dev/board/astro/astro-audio.c
rename to zircon/system/dev/board/astro/astro-audio.c
diff --git a/system/dev/board/astro/astro-backlight.c b/zircon/system/dev/board/astro/astro-backlight.c
similarity index 100%
rename from system/dev/board/astro/astro-backlight.c
rename to zircon/system/dev/board/astro/astro-backlight.c
diff --git a/system/dev/board/astro/astro-bluetooth.c b/zircon/system/dev/board/astro/astro-bluetooth.c
similarity index 100%
rename from system/dev/board/astro/astro-bluetooth.c
rename to zircon/system/dev/board/astro/astro-bluetooth.c
diff --git a/system/dev/board/astro/astro-buttons.c b/zircon/system/dev/board/astro/astro-buttons.c
similarity index 100%
rename from system/dev/board/astro/astro-buttons.c
rename to zircon/system/dev/board/astro/astro-buttons.c
diff --git a/system/dev/board/astro/astro-canvas.c b/zircon/system/dev/board/astro/astro-canvas.c
similarity index 100%
rename from system/dev/board/astro/astro-canvas.c
rename to zircon/system/dev/board/astro/astro-canvas.c
diff --git a/system/dev/board/astro/astro-clk.c b/zircon/system/dev/board/astro/astro-clk.c
similarity index 100%
rename from system/dev/board/astro/astro-clk.c
rename to zircon/system/dev/board/astro/astro-clk.c
diff --git a/system/dev/board/astro/astro-display.c b/zircon/system/dev/board/astro/astro-display.c
similarity index 100%
rename from system/dev/board/astro/astro-display.c
rename to zircon/system/dev/board/astro/astro-display.c
diff --git a/system/dev/board/astro/astro-gpio.c b/zircon/system/dev/board/astro/astro-gpio.c
similarity index 100%
rename from system/dev/board/astro/astro-gpio.c
rename to zircon/system/dev/board/astro/astro-gpio.c
diff --git a/system/dev/board/astro/astro-i2c.c b/zircon/system/dev/board/astro/astro-i2c.c
similarity index 100%
rename from system/dev/board/astro/astro-i2c.c
rename to zircon/system/dev/board/astro/astro-i2c.c
diff --git a/system/dev/board/astro/astro-light.c b/zircon/system/dev/board/astro/astro-light.c
similarity index 100%
rename from system/dev/board/astro/astro-light.c
rename to zircon/system/dev/board/astro/astro-light.c
diff --git a/system/dev/board/astro/astro-rawnand.c b/zircon/system/dev/board/astro/astro-rawnand.c
similarity index 100%
rename from system/dev/board/astro/astro-rawnand.c
rename to zircon/system/dev/board/astro/astro-rawnand.c
diff --git a/system/dev/board/astro/astro-sdio.c b/zircon/system/dev/board/astro/astro-sdio.c
similarity index 100%
rename from system/dev/board/astro/astro-sdio.c
rename to zircon/system/dev/board/astro/astro-sdio.c
diff --git a/system/dev/board/astro/astro-sysmem.c b/zircon/system/dev/board/astro/astro-sysmem.c
similarity index 100%
rename from system/dev/board/astro/astro-sysmem.c
rename to zircon/system/dev/board/astro/astro-sysmem.c
diff --git a/system/dev/board/astro/astro-tee.c b/zircon/system/dev/board/astro/astro-tee.c
similarity index 100%
rename from system/dev/board/astro/astro-tee.c
rename to zircon/system/dev/board/astro/astro-tee.c
diff --git a/system/dev/board/astro/astro-thermal.c b/zircon/system/dev/board/astro/astro-thermal.c
similarity index 100%
rename from system/dev/board/astro/astro-thermal.c
rename to zircon/system/dev/board/astro/astro-thermal.c
diff --git a/system/dev/board/astro/astro-touch.c b/zircon/system/dev/board/astro/astro-touch.c
similarity index 100%
rename from system/dev/board/astro/astro-touch.c
rename to zircon/system/dev/board/astro/astro-touch.c
diff --git a/system/dev/board/astro/astro-usb.c b/zircon/system/dev/board/astro/astro-usb.c
similarity index 100%
rename from system/dev/board/astro/astro-usb.c
rename to zircon/system/dev/board/astro/astro-usb.c
diff --git a/system/dev/board/astro/astro-video.c b/zircon/system/dev/board/astro/astro-video.c
similarity index 100%
rename from system/dev/board/astro/astro-video.c
rename to zircon/system/dev/board/astro/astro-video.c
diff --git a/system/dev/board/astro/astro.c b/zircon/system/dev/board/astro/astro.c
similarity index 100%
rename from system/dev/board/astro/astro.c
rename to zircon/system/dev/board/astro/astro.c
diff --git a/system/dev/board/astro/astro.h b/zircon/system/dev/board/astro/astro.h
similarity index 100%
rename from system/dev/board/astro/astro.h
rename to zircon/system/dev/board/astro/astro.h
diff --git a/system/dev/board/astro/rules.mk b/zircon/system/dev/board/astro/rules.mk
similarity index 100%
rename from system/dev/board/astro/rules.mk
rename to zircon/system/dev/board/astro/rules.mk
diff --git a/system/dev/board/gauss/gauss-audio.c b/zircon/system/dev/board/gauss/gauss-audio.c
similarity index 100%
rename from system/dev/board/gauss/gauss-audio.c
rename to zircon/system/dev/board/gauss/gauss-audio.c
diff --git a/system/dev/board/gauss/gauss-clk.c b/zircon/system/dev/board/gauss/gauss-clk.c
similarity index 100%
rename from system/dev/board/gauss/gauss-clk.c
rename to zircon/system/dev/board/gauss/gauss-clk.c
diff --git a/system/dev/board/gauss/gauss-gpio.c b/zircon/system/dev/board/gauss/gauss-gpio.c
similarity index 100%
rename from system/dev/board/gauss/gauss-gpio.c
rename to zircon/system/dev/board/gauss/gauss-gpio.c
diff --git a/system/dev/board/gauss/gauss-hw.h b/zircon/system/dev/board/gauss/gauss-hw.h
similarity index 100%
rename from system/dev/board/gauss/gauss-hw.h
rename to zircon/system/dev/board/gauss/gauss-hw.h
diff --git a/system/dev/board/gauss/gauss-i2c-test.c b/zircon/system/dev/board/gauss/gauss-i2c-test.c
similarity index 100%
rename from system/dev/board/gauss/gauss-i2c-test.c
rename to zircon/system/dev/board/gauss/gauss-i2c-test.c
diff --git a/system/dev/board/gauss/gauss-i2c.c b/zircon/system/dev/board/gauss/gauss-i2c.c
similarity index 100%
rename from system/dev/board/gauss/gauss-i2c.c
rename to zircon/system/dev/board/gauss/gauss-i2c.c
diff --git a/system/dev/board/gauss/gauss-led.c b/zircon/system/dev/board/gauss/gauss-led.c
similarity index 100%
rename from system/dev/board/gauss/gauss-led.c
rename to zircon/system/dev/board/gauss/gauss-led.c
diff --git a/system/dev/board/gauss/gauss-pcie.c b/zircon/system/dev/board/gauss/gauss-pcie.c
similarity index 100%
rename from system/dev/board/gauss/gauss-pcie.c
rename to zircon/system/dev/board/gauss/gauss-pcie.c
diff --git a/system/dev/board/gauss/gauss-rawnand.c b/zircon/system/dev/board/gauss/gauss-rawnand.c
similarity index 100%
rename from system/dev/board/gauss/gauss-rawnand.c
rename to zircon/system/dev/board/gauss/gauss-rawnand.c
diff --git a/system/dev/board/gauss/gauss-sysmem.c b/zircon/system/dev/board/gauss/gauss-sysmem.c
similarity index 100%
rename from system/dev/board/gauss/gauss-sysmem.c
rename to zircon/system/dev/board/gauss/gauss-sysmem.c
diff --git a/system/dev/board/gauss/gauss-usb.c b/zircon/system/dev/board/gauss/gauss-usb.c
similarity index 100%
rename from system/dev/board/gauss/gauss-usb.c
rename to zircon/system/dev/board/gauss/gauss-usb.c
diff --git a/system/dev/board/gauss/gauss.c b/zircon/system/dev/board/gauss/gauss.c
similarity index 100%
rename from system/dev/board/gauss/gauss.c
rename to zircon/system/dev/board/gauss/gauss.c
diff --git a/system/dev/board/gauss/gauss.h b/zircon/system/dev/board/gauss/gauss.h
similarity index 100%
rename from system/dev/board/gauss/gauss.h
rename to zircon/system/dev/board/gauss/gauss.h
diff --git a/system/dev/board/gauss/rules.mk b/zircon/system/dev/board/gauss/rules.mk
similarity index 100%
rename from system/dev/board/gauss/rules.mk
rename to zircon/system/dev/board/gauss/rules.mk
diff --git a/system/dev/board/hikey960/hikey960-devices.c b/zircon/system/dev/board/hikey960/hikey960-devices.c
similarity index 100%
rename from system/dev/board/hikey960/hikey960-devices.c
rename to zircon/system/dev/board/hikey960/hikey960-devices.c
diff --git a/system/dev/board/hikey960/hikey960-hw.h b/zircon/system/dev/board/hikey960/hikey960-hw.h
similarity index 100%
rename from system/dev/board/hikey960/hikey960-hw.h
rename to zircon/system/dev/board/hikey960/hikey960-hw.h
diff --git a/system/dev/board/hikey960/hikey960-i2c-test.c b/zircon/system/dev/board/hikey960/hikey960-i2c-test.c
similarity index 100%
rename from system/dev/board/hikey960/hikey960-i2c-test.c
rename to zircon/system/dev/board/hikey960/hikey960-i2c-test.c
diff --git a/system/dev/board/hikey960/hikey960-i2c.c b/zircon/system/dev/board/hikey960/hikey960-i2c.c
similarity index 100%
rename from system/dev/board/hikey960/hikey960-i2c.c
rename to zircon/system/dev/board/hikey960/hikey960-i2c.c
diff --git a/system/dev/board/hikey960/hikey960-sysmem.c b/zircon/system/dev/board/hikey960/hikey960-sysmem.c
similarity index 100%
rename from system/dev/board/hikey960/hikey960-sysmem.c
rename to zircon/system/dev/board/hikey960/hikey960-sysmem.c
diff --git a/system/dev/board/hikey960/hikey960-usb.c b/zircon/system/dev/board/hikey960/hikey960-usb.c
similarity index 100%
rename from system/dev/board/hikey960/hikey960-usb.c
rename to zircon/system/dev/board/hikey960/hikey960-usb.c
diff --git a/system/dev/board/hikey960/hikey960.c b/zircon/system/dev/board/hikey960/hikey960.c
similarity index 100%
rename from system/dev/board/hikey960/hikey960.c
rename to zircon/system/dev/board/hikey960/hikey960.c
diff --git a/system/dev/board/hikey960/hikey960.h b/zircon/system/dev/board/hikey960/hikey960.h
similarity index 100%
rename from system/dev/board/hikey960/hikey960.h
rename to zircon/system/dev/board/hikey960/hikey960.h
diff --git a/system/dev/board/hikey960/rules.mk b/zircon/system/dev/board/hikey960/rules.mk
similarity index 100%
rename from system/dev/board/hikey960/rules.mk
rename to zircon/system/dev/board/hikey960/rules.mk
diff --git a/system/dev/board/imx8mevk/imx8mevk-gpio.c b/zircon/system/dev/board/imx8mevk/imx8mevk-gpio.c
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk-gpio.c
rename to zircon/system/dev/board/imx8mevk/imx8mevk-gpio.c
diff --git a/system/dev/board/imx8mevk/imx8mevk-gpu.c b/zircon/system/dev/board/imx8mevk/imx8mevk-gpu.c
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk-gpu.c
rename to zircon/system/dev/board/imx8mevk/imx8mevk-gpu.c
diff --git a/system/dev/board/imx8mevk/imx8mevk-i2c.c b/zircon/system/dev/board/imx8mevk/imx8mevk-i2c.c
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk-i2c.c
rename to zircon/system/dev/board/imx8mevk/imx8mevk-i2c.c
diff --git a/system/dev/board/imx8mevk/imx8mevk-sdhci.c b/zircon/system/dev/board/imx8mevk/imx8mevk-sdhci.c
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk-sdhci.c
rename to zircon/system/dev/board/imx8mevk/imx8mevk-sdhci.c
diff --git a/system/dev/board/imx8mevk/imx8mevk-sysmem.c b/zircon/system/dev/board/imx8mevk/imx8mevk-sysmem.c
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk-sysmem.c
rename to zircon/system/dev/board/imx8mevk/imx8mevk-sysmem.c
diff --git a/system/dev/board/imx8mevk/imx8mevk-usb.c b/zircon/system/dev/board/imx8mevk/imx8mevk-usb.c
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk-usb.c
rename to zircon/system/dev/board/imx8mevk/imx8mevk-usb.c
diff --git a/system/dev/board/imx8mevk/imx8mevk.c b/zircon/system/dev/board/imx8mevk/imx8mevk.c
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk.c
rename to zircon/system/dev/board/imx8mevk/imx8mevk.c
diff --git a/system/dev/board/imx8mevk/imx8mevk.h b/zircon/system/dev/board/imx8mevk/imx8mevk.h
similarity index 100%
rename from system/dev/board/imx8mevk/imx8mevk.h
rename to zircon/system/dev/board/imx8mevk/imx8mevk.h
diff --git a/system/dev/board/imx8mevk/rules.mk b/zircon/system/dev/board/imx8mevk/rules.mk
similarity index 100%
rename from system/dev/board/imx8mevk/rules.mk
rename to zircon/system/dev/board/imx8mevk/rules.mk
diff --git a/system/dev/board/imx8mmevk/binding.c b/zircon/system/dev/board/imx8mmevk/binding.c
similarity index 100%
rename from system/dev/board/imx8mmevk/binding.c
rename to zircon/system/dev/board/imx8mmevk/binding.c
diff --git a/system/dev/board/imx8mmevk/imx8mmevk-gpio.cpp b/zircon/system/dev/board/imx8mmevk/imx8mmevk-gpio.cpp
similarity index 100%
rename from system/dev/board/imx8mmevk/imx8mmevk-gpio.cpp
rename to zircon/system/dev/board/imx8mmevk/imx8mmevk-gpio.cpp
diff --git a/system/dev/board/imx8mmevk/imx8mmevk-sysmem.cpp b/zircon/system/dev/board/imx8mmevk/imx8mmevk-sysmem.cpp
similarity index 100%
rename from system/dev/board/imx8mmevk/imx8mmevk-sysmem.cpp
rename to zircon/system/dev/board/imx8mmevk/imx8mmevk-sysmem.cpp
diff --git a/system/dev/board/imx8mmevk/imx8mmevk.cpp b/zircon/system/dev/board/imx8mmevk/imx8mmevk.cpp
similarity index 100%
rename from system/dev/board/imx8mmevk/imx8mmevk.cpp
rename to zircon/system/dev/board/imx8mmevk/imx8mmevk.cpp
diff --git a/system/dev/board/imx8mmevk/imx8mmevk.h b/zircon/system/dev/board/imx8mmevk/imx8mmevk.h
similarity index 100%
rename from system/dev/board/imx8mmevk/imx8mmevk.h
rename to zircon/system/dev/board/imx8mmevk/imx8mmevk.h
diff --git a/system/dev/board/imx8mmevk/rules.mk b/zircon/system/dev/board/imx8mmevk/rules.mk
similarity index 100%
rename from system/dev/board/imx8mmevk/rules.mk
rename to zircon/system/dev/board/imx8mmevk/rules.mk
diff --git a/system/dev/board/machina/machina-sysmem.c b/zircon/system/dev/board/machina/machina-sysmem.c
similarity index 100%
rename from system/dev/board/machina/machina-sysmem.c
rename to zircon/system/dev/board/machina/machina-sysmem.c
diff --git a/system/dev/board/machina/machina.c b/zircon/system/dev/board/machina/machina.c
similarity index 100%
rename from system/dev/board/machina/machina.c
rename to zircon/system/dev/board/machina/machina.c
diff --git a/system/dev/board/machina/machina.h b/zircon/system/dev/board/machina/machina.h
similarity index 100%
rename from system/dev/board/machina/machina.h
rename to zircon/system/dev/board/machina/machina.h
diff --git a/system/dev/board/machina/rules.mk b/zircon/system/dev/board/machina/rules.mk
similarity index 100%
rename from system/dev/board/machina/rules.mk
rename to zircon/system/dev/board/machina/rules.mk
diff --git a/system/dev/board/mt8167s_ref/mt8167-audio.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-audio.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-audio.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-audio.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-backlight.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-backlight.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-backlight.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-backlight.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-buttons.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-buttons.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-buttons.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-buttons.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-clk.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-clk.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-clk.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-clk.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-display.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-display.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-display.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-display.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-emmc.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-emmc.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-emmc.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-emmc.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-gpio.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-gpio.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-gpio.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-gpio.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-gpu.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-gpu.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-gpu.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-gpu.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-i2c.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-i2c.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-i2c.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-i2c.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-sdio.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-sdio.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-sdio.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-sdio.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-sensors.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-sensors.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-sensors.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-sensors.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-soc.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-soc.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-soc.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-soc.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-sysmem.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-sysmem.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-sysmem.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-sysmem.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-thermal.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-thermal.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-thermal.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-thermal.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-touch.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-touch.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-touch.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-touch.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167-usb.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167-usb.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167-usb.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167-usb.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167.cpp b/zircon/system/dev/board/mt8167s_ref/mt8167.cpp
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167.cpp
rename to zircon/system/dev/board/mt8167s_ref/mt8167.cpp
diff --git a/system/dev/board/mt8167s_ref/mt8167.h b/zircon/system/dev/board/mt8167s_ref/mt8167.h
similarity index 100%
rename from system/dev/board/mt8167s_ref/mt8167.h
rename to zircon/system/dev/board/mt8167s_ref/mt8167.h
diff --git a/system/dev/board/mt8167s_ref/rules.mk b/zircon/system/dev/board/mt8167s_ref/rules.mk
similarity index 100%
rename from system/dev/board/mt8167s_ref/rules.mk
rename to zircon/system/dev/board/mt8167s_ref/rules.mk
diff --git a/system/dev/board/qemu/qemu-bus.c b/zircon/system/dev/board/qemu/qemu-bus.c
similarity index 100%
rename from system/dev/board/qemu/qemu-bus.c
rename to zircon/system/dev/board/qemu/qemu-bus.c
diff --git a/system/dev/board/qemu/qemu-sysmem.c b/zircon/system/dev/board/qemu/qemu-sysmem.c
similarity index 100%
rename from system/dev/board/qemu/qemu-sysmem.c
rename to zircon/system/dev/board/qemu/qemu-sysmem.c
diff --git a/system/dev/board/qemu/qemu-virt.h b/zircon/system/dev/board/qemu/qemu-virt.h
similarity index 100%
rename from system/dev/board/qemu/qemu-virt.h
rename to zircon/system/dev/board/qemu/qemu-virt.h
diff --git a/system/dev/board/qemu/rules.mk b/zircon/system/dev/board/qemu/rules.mk
similarity index 100%
rename from system/dev/board/qemu/rules.mk
rename to zircon/system/dev/board/qemu/rules.mk
diff --git a/system/dev/board/sherlock/bind.c b/zircon/system/dev/board/sherlock/bind.c
similarity index 100%
rename from system/dev/board/sherlock/bind.c
rename to zircon/system/dev/board/sherlock/bind.c
diff --git a/system/dev/board/sherlock/rules.mk b/zircon/system/dev/board/sherlock/rules.mk
similarity index 100%
rename from system/dev/board/sherlock/rules.mk
rename to zircon/system/dev/board/sherlock/rules.mk
diff --git a/system/dev/board/sherlock/sherlock-audio.cpp b/zircon/system/dev/board/sherlock/sherlock-audio.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-audio.cpp
rename to zircon/system/dev/board/sherlock/sherlock-audio.cpp
diff --git a/system/dev/board/sherlock/sherlock-backlight.cpp b/zircon/system/dev/board/sherlock/sherlock-backlight.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-backlight.cpp
rename to zircon/system/dev/board/sherlock/sherlock-backlight.cpp
diff --git a/system/dev/board/sherlock/sherlock-bluetooth.cpp b/zircon/system/dev/board/sherlock/sherlock-bluetooth.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-bluetooth.cpp
rename to zircon/system/dev/board/sherlock/sherlock-bluetooth.cpp
diff --git a/system/dev/board/sherlock/sherlock-buttons.cpp b/zircon/system/dev/board/sherlock/sherlock-buttons.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-buttons.cpp
rename to zircon/system/dev/board/sherlock/sherlock-buttons.cpp
diff --git a/system/dev/board/sherlock/sherlock-camera.cpp b/zircon/system/dev/board/sherlock/sherlock-camera.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-camera.cpp
rename to zircon/system/dev/board/sherlock/sherlock-camera.cpp
diff --git a/system/dev/board/sherlock/sherlock-canvas.cpp b/zircon/system/dev/board/sherlock/sherlock-canvas.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-canvas.cpp
rename to zircon/system/dev/board/sherlock/sherlock-canvas.cpp
diff --git a/system/dev/board/sherlock/sherlock-clk.cpp b/zircon/system/dev/board/sherlock/sherlock-clk.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-clk.cpp
rename to zircon/system/dev/board/sherlock/sherlock-clk.cpp
diff --git a/system/dev/board/sherlock/sherlock-display.cpp b/zircon/system/dev/board/sherlock/sherlock-display.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-display.cpp
rename to zircon/system/dev/board/sherlock/sherlock-display.cpp
diff --git a/system/dev/board/sherlock/sherlock-emmc.cpp b/zircon/system/dev/board/sherlock/sherlock-emmc.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-emmc.cpp
rename to zircon/system/dev/board/sherlock/sherlock-emmc.cpp
diff --git a/system/dev/board/sherlock/sherlock-gpio.cpp b/zircon/system/dev/board/sherlock/sherlock-gpio.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-gpio.cpp
rename to zircon/system/dev/board/sherlock/sherlock-gpio.cpp
diff --git a/system/dev/board/sherlock/sherlock-i2c.cpp b/zircon/system/dev/board/sherlock/sherlock-i2c.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-i2c.cpp
rename to zircon/system/dev/board/sherlock/sherlock-i2c.cpp
diff --git a/system/dev/board/sherlock/sherlock-mali.cpp b/zircon/system/dev/board/sherlock/sherlock-mali.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-mali.cpp
rename to zircon/system/dev/board/sherlock/sherlock-mali.cpp
diff --git a/system/dev/board/sherlock/sherlock-sdio.cpp b/zircon/system/dev/board/sherlock/sherlock-sdio.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-sdio.cpp
rename to zircon/system/dev/board/sherlock/sherlock-sdio.cpp
diff --git a/system/dev/board/sherlock/sherlock-sysmem.cpp b/zircon/system/dev/board/sherlock/sherlock-sysmem.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-sysmem.cpp
rename to zircon/system/dev/board/sherlock/sherlock-sysmem.cpp
diff --git a/system/dev/board/sherlock/sherlock-usb.cpp b/zircon/system/dev/board/sherlock/sherlock-usb.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-usb.cpp
rename to zircon/system/dev/board/sherlock/sherlock-usb.cpp
diff --git a/system/dev/board/sherlock/sherlock-video.cpp b/zircon/system/dev/board/sherlock/sherlock-video.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock-video.cpp
rename to zircon/system/dev/board/sherlock/sherlock-video.cpp
diff --git a/system/dev/board/sherlock/sherlock.cpp b/zircon/system/dev/board/sherlock/sherlock.cpp
similarity index 100%
rename from system/dev/board/sherlock/sherlock.cpp
rename to zircon/system/dev/board/sherlock/sherlock.cpp
diff --git a/system/dev/board/sherlock/sherlock.h b/zircon/system/dev/board/sherlock/sherlock.h
similarity index 100%
rename from system/dev/board/sherlock/sherlock.h
rename to zircon/system/dev/board/sherlock/sherlock.h
diff --git a/system/dev/board/test/rules.mk b/zircon/system/dev/board/test/rules.mk
similarity index 100%
rename from system/dev/board/test/rules.mk
rename to zircon/system/dev/board/test/rules.mk
diff --git a/system/dev/board/test/test-board.cpp b/zircon/system/dev/board/test/test-board.cpp
similarity index 100%
rename from system/dev/board/test/test-board.cpp
rename to zircon/system/dev/board/test/test-board.cpp
diff --git a/system/dev/board/test/test-gpio.cpp b/zircon/system/dev/board/test/test-gpio.cpp
similarity index 100%
rename from system/dev/board/test/test-gpio.cpp
rename to zircon/system/dev/board/test/test-gpio.cpp
diff --git a/system/dev/board/test/test-resources.h b/zircon/system/dev/board/test/test-resources.h
similarity index 100%
rename from system/dev/board/test/test-resources.h
rename to zircon/system/dev/board/test/test-resources.h
diff --git a/system/dev/board/test/test.cpp b/zircon/system/dev/board/test/test.cpp
similarity index 100%
rename from system/dev/board/test/test.cpp
rename to zircon/system/dev/board/test/test.cpp
diff --git a/system/dev/board/test/test.h b/zircon/system/dev/board/test/test.h
similarity index 100%
rename from system/dev/board/test/test.h
rename to zircon/system/dev/board/test/test.h
diff --git a/system/dev/board/test/test/child-1.c b/zircon/system/dev/board/test/test/child-1.c
similarity index 100%
rename from system/dev/board/test/test/child-1.c
rename to zircon/system/dev/board/test/test/child-1.c
diff --git a/system/dev/board/test/test/child-2.c b/zircon/system/dev/board/test/test/child-2.c
similarity index 100%
rename from system/dev/board/test/test/child-2.c
rename to zircon/system/dev/board/test/test/child-2.c
diff --git a/system/dev/board/test/test/child-3.c b/zircon/system/dev/board/test/test/child-3.c
similarity index 100%
rename from system/dev/board/test/test/child-3.c
rename to zircon/system/dev/board/test/test/child-3.c
diff --git a/system/dev/board/test/test/gpio.cpp b/zircon/system/dev/board/test/test/gpio.cpp
similarity index 100%
rename from system/dev/board/test/test/gpio.cpp
rename to zircon/system/dev/board/test/test/gpio.cpp
diff --git a/system/dev/board/test/test/parent.c b/zircon/system/dev/board/test/test/parent.c
similarity index 100%
rename from system/dev/board/test/test/parent.c
rename to zircon/system/dev/board/test/test/parent.c
diff --git a/system/dev/board/vim/rules.mk b/zircon/system/dev/board/vim/rules.mk
similarity index 100%
rename from system/dev/board/vim/rules.mk
rename to zircon/system/dev/board/vim/rules.mk
diff --git a/system/dev/board/vim/vim-canvas.cpp b/zircon/system/dev/board/vim/vim-canvas.cpp
similarity index 100%
rename from system/dev/board/vim/vim-canvas.cpp
rename to zircon/system/dev/board/vim/vim-canvas.cpp
diff --git a/system/dev/board/vim/vim-clk.cpp b/zircon/system/dev/board/vim/vim-clk.cpp
similarity index 100%
rename from system/dev/board/vim/vim-clk.cpp
rename to zircon/system/dev/board/vim/vim-clk.cpp
diff --git a/system/dev/board/vim/vim-display.cpp b/zircon/system/dev/board/vim/vim-display.cpp
similarity index 100%
rename from system/dev/board/vim/vim-display.cpp
rename to zircon/system/dev/board/vim/vim-display.cpp
diff --git a/system/dev/board/vim/vim-eth.cpp b/zircon/system/dev/board/vim/vim-eth.cpp
similarity index 100%
rename from system/dev/board/vim/vim-eth.cpp
rename to zircon/system/dev/board/vim/vim-eth.cpp
diff --git a/system/dev/board/vim/vim-gpio.cpp b/zircon/system/dev/board/vim/vim-gpio.cpp
similarity index 100%
rename from system/dev/board/vim/vim-gpio.cpp
rename to zircon/system/dev/board/vim/vim-gpio.cpp
diff --git a/system/dev/board/vim/vim-i2c.cpp b/zircon/system/dev/board/vim/vim-i2c.cpp
similarity index 100%
rename from system/dev/board/vim/vim-i2c.cpp
rename to zircon/system/dev/board/vim/vim-i2c.cpp
diff --git a/system/dev/board/vim/vim-led2472g.cpp b/zircon/system/dev/board/vim/vim-led2472g.cpp
similarity index 100%
rename from system/dev/board/vim/vim-led2472g.cpp
rename to zircon/system/dev/board/vim/vim-led2472g.cpp
diff --git a/system/dev/board/vim/vim-mali.cpp b/zircon/system/dev/board/vim/vim-mali.cpp
similarity index 100%
rename from system/dev/board/vim/vim-mali.cpp
rename to zircon/system/dev/board/vim/vim-mali.cpp
diff --git a/system/dev/board/vim/vim-rtc.cpp b/zircon/system/dev/board/vim/vim-rtc.cpp
similarity index 100%
rename from system/dev/board/vim/vim-rtc.cpp
rename to zircon/system/dev/board/vim/vim-rtc.cpp
diff --git a/system/dev/board/vim/vim-sd-emmc.cpp b/zircon/system/dev/board/vim/vim-sd-emmc.cpp
similarity index 100%
rename from system/dev/board/vim/vim-sd-emmc.cpp
rename to zircon/system/dev/board/vim/vim-sd-emmc.cpp
diff --git a/system/dev/board/vim/vim-sdio.cpp b/zircon/system/dev/board/vim/vim-sdio.cpp
similarity index 100%
rename from system/dev/board/vim/vim-sdio.cpp
rename to zircon/system/dev/board/vim/vim-sdio.cpp
diff --git a/system/dev/board/vim/vim-sysmem.cpp b/zircon/system/dev/board/vim/vim-sysmem.cpp
similarity index 100%
rename from system/dev/board/vim/vim-sysmem.cpp
rename to zircon/system/dev/board/vim/vim-sysmem.cpp
diff --git a/system/dev/board/vim/vim-thermal.cpp b/zircon/system/dev/board/vim/vim-thermal.cpp
similarity index 100%
rename from system/dev/board/vim/vim-thermal.cpp
rename to zircon/system/dev/board/vim/vim-thermal.cpp
diff --git a/system/dev/board/vim/vim-uart.cpp b/zircon/system/dev/board/vim/vim-uart.cpp
similarity index 100%
rename from system/dev/board/vim/vim-uart.cpp
rename to zircon/system/dev/board/vim/vim-uart.cpp
diff --git a/system/dev/board/vim/vim-usb.cpp b/zircon/system/dev/board/vim/vim-usb.cpp
similarity index 100%
rename from system/dev/board/vim/vim-usb.cpp
rename to zircon/system/dev/board/vim/vim-usb.cpp
diff --git a/system/dev/board/vim/vim-video.cpp b/zircon/system/dev/board/vim/vim-video.cpp
similarity index 100%
rename from system/dev/board/vim/vim-video.cpp
rename to zircon/system/dev/board/vim/vim-video.cpp
diff --git a/system/dev/board/vim/vim.cpp b/zircon/system/dev/board/vim/vim.cpp
similarity index 100%
rename from system/dev/board/vim/vim.cpp
rename to zircon/system/dev/board/vim/vim.cpp
diff --git a/system/dev/board/vim/vim.h b/zircon/system/dev/board/vim/vim.h
similarity index 100%
rename from system/dev/board/vim/vim.h
rename to zircon/system/dev/board/vim/vim.h
diff --git a/system/dev/bus/acpi/MAINTAINERS b/zircon/system/dev/bus/acpi/MAINTAINERS
similarity index 100%
rename from system/dev/bus/acpi/MAINTAINERS
rename to zircon/system/dev/bus/acpi/MAINTAINERS
diff --git a/system/dev/bus/acpi/bus-acpi.c b/zircon/system/dev/bus/acpi/bus-acpi.c
similarity index 100%
rename from system/dev/bus/acpi/bus-acpi.c
rename to zircon/system/dev/bus/acpi/bus-acpi.c
diff --git a/system/dev/bus/acpi/cpu-trace.c b/zircon/system/dev/bus/acpi/cpu-trace.c
similarity index 100%
rename from system/dev/bus/acpi/cpu-trace.c
rename to zircon/system/dev/bus/acpi/cpu-trace.c
diff --git a/system/dev/bus/acpi/debug.c b/zircon/system/dev/bus/acpi/debug.c
similarity index 100%
rename from system/dev/bus/acpi/debug.c
rename to zircon/system/dev/bus/acpi/debug.c
diff --git a/system/dev/bus/acpi/dev/dev-battery.c b/zircon/system/dev/bus/acpi/dev/dev-battery.c
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-battery.c
rename to zircon/system/dev/bus/acpi/dev/dev-battery.c
diff --git a/system/dev/bus/acpi/dev/dev-cros-ec/dev.cpp b/zircon/system/dev/bus/acpi/dev/dev-cros-ec/dev.cpp
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-cros-ec/dev.cpp
rename to zircon/system/dev/bus/acpi/dev/dev-cros-ec/dev.cpp
diff --git a/system/dev/bus/acpi/dev/dev-cros-ec/dev.h b/zircon/system/dev/bus/acpi/dev/dev-cros-ec/dev.h
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-cros-ec/dev.h
rename to zircon/system/dev/bus/acpi/dev/dev-cros-ec/dev.h
diff --git a/system/dev/bus/acpi/dev/dev-cros-ec/motion.cpp b/zircon/system/dev/bus/acpi/dev/dev-cros-ec/motion.cpp
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-cros-ec/motion.cpp
rename to zircon/system/dev/bus/acpi/dev/dev-cros-ec/motion.cpp
diff --git a/system/dev/bus/acpi/dev/dev-ec.c b/zircon/system/dev/bus/acpi/dev/dev-ec.c
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-ec.c
rename to zircon/system/dev/bus/acpi/dev/dev-ec.c
diff --git a/system/dev/bus/acpi/dev/dev-pwrbtn.cpp b/zircon/system/dev/bus/acpi/dev/dev-pwrbtn.cpp
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-pwrbtn.cpp
rename to zircon/system/dev/bus/acpi/dev/dev-pwrbtn.cpp
diff --git a/system/dev/bus/acpi/dev/dev-pwrsrc.c b/zircon/system/dev/bus/acpi/dev/dev-pwrsrc.c
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-pwrsrc.c
rename to zircon/system/dev/bus/acpi/dev/dev-pwrsrc.c
diff --git a/system/dev/bus/acpi/dev/dev-tbmc.cpp b/zircon/system/dev/bus/acpi/dev/dev-tbmc.cpp
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-tbmc.cpp
rename to zircon/system/dev/bus/acpi/dev/dev-tbmc.cpp
diff --git a/system/dev/bus/acpi/dev/dev-thermal.c b/zircon/system/dev/bus/acpi/dev/dev-thermal.c
similarity index 100%
rename from system/dev/bus/acpi/dev/dev-thermal.c
rename to zircon/system/dev/bus/acpi/dev/dev-thermal.c
diff --git a/system/dev/bus/acpi/dummy.c b/zircon/system/dev/bus/acpi/dummy.c
similarity index 100%
rename from system/dev/bus/acpi/dummy.c
rename to zircon/system/dev/bus/acpi/dummy.c
diff --git a/system/dev/bus/acpi/include/acpi-private.h b/zircon/system/dev/bus/acpi/include/acpi-private.h
similarity index 100%
rename from system/dev/bus/acpi/include/acpi-private.h
rename to zircon/system/dev/bus/acpi/include/acpi-private.h
diff --git a/system/dev/bus/acpi/include/cpu-trace.h b/zircon/system/dev/bus/acpi/include/cpu-trace.h
similarity index 100%
rename from system/dev/bus/acpi/include/cpu-trace.h
rename to zircon/system/dev/bus/acpi/include/cpu-trace.h
diff --git a/system/dev/bus/acpi/include/dev.h b/zircon/system/dev/bus/acpi/include/dev.h
similarity index 100%
rename from system/dev/bus/acpi/include/dev.h
rename to zircon/system/dev/bus/acpi/include/dev.h
diff --git a/system/dev/bus/acpi/include/errors.h b/zircon/system/dev/bus/acpi/include/errors.h
similarity index 100%
rename from system/dev/bus/acpi/include/errors.h
rename to zircon/system/dev/bus/acpi/include/errors.h
diff --git a/system/dev/bus/acpi/include/init.h b/zircon/system/dev/bus/acpi/include/init.h
similarity index 100%
rename from system/dev/bus/acpi/include/init.h
rename to zircon/system/dev/bus/acpi/include/init.h
diff --git a/system/dev/bus/acpi/include/iommu.h b/zircon/system/dev/bus/acpi/include/iommu.h
similarity index 100%
rename from system/dev/bus/acpi/include/iommu.h
rename to zircon/system/dev/bus/acpi/include/iommu.h
diff --git a/system/dev/bus/acpi/include/methods.h b/zircon/system/dev/bus/acpi/include/methods.h
similarity index 100%
rename from system/dev/bus/acpi/include/methods.h
rename to zircon/system/dev/bus/acpi/include/methods.h
diff --git a/system/dev/bus/acpi/include/nhlt.h b/zircon/system/dev/bus/acpi/include/nhlt.h
similarity index 100%
rename from system/dev/bus/acpi/include/nhlt.h
rename to zircon/system/dev/bus/acpi/include/nhlt.h
diff --git a/system/dev/bus/acpi/include/pci.h b/zircon/system/dev/bus/acpi/include/pci.h
similarity index 100%
rename from system/dev/bus/acpi/include/pci.h
rename to zircon/system/dev/bus/acpi/include/pci.h
diff --git a/system/dev/bus/acpi/include/pciroot.h b/zircon/system/dev/bus/acpi/include/pciroot.h
similarity index 100%
rename from system/dev/bus/acpi/include/pciroot.h
rename to zircon/system/dev/bus/acpi/include/pciroot.h
diff --git a/system/dev/bus/acpi/include/power.h b/zircon/system/dev/bus/acpi/include/power.h
similarity index 100%
rename from system/dev/bus/acpi/include/power.h
rename to zircon/system/dev/bus/acpi/include/power.h
diff --git a/system/dev/bus/acpi/include/resources.h b/zircon/system/dev/bus/acpi/include/resources.h
similarity index 100%
rename from system/dev/bus/acpi/include/resources.h
rename to zircon/system/dev/bus/acpi/include/resources.h
diff --git a/system/dev/bus/acpi/include/sysmem.h b/zircon/system/dev/bus/acpi/include/sysmem.h
similarity index 100%
rename from system/dev/bus/acpi/include/sysmem.h
rename to zircon/system/dev/bus/acpi/include/sysmem.h
diff --git a/system/dev/bus/acpi/include/util.h b/zircon/system/dev/bus/acpi/include/util.h
similarity index 100%
rename from system/dev/bus/acpi/include/util.h
rename to zircon/system/dev/bus/acpi/include/util.h
diff --git a/system/dev/bus/acpi/init.c b/zircon/system/dev/bus/acpi/init.c
similarity index 100%
rename from system/dev/bus/acpi/init.c
rename to zircon/system/dev/bus/acpi/init.c
diff --git a/system/dev/bus/acpi/iommu.c b/zircon/system/dev/bus/acpi/iommu.c
similarity index 100%
rename from system/dev/bus/acpi/iommu.c
rename to zircon/system/dev/bus/acpi/iommu.c
diff --git a/system/dev/bus/acpi/kpci.c b/zircon/system/dev/bus/acpi/kpci.c
similarity index 100%
rename from system/dev/bus/acpi/kpci.c
rename to zircon/system/dev/bus/acpi/kpci.c
diff --git a/system/dev/bus/acpi/methods.cpp b/zircon/system/dev/bus/acpi/methods.cpp
similarity index 100%
rename from system/dev/bus/acpi/methods.cpp
rename to zircon/system/dev/bus/acpi/methods.cpp
diff --git a/system/dev/bus/acpi/nhlt.c b/zircon/system/dev/bus/acpi/nhlt.c
similarity index 100%
rename from system/dev/bus/acpi/nhlt.c
rename to zircon/system/dev/bus/acpi/nhlt.c
diff --git a/system/dev/bus/acpi/pci.cpp b/zircon/system/dev/bus/acpi/pci.cpp
similarity index 100%
rename from system/dev/bus/acpi/pci.cpp
rename to zircon/system/dev/bus/acpi/pci.cpp
diff --git a/system/dev/bus/acpi/pciroot.cpp b/zircon/system/dev/bus/acpi/pciroot.cpp
similarity index 100%
rename from system/dev/bus/acpi/pciroot.cpp
rename to zircon/system/dev/bus/acpi/pciroot.cpp
diff --git a/system/dev/bus/acpi/power.c b/zircon/system/dev/bus/acpi/power.c
similarity index 100%
rename from system/dev/bus/acpi/power.c
rename to zircon/system/dev/bus/acpi/power.c
diff --git a/system/dev/bus/acpi/resources.c b/zircon/system/dev/bus/acpi/resources.c
similarity index 100%
rename from system/dev/bus/acpi/resources.c
rename to zircon/system/dev/bus/acpi/resources.c
diff --git a/system/dev/bus/acpi/rules.mk b/zircon/system/dev/bus/acpi/rules.mk
similarity index 100%
rename from system/dev/bus/acpi/rules.mk
rename to zircon/system/dev/bus/acpi/rules.mk
diff --git a/system/dev/bus/acpi/sysmem.c b/zircon/system/dev/bus/acpi/sysmem.c
similarity index 100%
rename from system/dev/bus/acpi/sysmem.c
rename to zircon/system/dev/bus/acpi/sysmem.c
diff --git a/system/dev/bus/acpi/util.c b/zircon/system/dev/bus/acpi/util.c
similarity index 100%
rename from system/dev/bus/acpi/util.c
rename to zircon/system/dev/bus/acpi/util.c
diff --git a/system/dev/bus/pci/MAINTAINERS b/zircon/system/dev/bus/pci/MAINTAINERS
similarity index 100%
rename from system/dev/bus/pci/MAINTAINERS
rename to zircon/system/dev/bus/pci/MAINTAINERS
diff --git a/system/dev/bus/pci/bus.cpp b/zircon/system/dev/bus/pci/bus.cpp
similarity index 100%
rename from system/dev/bus/pci/bus.cpp
rename to zircon/system/dev/bus/pci/bus.cpp
diff --git a/system/dev/bus/pci/bus.h b/zircon/system/dev/bus/pci/bus.h
similarity index 100%
rename from system/dev/bus/pci/bus.h
rename to zircon/system/dev/bus/pci/bus.h
diff --git a/system/dev/bus/pci/common.h b/zircon/system/dev/bus/pci/common.h
similarity index 100%
rename from system/dev/bus/pci/common.h
rename to zircon/system/dev/bus/pci/common.h
diff --git a/system/dev/bus/pci/config.cpp b/zircon/system/dev/bus/pci/config.cpp
similarity index 100%
rename from system/dev/bus/pci/config.cpp
rename to zircon/system/dev/bus/pci/config.cpp
diff --git a/system/dev/bus/pci/config.h b/zircon/system/dev/bus/pci/config.h
similarity index 100%
rename from system/dev/bus/pci/config.h
rename to zircon/system/dev/bus/pci/config.h
diff --git a/system/dev/bus/pci/kpci/kpci-private.h b/zircon/system/dev/bus/pci/kpci/kpci-private.h
similarity index 100%
rename from system/dev/bus/pci/kpci/kpci-private.h
rename to zircon/system/dev/bus/pci/kpci/kpci-private.h
diff --git a/system/dev/bus/pci/kpci/kpci.c b/zircon/system/dev/bus/pci/kpci/kpci.c
similarity index 100%
rename from system/dev/bus/pci/kpci/kpci.c
rename to zircon/system/dev/bus/pci/kpci/kpci.c
diff --git a/system/dev/bus/pci/kpci/proxy.c b/zircon/system/dev/bus/pci/kpci/proxy.c
similarity index 100%
rename from system/dev/bus/pci/kpci/proxy.c
rename to zircon/system/dev/bus/pci/kpci/proxy.c
diff --git a/system/dev/bus/pci/root.cpp b/zircon/system/dev/bus/pci/root.cpp
similarity index 100%
rename from system/dev/bus/pci/root.cpp
rename to zircon/system/dev/bus/pci/root.cpp
diff --git a/system/dev/bus/pci/root.h b/zircon/system/dev/bus/pci/root.h
similarity index 100%
rename from system/dev/bus/pci/root.h
rename to zircon/system/dev/bus/pci/root.h
diff --git a/system/dev/bus/pci/rules.mk b/zircon/system/dev/bus/pci/rules.mk
similarity index 100%
rename from system/dev/bus/pci/rules.mk
rename to zircon/system/dev/bus/pci/rules.mk
diff --git a/system/dev/bus/pci/upstream_node.cpp b/zircon/system/dev/bus/pci/upstream_node.cpp
similarity index 100%
rename from system/dev/bus/pci/upstream_node.cpp
rename to zircon/system/dev/bus/pci/upstream_node.cpp
diff --git a/system/dev/bus/pci/upstream_node.h b/zircon/system/dev/bus/pci/upstream_node.h
similarity index 100%
rename from system/dev/bus/pci/upstream_node.h
rename to zircon/system/dev/bus/pci/upstream_node.h
diff --git a/system/dev/bus/platform/device-resources.cpp b/zircon/system/dev/bus/platform/device-resources.cpp
similarity index 100%
rename from system/dev/bus/platform/device-resources.cpp
rename to zircon/system/dev/bus/platform/device-resources.cpp
diff --git a/system/dev/bus/platform/device-resources.h b/zircon/system/dev/bus/platform/device-resources.h
similarity index 100%
rename from system/dev/bus/platform/device-resources.h
rename to zircon/system/dev/bus/platform/device-resources.h
diff --git a/system/dev/bus/platform/platform-bus.cpp b/zircon/system/dev/bus/platform/platform-bus.cpp
similarity index 100%
rename from system/dev/bus/platform/platform-bus.cpp
rename to zircon/system/dev/bus/platform/platform-bus.cpp
diff --git a/system/dev/bus/platform/platform-bus.h b/zircon/system/dev/bus/platform/platform-bus.h
similarity index 100%
rename from system/dev/bus/platform/platform-bus.h
rename to zircon/system/dev/bus/platform/platform-bus.h
diff --git a/system/dev/bus/platform/platform-device.cpp b/zircon/system/dev/bus/platform/platform-device.cpp
similarity index 100%
rename from system/dev/bus/platform/platform-device.cpp
rename to zircon/system/dev/bus/platform/platform-device.cpp
diff --git a/system/dev/bus/platform/platform-device.h b/zircon/system/dev/bus/platform/platform-device.h
similarity index 100%
rename from system/dev/bus/platform/platform-device.h
rename to zircon/system/dev/bus/platform/platform-device.h
diff --git a/system/dev/bus/platform/platform-i2c.cpp b/zircon/system/dev/bus/platform/platform-i2c.cpp
similarity index 100%
rename from system/dev/bus/platform/platform-i2c.cpp
rename to zircon/system/dev/bus/platform/platform-i2c.cpp
diff --git a/system/dev/bus/platform/platform-i2c.h b/zircon/system/dev/bus/platform/platform-i2c.h
similarity index 100%
rename from system/dev/bus/platform/platform-i2c.h
rename to zircon/system/dev/bus/platform/platform-i2c.h
diff --git a/system/dev/bus/platform/platform-protocol-device.cpp b/zircon/system/dev/bus/platform/platform-protocol-device.cpp
similarity index 100%
rename from system/dev/bus/platform/platform-protocol-device.cpp
rename to zircon/system/dev/bus/platform/platform-protocol-device.cpp
diff --git a/system/dev/bus/platform/platform-protocol-device.h b/zircon/system/dev/bus/platform/platform-protocol-device.h
similarity index 100%
rename from system/dev/bus/platform/platform-protocol-device.h
rename to zircon/system/dev/bus/platform/platform-protocol-device.h
diff --git a/system/dev/bus/platform/platform-proxy-bind.c b/zircon/system/dev/bus/platform/platform-proxy-bind.c
similarity index 100%
rename from system/dev/bus/platform/platform-proxy-bind.c
rename to zircon/system/dev/bus/platform/platform-proxy-bind.c
diff --git a/system/dev/bus/platform/platform-proxy-client.cpp b/zircon/system/dev/bus/platform/platform-proxy-client.cpp
similarity index 100%
rename from system/dev/bus/platform/platform-proxy-client.cpp
rename to zircon/system/dev/bus/platform/platform-proxy-client.cpp
diff --git a/system/dev/bus/platform/platform-proxy-client.h b/zircon/system/dev/bus/platform/platform-proxy-client.h
similarity index 100%
rename from system/dev/bus/platform/platform-proxy-client.h
rename to zircon/system/dev/bus/platform/platform-proxy-client.h
diff --git a/system/dev/bus/platform/platform-proxy-device.cpp b/zircon/system/dev/bus/platform/platform-proxy-device.cpp
similarity index 100%
rename from system/dev/bus/platform/platform-proxy-device.cpp
rename to zircon/system/dev/bus/platform/platform-proxy-device.cpp
diff --git a/system/dev/bus/platform/platform-proxy-device.h b/zircon/system/dev/bus/platform/platform-proxy-device.h
similarity index 100%
rename from system/dev/bus/platform/platform-proxy-device.h
rename to zircon/system/dev/bus/platform/platform-proxy-device.h
diff --git a/system/dev/bus/platform/platform-proxy.cpp b/zircon/system/dev/bus/platform/platform-proxy.cpp
similarity index 100%
rename from system/dev/bus/platform/platform-proxy.cpp
rename to zircon/system/dev/bus/platform/platform-proxy.cpp
diff --git a/system/dev/bus/platform/platform-proxy.h b/zircon/system/dev/bus/platform/platform-proxy.h
similarity index 100%
rename from system/dev/bus/platform/platform-proxy.h
rename to zircon/system/dev/bus/platform/platform-proxy.h
diff --git a/system/dev/bus/platform/proxy-protocol.h b/zircon/system/dev/bus/platform/proxy-protocol.h
similarity index 100%
rename from system/dev/bus/platform/proxy-protocol.h
rename to zircon/system/dev/bus/platform/proxy-protocol.h
diff --git a/system/dev/bus/platform/rules.mk b/zircon/system/dev/bus/platform/rules.mk
similarity index 100%
rename from system/dev/bus/platform/rules.mk
rename to zircon/system/dev/bus/platform/rules.mk
diff --git a/system/dev/bus/virtio/MAINTAINERS b/zircon/system/dev/bus/virtio/MAINTAINERS
similarity index 100%
rename from system/dev/bus/virtio/MAINTAINERS
rename to zircon/system/dev/bus/virtio/MAINTAINERS
diff --git a/system/dev/bus/virtio/backends/backend.h b/zircon/system/dev/bus/virtio/backends/backend.h
similarity index 100%
rename from system/dev/bus/virtio/backends/backend.h
rename to zircon/system/dev/bus/virtio/backends/backend.h
diff --git a/system/dev/bus/virtio/backends/fake.h b/zircon/system/dev/bus/virtio/backends/fake.h
similarity index 100%
rename from system/dev/bus/virtio/backends/fake.h
rename to zircon/system/dev/bus/virtio/backends/fake.h
diff --git a/system/dev/bus/virtio/backends/pci.cpp b/zircon/system/dev/bus/virtio/backends/pci.cpp
similarity index 100%
rename from system/dev/bus/virtio/backends/pci.cpp
rename to zircon/system/dev/bus/virtio/backends/pci.cpp
diff --git a/system/dev/bus/virtio/backends/pci.h b/zircon/system/dev/bus/virtio/backends/pci.h
similarity index 100%
rename from system/dev/bus/virtio/backends/pci.h
rename to zircon/system/dev/bus/virtio/backends/pci.h
diff --git a/system/dev/bus/virtio/backends/pci_legacy.cpp b/zircon/system/dev/bus/virtio/backends/pci_legacy.cpp
similarity index 100%
rename from system/dev/bus/virtio/backends/pci_legacy.cpp
rename to zircon/system/dev/bus/virtio/backends/pci_legacy.cpp
diff --git a/system/dev/bus/virtio/backends/pci_modern.cpp b/zircon/system/dev/bus/virtio/backends/pci_modern.cpp
similarity index 100%
rename from system/dev/bus/virtio/backends/pci_modern.cpp
rename to zircon/system/dev/bus/virtio/backends/pci_modern.cpp
diff --git a/system/dev/bus/virtio/block.cpp b/zircon/system/dev/bus/virtio/block.cpp
similarity index 100%
rename from system/dev/bus/virtio/block.cpp
rename to zircon/system/dev/bus/virtio/block.cpp
diff --git a/system/dev/bus/virtio/block.h b/zircon/system/dev/bus/virtio/block.h
similarity index 100%
rename from system/dev/bus/virtio/block.h
rename to zircon/system/dev/bus/virtio/block.h
diff --git a/system/dev/bus/virtio/console.cpp b/zircon/system/dev/bus/virtio/console.cpp
similarity index 100%
rename from system/dev/bus/virtio/console.cpp
rename to zircon/system/dev/bus/virtio/console.cpp
diff --git a/system/dev/bus/virtio/console.h b/zircon/system/dev/bus/virtio/console.h
similarity index 100%
rename from system/dev/bus/virtio/console.h
rename to zircon/system/dev/bus/virtio/console.h
diff --git a/system/dev/bus/virtio/device.cpp b/zircon/system/dev/bus/virtio/device.cpp
similarity index 100%
rename from system/dev/bus/virtio/device.cpp
rename to zircon/system/dev/bus/virtio/device.cpp
diff --git a/system/dev/bus/virtio/device.h b/zircon/system/dev/bus/virtio/device.h
similarity index 100%
rename from system/dev/bus/virtio/device.h
rename to zircon/system/dev/bus/virtio/device.h
diff --git a/system/dev/bus/virtio/ethernet.cpp b/zircon/system/dev/bus/virtio/ethernet.cpp
similarity index 100%
rename from system/dev/bus/virtio/ethernet.cpp
rename to zircon/system/dev/bus/virtio/ethernet.cpp
diff --git a/system/dev/bus/virtio/ethernet.h b/zircon/system/dev/bus/virtio/ethernet.h
similarity index 100%
rename from system/dev/bus/virtio/ethernet.h
rename to zircon/system/dev/bus/virtio/ethernet.h
diff --git a/system/dev/bus/virtio/gpu.cpp b/zircon/system/dev/bus/virtio/gpu.cpp
similarity index 100%
rename from system/dev/bus/virtio/gpu.cpp
rename to zircon/system/dev/bus/virtio/gpu.cpp
diff --git a/system/dev/bus/virtio/gpu.h b/zircon/system/dev/bus/virtio/gpu.h
similarity index 100%
rename from system/dev/bus/virtio/gpu.h
rename to zircon/system/dev/bus/virtio/gpu.h
diff --git a/system/dev/bus/virtio/input.cpp b/zircon/system/dev/bus/virtio/input.cpp
similarity index 100%
rename from system/dev/bus/virtio/input.cpp
rename to zircon/system/dev/bus/virtio/input.cpp
diff --git a/system/dev/bus/virtio/input.h b/zircon/system/dev/bus/virtio/input.h
similarity index 100%
rename from system/dev/bus/virtio/input.h
rename to zircon/system/dev/bus/virtio/input.h
diff --git a/system/dev/bus/virtio/mmio.h b/zircon/system/dev/bus/virtio/mmio.h
similarity index 100%
rename from system/dev/bus/virtio/mmio.h
rename to zircon/system/dev/bus/virtio/mmio.h
diff --git a/system/dev/bus/virtio/ring.cpp b/zircon/system/dev/bus/virtio/ring.cpp
similarity index 100%
rename from system/dev/bus/virtio/ring.cpp
rename to zircon/system/dev/bus/virtio/ring.cpp
diff --git a/system/dev/bus/virtio/ring.h b/zircon/system/dev/bus/virtio/ring.h
similarity index 100%
rename from system/dev/bus/virtio/ring.h
rename to zircon/system/dev/bus/virtio/ring.h
diff --git a/system/dev/bus/virtio/rng.cpp b/zircon/system/dev/bus/virtio/rng.cpp
similarity index 100%
rename from system/dev/bus/virtio/rng.cpp
rename to zircon/system/dev/bus/virtio/rng.cpp
diff --git a/system/dev/bus/virtio/rng.h b/zircon/system/dev/bus/virtio/rng.h
similarity index 100%
rename from system/dev/bus/virtio/rng.h
rename to zircon/system/dev/bus/virtio/rng.h
diff --git a/system/dev/bus/virtio/rules.mk b/zircon/system/dev/bus/virtio/rules.mk
similarity index 100%
rename from system/dev/bus/virtio/rules.mk
rename to zircon/system/dev/bus/virtio/rules.mk
diff --git a/system/dev/bus/virtio/scsi.cpp b/zircon/system/dev/bus/virtio/scsi.cpp
similarity index 100%
rename from system/dev/bus/virtio/scsi.cpp
rename to zircon/system/dev/bus/virtio/scsi.cpp
diff --git a/system/dev/bus/virtio/scsi.h b/zircon/system/dev/bus/virtio/scsi.h
similarity index 100%
rename from system/dev/bus/virtio/scsi.h
rename to zircon/system/dev/bus/virtio/scsi.h
diff --git a/system/dev/bus/virtio/scsi_test.cpp b/zircon/system/dev/bus/virtio/scsi_test.cpp
similarity index 100%
rename from system/dev/bus/virtio/scsi_test.cpp
rename to zircon/system/dev/bus/virtio/scsi_test.cpp
diff --git a/system/dev/bus/virtio/scsilib.cpp b/zircon/system/dev/bus/virtio/scsilib.cpp
similarity index 100%
rename from system/dev/bus/virtio/scsilib.cpp
rename to zircon/system/dev/bus/virtio/scsilib.cpp
diff --git a/system/dev/bus/virtio/scsilib.h b/zircon/system/dev/bus/virtio/scsilib.h
similarity index 100%
rename from system/dev/bus/virtio/scsilib.h
rename to zircon/system/dev/bus/virtio/scsilib.h
diff --git a/system/dev/bus/virtio/scsilib_controller.h b/zircon/system/dev/bus/virtio/scsilib_controller.h
similarity index 100%
rename from system/dev/bus/virtio/scsilib_controller.h
rename to zircon/system/dev/bus/virtio/scsilib_controller.h
diff --git a/system/dev/bus/virtio/socket.cpp b/zircon/system/dev/bus/virtio/socket.cpp
similarity index 100%
rename from system/dev/bus/virtio/socket.cpp
rename to zircon/system/dev/bus/virtio/socket.cpp
diff --git a/system/dev/bus/virtio/socket.h b/zircon/system/dev/bus/virtio/socket.h
similarity index 100%
rename from system/dev/bus/virtio/socket.h
rename to zircon/system/dev/bus/virtio/socket.h
diff --git a/system/dev/bus/virtio/test_main.cpp b/zircon/system/dev/bus/virtio/test_main.cpp
similarity index 100%
rename from system/dev/bus/virtio/test_main.cpp
rename to zircon/system/dev/bus/virtio/test_main.cpp
diff --git a/system/dev/bus/virtio/trace.h b/zircon/system/dev/bus/virtio/trace.h
similarity index 100%
rename from system/dev/bus/virtio/trace.h
rename to zircon/system/dev/bus/virtio/trace.h
diff --git a/system/dev/bus/virtio/virtio_driver.cpp b/zircon/system/dev/bus/virtio/virtio_driver.cpp
similarity index 100%
rename from system/dev/bus/virtio/virtio_driver.cpp
rename to zircon/system/dev/bus/virtio/virtio_driver.cpp
diff --git a/system/dev/bus/virtio/virtio_gpu.h b/zircon/system/dev/bus/virtio/virtio_gpu.h
similarity index 100%
rename from system/dev/bus/virtio/virtio_gpu.h
rename to zircon/system/dev/bus/virtio/virtio_gpu.h
diff --git a/system/dev/camera/aml-mipicsi/aml-mipi-adap.cpp b/zircon/system/dev/camera/aml-mipicsi/aml-mipi-adap.cpp
similarity index 100%
rename from system/dev/camera/aml-mipicsi/aml-mipi-adap.cpp
rename to zircon/system/dev/camera/aml-mipicsi/aml-mipi-adap.cpp
diff --git a/system/dev/camera/aml-mipicsi/aml-mipi-debug.cpp b/zircon/system/dev/camera/aml-mipicsi/aml-mipi-debug.cpp
similarity index 100%
rename from system/dev/camera/aml-mipicsi/aml-mipi-debug.cpp
rename to zircon/system/dev/camera/aml-mipicsi/aml-mipi-debug.cpp
diff --git a/system/dev/camera/aml-mipicsi/aml-mipi-regs.h b/zircon/system/dev/camera/aml-mipicsi/aml-mipi-regs.h
similarity index 100%
rename from system/dev/camera/aml-mipicsi/aml-mipi-regs.h
rename to zircon/system/dev/camera/aml-mipicsi/aml-mipi-regs.h
diff --git a/system/dev/camera/aml-mipicsi/aml-mipi.cpp b/zircon/system/dev/camera/aml-mipicsi/aml-mipi.cpp
similarity index 100%
rename from system/dev/camera/aml-mipicsi/aml-mipi.cpp
rename to zircon/system/dev/camera/aml-mipicsi/aml-mipi.cpp
diff --git a/system/dev/camera/aml-mipicsi/aml-mipi.h b/zircon/system/dev/camera/aml-mipicsi/aml-mipi.h
similarity index 100%
rename from system/dev/camera/aml-mipicsi/aml-mipi.h
rename to zircon/system/dev/camera/aml-mipicsi/aml-mipi.h
diff --git a/system/dev/camera/aml-mipicsi/rules.mk b/zircon/system/dev/camera/aml-mipicsi/rules.mk
similarity index 100%
rename from system/dev/camera/aml-mipicsi/rules.mk
rename to zircon/system/dev/camera/aml-mipicsi/rules.mk
diff --git a/system/dev/camera/arm-isp/arm-isp-impl.cpp b/zircon/system/dev/camera/arm-isp/arm-isp-impl.cpp
similarity index 100%
rename from system/dev/camera/arm-isp/arm-isp-impl.cpp
rename to zircon/system/dev/camera/arm-isp/arm-isp-impl.cpp
diff --git a/system/dev/camera/arm-isp/arm-isp-impl.h b/zircon/system/dev/camera/arm-isp/arm-isp-impl.h
similarity index 100%
rename from system/dev/camera/arm-isp/arm-isp-impl.h
rename to zircon/system/dev/camera/arm-isp/arm-isp-impl.h
diff --git a/system/dev/camera/arm-isp/arm-isp-regs.h b/zircon/system/dev/camera/arm-isp/arm-isp-regs.h
similarity index 100%
rename from system/dev/camera/arm-isp/arm-isp-regs.h
rename to zircon/system/dev/camera/arm-isp/arm-isp-regs.h
diff --git a/system/dev/camera/arm-isp/arm-isp.cpp b/zircon/system/dev/camera/arm-isp/arm-isp.cpp
similarity index 100%
rename from system/dev/camera/arm-isp/arm-isp.cpp
rename to zircon/system/dev/camera/arm-isp/arm-isp.cpp
diff --git a/system/dev/camera/arm-isp/arm-isp.h b/zircon/system/dev/camera/arm-isp/arm-isp.h
similarity index 100%
rename from system/dev/camera/arm-isp/arm-isp.h
rename to zircon/system/dev/camera/arm-isp/arm-isp.h
diff --git a/system/dev/camera/arm-isp/rules.mk b/zircon/system/dev/camera/arm-isp/rules.mk
similarity index 100%
rename from system/dev/camera/arm-isp/rules.mk
rename to zircon/system/dev/camera/arm-isp/rules.mk
diff --git a/system/dev/camera/imx227/imx227-seq.h b/zircon/system/dev/camera/imx227/imx227-seq.h
similarity index 100%
rename from system/dev/camera/imx227/imx227-seq.h
rename to zircon/system/dev/camera/imx227/imx227-seq.h
diff --git a/system/dev/camera/imx227/imx227.cpp b/zircon/system/dev/camera/imx227/imx227.cpp
similarity index 100%
rename from system/dev/camera/imx227/imx227.cpp
rename to zircon/system/dev/camera/imx227/imx227.cpp
diff --git a/system/dev/camera/imx227/imx227.h b/zircon/system/dev/camera/imx227/imx227.h
similarity index 100%
rename from system/dev/camera/imx227/imx227.h
rename to zircon/system/dev/camera/imx227/imx227.h
diff --git a/system/dev/camera/imx227/rules.mk b/zircon/system/dev/camera/imx227/rules.mk
similarity index 100%
rename from system/dev/camera/imx227/rules.mk
rename to zircon/system/dev/camera/imx227/rules.mk
diff --git a/system/dev/clk/amlogic-clk/aml-axg-blocks.h b/zircon/system/dev/clk/amlogic-clk/aml-axg-blocks.h
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-axg-blocks.h
rename to zircon/system/dev/clk/amlogic-clk/aml-axg-blocks.h
diff --git a/system/dev/clk/amlogic-clk/aml-clk-blocks.h b/zircon/system/dev/clk/amlogic-clk/aml-clk-blocks.h
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-clk-blocks.h
rename to zircon/system/dev/clk/amlogic-clk/aml-clk-blocks.h
diff --git a/system/dev/clk/amlogic-clk/aml-clk.c b/zircon/system/dev/clk/amlogic-clk/aml-clk.c
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-clk.c
rename to zircon/system/dev/clk/amlogic-clk/aml-clk.c
diff --git a/system/dev/clk/amlogic-clk/aml-clk.cpp b/zircon/system/dev/clk/amlogic-clk/aml-clk.cpp
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-clk.cpp
rename to zircon/system/dev/clk/amlogic-clk/aml-clk.cpp
diff --git a/system/dev/clk/amlogic-clk/aml-clk.h b/zircon/system/dev/clk/amlogic-clk/aml-clk.h
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-clk.h
rename to zircon/system/dev/clk/amlogic-clk/aml-clk.h
diff --git a/system/dev/clk/amlogic-clk/aml-g12a-blocks.h b/zircon/system/dev/clk/amlogic-clk/aml-g12a-blocks.h
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-g12a-blocks.h
rename to zircon/system/dev/clk/amlogic-clk/aml-g12a-blocks.h
diff --git a/system/dev/clk/amlogic-clk/aml-g12b-blocks.h b/zircon/system/dev/clk/amlogic-clk/aml-g12b-blocks.h
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-g12b-blocks.h
rename to zircon/system/dev/clk/amlogic-clk/aml-g12b-blocks.h
diff --git a/system/dev/clk/amlogic-clk/aml-gxl-blocks.h b/zircon/system/dev/clk/amlogic-clk/aml-gxl-blocks.h
similarity index 100%
rename from system/dev/clk/amlogic-clk/aml-gxl-blocks.h
rename to zircon/system/dev/clk/amlogic-clk/aml-gxl-blocks.h
diff --git a/system/dev/clk/amlogic-clk/rules.mk b/zircon/system/dev/clk/amlogic-clk/rules.mk
similarity index 100%
rename from system/dev/clk/amlogic-clk/rules.mk
rename to zircon/system/dev/clk/amlogic-clk/rules.mk
diff --git a/system/dev/clk/hisi-lib/hisi-clk.c b/zircon/system/dev/clk/hisi-lib/hisi-clk.c
similarity index 100%
rename from system/dev/clk/hisi-lib/hisi-clk.c
rename to zircon/system/dev/clk/hisi-lib/hisi-clk.c
diff --git a/system/dev/clk/hisi-lib/include/dev/clk/hisi-lib/hisi.h b/zircon/system/dev/clk/hisi-lib/include/dev/clk/hisi-lib/hisi.h
similarity index 100%
rename from system/dev/clk/hisi-lib/include/dev/clk/hisi-lib/hisi.h
rename to zircon/system/dev/clk/hisi-lib/include/dev/clk/hisi-lib/hisi.h
diff --git a/system/dev/clk/hisi-lib/rules.mk b/zircon/system/dev/clk/hisi-lib/rules.mk
similarity index 100%
rename from system/dev/clk/hisi-lib/rules.mk
rename to zircon/system/dev/clk/hisi-lib/rules.mk
diff --git a/system/dev/clk/hisi3660/hisi3660-clk.c b/zircon/system/dev/clk/hisi3660/hisi3660-clk.c
similarity index 100%
rename from system/dev/clk/hisi3660/hisi3660-clk.c
rename to zircon/system/dev/clk/hisi3660/hisi3660-clk.c
diff --git a/system/dev/clk/hisi3660/rules.mk b/zircon/system/dev/clk/hisi3660/rules.mk
similarity index 100%
rename from system/dev/clk/hisi3660/rules.mk
rename to zircon/system/dev/clk/hisi3660/rules.mk
diff --git a/system/dev/clk/mtk-clk/binding.c b/zircon/system/dev/clk/mtk-clk/binding.c
similarity index 100%
rename from system/dev/clk/mtk-clk/binding.c
rename to zircon/system/dev/clk/mtk-clk/binding.c
diff --git a/system/dev/clk/mtk-clk/mtk-clk.cpp b/zircon/system/dev/clk/mtk-clk/mtk-clk.cpp
similarity index 100%
rename from system/dev/clk/mtk-clk/mtk-clk.cpp
rename to zircon/system/dev/clk/mtk-clk/mtk-clk.cpp
diff --git a/system/dev/clk/mtk-clk/mtk-clk.h b/zircon/system/dev/clk/mtk-clk/mtk-clk.h
similarity index 100%
rename from system/dev/clk/mtk-clk/mtk-clk.h
rename to zircon/system/dev/clk/mtk-clk/mtk-clk.h
diff --git a/system/dev/clk/mtk-clk/rules.mk b/zircon/system/dev/clk/mtk-clk/rules.mk
similarity index 100%
rename from system/dev/clk/mtk-clk/rules.mk
rename to zircon/system/dev/clk/mtk-clk/rules.mk
diff --git a/system/dev/codec/alc5514/alc5514-registers.h b/zircon/system/dev/codec/alc5514/alc5514-registers.h
similarity index 100%
rename from system/dev/codec/alc5514/alc5514-registers.h
rename to zircon/system/dev/codec/alc5514/alc5514-registers.h
diff --git a/system/dev/codec/alc5514/alc5514.cpp b/zircon/system/dev/codec/alc5514/alc5514.cpp
similarity index 100%
rename from system/dev/codec/alc5514/alc5514.cpp
rename to zircon/system/dev/codec/alc5514/alc5514.cpp
diff --git a/system/dev/codec/alc5514/alc5514.h b/zircon/system/dev/codec/alc5514/alc5514.h
similarity index 100%
rename from system/dev/codec/alc5514/alc5514.h
rename to zircon/system/dev/codec/alc5514/alc5514.h
diff --git a/system/dev/codec/alc5514/binding.c b/zircon/system/dev/codec/alc5514/binding.c
similarity index 100%
rename from system/dev/codec/alc5514/binding.c
rename to zircon/system/dev/codec/alc5514/binding.c
diff --git a/system/dev/codec/alc5514/rules.mk b/zircon/system/dev/codec/alc5514/rules.mk
similarity index 100%
rename from system/dev/codec/alc5514/rules.mk
rename to zircon/system/dev/codec/alc5514/rules.mk
diff --git a/system/dev/codec/max98927/binding.c b/zircon/system/dev/codec/max98927/binding.c
similarity index 100%
rename from system/dev/codec/max98927/binding.c
rename to zircon/system/dev/codec/max98927/binding.c
diff --git a/system/dev/codec/max98927/max98927-registers.h b/zircon/system/dev/codec/max98927/max98927-registers.h
similarity index 100%
rename from system/dev/codec/max98927/max98927-registers.h
rename to zircon/system/dev/codec/max98927/max98927-registers.h
diff --git a/system/dev/codec/max98927/max98927.cpp b/zircon/system/dev/codec/max98927/max98927.cpp
similarity index 100%
rename from system/dev/codec/max98927/max98927.cpp
rename to zircon/system/dev/codec/max98927/max98927.cpp
diff --git a/system/dev/codec/max98927/max98927.h b/zircon/system/dev/codec/max98927/max98927.h
similarity index 100%
rename from system/dev/codec/max98927/max98927.h
rename to zircon/system/dev/codec/max98927/max98927.h
diff --git a/system/dev/codec/max98927/rules.mk b/zircon/system/dev/codec/max98927/rules.mk
similarity index 100%
rename from system/dev/codec/max98927/rules.mk
rename to zircon/system/dev/codec/max98927/rules.mk
diff --git a/system/dev/display/aml-canvas/aml-canvas-proxy-client.c b/zircon/system/dev/display/aml-canvas/aml-canvas-proxy-client.c
similarity index 100%
rename from system/dev/display/aml-canvas/aml-canvas-proxy-client.c
rename to zircon/system/dev/display/aml-canvas/aml-canvas-proxy-client.c
diff --git a/system/dev/display/aml-canvas/aml-canvas.c b/zircon/system/dev/display/aml-canvas/aml-canvas.c
similarity index 100%
rename from system/dev/display/aml-canvas/aml-canvas.c
rename to zircon/system/dev/display/aml-canvas/aml-canvas.c
diff --git a/system/dev/display/aml-canvas/aml-canvas.h b/zircon/system/dev/display/aml-canvas/aml-canvas.h
similarity index 100%
rename from system/dev/display/aml-canvas/aml-canvas.h
rename to zircon/system/dev/display/aml-canvas/aml-canvas.h
diff --git a/system/dev/display/aml-canvas/rules.mk b/zircon/system/dev/display/aml-canvas/rules.mk
similarity index 100%
rename from system/dev/display/aml-canvas/rules.mk
rename to zircon/system/dev/display/aml-canvas/rules.mk
diff --git a/system/dev/display/astro-display/aml-dsi-host.cpp b/zircon/system/dev/display/astro-display/aml-dsi-host.cpp
similarity index 100%
rename from system/dev/display/astro-display/aml-dsi-host.cpp
rename to zircon/system/dev/display/astro-display/aml-dsi-host.cpp
diff --git a/system/dev/display/astro-display/aml-dsi-host.h b/zircon/system/dev/display/astro-display/aml-dsi-host.h
similarity index 100%
rename from system/dev/display/astro-display/aml-dsi-host.h
rename to zircon/system/dev/display/astro-display/aml-dsi-host.h
diff --git a/system/dev/display/astro-display/aml-dsi.h b/zircon/system/dev/display/astro-display/aml-dsi.h
similarity index 100%
rename from system/dev/display/astro-display/aml-dsi.h
rename to zircon/system/dev/display/astro-display/aml-dsi.h
diff --git a/system/dev/display/astro-display/aml-mipi-phy.cpp b/zircon/system/dev/display/astro-display/aml-mipi-phy.cpp
similarity index 100%
rename from system/dev/display/astro-display/aml-mipi-phy.cpp
rename to zircon/system/dev/display/astro-display/aml-mipi-phy.cpp
diff --git a/system/dev/display/astro-display/aml-mipi-phy.h b/zircon/system/dev/display/astro-display/aml-mipi-phy.h
similarity index 100%
rename from system/dev/display/astro-display/aml-mipi-phy.h
rename to zircon/system/dev/display/astro-display/aml-mipi-phy.h
diff --git a/system/dev/display/astro-display/astro-clock.cpp b/zircon/system/dev/display/astro-display/astro-clock.cpp
similarity index 100%
rename from system/dev/display/astro-display/astro-clock.cpp
rename to zircon/system/dev/display/astro-display/astro-clock.cpp
diff --git a/system/dev/display/astro-display/astro-clock.h b/zircon/system/dev/display/astro-display/astro-clock.h
similarity index 100%
rename from system/dev/display/astro-display/astro-clock.h
rename to zircon/system/dev/display/astro-display/astro-clock.h
diff --git a/system/dev/display/astro-display/astro-display.cpp b/zircon/system/dev/display/astro-display/astro-display.cpp
similarity index 100%
rename from system/dev/display/astro-display/astro-display.cpp
rename to zircon/system/dev/display/astro-display/astro-display.cpp
diff --git a/system/dev/display/astro-display/astro-display.h b/zircon/system/dev/display/astro-display/astro-display.h
similarity index 100%
rename from system/dev/display/astro-display/astro-display.h
rename to zircon/system/dev/display/astro-display/astro-display.h
diff --git a/system/dev/display/astro-display/bind.c b/zircon/system/dev/display/astro-display/bind.c
similarity index 100%
rename from system/dev/display/astro-display/bind.c
rename to zircon/system/dev/display/astro-display/bind.c
diff --git a/system/dev/display/astro-display/common.h b/zircon/system/dev/display/astro-display/common.h
similarity index 100%
rename from system/dev/display/astro-display/common.h
rename to zircon/system/dev/display/astro-display/common.h
diff --git a/system/dev/display/astro-display/dw-mipi-dsi-reg.h b/zircon/system/dev/display/astro-display/dw-mipi-dsi-reg.h
similarity index 100%
rename from system/dev/display/astro-display/dw-mipi-dsi-reg.h
rename to zircon/system/dev/display/astro-display/dw-mipi-dsi-reg.h
diff --git a/system/dev/display/astro-display/dw-mipi-dsi.cpp b/zircon/system/dev/display/astro-display/dw-mipi-dsi.cpp
similarity index 100%
rename from system/dev/display/astro-display/dw-mipi-dsi.cpp
rename to zircon/system/dev/display/astro-display/dw-mipi-dsi.cpp
diff --git a/system/dev/display/astro-display/dw-mipi-dsi.h b/zircon/system/dev/display/astro-display/dw-mipi-dsi.h
similarity index 100%
rename from system/dev/display/astro-display/dw-mipi-dsi.h
rename to zircon/system/dev/display/astro-display/dw-mipi-dsi.h
diff --git a/system/dev/display/astro-display/hhi-regs.h b/zircon/system/dev/display/astro-display/hhi-regs.h
similarity index 100%
rename from system/dev/display/astro-display/hhi-regs.h
rename to zircon/system/dev/display/astro-display/hhi-regs.h
diff --git a/system/dev/display/astro-display/lcd.cpp b/zircon/system/dev/display/astro-display/lcd.cpp
similarity index 100%
rename from system/dev/display/astro-display/lcd.cpp
rename to zircon/system/dev/display/astro-display/lcd.cpp
diff --git a/system/dev/display/astro-display/lcd.h b/zircon/system/dev/display/astro-display/lcd.h
similarity index 100%
rename from system/dev/display/astro-display/lcd.h
rename to zircon/system/dev/display/astro-display/lcd.h
diff --git a/system/dev/display/astro-display/mipi-dsi.h b/zircon/system/dev/display/astro-display/mipi-dsi.h
similarity index 100%
rename from system/dev/display/astro-display/mipi-dsi.h
rename to zircon/system/dev/display/astro-display/mipi-dsi.h
diff --git a/system/dev/display/astro-display/osd.cpp b/zircon/system/dev/display/astro-display/osd.cpp
similarity index 100%
rename from system/dev/display/astro-display/osd.cpp
rename to zircon/system/dev/display/astro-display/osd.cpp
diff --git a/system/dev/display/astro-display/osd.h b/zircon/system/dev/display/astro-display/osd.h
similarity index 100%
rename from system/dev/display/astro-display/osd.h
rename to zircon/system/dev/display/astro-display/osd.h
diff --git a/system/dev/display/astro-display/rdma-regs.h b/zircon/system/dev/display/astro-display/rdma-regs.h
similarity index 100%
rename from system/dev/display/astro-display/rdma-regs.h
rename to zircon/system/dev/display/astro-display/rdma-regs.h
diff --git a/system/dev/display/astro-display/rules.mk b/zircon/system/dev/display/astro-display/rules.mk
similarity index 100%
rename from system/dev/display/astro-display/rules.mk
rename to zircon/system/dev/display/astro-display/rules.mk
diff --git a/system/dev/display/astro-display/vpp-regs.h b/zircon/system/dev/display/astro-display/vpp-regs.h
similarity index 100%
rename from system/dev/display/astro-display/vpp-regs.h
rename to zircon/system/dev/display/astro-display/vpp-regs.h
diff --git a/system/dev/display/astro-display/vpu-regs.h b/zircon/system/dev/display/astro-display/vpu-regs.h
similarity index 100%
rename from system/dev/display/astro-display/vpu-regs.h
rename to zircon/system/dev/display/astro-display/vpu-regs.h
diff --git a/system/dev/display/astro-display/vpu.cpp b/zircon/system/dev/display/astro-display/vpu.cpp
similarity index 100%
rename from system/dev/display/astro-display/vpu.cpp
rename to zircon/system/dev/display/astro-display/vpu.cpp
diff --git a/system/dev/display/astro-display/vpu.h b/zircon/system/dev/display/astro-display/vpu.h
similarity index 100%
rename from system/dev/display/astro-display/vpu.h
rename to zircon/system/dev/display/astro-display/vpu.h
diff --git a/system/dev/display/display/bind.c b/zircon/system/dev/display/display/bind.c
similarity index 100%
rename from system/dev/display/display/bind.c
rename to zircon/system/dev/display/display/bind.c
diff --git a/system/dev/display/display/client.cpp b/zircon/system/dev/display/display/client.cpp
similarity index 100%
rename from system/dev/display/display/client.cpp
rename to zircon/system/dev/display/display/client.cpp
diff --git a/system/dev/display/display/client.h b/zircon/system/dev/display/display/client.h
similarity index 100%
rename from system/dev/display/display/client.h
rename to zircon/system/dev/display/display/client.h
diff --git a/system/dev/display/display/controller.cpp b/zircon/system/dev/display/display/controller.cpp
similarity index 100%
rename from system/dev/display/display/controller.cpp
rename to zircon/system/dev/display/display/controller.cpp
diff --git a/system/dev/display/display/controller.h b/zircon/system/dev/display/display/controller.h
similarity index 100%
rename from system/dev/display/display/controller.h
rename to zircon/system/dev/display/display/controller.h
diff --git a/system/dev/display/display/fence.cpp b/zircon/system/dev/display/display/fence.cpp
similarity index 100%
rename from system/dev/display/display/fence.cpp
rename to zircon/system/dev/display/display/fence.cpp
diff --git a/system/dev/display/display/fence.h b/zircon/system/dev/display/display/fence.h
similarity index 100%
rename from system/dev/display/display/fence.h
rename to zircon/system/dev/display/display/fence.h
diff --git a/system/dev/display/display/id-map.h b/zircon/system/dev/display/display/id-map.h
similarity index 100%
rename from system/dev/display/display/id-map.h
rename to zircon/system/dev/display/display/id-map.h
diff --git a/system/dev/display/display/image.cpp b/zircon/system/dev/display/display/image.cpp
similarity index 100%
rename from system/dev/display/display/image.cpp
rename to zircon/system/dev/display/display/image.cpp
diff --git a/system/dev/display/display/image.h b/zircon/system/dev/display/display/image.h
similarity index 100%
rename from system/dev/display/display/image.h
rename to zircon/system/dev/display/display/image.h
diff --git a/system/dev/display/display/rules.mk b/zircon/system/dev/display/display/rules.mk
similarity index 100%
rename from system/dev/display/display/rules.mk
rename to zircon/system/dev/display/display/rules.mk
diff --git a/system/dev/display/dummy/dummy-display.cpp b/zircon/system/dev/display/dummy/dummy-display.cpp
similarity index 100%
rename from system/dev/display/dummy/dummy-display.cpp
rename to zircon/system/dev/display/dummy/dummy-display.cpp
diff --git a/system/dev/display/dummy/dummy-display.h b/zircon/system/dev/display/dummy/dummy-display.h
similarity index 100%
rename from system/dev/display/dummy/dummy-display.h
rename to zircon/system/dev/display/dummy/dummy-display.h
diff --git a/system/dev/display/dummy/rules.mk b/zircon/system/dev/display/dummy/rules.mk
similarity index 100%
rename from system/dev/display/dummy/rules.mk
rename to zircon/system/dev/display/dummy/rules.mk
diff --git a/system/dev/display/hikey-display/adv7533.c b/zircon/system/dev/display/hikey-display/adv7533.c
similarity index 100%
rename from system/dev/display/hikey-display/adv7533.c
rename to zircon/system/dev/display/hikey-display/adv7533.c
diff --git a/system/dev/display/hikey-display/adv7533.h b/zircon/system/dev/display/hikey-display/adv7533.h
similarity index 100%
rename from system/dev/display/hikey-display/adv7533.h
rename to zircon/system/dev/display/hikey-display/adv7533.h
diff --git a/system/dev/display/hikey-display/ddk-interface.cpp b/zircon/system/dev/display/hikey-display/ddk-interface.cpp
similarity index 100%
rename from system/dev/display/hikey-display/ddk-interface.cpp
rename to zircon/system/dev/display/hikey-display/ddk-interface.cpp
diff --git a/system/dev/display/hikey-display/ddk-interface.h b/zircon/system/dev/display/hikey-display/ddk-interface.h
similarity index 100%
rename from system/dev/display/hikey-display/ddk-interface.h
rename to zircon/system/dev/display/hikey-display/ddk-interface.h
diff --git a/system/dev/display/hikey-display/edid.c b/zircon/system/dev/display/hikey-display/edid.c
similarity index 100%
rename from system/dev/display/hikey-display/edid.c
rename to zircon/system/dev/display/hikey-display/edid.c
diff --git a/system/dev/display/hikey-display/edid.h b/zircon/system/dev/display/hikey-display/edid.h
similarity index 100%
rename from system/dev/display/hikey-display/edid.h
rename to zircon/system/dev/display/hikey-display/edid.h
diff --git a/system/dev/display/hikey-display/hi-display.h b/zircon/system/dev/display/hikey-display/hi-display.h
similarity index 100%
rename from system/dev/display/hikey-display/hi-display.h
rename to zircon/system/dev/display/hikey-display/hi-display.h
diff --git a/system/dev/display/hikey-display/hi3660-dsi.c b/zircon/system/dev/display/hikey-display/hi3660-dsi.c
similarity index 100%
rename from system/dev/display/hikey-display/hi3660-dsi.c
rename to zircon/system/dev/display/hikey-display/hi3660-dsi.c
diff --git a/system/dev/display/hikey-display/hi3660-dsi.h b/zircon/system/dev/display/hikey-display/hi3660-dsi.h
similarity index 100%
rename from system/dev/display/hikey-display/hi3660-dsi.h
rename to zircon/system/dev/display/hikey-display/hi3660-dsi.h
diff --git a/system/dev/display/hikey-display/rules.mk b/zircon/system/dev/display/hikey-display/rules.mk
similarity index 100%
rename from system/dev/display/hikey-display/rules.mk
rename to zircon/system/dev/display/hikey-display/rules.mk
diff --git a/system/dev/display/imx8m-display/imx8m-display.c b/zircon/system/dev/display/imx8m-display/imx8m-display.c
similarity index 100%
rename from system/dev/display/imx8m-display/imx8m-display.c
rename to zircon/system/dev/display/imx8m-display/imx8m-display.c
diff --git a/system/dev/display/imx8m-display/imx8m-display.h b/zircon/system/dev/display/imx8m-display/imx8m-display.h
similarity index 100%
rename from system/dev/display/imx8m-display/imx8m-display.h
rename to zircon/system/dev/display/imx8m-display/imx8m-display.h
diff --git a/system/dev/display/imx8m-display/rules.mk b/zircon/system/dev/display/imx8m-display/rules.mk
similarity index 100%
rename from system/dev/display/imx8m-display/rules.mk
rename to zircon/system/dev/display/imx8m-display/rules.mk
diff --git a/system/dev/display/intel-i915/bind.c b/zircon/system/dev/display/intel-i915/bind.c
similarity index 100%
rename from system/dev/display/intel-i915/bind.c
rename to zircon/system/dev/display/intel-i915/bind.c
diff --git a/system/dev/display/intel-i915/display-device.cpp b/zircon/system/dev/display/intel-i915/display-device.cpp
similarity index 100%
rename from system/dev/display/intel-i915/display-device.cpp
rename to zircon/system/dev/display/intel-i915/display-device.cpp
diff --git a/system/dev/display/intel-i915/display-device.h b/zircon/system/dev/display/intel-i915/display-device.h
similarity index 100%
rename from system/dev/display/intel-i915/display-device.h
rename to zircon/system/dev/display/intel-i915/display-device.h
diff --git a/system/dev/display/intel-i915/dp-display.cpp b/zircon/system/dev/display/intel-i915/dp-display.cpp
similarity index 100%
rename from system/dev/display/intel-i915/dp-display.cpp
rename to zircon/system/dev/display/intel-i915/dp-display.cpp
diff --git a/system/dev/display/intel-i915/dp-display.h b/zircon/system/dev/display/intel-i915/dp-display.h
similarity index 100%
rename from system/dev/display/intel-i915/dp-display.h
rename to zircon/system/dev/display/intel-i915/dp-display.h
diff --git a/system/dev/display/intel-i915/dpcd.h b/zircon/system/dev/display/intel-i915/dpcd.h
similarity index 100%
rename from system/dev/display/intel-i915/dpcd.h
rename to zircon/system/dev/display/intel-i915/dpcd.h
diff --git a/system/dev/display/intel-i915/gtt.cpp b/zircon/system/dev/display/intel-i915/gtt.cpp
similarity index 100%
rename from system/dev/display/intel-i915/gtt.cpp
rename to zircon/system/dev/display/intel-i915/gtt.cpp
diff --git a/system/dev/display/intel-i915/gtt.h b/zircon/system/dev/display/intel-i915/gtt.h
similarity index 100%
rename from system/dev/display/intel-i915/gtt.h
rename to zircon/system/dev/display/intel-i915/gtt.h
diff --git a/system/dev/display/intel-i915/hdmi-display.cpp b/zircon/system/dev/display/intel-i915/hdmi-display.cpp
similarity index 100%
rename from system/dev/display/intel-i915/hdmi-display.cpp
rename to zircon/system/dev/display/intel-i915/hdmi-display.cpp
diff --git a/system/dev/display/intel-i915/hdmi-display.h b/zircon/system/dev/display/intel-i915/hdmi-display.h
similarity index 100%
rename from system/dev/display/intel-i915/hdmi-display.h
rename to zircon/system/dev/display/intel-i915/hdmi-display.h
diff --git a/system/dev/display/intel-i915/igd.cpp b/zircon/system/dev/display/intel-i915/igd.cpp
similarity index 100%
rename from system/dev/display/intel-i915/igd.cpp
rename to zircon/system/dev/display/intel-i915/igd.cpp
diff --git a/system/dev/display/intel-i915/igd.h b/zircon/system/dev/display/intel-i915/igd.h
similarity index 100%
rename from system/dev/display/intel-i915/igd.h
rename to zircon/system/dev/display/intel-i915/igd.h
diff --git a/system/dev/display/intel-i915/intel-i915.cpp b/zircon/system/dev/display/intel-i915/intel-i915.cpp
similarity index 100%
rename from system/dev/display/intel-i915/intel-i915.cpp
rename to zircon/system/dev/display/intel-i915/intel-i915.cpp
diff --git a/system/dev/display/intel-i915/intel-i915.h b/zircon/system/dev/display/intel-i915/intel-i915.h
similarity index 100%
rename from system/dev/display/intel-i915/intel-i915.h
rename to zircon/system/dev/display/intel-i915/intel-i915.h
diff --git a/system/dev/display/intel-i915/interrupts.cpp b/zircon/system/dev/display/intel-i915/interrupts.cpp
similarity index 100%
rename from system/dev/display/intel-i915/interrupts.cpp
rename to zircon/system/dev/display/intel-i915/interrupts.cpp
diff --git a/system/dev/display/intel-i915/interrupts.h b/zircon/system/dev/display/intel-i915/interrupts.h
similarity index 100%
rename from system/dev/display/intel-i915/interrupts.h
rename to zircon/system/dev/display/intel-i915/interrupts.h
diff --git a/system/dev/display/intel-i915/macros.h b/zircon/system/dev/display/intel-i915/macros.h
similarity index 100%
rename from system/dev/display/intel-i915/macros.h
rename to zircon/system/dev/display/intel-i915/macros.h
diff --git a/system/dev/display/intel-i915/pci-ids.h b/zircon/system/dev/display/intel-i915/pci-ids.h
similarity index 100%
rename from system/dev/display/intel-i915/pci-ids.h
rename to zircon/system/dev/display/intel-i915/pci-ids.h
diff --git a/system/dev/display/intel-i915/pipe.cpp b/zircon/system/dev/display/intel-i915/pipe.cpp
similarity index 100%
rename from system/dev/display/intel-i915/pipe.cpp
rename to zircon/system/dev/display/intel-i915/pipe.cpp
diff --git a/system/dev/display/intel-i915/pipe.h b/zircon/system/dev/display/intel-i915/pipe.h
similarity index 100%
rename from system/dev/display/intel-i915/pipe.h
rename to zircon/system/dev/display/intel-i915/pipe.h
diff --git a/system/dev/display/intel-i915/power.cpp b/zircon/system/dev/display/intel-i915/power.cpp
similarity index 100%
rename from system/dev/display/intel-i915/power.cpp
rename to zircon/system/dev/display/intel-i915/power.cpp
diff --git a/system/dev/display/intel-i915/power.h b/zircon/system/dev/display/intel-i915/power.h
similarity index 100%
rename from system/dev/display/intel-i915/power.h
rename to zircon/system/dev/display/intel-i915/power.h
diff --git a/system/dev/display/intel-i915/registers-ddi.h b/zircon/system/dev/display/intel-i915/registers-ddi.h
similarity index 100%
rename from system/dev/display/intel-i915/registers-ddi.h
rename to zircon/system/dev/display/intel-i915/registers-ddi.h
diff --git a/system/dev/display/intel-i915/registers-dpll.h b/zircon/system/dev/display/intel-i915/registers-dpll.h
similarity index 100%
rename from system/dev/display/intel-i915/registers-dpll.h
rename to zircon/system/dev/display/intel-i915/registers-dpll.h
diff --git a/system/dev/display/intel-i915/registers-pipe.h b/zircon/system/dev/display/intel-i915/registers-pipe.h
similarity index 100%
rename from system/dev/display/intel-i915/registers-pipe.h
rename to zircon/system/dev/display/intel-i915/registers-pipe.h
diff --git a/system/dev/display/intel-i915/registers-transcoder.h b/zircon/system/dev/display/intel-i915/registers-transcoder.h
similarity index 100%
rename from system/dev/display/intel-i915/registers-transcoder.h
rename to zircon/system/dev/display/intel-i915/registers-transcoder.h
diff --git a/system/dev/display/intel-i915/registers.h b/zircon/system/dev/display/intel-i915/registers.h
similarity index 100%
rename from system/dev/display/intel-i915/registers.h
rename to zircon/system/dev/display/intel-i915/registers.h
diff --git a/system/dev/display/intel-i915/rules.mk b/zircon/system/dev/display/intel-i915/rules.mk
similarity index 100%
rename from system/dev/display/intel-i915/rules.mk
rename to zircon/system/dev/display/intel-i915/rules.mk
diff --git a/system/dev/display/intel-i915/tiling.h b/zircon/system/dev/display/intel-i915/tiling.h
similarity index 100%
rename from system/dev/display/intel-i915/tiling.h
rename to zircon/system/dev/display/intel-i915/tiling.h
diff --git a/system/dev/display/led2472g/led2472g.c b/zircon/system/dev/display/led2472g/led2472g.c
similarity index 100%
rename from system/dev/display/led2472g/led2472g.c
rename to zircon/system/dev/display/led2472g/led2472g.c
diff --git a/system/dev/display/led2472g/rules.mk b/zircon/system/dev/display/led2472g/rules.mk
similarity index 100%
rename from system/dev/display/led2472g/rules.mk
rename to zircon/system/dev/display/led2472g/rules.mk
diff --git a/system/dev/display/mt8167s-display/common.h b/zircon/system/dev/display/mt8167s-display/common.h
similarity index 100%
rename from system/dev/display/mt8167s-display/common.h
rename to zircon/system/dev/display/mt8167s-display/common.h
diff --git a/system/dev/display/mt8167s-display/disp-rdma.cpp b/zircon/system/dev/display/mt8167s-display/disp-rdma.cpp
similarity index 100%
rename from system/dev/display/mt8167s-display/disp-rdma.cpp
rename to zircon/system/dev/display/mt8167s-display/disp-rdma.cpp
diff --git a/system/dev/display/mt8167s-display/disp-rdma.h b/zircon/system/dev/display/mt8167s-display/disp-rdma.h
similarity index 100%
rename from system/dev/display/mt8167s-display/disp-rdma.h
rename to zircon/system/dev/display/mt8167s-display/disp-rdma.h
diff --git a/system/dev/display/mt8167s-display/mt8167s-display.cpp b/zircon/system/dev/display/mt8167s-display/mt8167s-display.cpp
similarity index 100%
rename from system/dev/display/mt8167s-display/mt8167s-display.cpp
rename to zircon/system/dev/display/mt8167s-display/mt8167s-display.cpp
diff --git a/system/dev/display/mt8167s-display/mt8167s-display.h b/zircon/system/dev/display/mt8167s-display/mt8167s-display.h
similarity index 100%
rename from system/dev/display/mt8167s-display/mt8167s-display.h
rename to zircon/system/dev/display/mt8167s-display/mt8167s-display.h
diff --git a/system/dev/display/mt8167s-display/ovl.cpp b/zircon/system/dev/display/mt8167s-display/ovl.cpp
similarity index 100%
rename from system/dev/display/mt8167s-display/ovl.cpp
rename to zircon/system/dev/display/mt8167s-display/ovl.cpp
diff --git a/system/dev/display/mt8167s-display/ovl.h b/zircon/system/dev/display/mt8167s-display/ovl.h
similarity index 100%
rename from system/dev/display/mt8167s-display/ovl.h
rename to zircon/system/dev/display/mt8167s-display/ovl.h
diff --git a/system/dev/display/mt8167s-display/registers-disp-rdma.h b/zircon/system/dev/display/mt8167s-display/registers-disp-rdma.h
similarity index 100%
rename from system/dev/display/mt8167s-display/registers-disp-rdma.h
rename to zircon/system/dev/display/mt8167s-display/registers-disp-rdma.h
diff --git a/system/dev/display/mt8167s-display/registers-ovl.h b/zircon/system/dev/display/mt8167s-display/registers-ovl.h
similarity index 100%
rename from system/dev/display/mt8167s-display/registers-ovl.h
rename to zircon/system/dev/display/mt8167s-display/registers-ovl.h
diff --git a/system/dev/display/mt8167s-display/rules.mk b/zircon/system/dev/display/mt8167s-display/rules.mk
similarity index 100%
rename from system/dev/display/mt8167s-display/rules.mk
rename to zircon/system/dev/display/mt8167s-display/rules.mk
diff --git a/system/dev/display/simple/rules.mk b/zircon/system/dev/display/simple/rules.mk
similarity index 100%
rename from system/dev/display/simple/rules.mk
rename to zircon/system/dev/display/simple/rules.mk
diff --git a/system/dev/display/simple/simple-amd-kaveri.c b/zircon/system/dev/display/simple/simple-amd-kaveri.c
similarity index 100%
rename from system/dev/display/simple/simple-amd-kaveri.c
rename to zircon/system/dev/display/simple/simple-amd-kaveri.c
diff --git a/system/dev/display/simple/simple-bochs.c b/zircon/system/dev/display/simple/simple-bochs.c
similarity index 100%
rename from system/dev/display/simple/simple-bochs.c
rename to zircon/system/dev/display/simple/simple-bochs.c
diff --git a/system/dev/display/simple/simple-display.cpp b/zircon/system/dev/display/simple/simple-display.cpp
similarity index 100%
rename from system/dev/display/simple/simple-display.cpp
rename to zircon/system/dev/display/simple/simple-display.cpp
diff --git a/system/dev/display/simple/simple-display.h b/zircon/system/dev/display/simple/simple-display.h
similarity index 100%
rename from system/dev/display/simple/simple-display.h
rename to zircon/system/dev/display/simple/simple-display.h
diff --git a/system/dev/display/simple/simple-intel.c b/zircon/system/dev/display/simple/simple-intel.c
similarity index 100%
rename from system/dev/display/simple/simple-intel.c
rename to zircon/system/dev/display/simple/simple-intel.c
diff --git a/system/dev/display/simple/simple-nv.c b/zircon/system/dev/display/simple/simple-nv.c
similarity index 100%
rename from system/dev/display/simple/simple-nv.c
rename to zircon/system/dev/display/simple/simple-nv.c
diff --git a/system/dev/display/vim-display/dwc-hdmi.h b/zircon/system/dev/display/vim-display/dwc-hdmi.h
similarity index 100%
rename from system/dev/display/vim-display/dwc-hdmi.h
rename to zircon/system/dev/display/vim-display/dwc-hdmi.h
diff --git a/system/dev/display/vim-display/edid.cpp b/zircon/system/dev/display/vim-display/edid.cpp
similarity index 100%
rename from system/dev/display/vim-display/edid.cpp
rename to zircon/system/dev/display/vim-display/edid.cpp
diff --git a/system/dev/display/vim-display/edid.h b/zircon/system/dev/display/vim-display/edid.h
similarity index 100%
rename from system/dev/display/vim-display/edid.h
rename to zircon/system/dev/display/vim-display/edid.h
diff --git a/system/dev/display/vim-display/hdmitx.cpp b/zircon/system/dev/display/vim-display/hdmitx.cpp
similarity index 100%
rename from system/dev/display/vim-display/hdmitx.cpp
rename to zircon/system/dev/display/vim-display/hdmitx.cpp
diff --git a/system/dev/display/vim-display/hdmitx.h b/zircon/system/dev/display/vim-display/hdmitx.h
similarity index 100%
rename from system/dev/display/vim-display/hdmitx.h
rename to zircon/system/dev/display/vim-display/hdmitx.h
diff --git a/system/dev/display/vim-display/hdmitx_clk.cpp b/zircon/system/dev/display/vim-display/hdmitx_clk.cpp
similarity index 100%
rename from system/dev/display/vim-display/hdmitx_clk.cpp
rename to zircon/system/dev/display/vim-display/hdmitx_clk.cpp
diff --git a/system/dev/display/vim-display/registers.cpp b/zircon/system/dev/display/vim-display/registers.cpp
similarity index 100%
rename from system/dev/display/vim-display/registers.cpp
rename to zircon/system/dev/display/vim-display/registers.cpp
diff --git a/system/dev/display/vim-display/registers.h b/zircon/system/dev/display/vim-display/registers.h
similarity index 100%
rename from system/dev/display/vim-display/registers.h
rename to zircon/system/dev/display/vim-display/registers.h
diff --git a/system/dev/display/vim-display/rules.mk b/zircon/system/dev/display/vim-display/rules.mk
similarity index 100%
rename from system/dev/display/vim-display/rules.mk
rename to zircon/system/dev/display/vim-display/rules.mk
diff --git a/system/dev/display/vim-display/vim-audio-utils.cpp b/zircon/system/dev/display/vim-display/vim-audio-utils.cpp
similarity index 100%
rename from system/dev/display/vim-display/vim-audio-utils.cpp
rename to zircon/system/dev/display/vim-display/vim-audio-utils.cpp
diff --git a/system/dev/display/vim-display/vim-audio-utils.h b/zircon/system/dev/display/vim-display/vim-audio-utils.h
similarity index 100%
rename from system/dev/display/vim-display/vim-audio-utils.h
rename to zircon/system/dev/display/vim-display/vim-audio-utils.h
diff --git a/system/dev/display/vim-display/vim-audio.cpp b/zircon/system/dev/display/vim-display/vim-audio.cpp
similarity index 100%
rename from system/dev/display/vim-display/vim-audio.cpp
rename to zircon/system/dev/display/vim-display/vim-audio.cpp
diff --git a/system/dev/display/vim-display/vim-audio.h b/zircon/system/dev/display/vim-display/vim-audio.h
similarity index 100%
rename from system/dev/display/vim-display/vim-audio.h
rename to zircon/system/dev/display/vim-display/vim-audio.h
diff --git a/system/dev/display/vim-display/vim-display.cpp b/zircon/system/dev/display/vim-display/vim-display.cpp
similarity index 100%
rename from system/dev/display/vim-display/vim-display.cpp
rename to zircon/system/dev/display/vim-display/vim-display.cpp
diff --git a/system/dev/display/vim-display/vim-display.h b/zircon/system/dev/display/vim-display/vim-display.h
similarity index 100%
rename from system/dev/display/vim-display/vim-display.h
rename to zircon/system/dev/display/vim-display/vim-display.h
diff --git a/system/dev/display/vim-display/vim-spdif-audio-stream.cpp b/zircon/system/dev/display/vim-display/vim-spdif-audio-stream.cpp
similarity index 100%
rename from system/dev/display/vim-display/vim-spdif-audio-stream.cpp
rename to zircon/system/dev/display/vim-display/vim-spdif-audio-stream.cpp
diff --git a/system/dev/display/vim-display/vim-spdif-audio-stream.h b/zircon/system/dev/display/vim-display/vim-spdif-audio-stream.h
similarity index 100%
rename from system/dev/display/vim-display/vim-spdif-audio-stream.h
rename to zircon/system/dev/display/vim-display/vim-spdif-audio-stream.h
diff --git a/system/dev/display/vim-display/vpp.cpp b/zircon/system/dev/display/vim-display/vpp.cpp
similarity index 100%
rename from system/dev/display/vim-display/vpp.cpp
rename to zircon/system/dev/display/vim-display/vpp.cpp
diff --git a/system/dev/display/vim-display/vpu.h b/zircon/system/dev/display/vim-display/vpu.h
similarity index 100%
rename from system/dev/display/vim-display/vpu.h
rename to zircon/system/dev/display/vim-display/vpu.h
diff --git a/system/dev/ethernet/aml-ethernet-s912/aml-ethernet.cpp b/zircon/system/dev/ethernet/aml-ethernet-s912/aml-ethernet.cpp
similarity index 100%
rename from system/dev/ethernet/aml-ethernet-s912/aml-ethernet.cpp
rename to zircon/system/dev/ethernet/aml-ethernet-s912/aml-ethernet.cpp
diff --git a/system/dev/ethernet/aml-ethernet-s912/aml-ethernet.h b/zircon/system/dev/ethernet/aml-ethernet-s912/aml-ethernet.h
similarity index 100%
rename from system/dev/ethernet/aml-ethernet-s912/aml-ethernet.h
rename to zircon/system/dev/ethernet/aml-ethernet-s912/aml-ethernet.h
diff --git a/system/dev/ethernet/aml-ethernet-s912/aml-regs.h b/zircon/system/dev/ethernet/aml-ethernet-s912/aml-regs.h
similarity index 100%
rename from system/dev/ethernet/aml-ethernet-s912/aml-regs.h
rename to zircon/system/dev/ethernet/aml-ethernet-s912/aml-regs.h
diff --git a/system/dev/ethernet/aml-ethernet-s912/binding.c b/zircon/system/dev/ethernet/aml-ethernet-s912/binding.c
similarity index 100%
rename from system/dev/ethernet/aml-ethernet-s912/binding.c
rename to zircon/system/dev/ethernet/aml-ethernet-s912/binding.c
diff --git a/system/dev/ethernet/aml-ethernet-s912/rules.mk b/zircon/system/dev/ethernet/aml-ethernet-s912/rules.mk
similarity index 100%
rename from system/dev/ethernet/aml-ethernet-s912/rules.mk
rename to zircon/system/dev/ethernet/aml-ethernet-s912/rules.mk
diff --git a/system/dev/ethernet/asix-88179/asix-88179.c b/zircon/system/dev/ethernet/asix-88179/asix-88179.c
similarity index 100%
rename from system/dev/ethernet/asix-88179/asix-88179.c
rename to zircon/system/dev/ethernet/asix-88179/asix-88179.c
diff --git a/system/dev/ethernet/asix-88179/asix-88179.h b/zircon/system/dev/ethernet/asix-88179/asix-88179.h
similarity index 100%
rename from system/dev/ethernet/asix-88179/asix-88179.h
rename to zircon/system/dev/ethernet/asix-88179/asix-88179.h
diff --git a/system/dev/ethernet/asix-88179/rules.mk b/zircon/system/dev/ethernet/asix-88179/rules.mk
similarity index 100%
rename from system/dev/ethernet/asix-88179/rules.mk
rename to zircon/system/dev/ethernet/asix-88179/rules.mk
diff --git a/system/dev/ethernet/asix-88772b/asix-88772b.c b/zircon/system/dev/ethernet/asix-88772b/asix-88772b.c
similarity index 100%
rename from system/dev/ethernet/asix-88772b/asix-88772b.c
rename to zircon/system/dev/ethernet/asix-88772b/asix-88772b.c
diff --git a/system/dev/ethernet/asix-88772b/asix-88772b.h b/zircon/system/dev/ethernet/asix-88772b/asix-88772b.h
similarity index 100%
rename from system/dev/ethernet/asix-88772b/asix-88772b.h
rename to zircon/system/dev/ethernet/asix-88772b/asix-88772b.h
diff --git a/system/dev/ethernet/asix-88772b/rules.mk b/zircon/system/dev/ethernet/asix-88772b/rules.mk
similarity index 100%
rename from system/dev/ethernet/asix-88772b/rules.mk
rename to zircon/system/dev/ethernet/asix-88772b/rules.mk
diff --git a/system/dev/ethernet/dwmac/binding.c b/zircon/system/dev/ethernet/dwmac/binding.c
similarity index 100%
rename from system/dev/ethernet/dwmac/binding.c
rename to zircon/system/dev/ethernet/dwmac/binding.c
diff --git a/system/dev/ethernet/dwmac/dw-gmac-dma.h b/zircon/system/dev/ethernet/dwmac/dw-gmac-dma.h
similarity index 100%
rename from system/dev/ethernet/dwmac/dw-gmac-dma.h
rename to zircon/system/dev/ethernet/dwmac/dw-gmac-dma.h
diff --git a/system/dev/ethernet/dwmac/dwmac-debug.cpp b/zircon/system/dev/ethernet/dwmac/dwmac-debug.cpp
similarity index 100%
rename from system/dev/ethernet/dwmac/dwmac-debug.cpp
rename to zircon/system/dev/ethernet/dwmac/dwmac-debug.cpp
diff --git a/system/dev/ethernet/dwmac/dwmac.cpp b/zircon/system/dev/ethernet/dwmac/dwmac.cpp
similarity index 100%
rename from system/dev/ethernet/dwmac/dwmac.cpp
rename to zircon/system/dev/ethernet/dwmac/dwmac.cpp
diff --git a/system/dev/ethernet/dwmac/dwmac.h b/zircon/system/dev/ethernet/dwmac/dwmac.h
similarity index 100%
rename from system/dev/ethernet/dwmac/dwmac.h
rename to zircon/system/dev/ethernet/dwmac/dwmac.h
diff --git a/system/dev/ethernet/dwmac/pinned-buffer.cpp b/zircon/system/dev/ethernet/dwmac/pinned-buffer.cpp
similarity index 100%
rename from system/dev/ethernet/dwmac/pinned-buffer.cpp
rename to zircon/system/dev/ethernet/dwmac/pinned-buffer.cpp
diff --git a/system/dev/ethernet/dwmac/pinned-buffer.h b/zircon/system/dev/ethernet/dwmac/pinned-buffer.h
similarity index 100%
rename from system/dev/ethernet/dwmac/pinned-buffer.h
rename to zircon/system/dev/ethernet/dwmac/pinned-buffer.h
diff --git a/system/dev/ethernet/dwmac/rules.mk b/zircon/system/dev/ethernet/dwmac/rules.mk
similarity index 100%
rename from system/dev/ethernet/dwmac/rules.mk
rename to zircon/system/dev/ethernet/dwmac/rules.mk
diff --git a/system/dev/ethernet/ethernet/ethernet.c b/zircon/system/dev/ethernet/ethernet/ethernet.c
similarity index 100%
rename from system/dev/ethernet/ethernet/ethernet.c
rename to zircon/system/dev/ethernet/ethernet/ethernet.c
diff --git a/system/dev/ethernet/ethernet/rules.mk b/zircon/system/dev/ethernet/ethernet/rules.mk
similarity index 100%
rename from system/dev/ethernet/ethernet/rules.mk
rename to zircon/system/dev/ethernet/ethernet/rules.mk
diff --git a/system/dev/ethernet/ethertap/binding.c b/zircon/system/dev/ethernet/ethertap/binding.c
similarity index 100%
rename from system/dev/ethernet/ethertap/binding.c
rename to zircon/system/dev/ethernet/ethertap/binding.c
diff --git a/system/dev/ethernet/ethertap/ethertap.cpp b/zircon/system/dev/ethernet/ethertap/ethertap.cpp
similarity index 100%
rename from system/dev/ethernet/ethertap/ethertap.cpp
rename to zircon/system/dev/ethernet/ethertap/ethertap.cpp
diff --git a/system/dev/ethernet/ethertap/ethertap.h b/zircon/system/dev/ethernet/ethertap/ethertap.h
similarity index 100%
rename from system/dev/ethernet/ethertap/ethertap.h
rename to zircon/system/dev/ethernet/ethertap/ethertap.h
diff --git a/system/dev/ethernet/ethertap/rules.mk b/zircon/system/dev/ethernet/ethertap/rules.mk
similarity index 100%
rename from system/dev/ethernet/ethertap/rules.mk
rename to zircon/system/dev/ethernet/ethertap/rules.mk
diff --git a/system/dev/ethernet/intel-ethernet/ethernet.c b/zircon/system/dev/ethernet/intel-ethernet/ethernet.c
similarity index 100%
rename from system/dev/ethernet/intel-ethernet/ethernet.c
rename to zircon/system/dev/ethernet/intel-ethernet/ethernet.c
diff --git a/system/dev/ethernet/intel-ethernet/ie-hw.h b/zircon/system/dev/ethernet/intel-ethernet/ie-hw.h
similarity index 100%
rename from system/dev/ethernet/intel-ethernet/ie-hw.h
rename to zircon/system/dev/ethernet/intel-ethernet/ie-hw.h
diff --git a/system/dev/ethernet/intel-ethernet/ie.c b/zircon/system/dev/ethernet/intel-ethernet/ie.c
similarity index 100%
rename from system/dev/ethernet/intel-ethernet/ie.c
rename to zircon/system/dev/ethernet/intel-ethernet/ie.c
diff --git a/system/dev/ethernet/intel-ethernet/ie.h b/zircon/system/dev/ethernet/intel-ethernet/ie.h
similarity index 100%
rename from system/dev/ethernet/intel-ethernet/ie.h
rename to zircon/system/dev/ethernet/intel-ethernet/ie.h
diff --git a/system/dev/ethernet/intel-ethernet/rules.mk b/zircon/system/dev/ethernet/intel-ethernet/rules.mk
similarity index 100%
rename from system/dev/ethernet/intel-ethernet/rules.mk
rename to zircon/system/dev/ethernet/intel-ethernet/rules.mk
diff --git a/system/dev/ethernet/realtek-8111/rtl8111.c b/zircon/system/dev/ethernet/realtek-8111/rtl8111.c
similarity index 100%
rename from system/dev/ethernet/realtek-8111/rtl8111.c
rename to zircon/system/dev/ethernet/realtek-8111/rtl8111.c
diff --git a/system/dev/ethernet/realtek-8111/rtl8111.h b/zircon/system/dev/ethernet/realtek-8111/rtl8111.h
similarity index 100%
rename from system/dev/ethernet/realtek-8111/rtl8111.h
rename to zircon/system/dev/ethernet/realtek-8111/rtl8111.h
diff --git a/system/dev/ethernet/realtek-8111/rules.mk b/zircon/system/dev/ethernet/realtek-8111/rules.mk
similarity index 100%
rename from system/dev/ethernet/realtek-8111/rules.mk
rename to zircon/system/dev/ethernet/realtek-8111/rules.mk
diff --git a/system/dev/ethernet/realtek-8211f/binding.c b/zircon/system/dev/ethernet/realtek-8211f/binding.c
similarity index 100%
rename from system/dev/ethernet/realtek-8211f/binding.c
rename to zircon/system/dev/ethernet/realtek-8211f/binding.c
diff --git a/system/dev/ethernet/realtek-8211f/mdio-regs.h b/zircon/system/dev/ethernet/realtek-8211f/mdio-regs.h
similarity index 100%
rename from system/dev/ethernet/realtek-8211f/mdio-regs.h
rename to zircon/system/dev/ethernet/realtek-8211f/mdio-regs.h
diff --git a/system/dev/ethernet/realtek-8211f/rtl8211f.cpp b/zircon/system/dev/ethernet/realtek-8211f/rtl8211f.cpp
similarity index 100%
rename from system/dev/ethernet/realtek-8211f/rtl8211f.cpp
rename to zircon/system/dev/ethernet/realtek-8211f/rtl8211f.cpp
diff --git a/system/dev/ethernet/realtek-8211f/rtl8211f.h b/zircon/system/dev/ethernet/realtek-8211f/rtl8211f.h
similarity index 100%
rename from system/dev/ethernet/realtek-8211f/rtl8211f.h
rename to zircon/system/dev/ethernet/realtek-8211f/rtl8211f.h
diff --git a/system/dev/ethernet/realtek-8211f/rules.mk b/zircon/system/dev/ethernet/realtek-8211f/rules.mk
similarity index 100%
rename from system/dev/ethernet/realtek-8211f/rules.mk
rename to zircon/system/dev/ethernet/realtek-8211f/rules.mk
diff --git a/system/dev/ethernet/rndis/rndishost.c b/zircon/system/dev/ethernet/rndis/rndishost.c
similarity index 100%
rename from system/dev/ethernet/rndis/rndishost.c
rename to zircon/system/dev/ethernet/rndis/rndishost.c
diff --git a/system/dev/ethernet/rndis/rndishost.h b/zircon/system/dev/ethernet/rndis/rndishost.h
similarity index 100%
rename from system/dev/ethernet/rndis/rndishost.h
rename to zircon/system/dev/ethernet/rndis/rndishost.h
diff --git a/system/dev/ethernet/rndis/rules.mk b/zircon/system/dev/ethernet/rndis/rules.mk
similarity index 100%
rename from system/dev/ethernet/rndis/rules.mk
rename to zircon/system/dev/ethernet/rndis/rules.mk
diff --git a/system/dev/ethernet/usb-cdc-ecm/rules.mk b/zircon/system/dev/ethernet/usb-cdc-ecm/rules.mk
similarity index 100%
rename from system/dev/ethernet/usb-cdc-ecm/rules.mk
rename to zircon/system/dev/ethernet/usb-cdc-ecm/rules.mk
diff --git a/system/dev/ethernet/usb-cdc-ecm/usb-cdc-ecm.c b/zircon/system/dev/ethernet/usb-cdc-ecm/usb-cdc-ecm.c
similarity index 100%
rename from system/dev/ethernet/usb-cdc-ecm/usb-cdc-ecm.c
rename to zircon/system/dev/ethernet/usb-cdc-ecm/usb-cdc-ecm.c
diff --git a/system/dev/ethernet/usb-cdc-function/cdc-eth-function.cpp b/zircon/system/dev/ethernet/usb-cdc-function/cdc-eth-function.cpp
similarity index 100%
rename from system/dev/ethernet/usb-cdc-function/cdc-eth-function.cpp
rename to zircon/system/dev/ethernet/usb-cdc-function/cdc-eth-function.cpp
diff --git a/system/dev/ethernet/usb-cdc-function/rules.mk b/zircon/system/dev/ethernet/usb-cdc-function/rules.mk
similarity index 100%
rename from system/dev/ethernet/usb-cdc-function/rules.mk
rename to zircon/system/dev/ethernet/usb-cdc-function/rules.mk
diff --git a/system/dev/gpio/aml-axg-gpio/a113-blocks.h b/zircon/system/dev/gpio/aml-axg-gpio/a113-blocks.h
similarity index 100%
rename from system/dev/gpio/aml-axg-gpio/a113-blocks.h
rename to zircon/system/dev/gpio/aml-axg-gpio/a113-blocks.h
diff --git a/system/dev/gpio/aml-axg-gpio/aml-axg-gpio.c b/zircon/system/dev/gpio/aml-axg-gpio/aml-axg-gpio.c
similarity index 100%
rename from system/dev/gpio/aml-axg-gpio/aml-axg-gpio.c
rename to zircon/system/dev/gpio/aml-axg-gpio/aml-axg-gpio.c
diff --git a/system/dev/gpio/aml-axg-gpio/rules.mk b/zircon/system/dev/gpio/aml-axg-gpio/rules.mk
similarity index 100%
rename from system/dev/gpio/aml-axg-gpio/rules.mk
rename to zircon/system/dev/gpio/aml-axg-gpio/rules.mk
diff --git a/system/dev/gpio/aml-axg-gpio/s905d2-blocks.h b/zircon/system/dev/gpio/aml-axg-gpio/s905d2-blocks.h
similarity index 100%
rename from system/dev/gpio/aml-axg-gpio/s905d2-blocks.h
rename to zircon/system/dev/gpio/aml-axg-gpio/s905d2-blocks.h
diff --git a/system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.cpp b/zircon/system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.cpp
similarity index 100%
rename from system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.cpp
rename to zircon/system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.cpp
diff --git a/system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.h b/zircon/system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.h
similarity index 100%
rename from system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.h
rename to zircon/system/dev/gpio/aml-gxl-gpio/aml-gxl-gpio.h
diff --git a/system/dev/gpio/aml-gxl-gpio/binding.c b/zircon/system/dev/gpio/aml-gxl-gpio/binding.c
similarity index 100%
rename from system/dev/gpio/aml-gxl-gpio/binding.c
rename to zircon/system/dev/gpio/aml-gxl-gpio/binding.c
diff --git a/system/dev/gpio/aml-gxl-gpio/rules.mk b/zircon/system/dev/gpio/aml-gxl-gpio/rules.mk
similarity index 100%
rename from system/dev/gpio/aml-gxl-gpio/rules.mk
rename to zircon/system/dev/gpio/aml-gxl-gpio/rules.mk
diff --git a/system/dev/gpio/aml-gxl-gpio/s905-blocks.h b/zircon/system/dev/gpio/aml-gxl-gpio/s905-blocks.h
similarity index 100%
rename from system/dev/gpio/aml-gxl-gpio/s905-blocks.h
rename to zircon/system/dev/gpio/aml-gxl-gpio/s905-blocks.h
diff --git a/system/dev/gpio/aml-gxl-gpio/s905x-blocks.h b/zircon/system/dev/gpio/aml-gxl-gpio/s905x-blocks.h
similarity index 100%
rename from system/dev/gpio/aml-gxl-gpio/s905x-blocks.h
rename to zircon/system/dev/gpio/aml-gxl-gpio/s905x-blocks.h
diff --git a/system/dev/gpio/aml-gxl-gpio/s912-blocks.h b/zircon/system/dev/gpio/aml-gxl-gpio/s912-blocks.h
similarity index 100%
rename from system/dev/gpio/aml-gxl-gpio/s912-blocks.h
rename to zircon/system/dev/gpio/aml-gxl-gpio/s912-blocks.h
diff --git a/system/dev/gpio/gpio-test/gpio-test.cpp b/zircon/system/dev/gpio/gpio-test/gpio-test.cpp
similarity index 100%
rename from system/dev/gpio/gpio-test/gpio-test.cpp
rename to zircon/system/dev/gpio/gpio-test/gpio-test.cpp
diff --git a/system/dev/gpio/gpio-test/gpio-test.h b/zircon/system/dev/gpio/gpio-test/gpio-test.h
similarity index 100%
rename from system/dev/gpio/gpio-test/gpio-test.h
rename to zircon/system/dev/gpio/gpio-test/gpio-test.h
diff --git a/system/dev/gpio/gpio-test/rules.mk b/zircon/system/dev/gpio/gpio-test/rules.mk
similarity index 100%
rename from system/dev/gpio/gpio-test/rules.mk
rename to zircon/system/dev/gpio/gpio-test/rules.mk
diff --git a/system/dev/gpio/imx8/imx8-gpio.c b/zircon/system/dev/gpio/imx8/imx8-gpio.c
similarity index 100%
rename from system/dev/gpio/imx8/imx8-gpio.c
rename to zircon/system/dev/gpio/imx8/imx8-gpio.c
diff --git a/system/dev/gpio/imx8/imx8-gpio.h b/zircon/system/dev/gpio/imx8/imx8-gpio.h
similarity index 100%
rename from system/dev/gpio/imx8/imx8-gpio.h
rename to zircon/system/dev/gpio/imx8/imx8-gpio.h
diff --git a/system/dev/gpio/imx8/imx8m-gpio.c b/zircon/system/dev/gpio/imx8/imx8m-gpio.c
similarity index 100%
rename from system/dev/gpio/imx8/imx8m-gpio.c
rename to zircon/system/dev/gpio/imx8/imx8m-gpio.c
diff --git a/system/dev/gpio/imx8/imx8m-mini-gpio.c b/zircon/system/dev/gpio/imx8/imx8m-mini-gpio.c
similarity index 100%
rename from system/dev/gpio/imx8/imx8m-mini-gpio.c
rename to zircon/system/dev/gpio/imx8/imx8m-mini-gpio.c
diff --git a/system/dev/gpio/imx8/rules.mk b/zircon/system/dev/gpio/imx8/rules.mk
similarity index 100%
rename from system/dev/gpio/imx8/rules.mk
rename to zircon/system/dev/gpio/imx8/rules.mk
diff --git a/system/dev/gpio/mt-8167/binding.cpp b/zircon/system/dev/gpio/mt-8167/binding.cpp
similarity index 100%
rename from system/dev/gpio/mt-8167/binding.cpp
rename to zircon/system/dev/gpio/mt-8167/binding.cpp
diff --git a/system/dev/gpio/mt-8167/mt8167-gpio-regs.h b/zircon/system/dev/gpio/mt-8167/mt8167-gpio-regs.h
similarity index 100%
rename from system/dev/gpio/mt-8167/mt8167-gpio-regs.h
rename to zircon/system/dev/gpio/mt-8167/mt8167-gpio-regs.h
diff --git a/system/dev/gpio/mt-8167/mt8167-gpio-test.cpp b/zircon/system/dev/gpio/mt-8167/mt8167-gpio-test.cpp
similarity index 100%
rename from system/dev/gpio/mt-8167/mt8167-gpio-test.cpp
rename to zircon/system/dev/gpio/mt-8167/mt8167-gpio-test.cpp
diff --git a/system/dev/gpio/mt-8167/mt8167-gpio.cpp b/zircon/system/dev/gpio/mt-8167/mt8167-gpio.cpp
similarity index 100%
rename from system/dev/gpio/mt-8167/mt8167-gpio.cpp
rename to zircon/system/dev/gpio/mt-8167/mt8167-gpio.cpp
diff --git a/system/dev/gpio/mt-8167/mt8167-gpio.h b/zircon/system/dev/gpio/mt-8167/mt8167-gpio.h
similarity index 100%
rename from system/dev/gpio/mt-8167/mt8167-gpio.h
rename to zircon/system/dev/gpio/mt-8167/mt8167-gpio.h
diff --git a/system/dev/gpio/mt-8167/rules.mk b/zircon/system/dev/gpio/mt-8167/rules.mk
similarity index 100%
rename from system/dev/gpio/mt-8167/rules.mk
rename to zircon/system/dev/gpio/mt-8167/rules.mk
diff --git a/system/dev/gpio/mt-8167/test-overrides.cpp b/zircon/system/dev/gpio/mt-8167/test-overrides.cpp
similarity index 100%
rename from system/dev/gpio/mt-8167/test-overrides.cpp
rename to zircon/system/dev/gpio/mt-8167/test-overrides.cpp
diff --git a/system/dev/gpio/pl061/include/gpio/pl061/pl061.h b/zircon/system/dev/gpio/pl061/include/gpio/pl061/pl061.h
similarity index 100%
rename from system/dev/gpio/pl061/include/gpio/pl061/pl061.h
rename to zircon/system/dev/gpio/pl061/include/gpio/pl061/pl061.h
diff --git a/system/dev/gpio/pl061/pl061.c b/zircon/system/dev/gpio/pl061/pl061.c
similarity index 100%
rename from system/dev/gpio/pl061/pl061.c
rename to zircon/system/dev/gpio/pl061/pl061.c
diff --git a/system/dev/gpio/pl061/rules.mk b/zircon/system/dev/gpio/pl061/rules.mk
similarity index 100%
rename from system/dev/gpio/pl061/rules.mk
rename to zircon/system/dev/gpio/pl061/rules.mk
diff --git a/system/dev/gpu/aml-gpu/aml-gpu.c b/zircon/system/dev/gpu/aml-gpu/aml-gpu.c
similarity index 100%
rename from system/dev/gpu/aml-gpu/aml-gpu.c
rename to zircon/system/dev/gpu/aml-gpu/aml-gpu.c
diff --git a/system/dev/gpu/aml-gpu/aml-s905d2g.c b/zircon/system/dev/gpu/aml-gpu/aml-s905d2g.c
similarity index 100%
rename from system/dev/gpu/aml-gpu/aml-s905d2g.c
rename to zircon/system/dev/gpu/aml-gpu/aml-s905d2g.c
diff --git a/system/dev/gpu/aml-gpu/rules.mk b/zircon/system/dev/gpu/aml-gpu/rules.mk
similarity index 100%
rename from system/dev/gpu/aml-gpu/rules.mk
rename to zircon/system/dev/gpu/aml-gpu/rules.mk
diff --git a/system/dev/gpu/aml-gpu/s905d2-gpu.h b/zircon/system/dev/gpu/aml-gpu/s905d2-gpu.h
similarity index 100%
rename from system/dev/gpu/aml-gpu/s905d2-gpu.h
rename to zircon/system/dev/gpu/aml-gpu/s905d2-gpu.h
diff --git a/system/dev/gpu/aml-gpu/s912-gpu.h b/zircon/system/dev/gpu/aml-gpu/s912-gpu.h
similarity index 100%
rename from system/dev/gpu/aml-gpu/s912-gpu.h
rename to zircon/system/dev/gpu/aml-gpu/s912-gpu.h
diff --git a/system/dev/gpu/aml-gpu/t931-gpu.h b/zircon/system/dev/gpu/aml-gpu/t931-gpu.h
similarity index 100%
rename from system/dev/gpu/aml-gpu/t931-gpu.h
rename to zircon/system/dev/gpu/aml-gpu/t931-gpu.h
diff --git a/system/dev/i2c/aml-i2c/aml-i2c.c b/zircon/system/dev/i2c/aml-i2c/aml-i2c.c
similarity index 100%
rename from system/dev/i2c/aml-i2c/aml-i2c.c
rename to zircon/system/dev/i2c/aml-i2c/aml-i2c.c
diff --git a/system/dev/i2c/aml-i2c/rules.mk b/zircon/system/dev/i2c/aml-i2c/rules.mk
similarity index 100%
rename from system/dev/i2c/aml-i2c/rules.mk
rename to zircon/system/dev/i2c/aml-i2c/rules.mk
diff --git a/system/dev/i2c/dw-i2c/dw-i2c-regs.h b/zircon/system/dev/i2c/dw-i2c/dw-i2c-regs.h
similarity index 100%
rename from system/dev/i2c/dw-i2c/dw-i2c-regs.h
rename to zircon/system/dev/i2c/dw-i2c/dw-i2c-regs.h
diff --git a/system/dev/i2c/dw-i2c/dw-i2c.c b/zircon/system/dev/i2c/dw-i2c/dw-i2c.c
similarity index 100%
rename from system/dev/i2c/dw-i2c/dw-i2c.c
rename to zircon/system/dev/i2c/dw-i2c/dw-i2c.c
diff --git a/system/dev/i2c/dw-i2c/rules.mk b/zircon/system/dev/i2c/dw-i2c/rules.mk
similarity index 100%
rename from system/dev/i2c/dw-i2c/rules.mk
rename to zircon/system/dev/i2c/dw-i2c/rules.mk
diff --git a/system/dev/i2c/imx-i2c/imx-i2c-regs.h b/zircon/system/dev/i2c/imx-i2c/imx-i2c-regs.h
similarity index 100%
rename from system/dev/i2c/imx-i2c/imx-i2c-regs.h
rename to zircon/system/dev/i2c/imx-i2c/imx-i2c-regs.h
diff --git a/system/dev/i2c/imx-i2c/imx-i2c.c b/zircon/system/dev/i2c/imx-i2c/imx-i2c.c
similarity index 100%
rename from system/dev/i2c/imx-i2c/imx-i2c.c
rename to zircon/system/dev/i2c/imx-i2c/imx-i2c.c
diff --git a/system/dev/i2c/imx-i2c/imx-i2c.cpp b/zircon/system/dev/i2c/imx-i2c/imx-i2c.cpp
similarity index 100%
rename from system/dev/i2c/imx-i2c/imx-i2c.cpp
rename to zircon/system/dev/i2c/imx-i2c/imx-i2c.cpp
diff --git a/system/dev/i2c/imx-i2c/imx-i2c.h b/zircon/system/dev/i2c/imx-i2c/imx-i2c.h
similarity index 100%
rename from system/dev/i2c/imx-i2c/imx-i2c.h
rename to zircon/system/dev/i2c/imx-i2c/imx-i2c.h
diff --git a/system/dev/i2c/imx-i2c/rules.mk b/zircon/system/dev/i2c/imx-i2c/rules.mk
similarity index 100%
rename from system/dev/i2c/imx-i2c/rules.mk
rename to zircon/system/dev/i2c/imx-i2c/rules.mk
diff --git a/system/dev/i2c/intel-i2c/binding.h b/zircon/system/dev/i2c/intel-i2c/binding.h
similarity index 100%
rename from system/dev/i2c/intel-i2c/binding.h
rename to zircon/system/dev/i2c/intel-i2c/binding.h
diff --git a/system/dev/i2c/intel-i2c/intel-i2c-controller.c b/zircon/system/dev/i2c/intel-i2c/intel-i2c-controller.c
similarity index 100%
rename from system/dev/i2c/intel-i2c/intel-i2c-controller.c
rename to zircon/system/dev/i2c/intel-i2c/intel-i2c-controller.c
diff --git a/system/dev/i2c/intel-i2c/intel-i2c-controller.h b/zircon/system/dev/i2c/intel-i2c/intel-i2c-controller.h
similarity index 100%
rename from system/dev/i2c/intel-i2c/intel-i2c-controller.h
rename to zircon/system/dev/i2c/intel-i2c/intel-i2c-controller.h
diff --git a/system/dev/i2c/intel-i2c/intel-i2c-slave.c b/zircon/system/dev/i2c/intel-i2c/intel-i2c-slave.c
similarity index 100%
rename from system/dev/i2c/intel-i2c/intel-i2c-slave.c
rename to zircon/system/dev/i2c/intel-i2c/intel-i2c-slave.c
diff --git a/system/dev/i2c/intel-i2c/intel-i2c-slave.h b/zircon/system/dev/i2c/intel-i2c/intel-i2c-slave.h
similarity index 100%
rename from system/dev/i2c/intel-i2c/intel-i2c-slave.h
rename to zircon/system/dev/i2c/intel-i2c/intel-i2c-slave.h
diff --git a/system/dev/i2c/intel-i2c/rules.mk b/zircon/system/dev/i2c/intel-i2c/rules.mk
similarity index 100%
rename from system/dev/i2c/intel-i2c/rules.mk
rename to zircon/system/dev/i2c/intel-i2c/rules.mk
diff --git a/system/dev/i2c/mt8167-i2c/bind.c b/zircon/system/dev/i2c/mt8167-i2c/bind.c
similarity index 100%
rename from system/dev/i2c/mt8167-i2c/bind.c
rename to zircon/system/dev/i2c/mt8167-i2c/bind.c
diff --git a/system/dev/i2c/mt8167-i2c/mt8167-i2c-regs.h b/zircon/system/dev/i2c/mt8167-i2c/mt8167-i2c-regs.h
similarity index 100%
rename from system/dev/i2c/mt8167-i2c/mt8167-i2c-regs.h
rename to zircon/system/dev/i2c/mt8167-i2c/mt8167-i2c-regs.h
diff --git a/system/dev/i2c/mt8167-i2c/mt8167-i2c.cpp b/zircon/system/dev/i2c/mt8167-i2c/mt8167-i2c.cpp
similarity index 100%
rename from system/dev/i2c/mt8167-i2c/mt8167-i2c.cpp
rename to zircon/system/dev/i2c/mt8167-i2c/mt8167-i2c.cpp
diff --git a/system/dev/i2c/mt8167-i2c/mt8167-i2c.h b/zircon/system/dev/i2c/mt8167-i2c/mt8167-i2c.h
similarity index 100%
rename from system/dev/i2c/mt8167-i2c/mt8167-i2c.h
rename to zircon/system/dev/i2c/mt8167-i2c/mt8167-i2c.h
diff --git a/system/dev/i2c/mt8167-i2c/rules.mk b/zircon/system/dev/i2c/mt8167-i2c/rules.mk
similarity index 100%
rename from system/dev/i2c/mt8167-i2c/rules.mk
rename to zircon/system/dev/i2c/mt8167-i2c/rules.mk
diff --git a/system/dev/input/bma253/bma253-test.cpp b/zircon/system/dev/input/bma253/bma253-test.cpp
similarity index 100%
rename from system/dev/input/bma253/bma253-test.cpp
rename to zircon/system/dev/input/bma253/bma253-test.cpp
diff --git a/system/dev/input/bma253/bma253.cpp b/zircon/system/dev/input/bma253/bma253.cpp
similarity index 100%
rename from system/dev/input/bma253/bma253.cpp
rename to zircon/system/dev/input/bma253/bma253.cpp
diff --git a/system/dev/input/bma253/bma253.h b/zircon/system/dev/input/bma253/bma253.h
similarity index 100%
rename from system/dev/input/bma253/bma253.h
rename to zircon/system/dev/input/bma253/bma253.h
diff --git a/system/dev/input/bma253/rules.mk b/zircon/system/dev/input/bma253/rules.mk
similarity index 100%
rename from system/dev/input/bma253/rules.mk
rename to zircon/system/dev/input/bma253/rules.mk
diff --git a/system/dev/input/focaltech/focaltech.c b/zircon/system/dev/input/focaltech/focaltech.c
similarity index 100%
rename from system/dev/input/focaltech/focaltech.c
rename to zircon/system/dev/input/focaltech/focaltech.c
diff --git a/system/dev/input/focaltech/ft_device.cpp b/zircon/system/dev/input/focaltech/ft_device.cpp
similarity index 100%
rename from system/dev/input/focaltech/ft_device.cpp
rename to zircon/system/dev/input/focaltech/ft_device.cpp
diff --git a/system/dev/input/focaltech/ft_device.h b/zircon/system/dev/input/focaltech/ft_device.h
similarity index 100%
rename from system/dev/input/focaltech/ft_device.h
rename to zircon/system/dev/input/focaltech/ft_device.h
diff --git a/system/dev/input/focaltech/rules.mk b/zircon/system/dev/input/focaltech/rules.mk
similarity index 100%
rename from system/dev/input/focaltech/rules.mk
rename to zircon/system/dev/input/focaltech/rules.mk
diff --git a/system/dev/input/goodix/gt92xx.cpp b/zircon/system/dev/input/goodix/gt92xx.cpp
similarity index 100%
rename from system/dev/input/goodix/gt92xx.cpp
rename to zircon/system/dev/input/goodix/gt92xx.cpp
diff --git a/system/dev/input/goodix/gt92xx.h b/zircon/system/dev/input/goodix/gt92xx.h
similarity index 100%
rename from system/dev/input/goodix/gt92xx.h
rename to zircon/system/dev/input/goodix/gt92xx.h
diff --git a/system/dev/input/goodix/rules.mk b/zircon/system/dev/input/goodix/rules.mk
similarity index 100%
rename from system/dev/input/goodix/rules.mk
rename to zircon/system/dev/input/goodix/rules.mk
diff --git a/system/dev/input/hid-buttons/bind.c b/zircon/system/dev/input/hid-buttons/bind.c
similarity index 100%
rename from system/dev/input/hid-buttons/bind.c
rename to zircon/system/dev/input/hid-buttons/bind.c
diff --git a/system/dev/input/hid-buttons/hid-buttons.cpp b/zircon/system/dev/input/hid-buttons/hid-buttons.cpp
similarity index 100%
rename from system/dev/input/hid-buttons/hid-buttons.cpp
rename to zircon/system/dev/input/hid-buttons/hid-buttons.cpp
diff --git a/system/dev/input/hid-buttons/hid-buttons.h b/zircon/system/dev/input/hid-buttons/hid-buttons.h
similarity index 100%
rename from system/dev/input/hid-buttons/hid-buttons.h
rename to zircon/system/dev/input/hid-buttons/hid-buttons.h
diff --git a/system/dev/input/hid-buttons/rules.mk b/zircon/system/dev/input/hid-buttons/rules.mk
similarity index 100%
rename from system/dev/input/hid-buttons/rules.mk
rename to zircon/system/dev/input/hid-buttons/rules.mk
diff --git a/system/dev/input/hid/hid-fifo.c b/zircon/system/dev/input/hid/hid-fifo.c
similarity index 100%
rename from system/dev/input/hid/hid-fifo.c
rename to zircon/system/dev/input/hid/hid-fifo.c
diff --git a/system/dev/input/hid/hid-fifo.h b/zircon/system/dev/input/hid/hid-fifo.h
similarity index 100%
rename from system/dev/input/hid/hid-fifo.h
rename to zircon/system/dev/input/hid/hid-fifo.h
diff --git a/system/dev/input/hid/hid-parser-lib.cpp b/zircon/system/dev/input/hid/hid-parser-lib.cpp
similarity index 100%
rename from system/dev/input/hid/hid-parser-lib.cpp
rename to zircon/system/dev/input/hid/hid-parser-lib.cpp
diff --git a/system/dev/input/hid/hid-parser.h b/zircon/system/dev/input/hid/hid-parser.h
similarity index 100%
rename from system/dev/input/hid/hid-parser.h
rename to zircon/system/dev/input/hid/hid-parser.h
diff --git a/system/dev/input/hid/hid.c b/zircon/system/dev/input/hid/hid.c
similarity index 100%
rename from system/dev/input/hid/hid.c
rename to zircon/system/dev/input/hid/hid.c
diff --git a/system/dev/input/hid/rules.mk b/zircon/system/dev/input/hid/rules.mk
similarity index 100%
rename from system/dev/input/hid/rules.mk
rename to zircon/system/dev/input/hid/rules.mk
diff --git a/system/dev/input/hidctl/binding.c b/zircon/system/dev/input/hidctl/binding.c
similarity index 100%
rename from system/dev/input/hidctl/binding.c
rename to zircon/system/dev/input/hidctl/binding.c
diff --git a/system/dev/input/hidctl/hidctl.cpp b/zircon/system/dev/input/hidctl/hidctl.cpp
similarity index 100%
rename from system/dev/input/hidctl/hidctl.cpp
rename to zircon/system/dev/input/hidctl/hidctl.cpp
diff --git a/system/dev/input/hidctl/hidctl.h b/zircon/system/dev/input/hidctl/hidctl.h
similarity index 100%
rename from system/dev/input/hidctl/hidctl.h
rename to zircon/system/dev/input/hidctl/hidctl.h
diff --git a/system/dev/input/hidctl/rules.mk b/zircon/system/dev/input/hidctl/rules.mk
similarity index 100%
rename from system/dev/input/hidctl/rules.mk
rename to zircon/system/dev/input/hidctl/rules.mk
diff --git a/system/dev/input/i2c-hid/MAINTAINERS b/zircon/system/dev/input/i2c-hid/MAINTAINERS
similarity index 100%
rename from system/dev/input/i2c-hid/MAINTAINERS
rename to zircon/system/dev/input/i2c-hid/MAINTAINERS
diff --git a/system/dev/input/i2c-hid/i2c-hid.c b/zircon/system/dev/input/i2c-hid/i2c-hid.c
similarity index 100%
rename from system/dev/input/i2c-hid/i2c-hid.c
rename to zircon/system/dev/input/i2c-hid/i2c-hid.c
diff --git a/system/dev/input/i2c-hid/rules.mk b/zircon/system/dev/input/i2c-hid/rules.mk
similarity index 100%
rename from system/dev/input/i2c-hid/rules.mk
rename to zircon/system/dev/input/i2c-hid/rules.mk
diff --git a/system/dev/input/pc-ps2/i8042.c b/zircon/system/dev/input/pc-ps2/i8042.c
similarity index 100%
rename from system/dev/input/pc-ps2/i8042.c
rename to zircon/system/dev/input/pc-ps2/i8042.c
diff --git a/system/dev/input/pc-ps2/rules.mk b/zircon/system/dev/input/pc-ps2/rules.mk
similarity index 100%
rename from system/dev/input/pc-ps2/rules.mk
rename to zircon/system/dev/input/pc-ps2/rules.mk
diff --git a/system/dev/input/usb-hid/rules.mk b/zircon/system/dev/input/usb-hid/rules.mk
similarity index 100%
rename from system/dev/input/usb-hid/rules.mk
rename to zircon/system/dev/input/usb-hid/rules.mk
diff --git a/system/dev/input/usb-hid/usb-hid.c b/zircon/system/dev/input/usb-hid/usb-hid.c
similarity index 100%
rename from system/dev/input/usb-hid/usb-hid.c
rename to zircon/system/dev/input/usb-hid/usb-hid.c
diff --git a/system/dev/lib/amlogic/a113-clocks.c b/zircon/system/dev/lib/amlogic/a113-clocks.c
similarity index 100%
rename from system/dev/lib/amlogic/a113-clocks.c
rename to zircon/system/dev/lib/amlogic/a113-clocks.c
diff --git a/system/dev/lib/amlogic/aml-pdm-audio.cpp b/zircon/system/dev/lib/amlogic/aml-pdm-audio.cpp
similarity index 100%
rename from system/dev/lib/amlogic/aml-pdm-audio.cpp
rename to zircon/system/dev/lib/amlogic/aml-pdm-audio.cpp
diff --git a/system/dev/lib/amlogic/aml-tdm-audio.cpp b/zircon/system/dev/lib/amlogic/aml-tdm-audio.cpp
similarity index 100%
rename from system/dev/lib/amlogic/aml-tdm-audio.cpp
rename to zircon/system/dev/lib/amlogic/aml-tdm-audio.cpp
diff --git a/system/dev/lib/amlogic/aml-usb-phy-v2.c b/zircon/system/dev/lib/amlogic/aml-usb-phy-v2.c
similarity index 100%
rename from system/dev/lib/amlogic/aml-usb-phy-v2.c
rename to zircon/system/dev/lib/amlogic/aml-usb-phy-v2.c
diff --git a/system/dev/lib/amlogic/include/soc/aml-a113/a113-clocks.h b/zircon/system/dev/lib/amlogic/include/soc/aml-a113/a113-clocks.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-a113/a113-clocks.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-a113/a113-clocks.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-a113/a113-gpio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-a113/a113-gpio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-a113/a113-gpio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-a113/a113-gpio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-a113/a113-hw.h b/zircon/system/dev/lib/amlogic/include/soc/aml-a113/a113-hw.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-a113/a113-hw.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-a113/a113-hw.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-a113/aml-tdm.h b/zircon/system/dev/lib/amlogic/include/soc/aml-a113/aml-tdm.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-a113/aml-tdm.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-a113/aml-tdm.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-audio-regs.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-audio-regs.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-audio-regs.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-audio-regs.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-gpu.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-gpu.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-gpu.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-gpu.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-pdm-audio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-pdm-audio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-pdm-audio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-pdm-audio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-rawnand.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-rawnand.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-rawnand.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-rawnand.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-sd-emmc.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-sd-emmc.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-sd-emmc.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-sd-emmc.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-tdm-audio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-tdm-audio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-tdm-audio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-tdm-audio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-thermal.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-thermal.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-thermal.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-thermal.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2-regs.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2-regs.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2-regs.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2-regs.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy-v2.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy.h b/zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-common/aml-usb-phy.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-meson/axg-clk.h b/zircon/system/dev/lib/amlogic/include/soc/aml-meson/axg-clk.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-meson/axg-clk.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-meson/axg-clk.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-meson/g12a-clk.h b/zircon/system/dev/lib/amlogic/include/soc/aml-meson/g12a-clk.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-meson/g12a-clk.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-meson/g12a-clk.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-meson/g12b-clk.h b/zircon/system/dev/lib/amlogic/include/soc/aml-meson/g12b-clk.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-meson/g12b-clk.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-meson/g12b-clk.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-meson/gxl-clk.h b/zircon/system/dev/lib/amlogic/include/soc/aml-meson/gxl-clk.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-meson/gxl-clk.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-meson/gxl-clk.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s905/s905-gpio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s905/s905-gpio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s905/s905-gpio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s905/s905-gpio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s905d2/aml-mali.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/aml-mali.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s905d2/aml-mali.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/aml-mali.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-gpio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-gpio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-gpio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-gpio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hiu.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hiu.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hiu.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hiu.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hw.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hw.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hw.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s905d2/s905d2-hw.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s905x/s905x-gpio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s905x/s905x-gpio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s905x/s905x-gpio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s905x/s905x-gpio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s912/s912-audio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s912/s912-audio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s912/s912-audio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s912/s912-audio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s912/s912-gpio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s912/s912-gpio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s912/s912-gpio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s912/s912-gpio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-s912/s912-hw.h b/zircon/system/dev/lib/amlogic/include/soc/aml-s912/s912-hw.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-s912/s912-hw.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-s912/s912-hw.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-t931/t931-gpio.h b/zircon/system/dev/lib/amlogic/include/soc/aml-t931/t931-gpio.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-t931/t931-gpio.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-t931/t931-gpio.h
diff --git a/system/dev/lib/amlogic/include/soc/aml-t931/t931-hw.h b/zircon/system/dev/lib/amlogic/include/soc/aml-t931/t931-hw.h
similarity index 100%
rename from system/dev/lib/amlogic/include/soc/aml-t931/t931-hw.h
rename to zircon/system/dev/lib/amlogic/include/soc/aml-t931/t931-hw.h
diff --git a/system/dev/lib/amlogic/rules.mk b/zircon/system/dev/lib/amlogic/rules.mk
similarity index 100%
rename from system/dev/lib/amlogic/rules.mk
rename to zircon/system/dev/lib/amlogic/rules.mk
diff --git a/system/dev/lib/amlogic/s905d2-hiu.c b/zircon/system/dev/lib/amlogic/s905d2-hiu.c
similarity index 100%
rename from system/dev/lib/amlogic/s905d2-hiu.c
rename to zircon/system/dev/lib/amlogic/s905d2-hiu.c
diff --git a/system/dev/lib/amlogic/s905d2-mali.c b/zircon/system/dev/lib/amlogic/s905d2-mali.c
similarity index 100%
rename from system/dev/lib/amlogic/s905d2-mali.c
rename to zircon/system/dev/lib/amlogic/s905d2-mali.c
diff --git a/system/dev/lib/amlogic/s905d2-pll-rates.c b/zircon/system/dev/lib/amlogic/s905d2-pll-rates.c
similarity index 100%
rename from system/dev/lib/amlogic/s905d2-pll-rates.c
rename to zircon/system/dev/lib/amlogic/s905d2-pll-rates.c
diff --git a/system/dev/lib/broadcom/include/wifi/wifi-config.h b/zircon/system/dev/lib/broadcom/include/wifi/wifi-config.h
similarity index 100%
rename from system/dev/lib/broadcom/include/wifi/wifi-config.h
rename to zircon/system/dev/lib/broadcom/include/wifi/wifi-config.h
diff --git a/system/dev/lib/broadcom/rules.mk b/zircon/system/dev/lib/broadcom/rules.mk
similarity index 100%
rename from system/dev/lib/broadcom/rules.mk
rename to zircon/system/dev/lib/broadcom/rules.mk
diff --git a/system/dev/lib/fake-bti/README.md b/zircon/system/dev/lib/fake-bti/README.md
similarity index 100%
rename from system/dev/lib/fake-bti/README.md
rename to zircon/system/dev/lib/fake-bti/README.md
diff --git a/system/dev/lib/fake-bti/fake-bti.cpp b/zircon/system/dev/lib/fake-bti/fake-bti.cpp
similarity index 100%
rename from system/dev/lib/fake-bti/fake-bti.cpp
rename to zircon/system/dev/lib/fake-bti/fake-bti.cpp
diff --git a/system/dev/lib/fake-bti/include/lib/fake-bti/bti.h b/zircon/system/dev/lib/fake-bti/include/lib/fake-bti/bti.h
similarity index 100%
rename from system/dev/lib/fake-bti/include/lib/fake-bti/bti.h
rename to zircon/system/dev/lib/fake-bti/include/lib/fake-bti/bti.h
diff --git a/system/dev/lib/fake-bti/rules.mk b/zircon/system/dev/lib/fake-bti/rules.mk
similarity index 100%
rename from system/dev/lib/fake-bti/rules.mk
rename to zircon/system/dev/lib/fake-bti/rules.mk
diff --git a/system/dev/lib/fake_ddk/fake_ddk.cpp b/zircon/system/dev/lib/fake_ddk/fake_ddk.cpp
similarity index 100%
rename from system/dev/lib/fake_ddk/fake_ddk.cpp
rename to zircon/system/dev/lib/fake_ddk/fake_ddk.cpp
diff --git a/system/dev/lib/fake_ddk/include/lib/fake_ddk/fake_ddk.h b/zircon/system/dev/lib/fake_ddk/include/lib/fake_ddk/fake_ddk.h
similarity index 100%
rename from system/dev/lib/fake_ddk/include/lib/fake_ddk/fake_ddk.h
rename to zircon/system/dev/lib/fake_ddk/include/lib/fake_ddk/fake_ddk.h
diff --git a/system/dev/lib/fake_ddk/rules.mk b/zircon/system/dev/lib/fake_ddk/rules.mk
similarity index 100%
rename from system/dev/lib/fake_ddk/rules.mk
rename to zircon/system/dev/lib/fake_ddk/rules.mk
diff --git a/system/dev/lib/focaltech/include/lib/focaltech/focaltech.h b/zircon/system/dev/lib/focaltech/include/lib/focaltech/focaltech.h
similarity index 100%
rename from system/dev/lib/focaltech/include/lib/focaltech/focaltech.h
rename to zircon/system/dev/lib/focaltech/include/lib/focaltech/focaltech.h
diff --git a/system/dev/lib/focaltech/rules.mk b/zircon/system/dev/lib/focaltech/rules.mk
similarity index 100%
rename from system/dev/lib/focaltech/rules.mk
rename to zircon/system/dev/lib/focaltech/rules.mk
diff --git a/system/dev/lib/hi3660/hi3660-dsi.c b/zircon/system/dev/lib/hi3660/hi3660-dsi.c
similarity index 100%
rename from system/dev/lib/hi3660/hi3660-dsi.c
rename to zircon/system/dev/lib/hi3660/hi3660-dsi.c
diff --git a/system/dev/lib/hi3660/hi3660-gpios.c b/zircon/system/dev/lib/hi3660/hi3660-gpios.c
similarity index 100%
rename from system/dev/lib/hi3660/hi3660-gpios.c
rename to zircon/system/dev/lib/hi3660/hi3660-gpios.c
diff --git a/system/dev/lib/hi3660/hi3660-i2c.c b/zircon/system/dev/lib/hi3660/hi3660-i2c.c
similarity index 100%
rename from system/dev/lib/hi3660/hi3660-i2c.c
rename to zircon/system/dev/lib/hi3660/hi3660-i2c.c
diff --git a/system/dev/lib/hi3660/hi3660-ufs.c b/zircon/system/dev/lib/hi3660/hi3660-ufs.c
similarity index 100%
rename from system/dev/lib/hi3660/hi3660-ufs.c
rename to zircon/system/dev/lib/hi3660/hi3660-ufs.c
diff --git a/system/dev/lib/hi3660/hi3660-usb.c b/zircon/system/dev/lib/hi3660/hi3660-usb.c
similarity index 100%
rename from system/dev/lib/hi3660/hi3660-usb.c
rename to zircon/system/dev/lib/hi3660/hi3660-usb.c
diff --git a/system/dev/lib/hi3660/hi3660.c b/zircon/system/dev/lib/hi3660/hi3660.c
similarity index 100%
rename from system/dev/lib/hi3660/hi3660.c
rename to zircon/system/dev/lib/hi3660/hi3660.c
diff --git a/system/dev/lib/hi3660/include/soc/hi3660/hi3660-hw.h b/zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660-hw.h
similarity index 100%
rename from system/dev/lib/hi3660/include/soc/hi3660/hi3660-hw.h
rename to zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660-hw.h
diff --git a/system/dev/lib/hi3660/include/soc/hi3660/hi3660-pinmux.h b/zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660-pinmux.h
similarity index 100%
rename from system/dev/lib/hi3660/include/soc/hi3660/hi3660-pinmux.h
rename to zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660-pinmux.h
diff --git a/system/dev/lib/hi3660/include/soc/hi3660/hi3660-regs.h b/zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660-regs.h
similarity index 100%
rename from system/dev/lib/hi3660/include/soc/hi3660/hi3660-regs.h
rename to zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660-regs.h
diff --git a/system/dev/lib/hi3660/include/soc/hi3660/hi3660.h b/zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660.h
similarity index 100%
rename from system/dev/lib/hi3660/include/soc/hi3660/hi3660.h
rename to zircon/system/dev/lib/hi3660/include/soc/hi3660/hi3660.h
diff --git a/system/dev/lib/hi3660/rules.mk b/zircon/system/dev/lib/hi3660/rules.mk
similarity index 100%
rename from system/dev/lib/hi3660/rules.mk
rename to zircon/system/dev/lib/hi3660/rules.mk
diff --git a/system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-hw.h b/zircon/system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-hw.h
similarity index 100%
rename from system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-hw.h
rename to zircon/system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-hw.h
diff --git a/system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-iomux.h b/zircon/system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-iomux.h
similarity index 100%
rename from system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-iomux.h
rename to zircon/system/dev/lib/imx8m/include/soc/imx8m-mini/imx8m-mini-iomux.h
diff --git a/system/dev/lib/imx8m/include/soc/imx8m/imx8m-gpio.h b/zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-gpio.h
similarity index 100%
rename from system/dev/lib/imx8m/include/soc/imx8m/imx8m-gpio.h
rename to zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-gpio.h
diff --git a/system/dev/lib/imx8m/include/soc/imx8m/imx8m-hw.h b/zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-hw.h
similarity index 100%
rename from system/dev/lib/imx8m/include/soc/imx8m/imx8m-hw.h
rename to zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-hw.h
diff --git a/system/dev/lib/imx8m/include/soc/imx8m/imx8m-iomux.h b/zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-iomux.h
similarity index 100%
rename from system/dev/lib/imx8m/include/soc/imx8m/imx8m-iomux.h
rename to zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-iomux.h
diff --git a/system/dev/lib/imx8m/include/soc/imx8m/imx8m-sip.h b/zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-sip.h
similarity index 100%
rename from system/dev/lib/imx8m/include/soc/imx8m/imx8m-sip.h
rename to zircon/system/dev/lib/imx8m/include/soc/imx8m/imx8m-sip.h
diff --git a/system/dev/lib/imx8m/rules.mk b/zircon/system/dev/lib/imx8m/rules.mk
similarity index 100%
rename from system/dev/lib/imx8m/rules.mk
rename to zircon/system/dev/lib/imx8m/rules.mk
diff --git a/system/dev/lib/mock-hidbus-ifc/include/lib/mock-hidbus-ifc/mock-hidbus-ifc.h b/zircon/system/dev/lib/mock-hidbus-ifc/include/lib/mock-hidbus-ifc/mock-hidbus-ifc.h
similarity index 100%
rename from system/dev/lib/mock-hidbus-ifc/include/lib/mock-hidbus-ifc/mock-hidbus-ifc.h
rename to zircon/system/dev/lib/mock-hidbus-ifc/include/lib/mock-hidbus-ifc/mock-hidbus-ifc.h
diff --git a/system/dev/lib/mock-hidbus-ifc/rules.mk b/zircon/system/dev/lib/mock-hidbus-ifc/rules.mk
similarity index 100%
rename from system/dev/lib/mock-hidbus-ifc/rules.mk
rename to zircon/system/dev/lib/mock-hidbus-ifc/rules.mk
diff --git a/system/dev/lib/mock-i2c/include/lib/mock-i2c/mock-i2c.h b/zircon/system/dev/lib/mock-i2c/include/lib/mock-i2c/mock-i2c.h
similarity index 100%
rename from system/dev/lib/mock-i2c/include/lib/mock-i2c/mock-i2c.h
rename to zircon/system/dev/lib/mock-i2c/include/lib/mock-i2c/mock-i2c.h
diff --git a/system/dev/lib/mock-i2c/mock-i2c.cpp b/zircon/system/dev/lib/mock-i2c/mock-i2c.cpp
similarity index 100%
rename from system/dev/lib/mock-i2c/mock-i2c.cpp
rename to zircon/system/dev/lib/mock-i2c/mock-i2c.cpp
diff --git a/system/dev/lib/mock-i2c/rules.mk b/zircon/system/dev/lib/mock-i2c/rules.mk
similarity index 100%
rename from system/dev/lib/mock-i2c/rules.mk
rename to zircon/system/dev/lib/mock-i2c/rules.mk
diff --git a/system/dev/lib/mock-mmio-reg/include/mock-mmio-reg/mock-mmio-reg.h b/zircon/system/dev/lib/mock-mmio-reg/include/mock-mmio-reg/mock-mmio-reg.h
similarity index 100%
rename from system/dev/lib/mock-mmio-reg/include/mock-mmio-reg/mock-mmio-reg.h
rename to zircon/system/dev/lib/mock-mmio-reg/include/mock-mmio-reg/mock-mmio-reg.h
diff --git a/system/dev/lib/mock-mmio-reg/mock-mmio-reg.cpp b/zircon/system/dev/lib/mock-mmio-reg/mock-mmio-reg.cpp
similarity index 100%
rename from system/dev/lib/mock-mmio-reg/mock-mmio-reg.cpp
rename to zircon/system/dev/lib/mock-mmio-reg/mock-mmio-reg.cpp
diff --git a/system/dev/lib/mock-mmio-reg/rules.mk b/zircon/system/dev/lib/mock-mmio-reg/rules.mk
similarity index 100%
rename from system/dev/lib/mock-mmio-reg/rules.mk
rename to zircon/system/dev/lib/mock-mmio-reg/rules.mk
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-in.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-in.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-in.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-in.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-out.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-out.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-out.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-out.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-regs.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-regs.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-regs.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-audio-regs.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk-regs.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk-regs.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk-regs.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk-regs.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-clk.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-gpio.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-gpio.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-gpio.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-gpio.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-hw.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-hw.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-hw.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-hw.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-sdmmc.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-sdmmc.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-sdmmc.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-sdmmc.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb-phy.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb-phy.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb-phy.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb-phy.h
diff --git a/system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb.h b/zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb.h
similarity index 100%
rename from system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb.h
rename to zircon/system/dev/lib/mt8167/include/soc/mt8167/mt8167-usb.h
diff --git a/system/dev/lib/mt8167/mt8167-audio-in.cpp b/zircon/system/dev/lib/mt8167/mt8167-audio-in.cpp
similarity index 100%
rename from system/dev/lib/mt8167/mt8167-audio-in.cpp
rename to zircon/system/dev/lib/mt8167/mt8167-audio-in.cpp
diff --git a/system/dev/lib/mt8167/mt8167-audio-out.cpp b/zircon/system/dev/lib/mt8167/mt8167-audio-out.cpp
similarity index 100%
rename from system/dev/lib/mt8167/mt8167-audio-out.cpp
rename to zircon/system/dev/lib/mt8167/mt8167-audio-out.cpp
diff --git a/system/dev/lib/mt8167/rules.mk b/zircon/system/dev/lib/mt8167/rules.mk
similarity index 100%
rename from system/dev/lib/mt8167/rules.mk
rename to zircon/system/dev/lib/mt8167/rules.mk
diff --git a/system/dev/lib/operation/dummy.cpp b/zircon/system/dev/lib/operation/dummy.cpp
similarity index 100%
rename from system/dev/lib/operation/dummy.cpp
rename to zircon/system/dev/lib/operation/dummy.cpp
diff --git a/system/dev/lib/operation/include/lib/operation/block.h b/zircon/system/dev/lib/operation/include/lib/operation/block.h
similarity index 100%
rename from system/dev/lib/operation/include/lib/operation/block.h
rename to zircon/system/dev/lib/operation/include/lib/operation/block.h
diff --git a/system/dev/lib/operation/include/lib/operation/nand.h b/zircon/system/dev/lib/operation/include/lib/operation/nand.h
similarity index 100%
rename from system/dev/lib/operation/include/lib/operation/nand.h
rename to zircon/system/dev/lib/operation/include/lib/operation/nand.h
diff --git a/system/dev/lib/operation/include/lib/operation/operation.h b/zircon/system/dev/lib/operation/include/lib/operation/operation.h
similarity index 100%
rename from system/dev/lib/operation/include/lib/operation/operation.h
rename to zircon/system/dev/lib/operation/include/lib/operation/operation.h
diff --git a/system/dev/lib/operation/rules.mk b/zircon/system/dev/lib/operation/rules.mk
similarity index 100%
rename from system/dev/lib/operation/rules.mk
rename to zircon/system/dev/lib/operation/rules.mk
diff --git a/system/dev/lib/usb/include/usb/request-cpp.h b/zircon/system/dev/lib/usb/include/usb/request-cpp.h
similarity index 100%
rename from system/dev/lib/usb/include/usb/request-cpp.h
rename to zircon/system/dev/lib/usb/include/usb/request-cpp.h
diff --git a/system/dev/lib/usb/include/usb/usb-request.h b/zircon/system/dev/lib/usb/include/usb/usb-request.h
similarity index 100%
rename from system/dev/lib/usb/include/usb/usb-request.h
rename to zircon/system/dev/lib/usb/include/usb/usb-request.h
diff --git a/system/dev/lib/usb/include/usb/usb.h b/zircon/system/dev/lib/usb/include/usb/usb.h
similarity index 100%
rename from system/dev/lib/usb/include/usb/usb.h
rename to zircon/system/dev/lib/usb/include/usb/usb.h
diff --git a/system/dev/lib/usb/rules.mk b/zircon/system/dev/lib/usb/rules.mk
similarity index 100%
rename from system/dev/lib/usb/rules.mk
rename to zircon/system/dev/lib/usb/rules.mk
diff --git a/system/dev/lib/usb/tests/main.c b/zircon/system/dev/lib/usb/tests/main.c
similarity index 100%
rename from system/dev/lib/usb/tests/main.c
rename to zircon/system/dev/lib/usb/tests/main.c
diff --git a/system/dev/lib/usb/tests/usb-wrapper-tests.cpp b/zircon/system/dev/lib/usb/tests/usb-wrapper-tests.cpp
similarity index 100%
rename from system/dev/lib/usb/tests/usb-wrapper-tests.cpp
rename to zircon/system/dev/lib/usb/tests/usb-wrapper-tests.cpp
diff --git a/system/dev/lib/usb/usb-request.c b/zircon/system/dev/lib/usb/usb-request.c
similarity index 100%
rename from system/dev/lib/usb/usb-request.c
rename to zircon/system/dev/lib/usb/usb-request.c
diff --git a/system/dev/lib/usb/usb-wrapper.cpp b/zircon/system/dev/lib/usb/usb-wrapper.cpp
similarity index 100%
rename from system/dev/lib/usb/usb-wrapper.cpp
rename to zircon/system/dev/lib/usb/usb-wrapper.cpp
diff --git a/system/dev/lib/usb/usb.c b/zircon/system/dev/lib/usb/usb.c
similarity index 100%
rename from system/dev/lib/usb/usb.c
rename to zircon/system/dev/lib/usb/usb.c
diff --git a/system/dev/light-sensor/ams-light/rules.mk b/zircon/system/dev/light-sensor/ams-light/rules.mk
similarity index 100%
rename from system/dev/light-sensor/ams-light/rules.mk
rename to zircon/system/dev/light-sensor/ams-light/rules.mk
diff --git a/system/dev/light-sensor/ams-light/tcs3400-regs.h b/zircon/system/dev/light-sensor/ams-light/tcs3400-regs.h
similarity index 100%
rename from system/dev/light-sensor/ams-light/tcs3400-regs.h
rename to zircon/system/dev/light-sensor/ams-light/tcs3400-regs.h
diff --git a/system/dev/light-sensor/ams-light/tcs3400.c b/zircon/system/dev/light-sensor/ams-light/tcs3400.c
similarity index 100%
rename from system/dev/light-sensor/ams-light/tcs3400.c
rename to zircon/system/dev/light-sensor/ams-light/tcs3400.c
diff --git a/system/dev/light-sensor/ams-light/tcs3400.cpp b/zircon/system/dev/light-sensor/ams-light/tcs3400.cpp
similarity index 100%
rename from system/dev/light-sensor/ams-light/tcs3400.cpp
rename to zircon/system/dev/light-sensor/ams-light/tcs3400.cpp
diff --git a/system/dev/light-sensor/ams-light/tcs3400.h b/zircon/system/dev/light-sensor/ams-light/tcs3400.h
similarity index 100%
rename from system/dev/light-sensor/ams-light/tcs3400.h
rename to zircon/system/dev/light-sensor/ams-light/tcs3400.h
diff --git a/system/dev/light-sensor/lite-on/binding.c b/zircon/system/dev/light-sensor/lite-on/binding.c
similarity index 100%
rename from system/dev/light-sensor/lite-on/binding.c
rename to zircon/system/dev/light-sensor/lite-on/binding.c
diff --git a/system/dev/light-sensor/lite-on/ltr-578als-test.cpp b/zircon/system/dev/light-sensor/lite-on/ltr-578als-test.cpp
similarity index 100%
rename from system/dev/light-sensor/lite-on/ltr-578als-test.cpp
rename to zircon/system/dev/light-sensor/lite-on/ltr-578als-test.cpp
diff --git a/system/dev/light-sensor/lite-on/ltr-578als.cpp b/zircon/system/dev/light-sensor/lite-on/ltr-578als.cpp
similarity index 100%
rename from system/dev/light-sensor/lite-on/ltr-578als.cpp
rename to zircon/system/dev/light-sensor/lite-on/ltr-578als.cpp
diff --git a/system/dev/light-sensor/lite-on/ltr-578als.h b/zircon/system/dev/light-sensor/lite-on/ltr-578als.h
similarity index 100%
rename from system/dev/light-sensor/lite-on/ltr-578als.h
rename to zircon/system/dev/light-sensor/lite-on/ltr-578als.h
diff --git a/system/dev/light-sensor/lite-on/rules.mk b/zircon/system/dev/light-sensor/lite-on/rules.mk
similarity index 100%
rename from system/dev/light-sensor/lite-on/rules.mk
rename to zircon/system/dev/light-sensor/lite-on/rules.mk
diff --git a/system/dev/misc/builtin/null.c b/zircon/system/dev/misc/builtin/null.c
similarity index 100%
rename from system/dev/misc/builtin/null.c
rename to zircon/system/dev/misc/builtin/null.c
diff --git a/system/dev/misc/builtin/root.c b/zircon/system/dev/misc/builtin/root.c
similarity index 100%
rename from system/dev/misc/builtin/root.c
rename to zircon/system/dev/misc/builtin/root.c
diff --git a/system/dev/misc/builtin/rules.mk b/zircon/system/dev/misc/builtin/rules.mk
similarity index 100%
rename from system/dev/misc/builtin/rules.mk
rename to zircon/system/dev/misc/builtin/rules.mk
diff --git a/system/dev/misc/builtin/zero.c b/zircon/system/dev/misc/builtin/zero.c
similarity index 100%
rename from system/dev/misc/builtin/zero.c
rename to zircon/system/dev/misc/builtin/zero.c
diff --git a/system/dev/misc/console/console.c b/zircon/system/dev/misc/console/console.c
similarity index 100%
rename from system/dev/misc/console/console.c
rename to zircon/system/dev/misc/console/console.c
diff --git a/system/dev/misc/console/rules.mk b/zircon/system/dev/misc/console/rules.mk
similarity index 100%
rename from system/dev/misc/console/rules.mk
rename to zircon/system/dev/misc/console/rules.mk
diff --git a/system/dev/misc/cpu-trace/MAINTAINERS b/zircon/system/dev/misc/cpu-trace/MAINTAINERS
similarity index 100%
rename from system/dev/misc/cpu-trace/MAINTAINERS
rename to zircon/system/dev/misc/cpu-trace/MAINTAINERS
diff --git a/system/dev/misc/cpu-trace/README.md b/zircon/system/dev/misc/cpu-trace/README.md
similarity index 100%
rename from system/dev/misc/cpu-trace/README.md
rename to zircon/system/dev/misc/cpu-trace/README.md
diff --git a/system/dev/misc/cpu-trace/cpu-trace-private.h b/zircon/system/dev/misc/cpu-trace/cpu-trace-private.h
similarity index 100%
rename from system/dev/misc/cpu-trace/cpu-trace-private.h
rename to zircon/system/dev/misc/cpu-trace/cpu-trace-private.h
diff --git a/system/dev/misc/cpu-trace/cpu-trace.cpp b/zircon/system/dev/misc/cpu-trace/cpu-trace.cpp
similarity index 100%
rename from system/dev/misc/cpu-trace/cpu-trace.cpp
rename to zircon/system/dev/misc/cpu-trace/cpu-trace.cpp
diff --git a/system/dev/misc/cpu-trace/intel-pm.cpp b/zircon/system/dev/misc/cpu-trace/intel-pm.cpp
similarity index 100%
rename from system/dev/misc/cpu-trace/intel-pm.cpp
rename to zircon/system/dev/misc/cpu-trace/intel-pm.cpp
diff --git a/system/dev/misc/cpu-trace/intel-pm.md b/zircon/system/dev/misc/cpu-trace/intel-pm.md
similarity index 100%
rename from system/dev/misc/cpu-trace/intel-pm.md
rename to zircon/system/dev/misc/cpu-trace/intel-pm.md
diff --git a/system/dev/misc/cpu-trace/intel-pt.cpp b/zircon/system/dev/misc/cpu-trace/intel-pt.cpp
similarity index 100%
rename from system/dev/misc/cpu-trace/intel-pt.cpp
rename to zircon/system/dev/misc/cpu-trace/intel-pt.cpp
diff --git a/system/dev/misc/cpu-trace/intel-pt.md b/zircon/system/dev/misc/cpu-trace/intel-pt.md
similarity index 100%
rename from system/dev/misc/cpu-trace/intel-pt.md
rename to zircon/system/dev/misc/cpu-trace/intel-pt.md
diff --git a/system/dev/misc/cpu-trace/rules.mk b/zircon/system/dev/misc/cpu-trace/rules.mk
similarity index 100%
rename from system/dev/misc/cpu-trace/rules.mk
rename to zircon/system/dev/misc/cpu-trace/rules.mk
diff --git a/system/dev/misc/ktrace/ktrace.c b/zircon/system/dev/misc/ktrace/ktrace.c
similarity index 100%
rename from system/dev/misc/ktrace/ktrace.c
rename to zircon/system/dev/misc/ktrace/ktrace.c
diff --git a/system/dev/misc/ktrace/rules.mk b/zircon/system/dev/misc/ktrace/rules.mk
similarity index 100%
rename from system/dev/misc/ktrace/rules.mk
rename to zircon/system/dev/misc/ktrace/rules.mk
diff --git a/system/dev/misc/pty/pty-core.cpp b/zircon/system/dev/misc/pty/pty-core.cpp
similarity index 100%
rename from system/dev/misc/pty/pty-core.cpp
rename to zircon/system/dev/misc/pty/pty-core.cpp
diff --git a/system/dev/misc/pty/pty-core.h b/zircon/system/dev/misc/pty/pty-core.h
similarity index 100%
rename from system/dev/misc/pty/pty-core.h
rename to zircon/system/dev/misc/pty/pty-core.h
diff --git a/system/dev/misc/pty/pty-driver.cpp b/zircon/system/dev/misc/pty/pty-driver.cpp
similarity index 100%
rename from system/dev/misc/pty/pty-driver.cpp
rename to zircon/system/dev/misc/pty/pty-driver.cpp
diff --git a/system/dev/misc/pty/pty-fifo.cpp b/zircon/system/dev/misc/pty/pty-fifo.cpp
similarity index 100%
rename from system/dev/misc/pty/pty-fifo.cpp
rename to zircon/system/dev/misc/pty/pty-fifo.cpp
diff --git a/system/dev/misc/pty/pty-fifo.h b/zircon/system/dev/misc/pty/pty-fifo.h
similarity index 100%
rename from system/dev/misc/pty/pty-fifo.h
rename to zircon/system/dev/misc/pty/pty-fifo.h
diff --git a/system/dev/misc/pty/rules.mk b/zircon/system/dev/misc/pty/rules.mk
similarity index 100%
rename from system/dev/misc/pty/rules.mk
rename to zircon/system/dev/misc/pty/rules.mk
diff --git a/system/dev/misc/sysinfo/rules.mk b/zircon/system/dev/misc/sysinfo/rules.mk
similarity index 100%
rename from system/dev/misc/sysinfo/rules.mk
rename to zircon/system/dev/misc/sysinfo/rules.mk
diff --git a/system/dev/misc/sysinfo/sysinfo.c b/zircon/system/dev/misc/sysinfo/sysinfo.c
similarity index 100%
rename from system/dev/misc/sysinfo/sysinfo.c
rename to zircon/system/dev/misc/sysinfo/sysinfo.c
diff --git a/system/dev/misc/test/rules.mk b/zircon/system/dev/misc/test/rules.mk
similarity index 100%
rename from system/dev/misc/test/rules.mk
rename to zircon/system/dev/misc/test/rules.mk
diff --git a/system/dev/misc/test/test.cpp b/zircon/system/dev/misc/test/test.cpp
similarity index 100%
rename from system/dev/misc/test/test.cpp
rename to zircon/system/dev/misc/test/test.cpp
diff --git a/system/dev/misc/tpm/bind.c b/zircon/system/dev/misc/tpm/bind.c
similarity index 100%
rename from system/dev/misc/tpm/bind.c
rename to zircon/system/dev/misc/tpm/bind.c
diff --git a/system/dev/misc/tpm/i2c-cr50.cpp b/zircon/system/dev/misc/tpm/i2c-cr50.cpp
similarity index 100%
rename from system/dev/misc/tpm/i2c-cr50.cpp
rename to zircon/system/dev/misc/tpm/i2c-cr50.cpp
diff --git a/system/dev/misc/tpm/i2c-cr50.h b/zircon/system/dev/misc/tpm/i2c-cr50.h
similarity index 100%
rename from system/dev/misc/tpm/i2c-cr50.h
rename to zircon/system/dev/misc/tpm/i2c-cr50.h
diff --git a/system/dev/misc/tpm/rules.mk b/zircon/system/dev/misc/tpm/rules.mk
similarity index 100%
rename from system/dev/misc/tpm/rules.mk
rename to zircon/system/dev/misc/tpm/rules.mk
diff --git a/system/dev/misc/tpm/tpm-commands.cpp b/zircon/system/dev/misc/tpm/tpm-commands.cpp
similarity index 100%
rename from system/dev/misc/tpm/tpm-commands.cpp
rename to zircon/system/dev/misc/tpm/tpm-commands.cpp
diff --git a/system/dev/misc/tpm/tpm-commands.h b/zircon/system/dev/misc/tpm/tpm-commands.h
similarity index 100%
rename from system/dev/misc/tpm/tpm-commands.h
rename to zircon/system/dev/misc/tpm/tpm-commands.h
diff --git a/system/dev/misc/tpm/tpm-proto.cpp b/zircon/system/dev/misc/tpm/tpm-proto.cpp
similarity index 100%
rename from system/dev/misc/tpm/tpm-proto.cpp
rename to zircon/system/dev/misc/tpm/tpm-proto.cpp
diff --git a/system/dev/misc/tpm/tpm.cpp b/zircon/system/dev/misc/tpm/tpm.cpp
similarity index 100%
rename from system/dev/misc/tpm/tpm.cpp
rename to zircon/system/dev/misc/tpm/tpm.cpp
diff --git a/system/dev/misc/tpm/tpm.h b/zircon/system/dev/misc/tpm/tpm.h
similarity index 100%
rename from system/dev/misc/tpm/tpm.h
rename to zircon/system/dev/misc/tpm/tpm.h
diff --git a/system/dev/mlg/usb-harriet/rules.mk b/zircon/system/dev/mlg/usb-harriet/rules.mk
similarity index 100%
rename from system/dev/mlg/usb-harriet/rules.mk
rename to zircon/system/dev/mlg/usb-harriet/rules.mk
diff --git a/system/dev/mlg/usb-harriet/usb-harriet.cpp b/zircon/system/dev/mlg/usb-harriet/usb-harriet.cpp
similarity index 100%
rename from system/dev/mlg/usb-harriet/usb-harriet.cpp
rename to zircon/system/dev/mlg/usb-harriet/usb-harriet.cpp
diff --git a/system/dev/mlg/usb-harriet/usb-harriet.h b/zircon/system/dev/mlg/usb-harriet/usb-harriet.h
similarity index 100%
rename from system/dev/mlg/usb-harriet/usb-harriet.h
rename to zircon/system/dev/mlg/usb-harriet/usb-harriet.h
diff --git a/system/dev/nand/aml-rawnand/README b/zircon/system/dev/nand/aml-rawnand/README
similarity index 100%
rename from system/dev/nand/aml-rawnand/README
rename to zircon/system/dev/nand/aml-rawnand/README
diff --git a/system/dev/nand/aml-rawnand/aml-rawnand.c b/zircon/system/dev/nand/aml-rawnand/aml-rawnand.c
similarity index 100%
rename from system/dev/nand/aml-rawnand/aml-rawnand.c
rename to zircon/system/dev/nand/aml-rawnand/aml-rawnand.c
diff --git a/system/dev/nand/aml-rawnand/aml-rawnand.h b/zircon/system/dev/nand/aml-rawnand/aml-rawnand.h
similarity index 100%
rename from system/dev/nand/aml-rawnand/aml-rawnand.h
rename to zircon/system/dev/nand/aml-rawnand/aml-rawnand.h
diff --git a/system/dev/nand/aml-rawnand/onfi.c b/zircon/system/dev/nand/aml-rawnand/onfi.c
similarity index 100%
rename from system/dev/nand/aml-rawnand/onfi.c
rename to zircon/system/dev/nand/aml-rawnand/onfi.c
diff --git a/system/dev/nand/aml-rawnand/onfi.h b/zircon/system/dev/nand/aml-rawnand/onfi.h
similarity index 100%
rename from system/dev/nand/aml-rawnand/onfi.h
rename to zircon/system/dev/nand/aml-rawnand/onfi.h
diff --git a/system/dev/nand/aml-rawnand/rules.mk b/zircon/system/dev/nand/aml-rawnand/rules.mk
similarity index 100%
rename from system/dev/nand/aml-rawnand/rules.mk
rename to zircon/system/dev/nand/aml-rawnand/rules.mk
diff --git a/system/dev/nand/broker/bind.c b/zircon/system/dev/nand/broker/bind.c
similarity index 100%
rename from system/dev/nand/broker/bind.c
rename to zircon/system/dev/nand/broker/bind.c
diff --git a/system/dev/nand/broker/broker.cpp b/zircon/system/dev/nand/broker/broker.cpp
similarity index 100%
rename from system/dev/nand/broker/broker.cpp
rename to zircon/system/dev/nand/broker/broker.cpp
diff --git a/system/dev/nand/broker/broker.h b/zircon/system/dev/nand/broker/broker.h
similarity index 100%
rename from system/dev/nand/broker/broker.h
rename to zircon/system/dev/nand/broker/broker.h
diff --git a/system/dev/nand/broker/rules.mk b/zircon/system/dev/nand/broker/rules.mk
similarity index 100%
rename from system/dev/nand/broker/rules.mk
rename to zircon/system/dev/nand/broker/rules.mk
diff --git a/system/dev/nand/broker/test/broker-test.cpp b/zircon/system/dev/nand/broker/test/broker-test.cpp
similarity index 100%
rename from system/dev/nand/broker/test/broker-test.cpp
rename to zircon/system/dev/nand/broker/test/broker-test.cpp
diff --git a/system/dev/nand/broker/test/main.cpp b/zircon/system/dev/nand/broker/test/main.cpp
similarity index 100%
rename from system/dev/nand/broker/test/main.cpp
rename to zircon/system/dev/nand/broker/test/main.cpp
diff --git a/system/dev/nand/broker/test/nandpart-main.cpp b/zircon/system/dev/nand/broker/test/nandpart-main.cpp
similarity index 100%
rename from system/dev/nand/broker/test/nandpart-main.cpp
rename to zircon/system/dev/nand/broker/test/nandpart-main.cpp
diff --git a/system/dev/nand/broker/test/parent.cpp b/zircon/system/dev/nand/broker/test/parent.cpp
similarity index 100%
rename from system/dev/nand/broker/test/parent.cpp
rename to zircon/system/dev/nand/broker/test/parent.cpp
diff --git a/system/dev/nand/broker/test/parent.h b/zircon/system/dev/nand/broker/test/parent.h
similarity index 100%
rename from system/dev/nand/broker/test/parent.h
rename to zircon/system/dev/nand/broker/test/parent.h
diff --git a/system/dev/nand/nand/nand.cpp b/zircon/system/dev/nand/nand/nand.cpp
similarity index 100%
rename from system/dev/nand/nand/nand.cpp
rename to zircon/system/dev/nand/nand/nand.cpp
diff --git a/system/dev/nand/nand/nand.h b/zircon/system/dev/nand/nand/nand.h
similarity index 100%
rename from system/dev/nand/nand/nand.h
rename to zircon/system/dev/nand/nand/nand.h
diff --git a/system/dev/nand/nand/rules.mk b/zircon/system/dev/nand/nand/rules.mk
similarity index 100%
rename from system/dev/nand/nand/rules.mk
rename to zircon/system/dev/nand/nand/rules.mk
diff --git a/system/dev/nand/nand/test/main.cpp b/zircon/system/dev/nand/nand/test/main.cpp
similarity index 100%
rename from system/dev/nand/nand/test/main.cpp
rename to zircon/system/dev/nand/nand/test/main.cpp
diff --git a/system/dev/nand/nand/test/nand-test.cpp b/zircon/system/dev/nand/nand/test/nand-test.cpp
similarity index 100%
rename from system/dev/nand/nand/test/nand-test.cpp
rename to zircon/system/dev/nand/nand/test/nand-test.cpp
diff --git a/system/dev/nand/nandpart/aml-bad-block.cpp b/zircon/system/dev/nand/nandpart/aml-bad-block.cpp
similarity index 100%
rename from system/dev/nand/nandpart/aml-bad-block.cpp
rename to zircon/system/dev/nand/nandpart/aml-bad-block.cpp
diff --git a/system/dev/nand/nandpart/aml-bad-block.h b/zircon/system/dev/nand/nandpart/aml-bad-block.h
similarity index 100%
rename from system/dev/nand/nandpart/aml-bad-block.h
rename to zircon/system/dev/nand/nandpart/aml-bad-block.h
diff --git a/system/dev/nand/nandpart/bad-block.cpp b/zircon/system/dev/nand/nandpart/bad-block.cpp
similarity index 100%
rename from system/dev/nand/nandpart/bad-block.cpp
rename to zircon/system/dev/nand/nandpart/bad-block.cpp
diff --git a/system/dev/nand/nandpart/bad-block.h b/zircon/system/dev/nand/nandpart/bad-block.h
similarity index 100%
rename from system/dev/nand/nandpart/bad-block.h
rename to zircon/system/dev/nand/nandpart/bad-block.h
diff --git a/system/dev/nand/nandpart/binding.c b/zircon/system/dev/nand/nandpart/binding.c
similarity index 100%
rename from system/dev/nand/nandpart/binding.c
rename to zircon/system/dev/nand/nandpart/binding.c
diff --git a/system/dev/nand/nandpart/nandpart-utils.cpp b/zircon/system/dev/nand/nandpart/nandpart-utils.cpp
similarity index 100%
rename from system/dev/nand/nandpart/nandpart-utils.cpp
rename to zircon/system/dev/nand/nandpart/nandpart-utils.cpp
diff --git a/system/dev/nand/nandpart/nandpart-utils.h b/zircon/system/dev/nand/nandpart/nandpart-utils.h
similarity index 100%
rename from system/dev/nand/nandpart/nandpart-utils.h
rename to zircon/system/dev/nand/nandpart/nandpart-utils.h
diff --git a/system/dev/nand/nandpart/nandpart.cpp b/zircon/system/dev/nand/nandpart/nandpart.cpp
similarity index 100%
rename from system/dev/nand/nandpart/nandpart.cpp
rename to zircon/system/dev/nand/nandpart/nandpart.cpp
diff --git a/system/dev/nand/nandpart/nandpart.h b/zircon/system/dev/nand/nandpart/nandpart.h
similarity index 100%
rename from system/dev/nand/nandpart/nandpart.h
rename to zircon/system/dev/nand/nandpart/nandpart.h
diff --git a/system/dev/nand/nandpart/rules.mk b/zircon/system/dev/nand/nandpart/rules.mk
similarity index 100%
rename from system/dev/nand/nandpart/rules.mk
rename to zircon/system/dev/nand/nandpart/rules.mk
diff --git a/system/dev/nand/nandpart/test/aml-bad-block-test.cpp b/zircon/system/dev/nand/nandpart/test/aml-bad-block-test.cpp
similarity index 100%
rename from system/dev/nand/nandpart/test/aml-bad-block-test.cpp
rename to zircon/system/dev/nand/nandpart/test/aml-bad-block-test.cpp
diff --git a/system/dev/nand/nandpart/test/main.cpp b/zircon/system/dev/nand/nandpart/test/main.cpp
similarity index 100%
rename from system/dev/nand/nandpart/test/main.cpp
rename to zircon/system/dev/nand/nandpart/test/main.cpp
diff --git a/system/dev/nand/nandpart/test/nandpart-utils-test.cpp b/zircon/system/dev/nand/nandpart/test/nandpart-utils-test.cpp
similarity index 100%
rename from system/dev/nand/nandpart/test/nandpart-utils-test.cpp
rename to zircon/system/dev/nand/nandpart/test/nandpart-utils-test.cpp
diff --git a/system/dev/nand/ram-nand/ram-nand-ctl.cpp b/zircon/system/dev/nand/ram-nand/ram-nand-ctl.cpp
similarity index 100%
rename from system/dev/nand/ram-nand/ram-nand-ctl.cpp
rename to zircon/system/dev/nand/ram-nand/ram-nand-ctl.cpp
diff --git a/system/dev/nand/ram-nand/ram-nand-ctl.h b/zircon/system/dev/nand/ram-nand/ram-nand-ctl.h
similarity index 100%
rename from system/dev/nand/ram-nand/ram-nand-ctl.h
rename to zircon/system/dev/nand/ram-nand/ram-nand-ctl.h
diff --git a/system/dev/nand/ram-nand/ram-nand.c b/zircon/system/dev/nand/ram-nand/ram-nand.c
similarity index 100%
rename from system/dev/nand/ram-nand/ram-nand.c
rename to zircon/system/dev/nand/ram-nand/ram-nand.c
diff --git a/system/dev/nand/ram-nand/ram-nand.cpp b/zircon/system/dev/nand/ram-nand/ram-nand.cpp
similarity index 100%
rename from system/dev/nand/ram-nand/ram-nand.cpp
rename to zircon/system/dev/nand/ram-nand/ram-nand.cpp
diff --git a/system/dev/nand/ram-nand/ram-nand.h b/zircon/system/dev/nand/ram-nand/ram-nand.h
similarity index 100%
rename from system/dev/nand/ram-nand/ram-nand.h
rename to zircon/system/dev/nand/ram-nand/ram-nand.h
diff --git a/system/dev/nand/ram-nand/rules.mk b/zircon/system/dev/nand/ram-nand/rules.mk
similarity index 100%
rename from system/dev/nand/ram-nand/rules.mk
rename to zircon/system/dev/nand/ram-nand/rules.mk
diff --git a/system/dev/nand/ram-nand/test/main.cpp b/zircon/system/dev/nand/ram-nand/test/main.cpp
similarity index 100%
rename from system/dev/nand/ram-nand/test/main.cpp
rename to zircon/system/dev/nand/ram-nand/test/main.cpp
diff --git a/system/dev/nand/ram-nand/test/ram-nand-ctl.cpp b/zircon/system/dev/nand/ram-nand/test/ram-nand-ctl.cpp
similarity index 100%
rename from system/dev/nand/ram-nand/test/ram-nand-ctl.cpp
rename to zircon/system/dev/nand/ram-nand/test/ram-nand-ctl.cpp
diff --git a/system/dev/nand/ram-nand/test/ram-nand.cpp b/zircon/system/dev/nand/ram-nand/test/ram-nand.cpp
similarity index 100%
rename from system/dev/nand/ram-nand/test/ram-nand.cpp
rename to zircon/system/dev/nand/ram-nand/test/ram-nand.cpp
diff --git a/system/dev/nand/skip-block/binding.c b/zircon/system/dev/nand/skip-block/binding.c
similarity index 100%
rename from system/dev/nand/skip-block/binding.c
rename to zircon/system/dev/nand/skip-block/binding.c
diff --git a/system/dev/nand/skip-block/logical-to-physical-map.cpp b/zircon/system/dev/nand/skip-block/logical-to-physical-map.cpp
similarity index 100%
rename from system/dev/nand/skip-block/logical-to-physical-map.cpp
rename to zircon/system/dev/nand/skip-block/logical-to-physical-map.cpp
diff --git a/system/dev/nand/skip-block/logical-to-physical-map.h b/zircon/system/dev/nand/skip-block/logical-to-physical-map.h
similarity index 100%
rename from system/dev/nand/skip-block/logical-to-physical-map.h
rename to zircon/system/dev/nand/skip-block/logical-to-physical-map.h
diff --git a/system/dev/nand/skip-block/rules.mk b/zircon/system/dev/nand/skip-block/rules.mk
similarity index 100%
rename from system/dev/nand/skip-block/rules.mk
rename to zircon/system/dev/nand/skip-block/rules.mk
diff --git a/system/dev/nand/skip-block/skip-block.cpp b/zircon/system/dev/nand/skip-block/skip-block.cpp
similarity index 100%
rename from system/dev/nand/skip-block/skip-block.cpp
rename to zircon/system/dev/nand/skip-block/skip-block.cpp
diff --git a/system/dev/nand/skip-block/skip-block.h b/zircon/system/dev/nand/skip-block/skip-block.h
similarity index 100%
rename from system/dev/nand/skip-block/skip-block.h
rename to zircon/system/dev/nand/skip-block/skip-block.h
diff --git a/system/dev/nand/skip-block/test/logical-to-physical-map-test.cpp b/zircon/system/dev/nand/skip-block/test/logical-to-physical-map-test.cpp
similarity index 100%
rename from system/dev/nand/skip-block/test/logical-to-physical-map-test.cpp
rename to zircon/system/dev/nand/skip-block/test/logical-to-physical-map-test.cpp
diff --git a/system/dev/nand/skip-block/test/main.cpp b/zircon/system/dev/nand/skip-block/test/main.cpp
similarity index 100%
rename from system/dev/nand/skip-block/test/main.cpp
rename to zircon/system/dev/nand/skip-block/test/main.cpp
diff --git a/system/dev/pci/amlogic-pcie/aml-pcie-clk.cpp b/zircon/system/dev/pci/amlogic-pcie/aml-pcie-clk.cpp
similarity index 100%
rename from system/dev/pci/amlogic-pcie/aml-pcie-clk.cpp
rename to zircon/system/dev/pci/amlogic-pcie/aml-pcie-clk.cpp
diff --git a/system/dev/pci/amlogic-pcie/aml-pcie-clk.h b/zircon/system/dev/pci/amlogic-pcie/aml-pcie-clk.h
similarity index 100%
rename from system/dev/pci/amlogic-pcie/aml-pcie-clk.h
rename to zircon/system/dev/pci/amlogic-pcie/aml-pcie-clk.h
diff --git a/system/dev/pci/amlogic-pcie/aml-pcie-device.cpp b/zircon/system/dev/pci/amlogic-pcie/aml-pcie-device.cpp
similarity index 100%
rename from system/dev/pci/amlogic-pcie/aml-pcie-device.cpp
rename to zircon/system/dev/pci/amlogic-pcie/aml-pcie-device.cpp
diff --git a/system/dev/pci/amlogic-pcie/aml-pcie-device.h b/zircon/system/dev/pci/amlogic-pcie/aml-pcie-device.h
similarity index 100%
rename from system/dev/pci/amlogic-pcie/aml-pcie-device.h
rename to zircon/system/dev/pci/amlogic-pcie/aml-pcie-device.h
diff --git a/system/dev/pci/amlogic-pcie/aml-pcie-regs.h b/zircon/system/dev/pci/amlogic-pcie/aml-pcie-regs.h
similarity index 100%
rename from system/dev/pci/amlogic-pcie/aml-pcie-regs.h
rename to zircon/system/dev/pci/amlogic-pcie/aml-pcie-regs.h
diff --git a/system/dev/pci/amlogic-pcie/aml-pcie.cpp b/zircon/system/dev/pci/amlogic-pcie/aml-pcie.cpp
similarity index 100%
rename from system/dev/pci/amlogic-pcie/aml-pcie.cpp
rename to zircon/system/dev/pci/amlogic-pcie/aml-pcie.cpp
diff --git a/system/dev/pci/amlogic-pcie/aml-pcie.h b/zircon/system/dev/pci/amlogic-pcie/aml-pcie.h
similarity index 100%
rename from system/dev/pci/amlogic-pcie/aml-pcie.h
rename to zircon/system/dev/pci/amlogic-pcie/aml-pcie.h
diff --git a/system/dev/pci/amlogic-pcie/rules.mk b/zircon/system/dev/pci/amlogic-pcie/rules.mk
similarity index 100%
rename from system/dev/pci/amlogic-pcie/rules.mk
rename to zircon/system/dev/pci/amlogic-pcie/rules.mk
diff --git a/system/dev/pci/designware/dw-pcie-hw.h b/zircon/system/dev/pci/designware/dw-pcie-hw.h
similarity index 100%
rename from system/dev/pci/designware/dw-pcie-hw.h
rename to zircon/system/dev/pci/designware/dw-pcie-hw.h
diff --git a/system/dev/pci/designware/dw-pcie.cpp b/zircon/system/dev/pci/designware/dw-pcie.cpp
similarity index 100%
rename from system/dev/pci/designware/dw-pcie.cpp
rename to zircon/system/dev/pci/designware/dw-pcie.cpp
diff --git a/system/dev/pci/designware/include/dev/pci/designware/atu-cfg.h b/zircon/system/dev/pci/designware/include/dev/pci/designware/atu-cfg.h
similarity index 100%
rename from system/dev/pci/designware/include/dev/pci/designware/atu-cfg.h
rename to zircon/system/dev/pci/designware/include/dev/pci/designware/atu-cfg.h
diff --git a/system/dev/pci/designware/include/dev/pci/designware/dw-pcie.h b/zircon/system/dev/pci/designware/include/dev/pci/designware/dw-pcie.h
similarity index 100%
rename from system/dev/pci/designware/include/dev/pci/designware/dw-pcie.h
rename to zircon/system/dev/pci/designware/include/dev/pci/designware/dw-pcie.h
diff --git a/system/dev/pci/designware/rules.mk b/zircon/system/dev/pci/designware/rules.mk
similarity index 100%
rename from system/dev/pci/designware/rules.mk
rename to zircon/system/dev/pci/designware/rules.mk
diff --git a/system/dev/rtc/fallback/fallback-rtc.c b/zircon/system/dev/rtc/fallback/fallback-rtc.c
similarity index 100%
rename from system/dev/rtc/fallback/fallback-rtc.c
rename to zircon/system/dev/rtc/fallback/fallback-rtc.c
diff --git a/system/dev/rtc/fallback/rtc-impl.cpp b/zircon/system/dev/rtc/fallback/rtc-impl.cpp
similarity index 100%
rename from system/dev/rtc/fallback/rtc-impl.cpp
rename to zircon/system/dev/rtc/fallback/rtc-impl.cpp
diff --git a/system/dev/rtc/fallback/rules.mk b/zircon/system/dev/rtc/fallback/rules.mk
similarity index 100%
rename from system/dev/rtc/fallback/rules.mk
rename to zircon/system/dev/rtc/fallback/rules.mk
diff --git a/system/dev/rtc/intel-rtc/intel-rtc.c b/zircon/system/dev/rtc/intel-rtc/intel-rtc.c
similarity index 100%
rename from system/dev/rtc/intel-rtc/intel-rtc.c
rename to zircon/system/dev/rtc/intel-rtc/intel-rtc.c
diff --git a/system/dev/rtc/intel-rtc/rules.mk b/zircon/system/dev/rtc/intel-rtc/rules.mk
similarity index 100%
rename from system/dev/rtc/intel-rtc/rules.mk
rename to zircon/system/dev/rtc/intel-rtc/rules.mk
diff --git a/system/dev/rtc/nxp/pcf8563-rtc.c b/zircon/system/dev/rtc/nxp/pcf8563-rtc.c
similarity index 100%
rename from system/dev/rtc/nxp/pcf8563-rtc.c
rename to zircon/system/dev/rtc/nxp/pcf8563-rtc.c
diff --git a/system/dev/rtc/nxp/rules.mk b/zircon/system/dev/rtc/nxp/rules.mk
similarity index 100%
rename from system/dev/rtc/nxp/rules.mk
rename to zircon/system/dev/rtc/nxp/rules.mk
diff --git a/system/dev/rtc/pl031-rtc/pl031-rtc.c b/zircon/system/dev/rtc/pl031-rtc/pl031-rtc.c
similarity index 100%
rename from system/dev/rtc/pl031-rtc/pl031-rtc.c
rename to zircon/system/dev/rtc/pl031-rtc/pl031-rtc.c
diff --git a/system/dev/rtc/pl031-rtc/rules.mk b/zircon/system/dev/rtc/pl031-rtc/rules.mk
similarity index 100%
rename from system/dev/rtc/pl031-rtc/rules.mk
rename to zircon/system/dev/rtc/pl031-rtc/rules.mk
diff --git a/system/dev/sample/fifo/demo-fifo.c b/zircon/system/dev/sample/fifo/demo-fifo.c
similarity index 100%
rename from system/dev/sample/fifo/demo-fifo.c
rename to zircon/system/dev/sample/fifo/demo-fifo.c
diff --git a/system/dev/sample/fifo/rules.mk b/zircon/system/dev/sample/fifo/rules.mk
similarity index 100%
rename from system/dev/sample/fifo/rules.mk
rename to zircon/system/dev/sample/fifo/rules.mk
diff --git a/system/dev/scpi/aml-scpi-s912/aml-mailbox-hw.h b/zircon/system/dev/scpi/aml-scpi-s912/aml-mailbox-hw.h
similarity index 100%
rename from system/dev/scpi/aml-scpi-s912/aml-mailbox-hw.h
rename to zircon/system/dev/scpi/aml-scpi-s912/aml-mailbox-hw.h
diff --git a/system/dev/scpi/aml-scpi-s912/aml-mailbox.cpp b/zircon/system/dev/scpi/aml-scpi-s912/aml-mailbox.cpp
similarity index 100%
rename from system/dev/scpi/aml-scpi-s912/aml-mailbox.cpp
rename to zircon/system/dev/scpi/aml-scpi-s912/aml-mailbox.cpp
diff --git a/system/dev/scpi/aml-scpi-s912/aml-mailbox.h b/zircon/system/dev/scpi/aml-scpi-s912/aml-mailbox.h
similarity index 100%
rename from system/dev/scpi/aml-scpi-s912/aml-mailbox.h
rename to zircon/system/dev/scpi/aml-scpi-s912/aml-mailbox.h
diff --git a/system/dev/scpi/aml-scpi-s912/aml-scpi.cpp b/zircon/system/dev/scpi/aml-scpi-s912/aml-scpi.cpp
similarity index 100%
rename from system/dev/scpi/aml-scpi-s912/aml-scpi.cpp
rename to zircon/system/dev/scpi/aml-scpi-s912/aml-scpi.cpp
diff --git a/system/dev/scpi/aml-scpi-s912/aml-scpi.h b/zircon/system/dev/scpi/aml-scpi-s912/aml-scpi.h
similarity index 100%
rename from system/dev/scpi/aml-scpi-s912/aml-scpi.h
rename to zircon/system/dev/scpi/aml-scpi-s912/aml-scpi.h
diff --git a/system/dev/scpi/aml-scpi-s912/rules.mk b/zircon/system/dev/scpi/aml-scpi-s912/rules.mk
similarity index 100%
rename from system/dev/scpi/aml-scpi-s912/rules.mk
rename to zircon/system/dev/scpi/aml-scpi-s912/rules.mk
diff --git a/system/dev/serial/aml-uart/aml-uart.cpp b/zircon/system/dev/serial/aml-uart/aml-uart.cpp
similarity index 100%
rename from system/dev/serial/aml-uart/aml-uart.cpp
rename to zircon/system/dev/serial/aml-uart/aml-uart.cpp
diff --git a/system/dev/serial/aml-uart/aml-uart.h b/zircon/system/dev/serial/aml-uart/aml-uart.h
similarity index 100%
rename from system/dev/serial/aml-uart/aml-uart.h
rename to zircon/system/dev/serial/aml-uart/aml-uart.h
diff --git a/system/dev/serial/aml-uart/binding.c b/zircon/system/dev/serial/aml-uart/binding.c
similarity index 100%
rename from system/dev/serial/aml-uart/binding.c
rename to zircon/system/dev/serial/aml-uart/binding.c
diff --git a/system/dev/serial/aml-uart/registers.h b/zircon/system/dev/serial/aml-uart/registers.h
similarity index 100%
rename from system/dev/serial/aml-uart/registers.h
rename to zircon/system/dev/serial/aml-uart/registers.h
diff --git a/system/dev/serial/aml-uart/rules.mk b/zircon/system/dev/serial/aml-uart/rules.mk
similarity index 100%
rename from system/dev/serial/aml-uart/rules.mk
rename to zircon/system/dev/serial/aml-uart/rules.mk
diff --git a/system/dev/serial/ftdi/ftdi.c b/zircon/system/dev/serial/ftdi/ftdi.c
similarity index 100%
rename from system/dev/serial/ftdi/ftdi.c
rename to zircon/system/dev/serial/ftdi/ftdi.c
diff --git a/system/dev/serial/ftdi/ftdi.h b/zircon/system/dev/serial/ftdi/ftdi.h
similarity index 100%
rename from system/dev/serial/ftdi/ftdi.h
rename to zircon/system/dev/serial/ftdi/ftdi.h
diff --git a/system/dev/serial/ftdi/rules.mk b/zircon/system/dev/serial/ftdi/rules.mk
similarity index 100%
rename from system/dev/serial/ftdi/rules.mk
rename to zircon/system/dev/serial/ftdi/rules.mk
diff --git a/system/dev/serial/intel-serialio/dma/dma.c b/zircon/system/dev/serial/intel-serialio/dma/dma.c
similarity index 100%
rename from system/dev/serial/intel-serialio/dma/dma.c
rename to zircon/system/dev/serial/intel-serialio/dma/dma.c
diff --git a/system/dev/serial/intel-serialio/intel-serialio-include/intel-serialio/serialio.h b/zircon/system/dev/serial/intel-serialio/intel-serialio-include/intel-serialio/serialio.h
similarity index 100%
rename from system/dev/serial/intel-serialio/intel-serialio-include/intel-serialio/serialio.h
rename to zircon/system/dev/serial/intel-serialio/intel-serialio-include/intel-serialio/serialio.h
diff --git a/system/dev/serial/intel-serialio/rules.mk b/zircon/system/dev/serial/intel-serialio/rules.mk
similarity index 100%
rename from system/dev/serial/intel-serialio/rules.mk
rename to zircon/system/dev/serial/intel-serialio/rules.mk
diff --git a/system/dev/serial/intel-serialio/sdio/sdio.c b/zircon/system/dev/serial/intel-serialio/sdio/sdio.c
similarity index 100%
rename from system/dev/serial/intel-serialio/sdio/sdio.c
rename to zircon/system/dev/serial/intel-serialio/sdio/sdio.c
diff --git a/system/dev/serial/intel-serialio/serialio.c b/zircon/system/dev/serial/intel-serialio/serialio.c
similarity index 100%
rename from system/dev/serial/intel-serialio/serialio.c
rename to zircon/system/dev/serial/intel-serialio/serialio.c
diff --git a/system/dev/serial/intel-serialio/spi/spi.c b/zircon/system/dev/serial/intel-serialio/spi/spi.c
similarity index 100%
rename from system/dev/serial/intel-serialio/spi/spi.c
rename to zircon/system/dev/serial/intel-serialio/spi/spi.c
diff --git a/system/dev/serial/intel-serialio/uart/uart.c b/zircon/system/dev/serial/intel-serialio/uart/uart.c
similarity index 100%
rename from system/dev/serial/intel-serialio/uart/uart.c
rename to zircon/system/dev/serial/intel-serialio/uart/uart.c
diff --git a/system/dev/serial/serial/rules.mk b/zircon/system/dev/serial/serial/rules.mk
similarity index 100%
rename from system/dev/serial/serial/rules.mk
rename to zircon/system/dev/serial/serial/rules.mk
diff --git a/system/dev/serial/serial/serial.c b/zircon/system/dev/serial/serial/serial.c
similarity index 100%
rename from system/dev/serial/serial/serial.c
rename to zircon/system/dev/serial/serial/serial.c
diff --git a/system/dev/sysmem/sysmem/README.md b/zircon/system/dev/sysmem/sysmem/README.md
similarity index 100%
rename from system/dev/sysmem/sysmem/README.md
rename to zircon/system/dev/sysmem/sysmem/README.md
diff --git a/system/dev/sysmem/sysmem/allocator.cpp b/zircon/system/dev/sysmem/sysmem/allocator.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/allocator.cpp
rename to zircon/system/dev/sysmem/sysmem/allocator.cpp
diff --git a/system/dev/sysmem/sysmem/allocator.h b/zircon/system/dev/sysmem/sysmem/allocator.h
similarity index 100%
rename from system/dev/sysmem/sysmem/allocator.h
rename to zircon/system/dev/sysmem/sysmem/allocator.h
diff --git a/system/dev/sysmem/sysmem/amlogic_memory_allocator.cpp b/zircon/system/dev/sysmem/sysmem/amlogic_memory_allocator.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/amlogic_memory_allocator.cpp
rename to zircon/system/dev/sysmem/sysmem/amlogic_memory_allocator.cpp
diff --git a/system/dev/sysmem/sysmem/amlogic_memory_allocator.h b/zircon/system/dev/sysmem/sysmem/amlogic_memory_allocator.h
similarity index 100%
rename from system/dev/sysmem/sysmem/amlogic_memory_allocator.h
rename to zircon/system/dev/sysmem/sysmem/amlogic_memory_allocator.h
diff --git a/system/dev/sysmem/sysmem/binding.cpp b/zircon/system/dev/sysmem/sysmem/binding.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/binding.cpp
rename to zircon/system/dev/sysmem/sysmem/binding.cpp
diff --git a/system/dev/sysmem/sysmem/buffer_collection.cpp b/zircon/system/dev/sysmem/sysmem/buffer_collection.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/buffer_collection.cpp
rename to zircon/system/dev/sysmem/sysmem/buffer_collection.cpp
diff --git a/system/dev/sysmem/sysmem/buffer_collection.h b/zircon/system/dev/sysmem/sysmem/buffer_collection.h
similarity index 100%
rename from system/dev/sysmem/sysmem/buffer_collection.h
rename to zircon/system/dev/sysmem/sysmem/buffer_collection.h
diff --git a/system/dev/sysmem/sysmem/buffer_collection_token.cpp b/zircon/system/dev/sysmem/sysmem/buffer_collection_token.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/buffer_collection_token.cpp
rename to zircon/system/dev/sysmem/sysmem/buffer_collection_token.cpp
diff --git a/system/dev/sysmem/sysmem/buffer_collection_token.h b/zircon/system/dev/sysmem/sysmem/buffer_collection_token.h
similarity index 100%
rename from system/dev/sysmem/sysmem/buffer_collection_token.h
rename to zircon/system/dev/sysmem/sysmem/buffer_collection_token.h
diff --git a/system/dev/sysmem/sysmem/device.cpp b/zircon/system/dev/sysmem/sysmem/device.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/device.cpp
rename to zircon/system/dev/sysmem/sysmem/device.cpp
diff --git a/system/dev/sysmem/sysmem/device.h b/zircon/system/dev/sysmem/sysmem/device.h
similarity index 100%
rename from system/dev/sysmem/sysmem/device.h
rename to zircon/system/dev/sysmem/sysmem/device.h
diff --git a/system/dev/sysmem/sysmem/driver.cpp b/zircon/system/dev/sysmem/sysmem/driver.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/driver.cpp
rename to zircon/system/dev/sysmem/sysmem/driver.cpp
diff --git a/system/dev/sysmem/sysmem/driver.h b/zircon/system/dev/sysmem/sysmem/driver.h
similarity index 100%
rename from system/dev/sysmem/sysmem/driver.h
rename to zircon/system/dev/sysmem/sysmem/driver.h
diff --git a/system/dev/sysmem/sysmem/koid_util.cpp b/zircon/system/dev/sysmem/sysmem/koid_util.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/koid_util.cpp
rename to zircon/system/dev/sysmem/sysmem/koid_util.cpp
diff --git a/system/dev/sysmem/sysmem/koid_util.h b/zircon/system/dev/sysmem/sysmem/koid_util.h
similarity index 100%
rename from system/dev/sysmem/sysmem/koid_util.h
rename to zircon/system/dev/sysmem/sysmem/koid_util.h
diff --git a/system/dev/sysmem/sysmem/logging.cpp b/zircon/system/dev/sysmem/sysmem/logging.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/logging.cpp
rename to zircon/system/dev/sysmem/sysmem/logging.cpp
diff --git a/system/dev/sysmem/sysmem/logging.h b/zircon/system/dev/sysmem/sysmem/logging.h
similarity index 100%
rename from system/dev/sysmem/sysmem/logging.h
rename to zircon/system/dev/sysmem/sysmem/logging.h
diff --git a/system/dev/sysmem/sysmem/logical_buffer_collection.cpp b/zircon/system/dev/sysmem/sysmem/logical_buffer_collection.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/logical_buffer_collection.cpp
rename to zircon/system/dev/sysmem/sysmem/logical_buffer_collection.cpp
diff --git a/system/dev/sysmem/sysmem/logical_buffer_collection.h b/zircon/system/dev/sysmem/sysmem/logical_buffer_collection.h
similarity index 100%
rename from system/dev/sysmem/sysmem/logical_buffer_collection.h
rename to zircon/system/dev/sysmem/sysmem/logical_buffer_collection.h
diff --git a/system/dev/sysmem/sysmem/macros.h b/zircon/system/dev/sysmem/sysmem/macros.h
similarity index 100%
rename from system/dev/sysmem/sysmem/macros.h
rename to zircon/system/dev/sysmem/sysmem/macros.h
diff --git a/system/dev/sysmem/sysmem/protected_memory_allocator.h b/zircon/system/dev/sysmem/sysmem/protected_memory_allocator.h
similarity index 100%
rename from system/dev/sysmem/sysmem/protected_memory_allocator.h
rename to zircon/system/dev/sysmem/sysmem/protected_memory_allocator.h
diff --git a/system/dev/sysmem/sysmem/rules.mk b/zircon/system/dev/sysmem/sysmem/rules.mk
similarity index 100%
rename from system/dev/sysmem/sysmem/rules.mk
rename to zircon/system/dev/sysmem/sysmem/rules.mk
diff --git a/system/dev/sysmem/sysmem/sysmem-proxy-client.c b/zircon/system/dev/sysmem/sysmem/sysmem-proxy-client.c
similarity index 100%
rename from system/dev/sysmem/sysmem/sysmem-proxy-client.c
rename to zircon/system/dev/sysmem/sysmem/sysmem-proxy-client.c
diff --git a/system/dev/sysmem/sysmem/sysmem-proxy.h b/zircon/system/dev/sysmem/sysmem/sysmem-proxy.h
similarity index 100%
rename from system/dev/sysmem/sysmem/sysmem-proxy.h
rename to zircon/system/dev/sysmem/sysmem/sysmem-proxy.h
diff --git a/system/dev/sysmem/sysmem/usage_pixel_format_cost.cpp b/zircon/system/dev/sysmem/sysmem/usage_pixel_format_cost.cpp
similarity index 100%
rename from system/dev/sysmem/sysmem/usage_pixel_format_cost.cpp
rename to zircon/system/dev/sysmem/sysmem/usage_pixel_format_cost.cpp
diff --git a/system/dev/sysmem/sysmem/usage_pixel_format_cost.h b/zircon/system/dev/sysmem/sysmem/usage_pixel_format_cost.h
similarity index 100%
rename from system/dev/sysmem/sysmem/usage_pixel_format_cost.h
rename to zircon/system/dev/sysmem/sysmem/usage_pixel_format_cost.h
diff --git a/system/dev/tee/optee/binding.c b/zircon/system/dev/tee/optee/binding.c
similarity index 100%
rename from system/dev/tee/optee/binding.c
rename to zircon/system/dev/tee/optee/binding.c
diff --git a/system/dev/tee/optee/optee-client.cpp b/zircon/system/dev/tee/optee/optee-client.cpp
similarity index 100%
rename from system/dev/tee/optee/optee-client.cpp
rename to zircon/system/dev/tee/optee/optee-client.cpp
diff --git a/system/dev/tee/optee/optee-client.h b/zircon/system/dev/tee/optee/optee-client.h
similarity index 100%
rename from system/dev/tee/optee/optee-client.h
rename to zircon/system/dev/tee/optee/optee-client.h
diff --git a/system/dev/tee/optee/optee-controller.cpp b/zircon/system/dev/tee/optee/optee-controller.cpp
similarity index 100%
rename from system/dev/tee/optee/optee-controller.cpp
rename to zircon/system/dev/tee/optee/optee-controller.cpp
diff --git a/system/dev/tee/optee/optee-controller.h b/zircon/system/dev/tee/optee/optee-controller.h
similarity index 100%
rename from system/dev/tee/optee/optee-controller.h
rename to zircon/system/dev/tee/optee/optee-controller.h
diff --git a/system/dev/tee/optee/optee-message.cpp b/zircon/system/dev/tee/optee/optee-message.cpp
similarity index 100%
rename from system/dev/tee/optee/optee-message.cpp
rename to zircon/system/dev/tee/optee/optee-message.cpp
diff --git a/system/dev/tee/optee/optee-message.h b/zircon/system/dev/tee/optee/optee-message.h
similarity index 100%
rename from system/dev/tee/optee/optee-message.h
rename to zircon/system/dev/tee/optee/optee-message.h
diff --git a/system/dev/tee/optee/optee-smc.h b/zircon/system/dev/tee/optee/optee-smc.h
similarity index 100%
rename from system/dev/tee/optee/optee-smc.h
rename to zircon/system/dev/tee/optee/optee-smc.h
diff --git a/system/dev/tee/optee/rules.mk b/zircon/system/dev/tee/optee/rules.mk
similarity index 100%
rename from system/dev/tee/optee/rules.mk
rename to zircon/system/dev/tee/optee/rules.mk
diff --git a/system/dev/tee/optee/shared-memory.cpp b/zircon/system/dev/tee/optee/shared-memory.cpp
similarity index 100%
rename from system/dev/tee/optee/shared-memory.cpp
rename to zircon/system/dev/tee/optee/shared-memory.cpp
diff --git a/system/dev/tee/optee/shared-memory.h b/zircon/system/dev/tee/optee/shared-memory.h
similarity index 100%
rename from system/dev/tee/optee/shared-memory.h
rename to zircon/system/dev/tee/optee/shared-memory.h
diff --git a/system/dev/tee/optee/tee-smc.h b/zircon/system/dev/tee/optee/tee-smc.h
similarity index 100%
rename from system/dev/tee/optee/tee-smc.h
rename to zircon/system/dev/tee/optee/tee-smc.h
diff --git a/system/dev/tee/optee/util.cpp b/zircon/system/dev/tee/optee/util.cpp
similarity index 100%
rename from system/dev/tee/optee/util.cpp
rename to zircon/system/dev/tee/optee/util.cpp
diff --git a/system/dev/tee/optee/util.h b/zircon/system/dev/tee/optee/util.h
similarity index 100%
rename from system/dev/tee/optee/util.h
rename to zircon/system/dev/tee/optee/util.h
diff --git a/system/dev/test/ddk-test/ddk-test-binding.c b/zircon/system/dev/test/ddk-test/ddk-test-binding.c
similarity index 100%
rename from system/dev/test/ddk-test/ddk-test-binding.c
rename to zircon/system/dev/test/ddk-test/ddk-test-binding.c
diff --git a/system/dev/test/ddk-test/ddk-test.c b/zircon/system/dev/test/ddk-test/ddk-test.c
similarity index 100%
rename from system/dev/test/ddk-test/ddk-test.c
rename to zircon/system/dev/test/ddk-test/ddk-test.c
diff --git a/system/dev/test/ddk-test/metadata-test.c b/zircon/system/dev/test/ddk-test/metadata-test.c
similarity index 100%
rename from system/dev/test/ddk-test/metadata-test.c
rename to zircon/system/dev/test/ddk-test/metadata-test.c
diff --git a/system/dev/test/ddk-test/rules.mk b/zircon/system/dev/test/ddk-test/rules.mk
similarity index 100%
rename from system/dev/test/ddk-test/rules.mk
rename to zircon/system/dev/test/ddk-test/rules.mk
diff --git a/system/dev/test/ddk-test/usb-request-test.c b/zircon/system/dev/test/ddk-test/usb-request-test.c
similarity index 100%
rename from system/dev/test/ddk-test/usb-request-test.c
rename to zircon/system/dev/test/ddk-test/usb-request-test.c
diff --git a/system/dev/test/mock-device/device.cpp b/zircon/system/dev/test/mock-device/device.cpp
similarity index 100%
rename from system/dev/test/mock-device/device.cpp
rename to zircon/system/dev/test/mock-device/device.cpp
diff --git a/system/dev/test/mock-device/fidl.cpp b/zircon/system/dev/test/mock-device/fidl.cpp
similarity index 100%
rename from system/dev/test/mock-device/fidl.cpp
rename to zircon/system/dev/test/mock-device/fidl.cpp
diff --git a/system/dev/test/mock-device/fidl.h b/zircon/system/dev/test/mock-device/fidl.h
similarity index 100%
rename from system/dev/test/mock-device/fidl.h
rename to zircon/system/dev/test/mock-device/fidl.h
diff --git a/system/dev/test/mock-device/mock-device.fidl b/zircon/system/dev/test/mock-device/mock-device.fidl
similarity index 100%
rename from system/dev/test/mock-device/mock-device.fidl
rename to zircon/system/dev/test/mock-device/mock-device.fidl
diff --git a/system/dev/test/mock-device/rules.mk b/zircon/system/dev/test/mock-device/rules.mk
similarity index 100%
rename from system/dev/test/mock-device/rules.mk
rename to zircon/system/dev/test/mock-device/rules.mk
diff --git a/system/dev/test/operation/main.cpp b/zircon/system/dev/test/operation/main.cpp
similarity index 100%
rename from system/dev/test/operation/main.cpp
rename to zircon/system/dev/test/operation/main.cpp
diff --git a/system/dev/test/operation/operation-pool-test.cpp b/zircon/system/dev/test/operation/operation-pool-test.cpp
similarity index 100%
rename from system/dev/test/operation/operation-pool-test.cpp
rename to zircon/system/dev/test/operation/operation-pool-test.cpp
diff --git a/system/dev/test/operation/operation-queue-test.cpp b/zircon/system/dev/test/operation/operation-queue-test.cpp
similarity index 100%
rename from system/dev/test/operation/operation-queue-test.cpp
rename to zircon/system/dev/test/operation/operation-queue-test.cpp
diff --git a/system/dev/test/operation/operation-test.cpp b/zircon/system/dev/test/operation/operation-test.cpp
similarity index 100%
rename from system/dev/test/operation/operation-test.cpp
rename to zircon/system/dev/test/operation/operation-test.cpp
diff --git a/system/dev/test/operation/rules.mk b/zircon/system/dev/test/operation/rules.mk
similarity index 100%
rename from system/dev/test/operation/rules.mk
rename to zircon/system/dev/test/operation/rules.mk
diff --git a/system/dev/test/sysdev/bind.c b/zircon/system/dev/test/sysdev/bind.c
similarity index 100%
rename from system/dev/test/sysdev/bind.c
rename to zircon/system/dev/test/sysdev/bind.c
diff --git a/system/dev/test/sysdev/rules.mk b/zircon/system/dev/test/sysdev/rules.mk
similarity index 100%
rename from system/dev/test/sysdev/rules.mk
rename to zircon/system/dev/test/sysdev/rules.mk
diff --git a/system/dev/test/sysdev/sysdev.cpp b/zircon/system/dev/test/sysdev/sysdev.cpp
similarity index 100%
rename from system/dev/test/sysdev/sysdev.cpp
rename to zircon/system/dev/test/sysdev/sysdev.cpp
diff --git a/system/dev/test/sysdev/sysdev.h b/zircon/system/dev/test/sysdev/sysdev.h
similarity index 100%
rename from system/dev/test/sysdev/sysdev.h
rename to zircon/system/dev/test/sysdev/sysdev.h
diff --git a/system/dev/test/usb/main.cpp b/zircon/system/dev/test/usb/main.cpp
similarity index 100%
rename from system/dev/test/usb/main.cpp
rename to zircon/system/dev/test/usb/main.cpp
diff --git a/system/dev/test/usb/rules.mk b/zircon/system/dev/test/usb/rules.mk
similarity index 100%
rename from system/dev/test/usb/rules.mk
rename to zircon/system/dev/test/usb/rules.mk
diff --git a/system/dev/test/usb/usb-request-pool-test.cpp b/zircon/system/dev/test/usb/usb-request-pool-test.cpp
similarity index 100%
rename from system/dev/test/usb/usb-request-pool-test.cpp
rename to zircon/system/dev/test/usb/usb-request-pool-test.cpp
diff --git a/system/dev/test/usb/usb-request-queue-test.cpp b/zircon/system/dev/test/usb/usb-request-queue-test.cpp
similarity index 100%
rename from system/dev/test/usb/usb-request-queue-test.cpp
rename to zircon/system/dev/test/usb/usb-request-queue-test.cpp
diff --git a/system/dev/test/usb/usb-request-test.cpp b/zircon/system/dev/test/usb/usb-request-test.cpp
similarity index 100%
rename from system/dev/test/usb/usb-request-test.cpp
rename to zircon/system/dev/test/usb/usb-request-test.cpp
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.cpp b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.cpp
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.cpp
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.cpp
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-cpufreq.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-fclk-rates.c b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-fclk-rates.c
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-fclk-rates.c
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-fclk-rates.c
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-fclk.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-fclk.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-fclk.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-fclk.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-pwm-regs.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-pwm-regs.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-pwm-regs.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-pwm-regs.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-pwm.cpp b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-pwm.cpp
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-pwm.cpp
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-pwm.cpp
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-pwm.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-pwm.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-pwm.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-pwm.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.c b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.c
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-thermal.c
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.c
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.cpp b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.cpp
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-thermal.cpp
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.cpp
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-thermal.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-thermal.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor-regs.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor-regs.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-tsensor-regs.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor-regs.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.cpp b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.cpp
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.cpp
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.cpp
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-tsensor.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-voltage.cpp b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-voltage.cpp
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-voltage.cpp
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-voltage.cpp
diff --git a/system/dev/thermal/aml-thermal-s905d2g/aml-voltage.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/aml-voltage.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/aml-voltage.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/aml-voltage.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/hiu-registers.h b/zircon/system/dev/thermal/aml-thermal-s905d2g/hiu-registers.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/hiu-registers.h
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/hiu-registers.h
diff --git a/system/dev/thermal/aml-thermal-s905d2g/rules.mk b/zircon/system/dev/thermal/aml-thermal-s905d2g/rules.mk
similarity index 100%
rename from system/dev/thermal/aml-thermal-s905d2g/rules.mk
rename to zircon/system/dev/thermal/aml-thermal-s905d2g/rules.mk
diff --git a/system/dev/thermal/aml-thermal-s912/aml-thermal.c b/zircon/system/dev/thermal/aml-thermal-s912/aml-thermal.c
similarity index 100%
rename from system/dev/thermal/aml-thermal-s912/aml-thermal.c
rename to zircon/system/dev/thermal/aml-thermal-s912/aml-thermal.c
diff --git a/system/dev/thermal/aml-thermal-s912/aml-thermal.cpp b/zircon/system/dev/thermal/aml-thermal-s912/aml-thermal.cpp
similarity index 100%
rename from system/dev/thermal/aml-thermal-s912/aml-thermal.cpp
rename to zircon/system/dev/thermal/aml-thermal-s912/aml-thermal.cpp
diff --git a/system/dev/thermal/aml-thermal-s912/aml-thermal.h b/zircon/system/dev/thermal/aml-thermal-s912/aml-thermal.h
similarity index 100%
rename from system/dev/thermal/aml-thermal-s912/aml-thermal.h
rename to zircon/system/dev/thermal/aml-thermal-s912/aml-thermal.h
diff --git a/system/dev/thermal/aml-thermal-s912/rules.mk b/zircon/system/dev/thermal/aml-thermal-s912/rules.mk
similarity index 100%
rename from system/dev/thermal/aml-thermal-s912/rules.mk
rename to zircon/system/dev/thermal/aml-thermal-s912/rules.mk
diff --git a/system/dev/thermal/mtk-thermal/mtk-thermal-reg.h b/zircon/system/dev/thermal/mtk-thermal/mtk-thermal-reg.h
similarity index 100%
rename from system/dev/thermal/mtk-thermal/mtk-thermal-reg.h
rename to zircon/system/dev/thermal/mtk-thermal/mtk-thermal-reg.h
diff --git a/system/dev/thermal/mtk-thermal/mtk-thermal.cpp b/zircon/system/dev/thermal/mtk-thermal/mtk-thermal.cpp
similarity index 100%
rename from system/dev/thermal/mtk-thermal/mtk-thermal.cpp
rename to zircon/system/dev/thermal/mtk-thermal/mtk-thermal.cpp
diff --git a/system/dev/thermal/mtk-thermal/mtk-thermal.h b/zircon/system/dev/thermal/mtk-thermal/mtk-thermal.h
similarity index 100%
rename from system/dev/thermal/mtk-thermal/mtk-thermal.h
rename to zircon/system/dev/thermal/mtk-thermal/mtk-thermal.h
diff --git a/system/dev/thermal/mtk-thermal/rules.mk b/zircon/system/dev/thermal/mtk-thermal/rules.mk
similarity index 100%
rename from system/dev/thermal/mtk-thermal/rules.mk
rename to zircon/system/dev/thermal/mtk-thermal/rules.mk
diff --git a/system/dev/usb/dwc3/dwc3-commands.cpp b/zircon/system/dev/usb/dwc3/dwc3-commands.cpp
similarity index 100%
rename from system/dev/usb/dwc3/dwc3-commands.cpp
rename to zircon/system/dev/usb/dwc3/dwc3-commands.cpp
diff --git a/system/dev/usb/dwc3/dwc3-endpoints.cpp b/zircon/system/dev/usb/dwc3/dwc3-endpoints.cpp
similarity index 100%
rename from system/dev/usb/dwc3/dwc3-endpoints.cpp
rename to zircon/system/dev/usb/dwc3/dwc3-endpoints.cpp
diff --git a/system/dev/usb/dwc3/dwc3-ep0.cpp b/zircon/system/dev/usb/dwc3/dwc3-ep0.cpp
similarity index 100%
rename from system/dev/usb/dwc3/dwc3-ep0.cpp
rename to zircon/system/dev/usb/dwc3/dwc3-ep0.cpp
diff --git a/system/dev/usb/dwc3/dwc3-events.cpp b/zircon/system/dev/usb/dwc3/dwc3-events.cpp
similarity index 100%
rename from system/dev/usb/dwc3/dwc3-events.cpp
rename to zircon/system/dev/usb/dwc3/dwc3-events.cpp
diff --git a/system/dev/usb/dwc3/dwc3-regs.h b/zircon/system/dev/usb/dwc3/dwc3-regs.h
similarity index 100%
rename from system/dev/usb/dwc3/dwc3-regs.h
rename to zircon/system/dev/usb/dwc3/dwc3-regs.h
diff --git a/system/dev/usb/dwc3/dwc3-types.h b/zircon/system/dev/usb/dwc3/dwc3-types.h
similarity index 100%
rename from system/dev/usb/dwc3/dwc3-types.h
rename to zircon/system/dev/usb/dwc3/dwc3-types.h
diff --git a/system/dev/usb/dwc3/dwc3.cpp b/zircon/system/dev/usb/dwc3/dwc3.cpp
similarity index 100%
rename from system/dev/usb/dwc3/dwc3.cpp
rename to zircon/system/dev/usb/dwc3/dwc3.cpp
diff --git a/system/dev/usb/dwc3/dwc3.h b/zircon/system/dev/usb/dwc3/dwc3.h
similarity index 100%
rename from system/dev/usb/dwc3/dwc3.h
rename to zircon/system/dev/usb/dwc3/dwc3.h
diff --git a/system/dev/usb/dwc3/rules.mk b/zircon/system/dev/usb/dwc3/rules.mk
similarity index 100%
rename from system/dev/usb/dwc3/rules.mk
rename to zircon/system/dev/usb/dwc3/rules.mk
diff --git a/system/dev/usb/hikey-usb/hikey-usb.cpp b/zircon/system/dev/usb/hikey-usb/hikey-usb.cpp
similarity index 100%
rename from system/dev/usb/hikey-usb/hikey-usb.cpp
rename to zircon/system/dev/usb/hikey-usb/hikey-usb.cpp
diff --git a/system/dev/usb/hikey-usb/hikey-usb.h b/zircon/system/dev/usb/hikey-usb/hikey-usb.h
similarity index 100%
rename from system/dev/usb/hikey-usb/hikey-usb.h
rename to zircon/system/dev/usb/hikey-usb/hikey-usb.h
diff --git a/system/dev/usb/hikey-usb/rules.mk b/zircon/system/dev/usb/hikey-usb/rules.mk
similarity index 100%
rename from system/dev/usb/hikey-usb/rules.mk
rename to zircon/system/dev/usb/hikey-usb/rules.mk
diff --git a/system/dev/usb/mt-musb-peripheral/mt-usb.cpp b/zircon/system/dev/usb/mt-musb-peripheral/mt-usb.cpp
similarity index 100%
rename from system/dev/usb/mt-musb-peripheral/mt-usb.cpp
rename to zircon/system/dev/usb/mt-musb-peripheral/mt-usb.cpp
diff --git a/system/dev/usb/mt-musb-peripheral/mt-usb.h b/zircon/system/dev/usb/mt-musb-peripheral/mt-usb.h
similarity index 100%
rename from system/dev/usb/mt-musb-peripheral/mt-usb.h
rename to zircon/system/dev/usb/mt-musb-peripheral/mt-usb.h
diff --git a/system/dev/usb/mt-musb-peripheral/rules.mk b/zircon/system/dev/usb/mt-musb-peripheral/rules.mk
similarity index 100%
rename from system/dev/usb/mt-musb-peripheral/rules.mk
rename to zircon/system/dev/usb/mt-musb-peripheral/rules.mk
diff --git a/system/dev/usb/usb-bus/rules.mk b/zircon/system/dev/usb/usb-bus/rules.mk
similarity index 100%
rename from system/dev/usb/usb-bus/rules.mk
rename to zircon/system/dev/usb/usb-bus/rules.mk
diff --git a/system/dev/usb/usb-bus/usb-bus.cpp b/zircon/system/dev/usb/usb-bus/usb-bus.cpp
similarity index 100%
rename from system/dev/usb/usb-bus/usb-bus.cpp
rename to zircon/system/dev/usb/usb-bus/usb-bus.cpp
diff --git a/system/dev/usb/usb-bus/usb-bus.h b/zircon/system/dev/usb/usb-bus/usb-bus.h
similarity index 100%
rename from system/dev/usb/usb-bus/usb-bus.h
rename to zircon/system/dev/usb/usb-bus/usb-bus.h
diff --git a/system/dev/usb/usb-bus/usb-device.cpp b/zircon/system/dev/usb/usb-bus/usb-device.cpp
similarity index 100%
rename from system/dev/usb/usb-bus/usb-device.cpp
rename to zircon/system/dev/usb/usb-bus/usb-device.cpp
diff --git a/system/dev/usb/usb-bus/usb-device.h b/zircon/system/dev/usb/usb-bus/usb-device.h
similarity index 100%
rename from system/dev/usb/usb-bus/usb-device.h
rename to zircon/system/dev/usb/usb-bus/usb-device.h
diff --git a/system/dev/usb/usb-composite/rules.mk b/zircon/system/dev/usb/usb-composite/rules.mk
similarity index 100%
rename from system/dev/usb/usb-composite/rules.mk
rename to zircon/system/dev/usb/usb-composite/rules.mk
diff --git a/system/dev/usb/usb-composite/usb-composite.c b/zircon/system/dev/usb/usb-composite/usb-composite.c
similarity index 100%
rename from system/dev/usb/usb-composite/usb-composite.c
rename to zircon/system/dev/usb/usb-composite/usb-composite.c
diff --git a/system/dev/usb/usb-composite/usb-composite.h b/zircon/system/dev/usb/usb-composite/usb-composite.h
similarity index 100%
rename from system/dev/usb/usb-composite/usb-composite.h
rename to zircon/system/dev/usb/usb-composite/usb-composite.h
diff --git a/system/dev/usb/usb-composite/usb-interface.c b/zircon/system/dev/usb/usb-composite/usb-interface.c
similarity index 100%
rename from system/dev/usb/usb-composite/usb-interface.c
rename to zircon/system/dev/usb/usb-composite/usb-interface.c
diff --git a/system/dev/usb/usb-composite/usb-interface.h b/zircon/system/dev/usb/usb-composite/usb-interface.h
similarity index 100%
rename from system/dev/usb/usb-composite/usb-interface.h
rename to zircon/system/dev/usb/usb-composite/usb-interface.h
diff --git a/system/dev/usb/usb-dfu/rules.mk b/zircon/system/dev/usb/usb-dfu/rules.mk
similarity index 100%
rename from system/dev/usb/usb-dfu/rules.mk
rename to zircon/system/dev/usb/usb-dfu/rules.mk
diff --git a/system/dev/usb/usb-dfu/usb-dfu.cpp b/zircon/system/dev/usb/usb-dfu/usb-dfu.cpp
similarity index 100%
rename from system/dev/usb/usb-dfu/usb-dfu.cpp
rename to zircon/system/dev/usb/usb-dfu/usb-dfu.cpp
diff --git a/system/dev/usb/usb-dfu/usb-dfu.h b/zircon/system/dev/usb/usb-dfu/usb-dfu.h
similarity index 100%
rename from system/dev/usb/usb-dfu/usb-dfu.h
rename to zircon/system/dev/usb/usb-dfu/usb-dfu.h
diff --git a/system/dev/usb/usb-hub/rules.mk b/zircon/system/dev/usb/usb-hub/rules.mk
similarity index 100%
rename from system/dev/usb/usb-hub/rules.mk
rename to zircon/system/dev/usb/usb-hub/rules.mk
diff --git a/system/dev/usb/usb-hub/usb-hub.c b/zircon/system/dev/usb/usb-hub/usb-hub.c
similarity index 100%
rename from system/dev/usb/usb-hub/usb-hub.c
rename to zircon/system/dev/usb/usb-hub/usb-hub.c
diff --git a/system/dev/usb/usb-peripheral-test/README.md b/zircon/system/dev/usb/usb-peripheral-test/README.md
similarity index 100%
rename from system/dev/usb/usb-peripheral-test/README.md
rename to zircon/system/dev/usb/usb-peripheral-test/README.md
diff --git a/system/dev/usb/usb-peripheral-test/driver.cpp b/zircon/system/dev/usb/usb-peripheral-test/driver.cpp
similarity index 100%
rename from system/dev/usb/usb-peripheral-test/driver.cpp
rename to zircon/system/dev/usb/usb-peripheral-test/driver.cpp
diff --git a/system/dev/usb/usb-peripheral-test/rules.mk b/zircon/system/dev/usb/usb-peripheral-test/rules.mk
similarity index 100%
rename from system/dev/usb/usb-peripheral-test/rules.mk
rename to zircon/system/dev/usb/usb-peripheral-test/rules.mk
diff --git a/system/dev/usb/usb-peripheral-test/test.cpp b/zircon/system/dev/usb/usb-peripheral-test/test.cpp
similarity index 100%
rename from system/dev/usb/usb-peripheral-test/test.cpp
rename to zircon/system/dev/usb/usb-peripheral-test/test.cpp
diff --git a/system/dev/usb/usb-peripheral/rules.mk b/zircon/system/dev/usb/usb-peripheral/rules.mk
similarity index 100%
rename from system/dev/usb/usb-peripheral/rules.mk
rename to zircon/system/dev/usb/usb-peripheral/rules.mk
diff --git a/system/dev/usb/usb-peripheral/usb-function.cpp b/zircon/system/dev/usb/usb-peripheral/usb-function.cpp
similarity index 100%
rename from system/dev/usb/usb-peripheral/usb-function.cpp
rename to zircon/system/dev/usb/usb-peripheral/usb-function.cpp
diff --git a/system/dev/usb/usb-peripheral/usb-function.h b/zircon/system/dev/usb/usb-peripheral/usb-function.h
similarity index 100%
rename from system/dev/usb/usb-peripheral/usb-function.h
rename to zircon/system/dev/usb/usb-peripheral/usb-function.h
diff --git a/system/dev/usb/usb-peripheral/usb-peripheral.cpp b/zircon/system/dev/usb/usb-peripheral/usb-peripheral.cpp
similarity index 100%
rename from system/dev/usb/usb-peripheral/usb-peripheral.cpp
rename to zircon/system/dev/usb/usb-peripheral/usb-peripheral.cpp
diff --git a/system/dev/usb/usb-peripheral/usb-peripheral.h b/zircon/system/dev/usb/usb-peripheral/usb-peripheral.h
similarity index 100%
rename from system/dev/usb/usb-peripheral/usb-peripheral.h
rename to zircon/system/dev/usb/usb-peripheral/usb-peripheral.h
diff --git a/system/dev/usb/usb-test/flash-programmer/flash-programmer-hw.h b/zircon/system/dev/usb/usb-test/flash-programmer/flash-programmer-hw.h
similarity index 100%
rename from system/dev/usb/usb-test/flash-programmer/flash-programmer-hw.h
rename to zircon/system/dev/usb/usb-test/flash-programmer/flash-programmer-hw.h
diff --git a/system/dev/usb/usb-test/flash-programmer/flash-programmer.cpp b/zircon/system/dev/usb/usb-test/flash-programmer/flash-programmer.cpp
similarity index 100%
rename from system/dev/usb/usb-test/flash-programmer/flash-programmer.cpp
rename to zircon/system/dev/usb/usb-test/flash-programmer/flash-programmer.cpp
diff --git a/system/dev/usb/usb-test/flash-programmer/flash-programmer.h b/zircon/system/dev/usb/usb-test/flash-programmer/flash-programmer.h
similarity index 100%
rename from system/dev/usb/usb-test/flash-programmer/flash-programmer.h
rename to zircon/system/dev/usb/usb-test/flash-programmer/flash-programmer.h
diff --git a/system/dev/usb/usb-test/flash-programmer/rules.mk b/zircon/system/dev/usb/usb-test/flash-programmer/rules.mk
similarity index 100%
rename from system/dev/usb/usb-test/flash-programmer/rules.mk
rename to zircon/system/dev/usb/usb-test/flash-programmer/rules.mk
diff --git a/system/dev/usb/usb-test/fx3/fx3.c b/zircon/system/dev/usb/usb-test/fx3/fx3.c
similarity index 100%
rename from system/dev/usb/usb-test/fx3/fx3.c
rename to zircon/system/dev/usb/usb-test/fx3/fx3.c
diff --git a/system/dev/usb/usb-test/fx3/fx3.h b/zircon/system/dev/usb/usb-test/fx3/fx3.h
similarity index 100%
rename from system/dev/usb/usb-test/fx3/fx3.h
rename to zircon/system/dev/usb/usb-test/fx3/fx3.h
diff --git a/system/dev/usb/usb-test/fx3/rules.mk b/zircon/system/dev/usb/usb-test/fx3/rules.mk
similarity index 100%
rename from system/dev/usb/usb-test/fx3/rules.mk
rename to zircon/system/dev/usb/usb-test/fx3/rules.mk
diff --git a/system/dev/usb/usb-test/rules.mk b/zircon/system/dev/usb/usb-test/rules.mk
similarity index 100%
rename from system/dev/usb/usb-test/rules.mk
rename to zircon/system/dev/usb/usb-test/rules.mk
diff --git a/system/dev/usb/usb-test/usb-tester/rules.mk b/zircon/system/dev/usb/usb-test/usb-tester/rules.mk
similarity index 100%
rename from system/dev/usb/usb-test/usb-tester/rules.mk
rename to zircon/system/dev/usb/usb-test/usb-tester/rules.mk
diff --git a/system/dev/usb/usb-test/usb-tester/usb-tester-hw.h b/zircon/system/dev/usb/usb-test/usb-tester/usb-tester-hw.h
similarity index 100%
rename from system/dev/usb/usb-test/usb-tester/usb-tester-hw.h
rename to zircon/system/dev/usb/usb-test/usb-tester/usb-tester-hw.h
diff --git a/system/dev/usb/usb-test/usb-tester/usb-tester.cpp b/zircon/system/dev/usb/usb-test/usb-tester/usb-tester.cpp
similarity index 100%
rename from system/dev/usb/usb-test/usb-tester/usb-tester.cpp
rename to zircon/system/dev/usb/usb-test/usb-tester/usb-tester.cpp
diff --git a/system/dev/usb/usb-test/usb-tester/usb-tester.h b/zircon/system/dev/usb/usb-test/usb-tester/usb-tester.h
similarity index 100%
rename from system/dev/usb/usb-test/usb-tester/usb-tester.h
rename to zircon/system/dev/usb/usb-test/usb-tester/usb-tester.h
diff --git a/system/dev/usb/usb-virtual-bus/rules.mk b/zircon/system/dev/usb/usb-virtual-bus/rules.mk
similarity index 100%
rename from system/dev/usb/usb-virtual-bus/rules.mk
rename to zircon/system/dev/usb/usb-virtual-bus/rules.mk
diff --git a/system/dev/usb/usb-virtual-bus/usb-virtual-bus.cpp b/zircon/system/dev/usb/usb-virtual-bus/usb-virtual-bus.cpp
similarity index 100%
rename from system/dev/usb/usb-virtual-bus/usb-virtual-bus.cpp
rename to zircon/system/dev/usb/usb-virtual-bus/usb-virtual-bus.cpp
diff --git a/system/dev/usb/usb-virtual-bus/usb-virtual-bus.h b/zircon/system/dev/usb/usb-virtual-bus/usb-virtual-bus.h
similarity index 100%
rename from system/dev/usb/usb-virtual-bus/usb-virtual-bus.h
rename to zircon/system/dev/usb/usb-virtual-bus/usb-virtual-bus.h
diff --git a/system/dev/usb/usb-virtual-bus/usb-virtual-device.cpp b/zircon/system/dev/usb/usb-virtual-bus/usb-virtual-device.cpp
similarity index 100%
rename from system/dev/usb/usb-virtual-bus/usb-virtual-device.cpp
rename to zircon/system/dev/usb/usb-virtual-bus/usb-virtual-device.cpp
diff --git a/system/dev/usb/usb-virtual-bus/usb-virtual-device.h b/zircon/system/dev/usb/usb-virtual-bus/usb-virtual-device.h
similarity index 100%
rename from system/dev/usb/usb-virtual-bus/usb-virtual-device.h
rename to zircon/system/dev/usb/usb-virtual-bus/usb-virtual-device.h
diff --git a/system/dev/usb/usb-virtual-bus/usb-virtual-host.cpp b/zircon/system/dev/usb/usb-virtual-bus/usb-virtual-host.cpp
similarity index 100%
rename from system/dev/usb/usb-virtual-bus/usb-virtual-host.cpp
rename to zircon/system/dev/usb/usb-virtual-bus/usb-virtual-host.cpp
diff --git a/system/dev/usb/usb-virtual-bus/usb-virtual-host.h b/zircon/system/dev/usb/usb-virtual-bus/usb-virtual-host.h
similarity index 100%
rename from system/dev/usb/usb-virtual-bus/usb-virtual-host.h
rename to zircon/system/dev/usb/usb-virtual-bus/usb-virtual-host.h
diff --git a/system/dev/usb/xhci/rules.mk b/zircon/system/dev/usb/xhci/rules.mk
similarity index 100%
rename from system/dev/usb/xhci/rules.mk
rename to zircon/system/dev/usb/xhci/rules.mk
diff --git a/system/dev/usb/xhci/usb-xhci.cpp b/zircon/system/dev/usb/xhci/usb-xhci.cpp
similarity index 100%
rename from system/dev/usb/xhci/usb-xhci.cpp
rename to zircon/system/dev/usb/xhci/usb-xhci.cpp
diff --git a/system/dev/usb/xhci/xdc-hw.h b/zircon/system/dev/usb/xhci/xdc-hw.h
similarity index 100%
rename from system/dev/usb/xhci/xdc-hw.h
rename to zircon/system/dev/usb/xhci/xdc-hw.h
diff --git a/system/dev/usb/xhci/xdc-transfer.cpp b/zircon/system/dev/usb/xhci/xdc-transfer.cpp
similarity index 100%
rename from system/dev/usb/xhci/xdc-transfer.cpp
rename to zircon/system/dev/usb/xhci/xdc-transfer.cpp
diff --git a/system/dev/usb/xhci/xdc-transfer.h b/zircon/system/dev/usb/xhci/xdc-transfer.h
similarity index 100%
rename from system/dev/usb/xhci/xdc-transfer.h
rename to zircon/system/dev/usb/xhci/xdc-transfer.h
diff --git a/system/dev/usb/xhci/xdc.cpp b/zircon/system/dev/usb/xhci/xdc.cpp
similarity index 100%
rename from system/dev/usb/xhci/xdc.cpp
rename to zircon/system/dev/usb/xhci/xdc.cpp
diff --git a/system/dev/usb/xhci/xdc.h b/zircon/system/dev/usb/xhci/xdc.h
similarity index 100%
rename from system/dev/usb/xhci/xdc.h
rename to zircon/system/dev/usb/xhci/xdc.h
diff --git a/system/dev/usb/xhci/xhci-device-manager.cpp b/zircon/system/dev/usb/xhci/xhci-device-manager.cpp
similarity index 100%
rename from system/dev/usb/xhci/xhci-device-manager.cpp
rename to zircon/system/dev/usb/xhci/xhci-device-manager.cpp
diff --git a/system/dev/usb/xhci/xhci-device-manager.h b/zircon/system/dev/usb/xhci/xhci-device-manager.h
similarity index 100%
rename from system/dev/usb/xhci/xhci-device-manager.h
rename to zircon/system/dev/usb/xhci/xhci-device-manager.h
diff --git a/system/dev/usb/xhci/xhci-hw.h b/zircon/system/dev/usb/xhci/xhci-hw.h
similarity index 100%
rename from system/dev/usb/xhci/xhci-hw.h
rename to zircon/system/dev/usb/xhci/xhci-hw.h
diff --git a/system/dev/usb/xhci/xhci-root-hub.cpp b/zircon/system/dev/usb/xhci/xhci-root-hub.cpp
similarity index 100%
rename from system/dev/usb/xhci/xhci-root-hub.cpp
rename to zircon/system/dev/usb/xhci/xhci-root-hub.cpp
diff --git a/system/dev/usb/xhci/xhci-root-hub.h b/zircon/system/dev/usb/xhci/xhci-root-hub.h
similarity index 100%
rename from system/dev/usb/xhci/xhci-root-hub.h
rename to zircon/system/dev/usb/xhci/xhci-root-hub.h
diff --git a/system/dev/usb/xhci/xhci-transfer-common.cpp b/zircon/system/dev/usb/xhci/xhci-transfer-common.cpp
similarity index 100%
rename from system/dev/usb/xhci/xhci-transfer-common.cpp
rename to zircon/system/dev/usb/xhci/xhci-transfer-common.cpp
diff --git a/system/dev/usb/xhci/xhci-transfer-common.h b/zircon/system/dev/usb/xhci/xhci-transfer-common.h
similarity index 100%
rename from system/dev/usb/xhci/xhci-transfer-common.h
rename to zircon/system/dev/usb/xhci/xhci-transfer-common.h
diff --git a/system/dev/usb/xhci/xhci-transfer.cpp b/zircon/system/dev/usb/xhci/xhci-transfer.cpp
similarity index 100%
rename from system/dev/usb/xhci/xhci-transfer.cpp
rename to zircon/system/dev/usb/xhci/xhci-transfer.cpp
diff --git a/system/dev/usb/xhci/xhci-transfer.h b/zircon/system/dev/usb/xhci/xhci-transfer.h
similarity index 100%
rename from system/dev/usb/xhci/xhci-transfer.h
rename to zircon/system/dev/usb/xhci/xhci-transfer.h
diff --git a/system/dev/usb/xhci/xhci-trb.cpp b/zircon/system/dev/usb/xhci/xhci-trb.cpp
similarity index 100%
rename from system/dev/usb/xhci/xhci-trb.cpp
rename to zircon/system/dev/usb/xhci/xhci-trb.cpp
diff --git a/system/dev/usb/xhci/xhci-trb.h b/zircon/system/dev/usb/xhci/xhci-trb.h
similarity index 100%
rename from system/dev/usb/xhci/xhci-trb.h
rename to zircon/system/dev/usb/xhci/xhci-trb.h
diff --git a/system/dev/usb/xhci/xhci-util.cpp b/zircon/system/dev/usb/xhci/xhci-util.cpp
similarity index 100%
rename from system/dev/usb/xhci/xhci-util.cpp
rename to zircon/system/dev/usb/xhci/xhci-util.cpp
diff --git a/system/dev/usb/xhci/xhci-util.h b/zircon/system/dev/usb/xhci/xhci-util.h
similarity index 100%
rename from system/dev/usb/xhci/xhci-util.h
rename to zircon/system/dev/usb/xhci/xhci-util.h
diff --git a/system/dev/usb/xhci/xhci.cpp b/zircon/system/dev/usb/xhci/xhci.cpp
similarity index 100%
rename from system/dev/usb/xhci/xhci.cpp
rename to zircon/system/dev/usb/xhci/xhci.cpp
diff --git a/system/dev/usb/xhci/xhci.h b/zircon/system/dev/usb/xhci/xhci.h
similarity index 100%
rename from system/dev/usb/xhci/xhci.h
rename to zircon/system/dev/usb/xhci/xhci.h
diff --git a/system/dev/video/usb-video/video-buffer.cpp b/zircon/system/dev/video/usb-video/video-buffer.cpp
similarity index 100%
rename from system/dev/video/usb-video/video-buffer.cpp
rename to zircon/system/dev/video/usb-video/video-buffer.cpp
diff --git a/system/fidl/fuchsia-blobfs/blobfs.fidl b/zircon/system/fidl/fuchsia-blobfs/blobfs.fidl
similarity index 100%
rename from system/fidl/fuchsia-blobfs/blobfs.fidl
rename to zircon/system/fidl/fuchsia-blobfs/blobfs.fidl
diff --git a/system/fidl/fuchsia-blobfs/rules.mk b/zircon/system/fidl/fuchsia-blobfs/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-blobfs/rules.mk
rename to zircon/system/fidl/fuchsia-blobfs/rules.mk
diff --git a/system/fidl/fuchsia-cobalt/cobalt.fidl b/zircon/system/fidl/fuchsia-cobalt/cobalt.fidl
similarity index 100%
rename from system/fidl/fuchsia-cobalt/cobalt.fidl
rename to zircon/system/fidl/fuchsia-cobalt/cobalt.fidl
diff --git a/system/fidl/fuchsia-cobalt/cobalt_controller.fidl b/zircon/system/fidl/fuchsia-cobalt/cobalt_controller.fidl
similarity index 100%
rename from system/fidl/fuchsia-cobalt/cobalt_controller.fidl
rename to zircon/system/fidl/fuchsia-cobalt/cobalt_controller.fidl
diff --git a/system/fidl/fuchsia-cobalt/rules.mk b/zircon/system/fidl/fuchsia-cobalt/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-cobalt/rules.mk
rename to zircon/system/fidl/fuchsia-cobalt/rules.mk
diff --git a/system/fidl/fuchsia-crash/crash.fidl b/zircon/system/fidl/fuchsia-crash/crash.fidl
similarity index 100%
rename from system/fidl/fuchsia-crash/crash.fidl
rename to zircon/system/fidl/fuchsia-crash/crash.fidl
diff --git a/system/fidl/fuchsia-crash/rules.mk b/zircon/system/fidl/fuchsia-crash/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-crash/rules.mk
rename to zircon/system/fidl/fuchsia-crash/rules.mk
diff --git a/system/fidl/fuchsia-device-manager/coordinator.fidl b/zircon/system/fidl/fuchsia-device-manager/coordinator.fidl
similarity index 100%
rename from system/fidl/fuchsia-device-manager/coordinator.fidl
rename to zircon/system/fidl/fuchsia-device-manager/coordinator.fidl
diff --git a/system/fidl/fuchsia-device-manager/dmctl.fidl b/zircon/system/fidl/fuchsia-device-manager/dmctl.fidl
similarity index 100%
rename from system/fidl/fuchsia-device-manager/dmctl.fidl
rename to zircon/system/fidl/fuchsia-device-manager/dmctl.fidl
diff --git a/system/fidl/fuchsia-device-manager/rules.mk b/zircon/system/fidl/fuchsia-device-manager/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-device-manager/rules.mk
rename to zircon/system/fidl/fuchsia-device-manager/rules.mk
diff --git a/system/fidl/fuchsia-device-test/rules.mk b/zircon/system/fidl/fuchsia-device-test/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-device-test/rules.mk
rename to zircon/system/fidl/fuchsia-device-test/rules.mk
diff --git a/system/fidl/fuchsia-device-test/test.fidl b/zircon/system/fidl/fuchsia-device-test/test.fidl
similarity index 100%
rename from system/fidl/fuchsia-device-test/test.fidl
rename to zircon/system/fidl/fuchsia-device-test/test.fidl
diff --git a/system/fidl/fuchsia-hardware-backlight/backlight.fidl b/zircon/system/fidl/fuchsia-hardware-backlight/backlight.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-backlight/backlight.fidl
rename to zircon/system/fidl/fuchsia-hardware-backlight/backlight.fidl
diff --git a/system/fidl/fuchsia-hardware-backlight/rules.mk b/zircon/system/fidl/fuchsia-hardware-backlight/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-backlight/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-backlight/rules.mk
diff --git a/system/fidl/fuchsia-hardware-block-partition/partition.fidl b/zircon/system/fidl/fuchsia-hardware-block-partition/partition.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-block-partition/partition.fidl
rename to zircon/system/fidl/fuchsia-hardware-block-partition/partition.fidl
diff --git a/system/fidl/fuchsia-hardware-block-partition/rules.mk b/zircon/system/fidl/fuchsia-hardware-block-partition/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-block-partition/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-block-partition/rules.mk
diff --git a/system/fidl/fuchsia-hardware-block-volume/rules.mk b/zircon/system/fidl/fuchsia-hardware-block-volume/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-block-volume/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-block-volume/rules.mk
diff --git a/system/fidl/fuchsia-hardware-block-volume/volume.fidl b/zircon/system/fidl/fuchsia-hardware-block-volume/volume.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-block-volume/volume.fidl
rename to zircon/system/fidl/fuchsia-hardware-block-volume/volume.fidl
diff --git a/system/fidl/fuchsia-hardware-block/block.fidl b/zircon/system/fidl/fuchsia-hardware-block/block.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-block/block.fidl
rename to zircon/system/fidl/fuchsia-hardware-block/block.fidl
diff --git a/system/fidl/fuchsia-hardware-block/ftl.fidl b/zircon/system/fidl/fuchsia-hardware-block/ftl.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-block/ftl.fidl
rename to zircon/system/fidl/fuchsia-hardware-block/ftl.fidl
diff --git a/system/fidl/fuchsia-hardware-block/rules.mk b/zircon/system/fidl/fuchsia-hardware-block/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-block/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-block/rules.mk
diff --git a/system/fidl/fuchsia-hardware-display/display-controller.fidl b/zircon/system/fidl/fuchsia-hardware-display/display-controller.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-display/display-controller.fidl
rename to zircon/system/fidl/fuchsia-hardware-display/display-controller.fidl
diff --git a/system/fidl/fuchsia-hardware-display/rules.mk b/zircon/system/fidl/fuchsia-hardware-display/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-display/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-display/rules.mk
diff --git a/system/fidl/fuchsia-hardware-ethernet/ethernet.fidl b/zircon/system/fidl/fuchsia-hardware-ethernet/ethernet.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-ethernet/ethernet.fidl
rename to zircon/system/fidl/fuchsia-hardware-ethernet/ethernet.fidl
diff --git a/system/fidl/fuchsia-hardware-ethernet/rules.mk b/zircon/system/fidl/fuchsia-hardware-ethernet/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-ethernet/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-ethernet/rules.mk
diff --git a/system/fidl/fuchsia-hardware-gpu-clock/clock.fidl b/zircon/system/fidl/fuchsia-hardware-gpu-clock/clock.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-gpu-clock/clock.fidl
rename to zircon/system/fidl/fuchsia-hardware-gpu-clock/clock.fidl
diff --git a/system/fidl/fuchsia-hardware-gpu-clock/rules.mk b/zircon/system/fidl/fuchsia-hardware-gpu-clock/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-gpu-clock/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-gpu-clock/rules.mk
diff --git a/system/fidl/fuchsia-hardware-i2c/i2c.fidl b/zircon/system/fidl/fuchsia-hardware-i2c/i2c.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-i2c/i2c.fidl
rename to zircon/system/fidl/fuchsia-hardware-i2c/i2c.fidl
diff --git a/system/fidl/fuchsia-hardware-i2c/rules.mk b/zircon/system/fidl/fuchsia-hardware-i2c/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-i2c/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-i2c/rules.mk
diff --git a/system/fidl/fuchsia-hardware-input/input.fidl b/zircon/system/fidl/fuchsia-hardware-input/input.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-input/input.fidl
rename to zircon/system/fidl/fuchsia-hardware-input/input.fidl
diff --git a/system/fidl/fuchsia-hardware-input/rules.mk b/zircon/system/fidl/fuchsia-hardware-input/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-input/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-input/rules.mk
diff --git a/system/fidl/fuchsia-hardware-light/light.fidl b/zircon/system/fidl/fuchsia-hardware-light/light.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-light/light.fidl
rename to zircon/system/fidl/fuchsia-hardware-light/light.fidl
diff --git a/system/fidl/fuchsia-hardware-light/rules.mk b/zircon/system/fidl/fuchsia-hardware-light/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-light/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-light/rules.mk
diff --git a/system/fidl/fuchsia-hardware-nand/nand.fidl b/zircon/system/fidl/fuchsia-hardware-nand/nand.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-nand/nand.fidl
rename to zircon/system/fidl/fuchsia-hardware-nand/nand.fidl
diff --git a/system/fidl/fuchsia-hardware-nand/ram-nand.fidl b/zircon/system/fidl/fuchsia-hardware-nand/ram-nand.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-nand/ram-nand.fidl
rename to zircon/system/fidl/fuchsia-hardware-nand/ram-nand.fidl
diff --git a/system/fidl/fuchsia-hardware-nand/rules.mk b/zircon/system/fidl/fuchsia-hardware-nand/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-nand/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-nand/rules.mk
diff --git a/system/fidl/fuchsia-hardware-power/power.fidl b/zircon/system/fidl/fuchsia-hardware-power/power.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-power/power.fidl
rename to zircon/system/fidl/fuchsia-hardware-power/power.fidl
diff --git a/system/fidl/fuchsia-hardware-power/rules.mk b/zircon/system/fidl/fuchsia-hardware-power/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-power/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-power/rules.mk
diff --git a/system/fidl/fuchsia-hardware-ramdisk/ramdisk.fidl b/zircon/system/fidl/fuchsia-hardware-ramdisk/ramdisk.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-ramdisk/ramdisk.fidl
rename to zircon/system/fidl/fuchsia-hardware-ramdisk/ramdisk.fidl
diff --git a/system/fidl/fuchsia-hardware-ramdisk/rules.mk b/zircon/system/fidl/fuchsia-hardware-ramdisk/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-ramdisk/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-ramdisk/rules.mk
diff --git a/system/fidl/fuchsia-hardware-rtc/rtc.fidl b/zircon/system/fidl/fuchsia-hardware-rtc/rtc.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-rtc/rtc.fidl
rename to zircon/system/fidl/fuchsia-hardware-rtc/rtc.fidl
diff --git a/system/fidl/fuchsia-hardware-rtc/rules.mk b/zircon/system/fidl/fuchsia-hardware-rtc/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-rtc/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-rtc/rules.mk
diff --git a/system/fidl/fuchsia-hardware-skipblock/rules.mk b/zircon/system/fidl/fuchsia-hardware-skipblock/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-skipblock/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-skipblock/rules.mk
diff --git a/system/fidl/fuchsia-hardware-skipblock/skip-block.fidl b/zircon/system/fidl/fuchsia-hardware-skipblock/skip-block.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-skipblock/skip-block.fidl
rename to zircon/system/fidl/fuchsia-hardware-skipblock/skip-block.fidl
diff --git a/system/fidl/fuchsia-hardware-tee/rules.mk b/zircon/system/fidl/fuchsia-hardware-tee/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-tee/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-tee/rules.mk
diff --git a/system/fidl/fuchsia-hardware-tee/tee.fidl b/zircon/system/fidl/fuchsia-hardware-tee/tee.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-tee/tee.fidl
rename to zircon/system/fidl/fuchsia-hardware-tee/tee.fidl
diff --git a/system/fidl/fuchsia-hardware-usb-device/rules.mk b/zircon/system/fidl/fuchsia-hardware-usb-device/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-device/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-usb-device/rules.mk
diff --git a/system/fidl/fuchsia-hardware-usb-device/usb-device.fidl b/zircon/system/fidl/fuchsia-hardware-usb-device/usb-device.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-device/usb-device.fidl
rename to zircon/system/fidl/fuchsia-hardware-usb-device/usb-device.fidl
diff --git a/system/fidl/fuchsia-hardware-usb-fwloader/rules.mk b/zircon/system/fidl/fuchsia-hardware-usb-fwloader/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-fwloader/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-usb-fwloader/rules.mk
diff --git a/system/fidl/fuchsia-hardware-usb-fwloader/usb-test-fwloader.fidl b/zircon/system/fidl/fuchsia-hardware-usb-fwloader/usb-test-fwloader.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-fwloader/usb-test-fwloader.fidl
rename to zircon/system/fidl/fuchsia-hardware-usb-fwloader/usb-test-fwloader.fidl
diff --git a/system/fidl/fuchsia-hardware-usb-peripheral/rules.mk b/zircon/system/fidl/fuchsia-hardware-usb-peripheral/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-peripheral/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-usb-peripheral/rules.mk
diff --git a/system/fidl/fuchsia-hardware-usb-peripheral/usb-peripheral.fidl b/zircon/system/fidl/fuchsia-hardware-usb-peripheral/usb-peripheral.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-peripheral/usb-peripheral.fidl
rename to zircon/system/fidl/fuchsia-hardware-usb-peripheral/usb-peripheral.fidl
diff --git a/system/fidl/fuchsia-hardware-usb-tester/rules.mk b/zircon/system/fidl/fuchsia-hardware-usb-tester/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-tester/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-usb-tester/rules.mk
diff --git a/system/fidl/fuchsia-hardware-usb-tester/usb-tester.fidl b/zircon/system/fidl/fuchsia-hardware-usb-tester/usb-tester.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-tester/usb-tester.fidl
rename to zircon/system/fidl/fuchsia-hardware-usb-tester/usb-tester.fidl
diff --git a/system/fidl/fuchsia-hardware-usb-virtual-bus/rules.mk b/zircon/system/fidl/fuchsia-hardware-usb-virtual-bus/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-virtual-bus/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-usb-virtual-bus/rules.mk
diff --git a/system/fidl/fuchsia-hardware-usb-virtual-bus/usb-virtual-bus.fidl b/zircon/system/fidl/fuchsia-hardware-usb-virtual-bus/usb-virtual-bus.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-usb-virtual-bus/usb-virtual-bus.fidl
rename to zircon/system/fidl/fuchsia-hardware-usb-virtual-bus/usb-virtual-bus.fidl
diff --git a/system/fidl/fuchsia-hardware-vsock/rules.mk b/zircon/system/fidl/fuchsia-hardware-vsock/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-hardware-vsock/rules.mk
rename to zircon/system/fidl/fuchsia-hardware-vsock/rules.mk
diff --git a/system/fidl/fuchsia-hardware-vsock/vsock.fidl b/zircon/system/fidl/fuchsia-hardware-vsock/vsock.fidl
similarity index 100%
rename from system/fidl/fuchsia-hardware-vsock/vsock.fidl
rename to zircon/system/fidl/fuchsia-hardware-vsock/vsock.fidl
diff --git a/system/fidl/fuchsia-inspect/inspect.fidl b/zircon/system/fidl/fuchsia-inspect/inspect.fidl
similarity index 100%
rename from system/fidl/fuchsia-inspect/inspect.fidl
rename to zircon/system/fidl/fuchsia-inspect/inspect.fidl
diff --git a/system/fidl/fuchsia-inspect/rules.mk b/zircon/system/fidl/fuchsia-inspect/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-inspect/rules.mk
rename to zircon/system/fidl/fuchsia-inspect/rules.mk
diff --git a/system/fidl/fuchsia-io/io.fidl b/zircon/system/fidl/fuchsia-io/io.fidl
similarity index 100%
rename from system/fidl/fuchsia-io/io.fidl
rename to zircon/system/fidl/fuchsia-io/io.fidl
diff --git a/system/fidl/fuchsia-io/rules.mk b/zircon/system/fidl/fuchsia-io/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-io/rules.mk
rename to zircon/system/fidl/fuchsia-io/rules.mk
diff --git a/system/fidl/fuchsia-ldsvc/ldsvc.fidl b/zircon/system/fidl/fuchsia-ldsvc/ldsvc.fidl
similarity index 100%
rename from system/fidl/fuchsia-ldsvc/ldsvc.fidl
rename to zircon/system/fidl/fuchsia-ldsvc/ldsvc.fidl
diff --git a/system/fidl/fuchsia-ldsvc/rules.mk b/zircon/system/fidl/fuchsia-ldsvc/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-ldsvc/rules.mk
rename to zircon/system/fidl/fuchsia-ldsvc/rules.mk
diff --git a/system/fidl/fuchsia-logger/logger.fidl b/zircon/system/fidl/fuchsia-logger/logger.fidl
similarity index 100%
rename from system/fidl/fuchsia-logger/logger.fidl
rename to zircon/system/fidl/fuchsia-logger/logger.fidl
diff --git a/system/fidl/fuchsia-logger/rules.mk b/zircon/system/fidl/fuchsia-logger/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-logger/rules.mk
rename to zircon/system/fidl/fuchsia-logger/rules.mk
diff --git a/system/fidl/fuchsia-mem/buffer.fidl b/zircon/system/fidl/fuchsia-mem/buffer.fidl
similarity index 100%
rename from system/fidl/fuchsia-mem/buffer.fidl
rename to zircon/system/fidl/fuchsia-mem/buffer.fidl
diff --git a/system/fidl/fuchsia-mem/rules.mk b/zircon/system/fidl/fuchsia-mem/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-mem/rules.mk
rename to zircon/system/fidl/fuchsia-mem/rules.mk
diff --git a/system/fidl/fuchsia-minfs/minfs.fidl b/zircon/system/fidl/fuchsia-minfs/minfs.fidl
similarity index 100%
rename from system/fidl/fuchsia-minfs/minfs.fidl
rename to zircon/system/fidl/fuchsia-minfs/minfs.fidl
diff --git a/system/fidl/fuchsia-minfs/rules.mk b/zircon/system/fidl/fuchsia-minfs/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-minfs/rules.mk
rename to zircon/system/fidl/fuchsia-minfs/rules.mk
diff --git a/system/fidl/fuchsia-nand/broker.fidl b/zircon/system/fidl/fuchsia-nand/broker.fidl
similarity index 100%
rename from system/fidl/fuchsia-nand/broker.fidl
rename to zircon/system/fidl/fuchsia-nand/broker.fidl
diff --git a/system/fidl/fuchsia-nand/rules.mk b/zircon/system/fidl/fuchsia-nand/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-nand/rules.mk
rename to zircon/system/fidl/fuchsia-nand/rules.mk
diff --git a/system/fidl/fuchsia-net-stack/rules.mk b/zircon/system/fidl/fuchsia-net-stack/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-net-stack/rules.mk
rename to zircon/system/fidl/fuchsia-net-stack/rules.mk
diff --git a/system/fidl/fuchsia-net-stack/stack.fidl b/zircon/system/fidl/fuchsia-net-stack/stack.fidl
similarity index 100%
rename from system/fidl/fuchsia-net-stack/stack.fidl
rename to zircon/system/fidl/fuchsia-net-stack/stack.fidl
diff --git a/system/fidl/fuchsia-net/connectivity.fidl b/zircon/system/fidl/fuchsia-net/connectivity.fidl
similarity index 100%
rename from system/fidl/fuchsia-net/connectivity.fidl
rename to zircon/system/fidl/fuchsia-net/connectivity.fidl
diff --git a/system/fidl/fuchsia-net/net.fidl b/zircon/system/fidl/fuchsia-net/net.fidl
similarity index 100%
rename from system/fidl/fuchsia-net/net.fidl
rename to zircon/system/fidl/fuchsia-net/net.fidl
diff --git a/system/fidl/fuchsia-net/rules.mk b/zircon/system/fidl/fuchsia-net/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-net/rules.mk
rename to zircon/system/fidl/fuchsia-net/rules.mk
diff --git a/system/fidl/fuchsia-net/socket.fidl b/zircon/system/fidl/fuchsia-net/socket.fidl
similarity index 100%
rename from system/fidl/fuchsia-net/socket.fidl
rename to zircon/system/fidl/fuchsia-net/socket.fidl
diff --git a/system/fidl/fuchsia-process/launcher.fidl b/zircon/system/fidl/fuchsia-process/launcher.fidl
similarity index 100%
rename from system/fidl/fuchsia-process/launcher.fidl
rename to zircon/system/fidl/fuchsia-process/launcher.fidl
diff --git a/system/fidl/fuchsia-process/resolver.fidl b/zircon/system/fidl/fuchsia-process/resolver.fidl
similarity index 100%
rename from system/fidl/fuchsia-process/resolver.fidl
rename to zircon/system/fidl/fuchsia-process/resolver.fidl
diff --git a/system/fidl/fuchsia-process/rules.mk b/zircon/system/fidl/fuchsia-process/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-process/rules.mk
rename to zircon/system/fidl/fuchsia-process/rules.mk
diff --git a/system/fidl/fuchsia-profile/profile.fidl b/zircon/system/fidl/fuchsia-profile/profile.fidl
similarity index 100%
rename from system/fidl/fuchsia-profile/profile.fidl
rename to zircon/system/fidl/fuchsia-profile/profile.fidl
diff --git a/system/fidl/fuchsia-profile/rules.mk b/zircon/system/fidl/fuchsia-profile/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-profile/rules.mk
rename to zircon/system/fidl/fuchsia-profile/rules.mk
diff --git a/system/fidl/fuchsia-sysinfo/rules.mk b/zircon/system/fidl/fuchsia-sysinfo/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-sysinfo/rules.mk
rename to zircon/system/fidl/fuchsia-sysinfo/rules.mk
diff --git a/system/fidl/fuchsia-sysinfo/sysinfo.fidl b/zircon/system/fidl/fuchsia-sysinfo/sysinfo.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysinfo/sysinfo.fidl
rename to zircon/system/fidl/fuchsia-sysinfo/sysinfo.fidl
diff --git a/system/fidl/fuchsia-sysmem/allocator.fidl b/zircon/system/fidl/fuchsia-sysmem/allocator.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/allocator.fidl
rename to zircon/system/fidl/fuchsia-sysmem/allocator.fidl
diff --git a/system/fidl/fuchsia-sysmem/allocator_2.fidl b/zircon/system/fidl/fuchsia-sysmem/allocator_2.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/allocator_2.fidl
rename to zircon/system/fidl/fuchsia-sysmem/allocator_2.fidl
diff --git a/system/fidl/fuchsia-sysmem/collection.fidl b/zircon/system/fidl/fuchsia-sysmem/collection.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/collection.fidl
rename to zircon/system/fidl/fuchsia-sysmem/collection.fidl
diff --git a/system/fidl/fuchsia-sysmem/collections.fidl b/zircon/system/fidl/fuchsia-sysmem/collections.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/collections.fidl
rename to zircon/system/fidl/fuchsia-sysmem/collections.fidl
diff --git a/system/fidl/fuchsia-sysmem/constraints.fidl b/zircon/system/fidl/fuchsia-sysmem/constraints.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/constraints.fidl
rename to zircon/system/fidl/fuchsia-sysmem/constraints.fidl
diff --git a/system/fidl/fuchsia-sysmem/driver_connector.fidl b/zircon/system/fidl/fuchsia-sysmem/driver_connector.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/driver_connector.fidl
rename to zircon/system/fidl/fuchsia-sysmem/driver_connector.fidl
diff --git a/system/fidl/fuchsia-sysmem/format_modifier.fidl b/zircon/system/fidl/fuchsia-sysmem/format_modifier.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/format_modifier.fidl
rename to zircon/system/fidl/fuchsia-sysmem/format_modifier.fidl
diff --git a/system/fidl/fuchsia-sysmem/formats.fidl b/zircon/system/fidl/fuchsia-sysmem/formats.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/formats.fidl
rename to zircon/system/fidl/fuchsia-sysmem/formats.fidl
diff --git a/system/fidl/fuchsia-sysmem/image_formats.fidl b/zircon/system/fidl/fuchsia-sysmem/image_formats.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/image_formats.fidl
rename to zircon/system/fidl/fuchsia-sysmem/image_formats.fidl
diff --git a/system/fidl/fuchsia-sysmem/rules.mk b/zircon/system/fidl/fuchsia-sysmem/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-sysmem/rules.mk
rename to zircon/system/fidl/fuchsia-sysmem/rules.mk
diff --git a/system/fidl/fuchsia-sysmem/usages.fidl b/zircon/system/fidl/fuchsia-sysmem/usages.fidl
similarity index 100%
rename from system/fidl/fuchsia-sysmem/usages.fidl
rename to zircon/system/fidl/fuchsia-sysmem/usages.fidl
diff --git a/system/fidl/fuchsia-tracelink/rules.mk b/zircon/system/fidl/fuchsia-tracelink/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-tracelink/rules.mk
rename to zircon/system/fidl/fuchsia-tracelink/rules.mk
diff --git a/system/fidl/fuchsia-tracelink/tracelink.fidl b/zircon/system/fidl/fuchsia-tracelink/tracelink.fidl
similarity index 100%
rename from system/fidl/fuchsia-tracelink/tracelink.fidl
rename to zircon/system/fidl/fuchsia-tracelink/tracelink.fidl
diff --git a/system/fidl/fuchsia-usb-debug/rules.mk b/zircon/system/fidl/fuchsia-usb-debug/rules.mk
similarity index 100%
rename from system/fidl/fuchsia-usb-debug/rules.mk
rename to zircon/system/fidl/fuchsia-usb-debug/rules.mk
diff --git a/system/fidl/fuchsia-usb-debug/usb-debug.fidl b/zircon/system/fidl/fuchsia-usb-debug/usb-debug.fidl
similarity index 100%
rename from system/fidl/fuchsia-usb-debug/usb-debug.fidl
rename to zircon/system/fidl/fuchsia-usb-debug/usb-debug.fidl
diff --git a/system/host/MAINTAINERS b/zircon/system/host/MAINTAINERS
similarity index 100%
rename from system/host/MAINTAINERS
rename to zircon/system/host/MAINTAINERS
diff --git a/system/host/abigen/MAINTAINERS b/zircon/system/host/abigen/MAINTAINERS
similarity index 100%
rename from system/host/abigen/MAINTAINERS
rename to zircon/system/host/abigen/MAINTAINERS
diff --git a/system/host/abigen/abigen.cpp b/zircon/system/host/abigen/abigen.cpp
similarity index 100%
rename from system/host/abigen/abigen.cpp
rename to zircon/system/host/abigen/abigen.cpp
diff --git a/system/host/abigen/abigen_generator.cpp b/zircon/system/host/abigen/abigen_generator.cpp
similarity index 100%
rename from system/host/abigen/abigen_generator.cpp
rename to zircon/system/host/abigen/abigen_generator.cpp
diff --git a/system/host/abigen/abigen_generator.h b/zircon/system/host/abigen/abigen_generator.h
similarity index 100%
rename from system/host/abigen/abigen_generator.h
rename to zircon/system/host/abigen/abigen_generator.h
diff --git a/system/host/abigen/generator.cpp b/zircon/system/host/abigen/generator.cpp
similarity index 100%
rename from system/host/abigen/generator.cpp
rename to zircon/system/host/abigen/generator.cpp
diff --git a/system/host/abigen/generator.h b/zircon/system/host/abigen/generator.h
similarity index 100%
rename from system/host/abigen/generator.h
rename to zircon/system/host/abigen/generator.h
diff --git a/system/host/abigen/header_generator.cpp b/zircon/system/host/abigen/header_generator.cpp
similarity index 100%
rename from system/host/abigen/header_generator.cpp
rename to zircon/system/host/abigen/header_generator.cpp
diff --git a/system/host/abigen/header_generator.h b/zircon/system/host/abigen/header_generator.h
similarity index 100%
rename from system/host/abigen/header_generator.h
rename to zircon/system/host/abigen/header_generator.h
diff --git a/system/host/abigen/json_generator.cpp b/zircon/system/host/abigen/json_generator.cpp
similarity index 100%
rename from system/host/abigen/json_generator.cpp
rename to zircon/system/host/abigen/json_generator.cpp
diff --git a/system/host/abigen/kernel_wrapper_generator.cpp b/zircon/system/host/abigen/kernel_wrapper_generator.cpp
similarity index 100%
rename from system/host/abigen/kernel_wrapper_generator.cpp
rename to zircon/system/host/abigen/kernel_wrapper_generator.cpp
diff --git a/system/host/abigen/parser/parser.cpp b/zircon/system/host/abigen/parser/parser.cpp
similarity index 100%
rename from system/host/abigen/parser/parser.cpp
rename to zircon/system/host/abigen/parser/parser.cpp
diff --git a/system/host/abigen/parser/parser.h b/zircon/system/host/abigen/parser/parser.h
similarity index 100%
rename from system/host/abigen/parser/parser.h
rename to zircon/system/host/abigen/parser/parser.h
diff --git a/system/host/abigen/rules.mk b/zircon/system/host/abigen/rules.mk
similarity index 100%
rename from system/host/abigen/rules.mk
rename to zircon/system/host/abigen/rules.mk
diff --git a/system/host/abigen/rust_binding_generator.cpp b/zircon/system/host/abigen/rust_binding_generator.cpp
similarity index 100%
rename from system/host/abigen/rust_binding_generator.cpp
rename to zircon/system/host/abigen/rust_binding_generator.cpp
diff --git a/system/host/abigen/syscall_parser.cpp b/zircon/system/host/abigen/syscall_parser.cpp
similarity index 100%
rename from system/host/abigen/syscall_parser.cpp
rename to zircon/system/host/abigen/syscall_parser.cpp
diff --git a/system/host/abigen/syscall_parser.h b/zircon/system/host/abigen/syscall_parser.h
similarity index 100%
rename from system/host/abigen/syscall_parser.h
rename to zircon/system/host/abigen/syscall_parser.h
diff --git a/system/host/abigen/syscall_schema.json b/zircon/system/host/abigen/syscall_schema.json
similarity index 100%
rename from system/host/abigen/syscall_schema.json
rename to zircon/system/host/abigen/syscall_schema.json
diff --git a/system/host/abigen/types.cpp b/zircon/system/host/abigen/types.cpp
similarity index 100%
rename from system/host/abigen/types.cpp
rename to zircon/system/host/abigen/types.cpp
diff --git a/system/host/abigen/types.h b/zircon/system/host/abigen/types.h
similarity index 100%
rename from system/host/abigen/types.h
rename to zircon/system/host/abigen/types.h
diff --git a/system/host/abigen/vdso_wrapper_generator.cpp b/zircon/system/host/abigen/vdso_wrapper_generator.cpp
similarity index 100%
rename from system/host/abigen/vdso_wrapper_generator.cpp
rename to zircon/system/host/abigen/vdso_wrapper_generator.cpp
diff --git a/system/host/abigen/vdso_wrapper_generator.h b/zircon/system/host/abigen/vdso_wrapper_generator.h
similarity index 100%
rename from system/host/abigen/vdso_wrapper_generator.h
rename to zircon/system/host/abigen/vdso_wrapper_generator.h
diff --git a/system/host/banjo/BUILD.gn b/zircon/system/host/banjo/BUILD.gn
similarity index 100%
rename from system/host/banjo/BUILD.gn
rename to zircon/system/host/banjo/BUILD.gn
diff --git a/system/host/banjo/MAINTAINERS b/zircon/system/host/banjo/MAINTAINERS
similarity index 100%
rename from system/host/banjo/MAINTAINERS
rename to zircon/system/host/banjo/MAINTAINERS
diff --git a/system/host/banjo/README.md b/zircon/system/host/banjo/README.md
similarity index 100%
rename from system/host/banjo/README.md
rename to zircon/system/host/banjo/README.md
diff --git a/system/host/banjo/compiler/main.cpp b/zircon/system/host/banjo/compiler/main.cpp
similarity index 100%
rename from system/host/banjo/compiler/main.cpp
rename to zircon/system/host/banjo/compiler/main.cpp
diff --git a/system/host/banjo/compiler/rules.mk b/zircon/system/host/banjo/compiler/rules.mk
similarity index 100%
rename from system/host/banjo/compiler/rules.mk
rename to zircon/system/host/banjo/compiler/rules.mk
diff --git a/system/host/banjo/examples/alignment.banjo b/zircon/system/host/banjo/examples/alignment.banjo
similarity index 100%
rename from system/host/banjo/examples/alignment.banjo
rename to zircon/system/host/banjo/examples/alignment.banjo
diff --git a/system/host/banjo/examples/empty.banjo b/zircon/system/host/banjo/examples/empty.banjo
similarity index 100%
rename from system/host/banjo/examples/empty.banjo
rename to zircon/system/host/banjo/examples/empty.banjo
diff --git a/system/host/banjo/examples/enums.banjo b/zircon/system/host/banjo/examples/enums.banjo
similarity index 100%
rename from system/host/banjo/examples/enums.banjo
rename to zircon/system/host/banjo/examples/enums.banjo
diff --git a/system/host/banjo/examples/events.banjo b/zircon/system/host/banjo/examples/events.banjo
similarity index 100%
rename from system/host/banjo/examples/events.banjo
rename to zircon/system/host/banjo/examples/events.banjo
diff --git a/system/host/banjo/examples/example-0.banjo b/zircon/system/host/banjo/examples/example-0.banjo
similarity index 100%
rename from system/host/banjo/examples/example-0.banjo
rename to zircon/system/host/banjo/examples/example-0.banjo
diff --git a/system/host/banjo/examples/example-1.banjo b/zircon/system/host/banjo/examples/example-1.banjo
similarity index 100%
rename from system/host/banjo/examples/example-1.banjo
rename to zircon/system/host/banjo/examples/example-1.banjo
diff --git a/system/host/banjo/examples/example-2.banjo b/zircon/system/host/banjo/examples/example-2.banjo
similarity index 100%
rename from system/host/banjo/examples/example-2.banjo
rename to zircon/system/host/banjo/examples/example-2.banjo
diff --git a/system/host/banjo/examples/example-3.banjo b/zircon/system/host/banjo/examples/example-3.banjo
similarity index 100%
rename from system/host/banjo/examples/example-3.banjo
rename to zircon/system/host/banjo/examples/example-3.banjo
diff --git a/system/host/banjo/examples/example-4.banjo b/zircon/system/host/banjo/examples/example-4.banjo
similarity index 100%
rename from system/host/banjo/examples/example-4.banjo
rename to zircon/system/host/banjo/examples/example-4.banjo
diff --git a/system/host/banjo/examples/example-5.banjo b/zircon/system/host/banjo/examples/example-5.banjo
similarity index 100%
rename from system/host/banjo/examples/example-5.banjo
rename to zircon/system/host/banjo/examples/example-5.banjo
diff --git a/system/host/banjo/examples/example-6.banjo b/zircon/system/host/banjo/examples/example-6.banjo
similarity index 100%
rename from system/host/banjo/examples/example-6.banjo
rename to zircon/system/host/banjo/examples/example-6.banjo
diff --git a/system/host/banjo/examples/example-7.banjo b/zircon/system/host/banjo/examples/example-7.banjo
similarity index 100%
rename from system/host/banjo/examples/example-7.banjo
rename to zircon/system/host/banjo/examples/example-7.banjo
diff --git a/system/host/banjo/examples/example-8.banjo b/zircon/system/host/banjo/examples/example-8.banjo
similarity index 100%
rename from system/host/banjo/examples/example-8.banjo
rename to zircon/system/host/banjo/examples/example-8.banjo
diff --git a/system/host/banjo/examples/example-9.banjo b/zircon/system/host/banjo/examples/example-9.banjo
similarity index 100%
rename from system/host/banjo/examples/example-9.banjo
rename to zircon/system/host/banjo/examples/example-9.banjo
diff --git a/system/host/banjo/examples/interface-ordinals.banjo b/zircon/system/host/banjo/examples/interface-ordinals.banjo
similarity index 100%
rename from system/host/banjo/examples/interface-ordinals.banjo
rename to zircon/system/host/banjo/examples/interface-ordinals.banjo
diff --git a/system/host/banjo/examples/library-a/point.banjo b/zircon/system/host/banjo/examples/library-a/point.banjo
similarity index 100%
rename from system/host/banjo/examples/library-a/point.banjo
rename to zircon/system/host/banjo/examples/library-a/point.banjo
diff --git a/system/host/banjo/examples/library-b/view.banjo b/zircon/system/host/banjo/examples/library-b/view.banjo
similarity index 100%
rename from system/host/banjo/examples/library-b/view.banjo
rename to zircon/system/host/banjo/examples/library-b/view.banjo
diff --git a/system/host/banjo/examples/simple.banjo b/zircon/system/host/banjo/examples/simple.banjo
similarity index 100%
rename from system/host/banjo/examples/simple.banjo
rename to zircon/system/host/banjo/examples/simple.banjo
diff --git a/system/host/banjo/examples/tables.banjo b/zircon/system/host/banjo/examples/tables.banjo
similarity index 100%
rename from system/host/banjo/examples/tables.banjo
rename to zircon/system/host/banjo/examples/tables.banjo
diff --git a/system/host/banjo/examples/test.banjo b/zircon/system/host/banjo/examples/test.banjo
similarity index 100%
rename from system/host/banjo/examples/test.banjo
rename to zircon/system/host/banjo/examples/test.banjo
diff --git a/system/host/banjo/examples/types.banjo b/zircon/system/host/banjo/examples/types.banjo
similarity index 100%
rename from system/host/banjo/examples/types.banjo
rename to zircon/system/host/banjo/examples/types.banjo
diff --git a/system/host/banjo/formatter/main.cpp b/zircon/system/host/banjo/formatter/main.cpp
similarity index 100%
rename from system/host/banjo/formatter/main.cpp
rename to zircon/system/host/banjo/formatter/main.cpp
diff --git a/system/host/banjo/formatter/rules.mk b/zircon/system/host/banjo/formatter/rules.mk
similarity index 100%
rename from system/host/banjo/formatter/rules.mk
rename to zircon/system/host/banjo/formatter/rules.mk
diff --git a/system/host/banjo/include/banjo/attributes.h b/zircon/system/host/banjo/include/banjo/attributes.h
similarity index 100%
rename from system/host/banjo/include/banjo/attributes.h
rename to zircon/system/host/banjo/include/banjo/attributes.h
diff --git a/system/host/banjo/include/banjo/coded_ast.h b/zircon/system/host/banjo/include/banjo/coded_ast.h
similarity index 100%
rename from system/host/banjo/include/banjo/coded_ast.h
rename to zircon/system/host/banjo/include/banjo/coded_ast.h
diff --git a/system/host/banjo/include/banjo/ddk_generator.h b/zircon/system/host/banjo/include/banjo/ddk_generator.h
similarity index 100%
rename from system/host/banjo/include/banjo/ddk_generator.h
rename to zircon/system/host/banjo/include/banjo/ddk_generator.h
diff --git a/system/host/banjo/include/banjo/error_reporter.h b/zircon/system/host/banjo/include/banjo/error_reporter.h
similarity index 100%
rename from system/host/banjo/include/banjo/error_reporter.h
rename to zircon/system/host/banjo/include/banjo/error_reporter.h
diff --git a/system/host/banjo/include/banjo/flat_ast.h b/zircon/system/host/banjo/include/banjo/flat_ast.h
similarity index 100%
rename from system/host/banjo/include/banjo/flat_ast.h
rename to zircon/system/host/banjo/include/banjo/flat_ast.h
diff --git a/system/host/banjo/include/banjo/formatter.h b/zircon/system/host/banjo/include/banjo/formatter.h
similarity index 100%
rename from system/host/banjo/include/banjo/formatter.h
rename to zircon/system/host/banjo/include/banjo/formatter.h
diff --git a/system/host/banjo/include/banjo/identifier_table.h b/zircon/system/host/banjo/include/banjo/identifier_table.h
similarity index 100%
rename from system/host/banjo/include/banjo/identifier_table.h
rename to zircon/system/host/banjo/include/banjo/identifier_table.h
diff --git a/system/host/banjo/include/banjo/json_generator.h b/zircon/system/host/banjo/include/banjo/json_generator.h
similarity index 100%
rename from system/host/banjo/include/banjo/json_generator.h
rename to zircon/system/host/banjo/include/banjo/json_generator.h
diff --git a/system/host/banjo/include/banjo/lexer.h b/zircon/system/host/banjo/include/banjo/lexer.h
similarity index 100%
rename from system/host/banjo/include/banjo/lexer.h
rename to zircon/system/host/banjo/include/banjo/lexer.h
diff --git a/system/host/banjo/include/banjo/library_zx.h b/zircon/system/host/banjo/include/banjo/library_zx.h
similarity index 100%
rename from system/host/banjo/include/banjo/library_zx.h
rename to zircon/system/host/banjo/include/banjo/library_zx.h
diff --git a/system/host/banjo/include/banjo/names.h b/zircon/system/host/banjo/include/banjo/names.h
similarity index 100%
rename from system/host/banjo/include/banjo/names.h
rename to zircon/system/host/banjo/include/banjo/names.h
diff --git a/system/host/banjo/include/banjo/parser.h b/zircon/system/host/banjo/include/banjo/parser.h
similarity index 100%
rename from system/host/banjo/include/banjo/parser.h
rename to zircon/system/host/banjo/include/banjo/parser.h
diff --git a/system/host/banjo/include/banjo/raw_ast.h b/zircon/system/host/banjo/include/banjo/raw_ast.h
similarity index 100%
rename from system/host/banjo/include/banjo/raw_ast.h
rename to zircon/system/host/banjo/include/banjo/raw_ast.h
diff --git a/system/host/banjo/include/banjo/source_file.h b/zircon/system/host/banjo/include/banjo/source_file.h
similarity index 100%
rename from system/host/banjo/include/banjo/source_file.h
rename to zircon/system/host/banjo/include/banjo/source_file.h
diff --git a/system/host/banjo/include/banjo/source_location.h b/zircon/system/host/banjo/include/banjo/source_location.h
similarity index 100%
rename from system/host/banjo/include/banjo/source_location.h
rename to zircon/system/host/banjo/include/banjo/source_location.h
diff --git a/system/host/banjo/include/banjo/source_manager.h b/zircon/system/host/banjo/include/banjo/source_manager.h
similarity index 100%
rename from system/host/banjo/include/banjo/source_manager.h
rename to zircon/system/host/banjo/include/banjo/source_manager.h
diff --git a/system/host/banjo/include/banjo/string_view.h b/zircon/system/host/banjo/include/banjo/string_view.h
similarity index 100%
rename from system/host/banjo/include/banjo/string_view.h
rename to zircon/system/host/banjo/include/banjo/string_view.h
diff --git a/system/host/banjo/include/banjo/tables_generator.h b/zircon/system/host/banjo/include/banjo/tables_generator.h
similarity index 100%
rename from system/host/banjo/include/banjo/tables_generator.h
rename to zircon/system/host/banjo/include/banjo/tables_generator.h
diff --git a/system/host/banjo/include/banjo/token.h b/zircon/system/host/banjo/include/banjo/token.h
similarity index 100%
rename from system/host/banjo/include/banjo/token.h
rename to zircon/system/host/banjo/include/banjo/token.h
diff --git a/system/host/banjo/include/banjo/token_definitions.inc b/zircon/system/host/banjo/include/banjo/token_definitions.inc
similarity index 100%
rename from system/host/banjo/include/banjo/token_definitions.inc
rename to zircon/system/host/banjo/include/banjo/token_definitions.inc
diff --git a/system/host/banjo/include/banjo/tree_visitor.h b/zircon/system/host/banjo/include/banjo/tree_visitor.h
similarity index 100%
rename from system/host/banjo/include/banjo/tree_visitor.h
rename to zircon/system/host/banjo/include/banjo/tree_visitor.h
diff --git a/system/host/banjo/include/banjo/type_shape.h b/zircon/system/host/banjo/include/banjo/type_shape.h
similarity index 100%
rename from system/host/banjo/include/banjo/type_shape.h
rename to zircon/system/host/banjo/include/banjo/type_shape.h
diff --git a/system/host/banjo/include/banjo/types.h b/zircon/system/host/banjo/include/banjo/types.h
similarity index 100%
rename from system/host/banjo/include/banjo/types.h
rename to zircon/system/host/banjo/include/banjo/types.h
diff --git a/system/host/banjo/lib/attributes.cpp b/zircon/system/host/banjo/lib/attributes.cpp
similarity index 100%
rename from system/host/banjo/lib/attributes.cpp
rename to zircon/system/host/banjo/lib/attributes.cpp
diff --git a/system/host/banjo/lib/ddk_generator.cpp b/zircon/system/host/banjo/lib/ddk_generator.cpp
similarity index 100%
rename from system/host/banjo/lib/ddk_generator.cpp
rename to zircon/system/host/banjo/lib/ddk_generator.cpp
diff --git a/system/host/banjo/lib/error_reporter.cpp b/zircon/system/host/banjo/lib/error_reporter.cpp
similarity index 100%
rename from system/host/banjo/lib/error_reporter.cpp
rename to zircon/system/host/banjo/lib/error_reporter.cpp
diff --git a/system/host/banjo/lib/flat_ast.cpp b/zircon/system/host/banjo/lib/flat_ast.cpp
similarity index 100%
rename from system/host/banjo/lib/flat_ast.cpp
rename to zircon/system/host/banjo/lib/flat_ast.cpp
diff --git a/system/host/banjo/lib/formatter.cpp b/zircon/system/host/banjo/lib/formatter.cpp
similarity index 100%
rename from system/host/banjo/lib/formatter.cpp
rename to zircon/system/host/banjo/lib/formatter.cpp
diff --git a/system/host/banjo/lib/identifier_table.cpp b/zircon/system/host/banjo/lib/identifier_table.cpp
similarity index 100%
rename from system/host/banjo/lib/identifier_table.cpp
rename to zircon/system/host/banjo/lib/identifier_table.cpp
diff --git a/system/host/banjo/lib/json_generator.cpp b/zircon/system/host/banjo/lib/json_generator.cpp
similarity index 100%
rename from system/host/banjo/lib/json_generator.cpp
rename to zircon/system/host/banjo/lib/json_generator.cpp
diff --git a/system/host/banjo/lib/lexer.cpp b/zircon/system/host/banjo/lib/lexer.cpp
similarity index 100%
rename from system/host/banjo/lib/lexer.cpp
rename to zircon/system/host/banjo/lib/lexer.cpp
diff --git a/system/host/banjo/lib/library_zx.cpp b/zircon/system/host/banjo/lib/library_zx.cpp
similarity index 100%
rename from system/host/banjo/lib/library_zx.cpp
rename to zircon/system/host/banjo/lib/library_zx.cpp
diff --git a/system/host/banjo/lib/names.cpp b/zircon/system/host/banjo/lib/names.cpp
similarity index 100%
rename from system/host/banjo/lib/names.cpp
rename to zircon/system/host/banjo/lib/names.cpp
diff --git a/system/host/banjo/lib/parser.cpp b/zircon/system/host/banjo/lib/parser.cpp
similarity index 100%
rename from system/host/banjo/lib/parser.cpp
rename to zircon/system/host/banjo/lib/parser.cpp
diff --git a/system/host/banjo/lib/raw_ast.cpp b/zircon/system/host/banjo/lib/raw_ast.cpp
similarity index 100%
rename from system/host/banjo/lib/raw_ast.cpp
rename to zircon/system/host/banjo/lib/raw_ast.cpp
diff --git a/system/host/banjo/lib/source_file.cpp b/zircon/system/host/banjo/lib/source_file.cpp
similarity index 100%
rename from system/host/banjo/lib/source_file.cpp
rename to zircon/system/host/banjo/lib/source_file.cpp
diff --git a/system/host/banjo/lib/source_location.cpp b/zircon/system/host/banjo/lib/source_location.cpp
similarity index 100%
rename from system/host/banjo/lib/source_location.cpp
rename to zircon/system/host/banjo/lib/source_location.cpp
diff --git a/system/host/banjo/lib/source_manager.cpp b/zircon/system/host/banjo/lib/source_manager.cpp
similarity index 100%
rename from system/host/banjo/lib/source_manager.cpp
rename to zircon/system/host/banjo/lib/source_manager.cpp
diff --git a/system/host/banjo/lib/tables_generator.cpp b/zircon/system/host/banjo/lib/tables_generator.cpp
similarity index 100%
rename from system/host/banjo/lib/tables_generator.cpp
rename to zircon/system/host/banjo/lib/tables_generator.cpp
diff --git a/system/host/banjo/lib/tree_visitor.cpp b/zircon/system/host/banjo/lib/tree_visitor.cpp
similarity index 100%
rename from system/host/banjo/lib/tree_visitor.cpp
rename to zircon/system/host/banjo/lib/tree_visitor.cpp
diff --git a/system/host/banjo/rules.mk b/zircon/system/host/banjo/rules.mk
similarity index 100%
rename from system/host/banjo/rules.mk
rename to zircon/system/host/banjo/rules.mk
diff --git a/system/host/banjo/schema.json b/zircon/system/host/banjo/schema.json
similarity index 100%
rename from system/host/banjo/schema.json
rename to zircon/system/host/banjo/schema.json
diff --git a/system/host/blobfs/blobfs.h b/zircon/system/host/blobfs/blobfs.h
similarity index 100%
rename from system/host/blobfs/blobfs.h
rename to zircon/system/host/blobfs/blobfs.h
diff --git a/system/host/blobfs/main.cpp b/zircon/system/host/blobfs/main.cpp
similarity index 100%
rename from system/host/blobfs/main.cpp
rename to zircon/system/host/blobfs/main.cpp
diff --git a/system/host/blobfs/rules.mk b/zircon/system/host/blobfs/rules.mk
similarity index 100%
rename from system/host/blobfs/rules.mk
rename to zircon/system/host/blobfs/rules.mk
diff --git a/system/host/bootserver/bootserver.c b/zircon/system/host/bootserver/bootserver.c
similarity index 100%
rename from system/host/bootserver/bootserver.c
rename to zircon/system/host/bootserver/bootserver.c
diff --git a/system/host/bootserver/bootserver.h b/zircon/system/host/bootserver/bootserver.h
similarity index 100%
rename from system/host/bootserver/bootserver.h
rename to zircon/system/host/bootserver/bootserver.h
diff --git a/system/host/bootserver/netboot.c b/zircon/system/host/bootserver/netboot.c
similarity index 100%
rename from system/host/bootserver/netboot.c
rename to zircon/system/host/bootserver/netboot.c
diff --git a/system/host/bootserver/rules.mk b/zircon/system/host/bootserver/rules.mk
similarity index 100%
rename from system/host/bootserver/rules.mk
rename to zircon/system/host/bootserver/rules.mk
diff --git a/system/host/bootserver/tftp.c b/zircon/system/host/bootserver/tftp.c
similarity index 100%
rename from system/host/bootserver/tftp.c
rename to zircon/system/host/bootserver/tftp.c
diff --git a/system/host/fidl/BUILD.gn b/zircon/system/host/fidl/BUILD.gn
similarity index 100%
rename from system/host/fidl/BUILD.gn
rename to zircon/system/host/fidl/BUILD.gn
diff --git a/system/host/fidl/MAINTAINERS b/zircon/system/host/fidl/MAINTAINERS
similarity index 100%
rename from system/host/fidl/MAINTAINERS
rename to zircon/system/host/fidl/MAINTAINERS
diff --git a/system/host/fidl/README.md b/zircon/system/host/fidl/README.md
similarity index 100%
rename from system/host/fidl/README.md
rename to zircon/system/host/fidl/README.md
diff --git a/system/host/fidl/compiler/main.cpp b/zircon/system/host/fidl/compiler/main.cpp
similarity index 100%
rename from system/host/fidl/compiler/main.cpp
rename to zircon/system/host/fidl/compiler/main.cpp
diff --git a/system/host/fidl/compiler/rules.mk b/zircon/system/host/fidl/compiler/rules.mk
similarity index 100%
rename from system/host/fidl/compiler/rules.mk
rename to zircon/system/host/fidl/compiler/rules.mk
diff --git a/system/host/fidl/examples/alignment.fidl b/zircon/system/host/fidl/examples/alignment.fidl
similarity index 100%
rename from system/host/fidl/examples/alignment.fidl
rename to zircon/system/host/fidl/examples/alignment.fidl
diff --git a/system/host/fidl/examples/empty.fidl b/zircon/system/host/fidl/examples/empty.fidl
similarity index 100%
rename from system/host/fidl/examples/empty.fidl
rename to zircon/system/host/fidl/examples/empty.fidl
diff --git a/system/host/fidl/examples/empty_struct.fidl b/zircon/system/host/fidl/examples/empty_struct.fidl
similarity index 100%
rename from system/host/fidl/examples/empty_struct.fidl
rename to zircon/system/host/fidl/examples/empty_struct.fidl
diff --git a/system/host/fidl/examples/enums.fidl b/zircon/system/host/fidl/examples/enums.fidl
similarity index 100%
rename from system/host/fidl/examples/enums.fidl
rename to zircon/system/host/fidl/examples/enums.fidl
diff --git a/system/host/fidl/examples/errors.fidl b/zircon/system/host/fidl/examples/errors.fidl
similarity index 100%
rename from system/host/fidl/examples/errors.fidl
rename to zircon/system/host/fidl/examples/errors.fidl
diff --git a/system/host/fidl/examples/events.fidl b/zircon/system/host/fidl/examples/events.fidl
similarity index 100%
rename from system/host/fidl/examples/events.fidl
rename to zircon/system/host/fidl/examples/events.fidl
diff --git a/system/host/fidl/examples/example-0.fidl b/zircon/system/host/fidl/examples/example-0.fidl
similarity index 100%
rename from system/host/fidl/examples/example-0.fidl
rename to zircon/system/host/fidl/examples/example-0.fidl
diff --git a/system/host/fidl/examples/example-1.fidl b/zircon/system/host/fidl/examples/example-1.fidl
similarity index 100%
rename from system/host/fidl/examples/example-1.fidl
rename to zircon/system/host/fidl/examples/example-1.fidl
diff --git a/system/host/fidl/examples/example-10.fidl b/zircon/system/host/fidl/examples/example-10.fidl
similarity index 100%
rename from system/host/fidl/examples/example-10.fidl
rename to zircon/system/host/fidl/examples/example-10.fidl
diff --git a/system/host/fidl/examples/example-2.fidl b/zircon/system/host/fidl/examples/example-2.fidl
similarity index 100%
rename from system/host/fidl/examples/example-2.fidl
rename to zircon/system/host/fidl/examples/example-2.fidl
diff --git a/system/host/fidl/examples/example-3.fidl b/zircon/system/host/fidl/examples/example-3.fidl
similarity index 100%
rename from system/host/fidl/examples/example-3.fidl
rename to zircon/system/host/fidl/examples/example-3.fidl
diff --git a/system/host/fidl/examples/example-4.fidl b/zircon/system/host/fidl/examples/example-4.fidl
similarity index 100%
rename from system/host/fidl/examples/example-4.fidl
rename to zircon/system/host/fidl/examples/example-4.fidl
diff --git a/system/host/fidl/examples/example-5.fidl b/zircon/system/host/fidl/examples/example-5.fidl
similarity index 100%
rename from system/host/fidl/examples/example-5.fidl
rename to zircon/system/host/fidl/examples/example-5.fidl
diff --git a/system/host/fidl/examples/example-6.fidl b/zircon/system/host/fidl/examples/example-6.fidl
similarity index 100%
rename from system/host/fidl/examples/example-6.fidl
rename to zircon/system/host/fidl/examples/example-6.fidl
diff --git a/system/host/fidl/examples/example-7.fidl b/zircon/system/host/fidl/examples/example-7.fidl
similarity index 100%
rename from system/host/fidl/examples/example-7.fidl
rename to zircon/system/host/fidl/examples/example-7.fidl
diff --git a/system/host/fidl/examples/example-8.fidl b/zircon/system/host/fidl/examples/example-8.fidl
similarity index 100%
rename from system/host/fidl/examples/example-8.fidl
rename to zircon/system/host/fidl/examples/example-8.fidl
diff --git a/system/host/fidl/examples/example-9.fidl b/zircon/system/host/fidl/examples/example-9.fidl
similarity index 100%
rename from system/host/fidl/examples/example-9.fidl
rename to zircon/system/host/fidl/examples/example-9.fidl
diff --git a/system/host/fidl/examples/interface-ordinals.fidl b/zircon/system/host/fidl/examples/interface-ordinals.fidl
similarity index 100%
rename from system/host/fidl/examples/interface-ordinals.fidl
rename to zircon/system/host/fidl/examples/interface-ordinals.fidl
diff --git a/system/host/fidl/examples/library-a/point.fidl b/zircon/system/host/fidl/examples/library-a/point.fidl
similarity index 100%
rename from system/host/fidl/examples/library-a/point.fidl
rename to zircon/system/host/fidl/examples/library-a/point.fidl
diff --git a/system/host/fidl/examples/library-b/view.fidl b/zircon/system/host/fidl/examples/library-b/view.fidl
similarity index 100%
rename from system/host/fidl/examples/library-b/view.fidl
rename to zircon/system/host/fidl/examples/library-b/view.fidl
diff --git a/system/host/fidl/examples/simple.fidl b/zircon/system/host/fidl/examples/simple.fidl
similarity index 100%
rename from system/host/fidl/examples/simple.fidl
rename to zircon/system/host/fidl/examples/simple.fidl
diff --git a/system/host/fidl/examples/tables.fidl b/zircon/system/host/fidl/examples/tables.fidl
similarity index 100%
rename from system/host/fidl/examples/tables.fidl
rename to zircon/system/host/fidl/examples/tables.fidl
diff --git a/system/host/fidl/examples/test.fidl b/zircon/system/host/fidl/examples/test.fidl
similarity index 100%
rename from system/host/fidl/examples/test.fidl
rename to zircon/system/host/fidl/examples/test.fidl
diff --git a/system/host/fidl/examples/types.fidl b/zircon/system/host/fidl/examples/types.fidl
similarity index 100%
rename from system/host/fidl/examples/types.fidl
rename to zircon/system/host/fidl/examples/types.fidl
diff --git a/system/host/fidl/examples/xunion.fidl b/zircon/system/host/fidl/examples/xunion.fidl
similarity index 100%
rename from system/host/fidl/examples/xunion.fidl
rename to zircon/system/host/fidl/examples/xunion.fidl
diff --git a/system/host/fidl/formatter/main.cpp b/zircon/system/host/fidl/formatter/main.cpp
similarity index 100%
rename from system/host/fidl/formatter/main.cpp
rename to zircon/system/host/fidl/formatter/main.cpp
diff --git a/system/host/fidl/formatter/rules.mk b/zircon/system/host/fidl/formatter/rules.mk
similarity index 100%
rename from system/host/fidl/formatter/rules.mk
rename to zircon/system/host/fidl/formatter/rules.mk
diff --git a/system/host/fidl/include/fidl/attributes.h b/zircon/system/host/fidl/include/fidl/attributes.h
similarity index 100%
rename from system/host/fidl/include/fidl/attributes.h
rename to zircon/system/host/fidl/include/fidl/attributes.h
diff --git a/system/host/fidl/include/fidl/c_generator.h b/zircon/system/host/fidl/include/fidl/c_generator.h
similarity index 100%
rename from system/host/fidl/include/fidl/c_generator.h
rename to zircon/system/host/fidl/include/fidl/c_generator.h
diff --git a/system/host/fidl/include/fidl/coded_ast.h b/zircon/system/host/fidl/include/fidl/coded_ast.h
similarity index 100%
rename from system/host/fidl/include/fidl/coded_ast.h
rename to zircon/system/host/fidl/include/fidl/coded_ast.h
diff --git a/system/host/fidl/include/fidl/coded_types_generator.h b/zircon/system/host/fidl/include/fidl/coded_types_generator.h
similarity index 100%
rename from system/host/fidl/include/fidl/coded_types_generator.h
rename to zircon/system/host/fidl/include/fidl/coded_types_generator.h
diff --git a/system/host/fidl/include/fidl/error_reporter.h b/zircon/system/host/fidl/include/fidl/error_reporter.h
similarity index 100%
rename from system/host/fidl/include/fidl/error_reporter.h
rename to zircon/system/host/fidl/include/fidl/error_reporter.h
diff --git a/system/host/fidl/include/fidl/flat_ast.h b/zircon/system/host/fidl/include/fidl/flat_ast.h
similarity index 100%
rename from system/host/fidl/include/fidl/flat_ast.h
rename to zircon/system/host/fidl/include/fidl/flat_ast.h
diff --git a/system/host/fidl/include/fidl/formatter.h b/zircon/system/host/fidl/include/fidl/formatter.h
similarity index 100%
rename from system/host/fidl/include/fidl/formatter.h
rename to zircon/system/host/fidl/include/fidl/formatter.h
diff --git a/system/host/fidl/include/fidl/json_generator.h b/zircon/system/host/fidl/include/fidl/json_generator.h
similarity index 100%
rename from system/host/fidl/include/fidl/json_generator.h
rename to zircon/system/host/fidl/include/fidl/json_generator.h
diff --git a/system/host/fidl/include/fidl/json_schema.h b/zircon/system/host/fidl/include/fidl/json_schema.h
similarity index 100%
rename from system/host/fidl/include/fidl/json_schema.h
rename to zircon/system/host/fidl/include/fidl/json_schema.h
diff --git a/system/host/fidl/include/fidl/lexer.h b/zircon/system/host/fidl/include/fidl/lexer.h
similarity index 100%
rename from system/host/fidl/include/fidl/lexer.h
rename to zircon/system/host/fidl/include/fidl/lexer.h
diff --git a/system/host/fidl/include/fidl/library_zx.h b/zircon/system/host/fidl/include/fidl/library_zx.h
similarity index 100%
rename from system/host/fidl/include/fidl/library_zx.h
rename to zircon/system/host/fidl/include/fidl/library_zx.h
diff --git a/system/host/fidl/include/fidl/names.h b/zircon/system/host/fidl/include/fidl/names.h
similarity index 100%
rename from system/host/fidl/include/fidl/names.h
rename to zircon/system/host/fidl/include/fidl/names.h
diff --git a/system/host/fidl/include/fidl/ordinals.h b/zircon/system/host/fidl/include/fidl/ordinals.h
similarity index 100%
rename from system/host/fidl/include/fidl/ordinals.h
rename to zircon/system/host/fidl/include/fidl/ordinals.h
diff --git a/system/host/fidl/include/fidl/parser.h b/zircon/system/host/fidl/include/fidl/parser.h
similarity index 100%
rename from system/host/fidl/include/fidl/parser.h
rename to zircon/system/host/fidl/include/fidl/parser.h
diff --git a/system/host/fidl/include/fidl/raw_ast.h b/zircon/system/host/fidl/include/fidl/raw_ast.h
similarity index 100%
rename from system/host/fidl/include/fidl/raw_ast.h
rename to zircon/system/host/fidl/include/fidl/raw_ast.h
diff --git a/system/host/fidl/include/fidl/source_file.h b/zircon/system/host/fidl/include/fidl/source_file.h
similarity index 100%
rename from system/host/fidl/include/fidl/source_file.h
rename to zircon/system/host/fidl/include/fidl/source_file.h
diff --git a/system/host/fidl/include/fidl/source_location.h b/zircon/system/host/fidl/include/fidl/source_location.h
similarity index 100%
rename from system/host/fidl/include/fidl/source_location.h
rename to zircon/system/host/fidl/include/fidl/source_location.h
diff --git a/system/host/fidl/include/fidl/source_manager.h b/zircon/system/host/fidl/include/fidl/source_manager.h
similarity index 100%
rename from system/host/fidl/include/fidl/source_manager.h
rename to zircon/system/host/fidl/include/fidl/source_manager.h
diff --git a/system/host/fidl/include/fidl/string_view.h b/zircon/system/host/fidl/include/fidl/string_view.h
similarity index 100%
rename from system/host/fidl/include/fidl/string_view.h
rename to zircon/system/host/fidl/include/fidl/string_view.h
diff --git a/system/host/fidl/include/fidl/tables_generator.h b/zircon/system/host/fidl/include/fidl/tables_generator.h
similarity index 100%
rename from system/host/fidl/include/fidl/tables_generator.h
rename to zircon/system/host/fidl/include/fidl/tables_generator.h
diff --git a/system/host/fidl/include/fidl/token.h b/zircon/system/host/fidl/include/fidl/token.h
similarity index 100%
rename from system/host/fidl/include/fidl/token.h
rename to zircon/system/host/fidl/include/fidl/token.h
diff --git a/system/host/fidl/include/fidl/token_definitions.inc b/zircon/system/host/fidl/include/fidl/token_definitions.inc
similarity index 100%
rename from system/host/fidl/include/fidl/token_definitions.inc
rename to zircon/system/host/fidl/include/fidl/token_definitions.inc
diff --git a/system/host/fidl/include/fidl/tree_visitor.h b/zircon/system/host/fidl/include/fidl/tree_visitor.h
similarity index 100%
rename from system/host/fidl/include/fidl/tree_visitor.h
rename to zircon/system/host/fidl/include/fidl/tree_visitor.h
diff --git a/system/host/fidl/include/fidl/type_shape.h b/zircon/system/host/fidl/include/fidl/type_shape.h
similarity index 100%
rename from system/host/fidl/include/fidl/type_shape.h
rename to zircon/system/host/fidl/include/fidl/type_shape.h
diff --git a/system/host/fidl/include/fidl/types.h b/zircon/system/host/fidl/include/fidl/types.h
similarity index 100%
rename from system/host/fidl/include/fidl/types.h
rename to zircon/system/host/fidl/include/fidl/types.h
diff --git a/system/host/fidl/include/fidl/utils.h b/zircon/system/host/fidl/include/fidl/utils.h
similarity index 100%
rename from system/host/fidl/include/fidl/utils.h
rename to zircon/system/host/fidl/include/fidl/utils.h
diff --git a/system/host/fidl/include/fidl/virtual_source_file.h b/zircon/system/host/fidl/include/fidl/virtual_source_file.h
similarity index 100%
rename from system/host/fidl/include/fidl/virtual_source_file.h
rename to zircon/system/host/fidl/include/fidl/virtual_source_file.h
diff --git a/system/host/fidl/lib/attributes.cpp b/zircon/system/host/fidl/lib/attributes.cpp
similarity index 100%
rename from system/host/fidl/lib/attributes.cpp
rename to zircon/system/host/fidl/lib/attributes.cpp
diff --git a/system/host/fidl/lib/c_generator.cpp b/zircon/system/host/fidl/lib/c_generator.cpp
similarity index 100%
rename from system/host/fidl/lib/c_generator.cpp
rename to zircon/system/host/fidl/lib/c_generator.cpp
diff --git a/system/host/fidl/lib/coded_types_generator.cpp b/zircon/system/host/fidl/lib/coded_types_generator.cpp
similarity index 100%
rename from system/host/fidl/lib/coded_types_generator.cpp
rename to zircon/system/host/fidl/lib/coded_types_generator.cpp
diff --git a/system/host/fidl/lib/error_reporter.cpp b/zircon/system/host/fidl/lib/error_reporter.cpp
similarity index 100%
rename from system/host/fidl/lib/error_reporter.cpp
rename to zircon/system/host/fidl/lib/error_reporter.cpp
diff --git a/system/host/fidl/lib/flat_ast.cpp b/zircon/system/host/fidl/lib/flat_ast.cpp
similarity index 100%
rename from system/host/fidl/lib/flat_ast.cpp
rename to zircon/system/host/fidl/lib/flat_ast.cpp
diff --git a/system/host/fidl/lib/formatter.cpp b/zircon/system/host/fidl/lib/formatter.cpp
similarity index 100%
rename from system/host/fidl/lib/formatter.cpp
rename to zircon/system/host/fidl/lib/formatter.cpp
diff --git a/system/host/fidl/lib/json_generator.cpp b/zircon/system/host/fidl/lib/json_generator.cpp
similarity index 100%
rename from system/host/fidl/lib/json_generator.cpp
rename to zircon/system/host/fidl/lib/json_generator.cpp
diff --git a/system/host/fidl/lib/lexer.cpp b/zircon/system/host/fidl/lib/lexer.cpp
similarity index 100%
rename from system/host/fidl/lib/lexer.cpp
rename to zircon/system/host/fidl/lib/lexer.cpp
diff --git a/system/host/fidl/lib/library_zx.cpp b/zircon/system/host/fidl/lib/library_zx.cpp
similarity index 100%
rename from system/host/fidl/lib/library_zx.cpp
rename to zircon/system/host/fidl/lib/library_zx.cpp
diff --git a/system/host/fidl/lib/names.cpp b/zircon/system/host/fidl/lib/names.cpp
similarity index 100%
rename from system/host/fidl/lib/names.cpp
rename to zircon/system/host/fidl/lib/names.cpp
diff --git a/system/host/fidl/lib/ordinals.cpp b/zircon/system/host/fidl/lib/ordinals.cpp
similarity index 100%
rename from system/host/fidl/lib/ordinals.cpp
rename to zircon/system/host/fidl/lib/ordinals.cpp
diff --git a/system/host/fidl/lib/parser.cpp b/zircon/system/host/fidl/lib/parser.cpp
similarity index 100%
rename from system/host/fidl/lib/parser.cpp
rename to zircon/system/host/fidl/lib/parser.cpp
diff --git a/system/host/fidl/lib/raw_ast.cpp b/zircon/system/host/fidl/lib/raw_ast.cpp
similarity index 100%
rename from system/host/fidl/lib/raw_ast.cpp
rename to zircon/system/host/fidl/lib/raw_ast.cpp
diff --git a/system/host/fidl/lib/source_file.cpp b/zircon/system/host/fidl/lib/source_file.cpp
similarity index 100%
rename from system/host/fidl/lib/source_file.cpp
rename to zircon/system/host/fidl/lib/source_file.cpp
diff --git a/system/host/fidl/lib/source_location.cpp b/zircon/system/host/fidl/lib/source_location.cpp
similarity index 100%
rename from system/host/fidl/lib/source_location.cpp
rename to zircon/system/host/fidl/lib/source_location.cpp
diff --git a/system/host/fidl/lib/source_manager.cpp b/zircon/system/host/fidl/lib/source_manager.cpp
similarity index 100%
rename from system/host/fidl/lib/source_manager.cpp
rename to zircon/system/host/fidl/lib/source_manager.cpp
diff --git a/system/host/fidl/lib/tables_generator.cpp b/zircon/system/host/fidl/lib/tables_generator.cpp
similarity index 100%
rename from system/host/fidl/lib/tables_generator.cpp
rename to zircon/system/host/fidl/lib/tables_generator.cpp
diff --git a/system/host/fidl/lib/tree_visitor.cpp b/zircon/system/host/fidl/lib/tree_visitor.cpp
similarity index 100%
rename from system/host/fidl/lib/tree_visitor.cpp
rename to zircon/system/host/fidl/lib/tree_visitor.cpp
diff --git a/system/host/fidl/lib/virtual_source_file.cpp b/zircon/system/host/fidl/lib/virtual_source_file.cpp
similarity index 100%
rename from system/host/fidl/lib/virtual_source_file.cpp
rename to zircon/system/host/fidl/lib/virtual_source_file.cpp
diff --git a/system/host/fidl/rules.mk b/zircon/system/host/fidl/rules.mk
similarity index 100%
rename from system/host/fidl/rules.mk
rename to zircon/system/host/fidl/rules.mk
diff --git a/system/host/fidl/schema.json b/zircon/system/host/fidl/schema.json
similarity index 100%
rename from system/host/fidl/schema.json
rename to zircon/system/host/fidl/schema.json
diff --git a/system/host/fvm/main.cpp b/zircon/system/host/fvm/main.cpp
similarity index 100%
rename from system/host/fvm/main.cpp
rename to zircon/system/host/fvm/main.cpp
diff --git a/system/host/fvm/rules.mk b/zircon/system/host/fvm/rules.mk
similarity index 100%
rename from system/host/fvm/rules.mk
rename to zircon/system/host/fvm/rules.mk
diff --git a/system/host/h2md/h2md.c b/zircon/system/host/h2md/h2md.c
similarity index 100%
rename from system/host/h2md/h2md.c
rename to zircon/system/host/h2md/h2md.c
diff --git a/system/host/h2md/rules.mk b/zircon/system/host/h2md/rules.mk
similarity index 100%
rename from system/host/h2md/rules.mk
rename to zircon/system/host/h2md/rules.mk
diff --git a/system/host/kernel-buildsig/kernel-buildsig.cpp b/zircon/system/host/kernel-buildsig/kernel-buildsig.cpp
similarity index 100%
rename from system/host/kernel-buildsig/kernel-buildsig.cpp
rename to zircon/system/host/kernel-buildsig/kernel-buildsig.cpp
diff --git a/system/host/kernel-buildsig/rules.mk b/zircon/system/host/kernel-buildsig/rules.mk
similarity index 100%
rename from system/host/kernel-buildsig/rules.mk
rename to zircon/system/host/kernel-buildsig/rules.mk
diff --git a/system/host/loglistener/loglistener.c b/zircon/system/host/loglistener/loglistener.c
similarity index 100%
rename from system/host/loglistener/loglistener.c
rename to zircon/system/host/loglistener/loglistener.c
diff --git a/system/host/loglistener/rules.mk b/zircon/system/host/loglistener/rules.mk
similarity index 100%
rename from system/host/loglistener/rules.mk
rename to zircon/system/host/loglistener/rules.mk
diff --git a/system/host/merkleroot/merkleroot.cpp b/zircon/system/host/merkleroot/merkleroot.cpp
similarity index 100%
rename from system/host/merkleroot/merkleroot.cpp
rename to zircon/system/host/merkleroot/merkleroot.cpp
diff --git a/system/host/merkleroot/rules.mk b/zircon/system/host/merkleroot/rules.mk
similarity index 100%
rename from system/host/merkleroot/rules.mk
rename to zircon/system/host/merkleroot/rules.mk
diff --git a/system/host/minfs/main.cpp b/zircon/system/host/minfs/main.cpp
similarity index 100%
rename from system/host/minfs/main.cpp
rename to zircon/system/host/minfs/main.cpp
diff --git a/system/host/minfs/minfs.h b/zircon/system/host/minfs/minfs.h
similarity index 100%
rename from system/host/minfs/minfs.h
rename to zircon/system/host/minfs/minfs.h
diff --git a/system/host/minfs/rules.mk b/zircon/system/host/minfs/rules.mk
similarity index 100%
rename from system/host/minfs/rules.mk
rename to zircon/system/host/minfs/rules.mk
diff --git a/system/host/mkfs-msdosfs/rules.mk b/zircon/system/host/mkfs-msdosfs/rules.mk
similarity index 100%
rename from system/host/mkfs-msdosfs/rules.mk
rename to zircon/system/host/mkfs-msdosfs/rules.mk
diff --git a/system/host/mkkdtb/mkkdtb.c b/zircon/system/host/mkkdtb/mkkdtb.c
similarity index 100%
rename from system/host/mkkdtb/mkkdtb.c
rename to zircon/system/host/mkkdtb/mkkdtb.c
diff --git a/system/host/mkkdtb/rules.mk b/zircon/system/host/mkkdtb/rules.mk
similarity index 100%
rename from system/host/mkkdtb/rules.mk
rename to zircon/system/host/mkkdtb/rules.mk
diff --git a/system/host/netprotocol/netaddr.c b/zircon/system/host/netprotocol/netaddr.c
similarity index 100%
rename from system/host/netprotocol/netaddr.c
rename to zircon/system/host/netprotocol/netaddr.c
diff --git a/system/host/netprotocol/netcp.c b/zircon/system/host/netprotocol/netcp.c
similarity index 100%
rename from system/host/netprotocol/netcp.c
rename to zircon/system/host/netprotocol/netcp.c
diff --git a/system/host/netprotocol/netls.c b/zircon/system/host/netprotocol/netls.c
similarity index 100%
rename from system/host/netprotocol/netls.c
rename to zircon/system/host/netprotocol/netls.c
diff --git a/system/host/netprotocol/netprotocol.c b/zircon/system/host/netprotocol/netprotocol.c
similarity index 100%
rename from system/host/netprotocol/netprotocol.c
rename to zircon/system/host/netprotocol/netprotocol.c
diff --git a/system/host/netprotocol/netprotocol.h b/zircon/system/host/netprotocol/netprotocol.h
similarity index 100%
rename from system/host/netprotocol/netprotocol.h
rename to zircon/system/host/netprotocol/netprotocol.h
diff --git a/system/host/netprotocol/netruncmd.c b/zircon/system/host/netprotocol/netruncmd.c
similarity index 100%
rename from system/host/netprotocol/netruncmd.c
rename to zircon/system/host/netprotocol/netruncmd.c
diff --git a/system/host/netprotocol/rules.mk b/zircon/system/host/netprotocol/rules.mk
similarity index 100%
rename from system/host/netprotocol/rules.mk
rename to zircon/system/host/netprotocol/rules.mk
diff --git a/system/host/rules.mk b/zircon/system/host/rules.mk
similarity index 100%
rename from system/host/rules.mk
rename to zircon/system/host/rules.mk
diff --git a/system/host/runtests/rules.mk b/zircon/system/host/runtests/rules.mk
similarity index 100%
rename from system/host/runtests/rules.mk
rename to zircon/system/host/runtests/rules.mk
diff --git a/system/host/runtests/runtests.cpp b/zircon/system/host/runtests/runtests.cpp
similarity index 100%
rename from system/host/runtests/runtests.cpp
rename to zircon/system/host/runtests/runtests.cpp
diff --git a/system/host/xdc-server/rules.mk b/zircon/system/host/xdc-server/rules.mk
similarity index 100%
rename from system/host/xdc-server/rules.mk
rename to zircon/system/host/xdc-server/rules.mk
diff --git a/system/host/xdc-server/usb-handler.cpp b/zircon/system/host/xdc-server/usb-handler.cpp
similarity index 100%
rename from system/host/xdc-server/usb-handler.cpp
rename to zircon/system/host/xdc-server/usb-handler.cpp
diff --git a/system/host/xdc-server/usb-handler.h b/zircon/system/host/xdc-server/usb-handler.h
similarity index 100%
rename from system/host/xdc-server/usb-handler.h
rename to zircon/system/host/xdc-server/usb-handler.h
diff --git a/system/host/xdc-server/xdc-server.cpp b/zircon/system/host/xdc-server/xdc-server.cpp
similarity index 100%
rename from system/host/xdc-server/xdc-server.cpp
rename to zircon/system/host/xdc-server/xdc-server.cpp
diff --git a/system/host/xdc-server/xdc-server.h b/zircon/system/host/xdc-server/xdc-server.h
similarity index 100%
rename from system/host/xdc-server/xdc-server.h
rename to zircon/system/host/xdc-server/xdc-server.h
diff --git a/system/host/zbi/rules.mk b/zircon/system/host/zbi/rules.mk
similarity index 100%
rename from system/host/zbi/rules.mk
rename to zircon/system/host/zbi/rules.mk
diff --git a/system/host/zbi/zbi.cpp b/zircon/system/host/zbi/zbi.cpp
similarity index 100%
rename from system/host/zbi/zbi.cpp
rename to zircon/system/host/zbi/zbi.cpp
diff --git a/system/private/MAINTAINERS b/zircon/system/private/MAINTAINERS
similarity index 100%
rename from system/private/MAINTAINERS
rename to zircon/system/private/MAINTAINERS
diff --git a/system/private/README.md b/zircon/system/private/README.md
similarity index 100%
rename from system/private/README.md
rename to zircon/system/private/README.md
diff --git a/system/private/efi/boot-services.h b/zircon/system/private/efi/boot-services.h
similarity index 100%
rename from system/private/efi/boot-services.h
rename to zircon/system/private/efi/boot-services.h
diff --git a/system/private/efi/protocol/block-io.h b/zircon/system/private/efi/protocol/block-io.h
similarity index 100%
rename from system/private/efi/protocol/block-io.h
rename to zircon/system/private/efi/protocol/block-io.h
diff --git a/system/private/efi/protocol/device-path-to-text.h b/zircon/system/private/efi/protocol/device-path-to-text.h
similarity index 100%
rename from system/private/efi/protocol/device-path-to-text.h
rename to zircon/system/private/efi/protocol/device-path-to-text.h
diff --git a/system/private/efi/protocol/device-path.h b/zircon/system/private/efi/protocol/device-path.h
similarity index 100%
rename from system/private/efi/protocol/device-path.h
rename to zircon/system/private/efi/protocol/device-path.h
diff --git a/system/private/efi/protocol/disk-io.h b/zircon/system/private/efi/protocol/disk-io.h
similarity index 100%
rename from system/private/efi/protocol/disk-io.h
rename to zircon/system/private/efi/protocol/disk-io.h
diff --git a/system/private/efi/protocol/driver-binding.h b/zircon/system/private/efi/protocol/driver-binding.h
similarity index 100%
rename from system/private/efi/protocol/driver-binding.h
rename to zircon/system/private/efi/protocol/driver-binding.h
diff --git a/system/private/efi/protocol/file.h b/zircon/system/private/efi/protocol/file.h
similarity index 100%
rename from system/private/efi/protocol/file.h
rename to zircon/system/private/efi/protocol/file.h
diff --git a/system/private/efi/protocol/graphics-output.h b/zircon/system/private/efi/protocol/graphics-output.h
similarity index 100%
rename from system/private/efi/protocol/graphics-output.h
rename to zircon/system/private/efi/protocol/graphics-output.h
diff --git a/system/private/efi/protocol/loaded-image.h b/zircon/system/private/efi/protocol/loaded-image.h
similarity index 100%
rename from system/private/efi/protocol/loaded-image.h
rename to zircon/system/private/efi/protocol/loaded-image.h
diff --git a/system/private/efi/protocol/managed-network.h b/zircon/system/private/efi/protocol/managed-network.h
similarity index 100%
rename from system/private/efi/protocol/managed-network.h
rename to zircon/system/private/efi/protocol/managed-network.h
diff --git a/system/private/efi/protocol/pci-root-bridge-io.h b/zircon/system/private/efi/protocol/pci-root-bridge-io.h
similarity index 100%
rename from system/private/efi/protocol/pci-root-bridge-io.h
rename to zircon/system/private/efi/protocol/pci-root-bridge-io.h
diff --git a/system/private/efi/protocol/simple-file-system.h b/zircon/system/private/efi/protocol/simple-file-system.h
similarity index 100%
rename from system/private/efi/protocol/simple-file-system.h
rename to zircon/system/private/efi/protocol/simple-file-system.h
diff --git a/system/private/efi/protocol/simple-network.h b/zircon/system/private/efi/protocol/simple-network.h
similarity index 100%
rename from system/private/efi/protocol/simple-network.h
rename to zircon/system/private/efi/protocol/simple-network.h
diff --git a/system/private/efi/protocol/simple-text-input.h b/zircon/system/private/efi/protocol/simple-text-input.h
similarity index 100%
rename from system/private/efi/protocol/simple-text-input.h
rename to zircon/system/private/efi/protocol/simple-text-input.h
diff --git a/system/private/efi/protocol/simple-text-output.h b/zircon/system/private/efi/protocol/simple-text-output.h
similarity index 100%
rename from system/private/efi/protocol/simple-text-output.h
rename to zircon/system/private/efi/protocol/simple-text-output.h
diff --git a/system/private/efi/protocol/usb-io.h b/zircon/system/private/efi/protocol/usb-io.h
similarity index 100%
rename from system/private/efi/protocol/usb-io.h
rename to zircon/system/private/efi/protocol/usb-io.h
diff --git a/system/private/efi/runtime-services.h b/zircon/system/private/efi/runtime-services.h
similarity index 100%
rename from system/private/efi/runtime-services.h
rename to zircon/system/private/efi/runtime-services.h
diff --git a/system/private/efi/system-table.h b/zircon/system/private/efi/system-table.h
similarity index 100%
rename from system/private/efi/system-table.h
rename to zircon/system/private/efi/system-table.h
diff --git a/system/private/efi/types.h b/zircon/system/private/efi/types.h
similarity index 100%
rename from system/private/efi/types.h
rename to zircon/system/private/efi/types.h
diff --git a/system/private/efi/zircon.h b/zircon/system/private/efi/zircon.h
similarity index 100%
rename from system/private/efi/zircon.h
rename to zircon/system/private/efi/zircon.h
diff --git a/system/private/zircon/font/font-18x32.h b/zircon/system/private/zircon/font/font-18x32.h
similarity index 100%
rename from system/private/zircon/font/font-18x32.h
rename to zircon/system/private/zircon/font/font-18x32.h
diff --git a/system/private/zircon/font/font-9x16.h b/zircon/system/private/zircon/font/font-9x16.h
similarity index 100%
rename from system/private/zircon/font/font-9x16.h
rename to zircon/system/private/zircon/font/font-9x16.h
diff --git a/system/private/zircon/kernel-counters.h b/zircon/system/private/zircon/kernel-counters.h
similarity index 100%
rename from system/private/zircon/kernel-counters.h
rename to zircon/system/private/zircon/kernel-counters.h
diff --git a/system/private/zircon/paths.h b/zircon/system/private/zircon/paths.h
similarity index 100%
rename from system/private/zircon/paths.h
rename to zircon/system/private/zircon/paths.h
diff --git a/system/private/zircon/stack.h b/zircon/system/private/zircon/stack.h
similarity index 100%
rename from system/private/zircon/stack.h
rename to zircon/system/private/zircon/stack.h
diff --git a/system/private/zircon/thread_annotations.h b/zircon/system/private/zircon/thread_annotations.h
similarity index 100%
rename from system/private/zircon/thread_annotations.h
rename to zircon/system/private/zircon/thread_annotations.h
diff --git a/system/public/BUILD.gn b/zircon/system/public/BUILD.gn
similarity index 100%
rename from system/public/BUILD.gn
rename to zircon/system/public/BUILD.gn
diff --git a/system/public/MAINTAINERS b/zircon/system/public/MAINTAINERS
similarity index 100%
rename from system/public/MAINTAINERS
rename to zircon/system/public/MAINTAINERS
diff --git a/system/public/README.md b/zircon/system/public/README.md
similarity index 100%
rename from system/public/README.md
rename to zircon/system/public/README.md
diff --git a/system/public/zircon/assert.h b/zircon/system/public/zircon/assert.h
similarity index 100%
rename from system/public/zircon/assert.h
rename to zircon/system/public/zircon/assert.h
diff --git a/system/public/zircon/boot/bootdata.h b/zircon/system/public/zircon/boot/bootdata.h
similarity index 100%
rename from system/public/zircon/boot/bootdata.h
rename to zircon/system/public/zircon/boot/bootdata.h
diff --git a/system/public/zircon/boot/driver-config.h b/zircon/system/public/zircon/boot/driver-config.h
similarity index 100%
rename from system/public/zircon/boot/driver-config.h
rename to zircon/system/public/zircon/boot/driver-config.h
diff --git a/system/public/zircon/boot/e820.h b/zircon/system/public/zircon/boot/e820.h
similarity index 100%
rename from system/public/zircon/boot/e820.h
rename to zircon/system/public/zircon/boot/e820.h
diff --git a/system/public/zircon/boot/image.h b/zircon/system/public/zircon/boot/image.h
similarity index 100%
rename from system/public/zircon/boot/image.h
rename to zircon/system/public/zircon/boot/image.h
diff --git a/system/public/zircon/boot/multiboot.h b/zircon/system/public/zircon/boot/multiboot.h
similarity index 100%
rename from system/public/zircon/boot/multiboot.h
rename to zircon/system/public/zircon/boot/multiboot.h
diff --git a/system/public/zircon/boot/netboot.h b/zircon/system/public/zircon/boot/netboot.h
similarity index 100%
rename from system/public/zircon/boot/netboot.h
rename to zircon/system/public/zircon/boot/netboot.h
diff --git a/system/public/zircon/boot/sysconfig.h b/zircon/system/public/zircon/boot/sysconfig.h
similarity index 100%
rename from system/public/zircon/boot/sysconfig.h
rename to zircon/system/public/zircon/boot/sysconfig.h
diff --git a/system/public/zircon/compiler.h b/zircon/system/public/zircon/compiler.h
similarity index 100%
rename from system/public/zircon/compiler.h
rename to zircon/system/public/zircon/compiler.h
diff --git a/system/public/zircon/device/audio-codec.h b/zircon/system/public/zircon/device/audio-codec.h
similarity index 100%
rename from system/public/zircon/device/audio-codec.h
rename to zircon/system/public/zircon/device/audio-codec.h
diff --git a/system/public/zircon/device/audio.h b/zircon/system/public/zircon/device/audio.h
similarity index 100%
rename from system/public/zircon/device/audio.h
rename to zircon/system/public/zircon/device/audio.h
diff --git a/system/public/zircon/device/block.h b/zircon/system/public/zircon/device/block.h
similarity index 100%
rename from system/public/zircon/device/block.h
rename to zircon/system/public/zircon/device/block.h
diff --git a/system/public/zircon/device/bt-hci.h b/zircon/system/public/zircon/device/bt-hci.h
similarity index 100%
rename from system/public/zircon/device/bt-hci.h
rename to zircon/system/public/zircon/device/bt-hci.h
diff --git a/system/public/zircon/device/clk.h b/zircon/system/public/zircon/device/clk.h
similarity index 100%
rename from system/public/zircon/device/clk.h
rename to zircon/system/public/zircon/device/clk.h
diff --git a/system/public/zircon/device/device.h b/zircon/system/public/zircon/device/device.h
similarity index 100%
rename from system/public/zircon/device/device.h
rename to zircon/system/public/zircon/device/device.h
diff --git a/system/public/zircon/device/display-controller.h b/zircon/system/public/zircon/device/display-controller.h
similarity index 100%
rename from system/public/zircon/device/display-controller.h
rename to zircon/system/public/zircon/device/display-controller.h
diff --git a/system/public/zircon/device/ethertap.h b/zircon/system/public/zircon/device/ethertap.h
similarity index 100%
rename from system/public/zircon/device/ethertap.h
rename to zircon/system/public/zircon/device/ethertap.h
diff --git a/system/public/zircon/device/hidctl.h b/zircon/system/public/zircon/device/hidctl.h
similarity index 100%
rename from system/public/zircon/device/hidctl.h
rename to zircon/system/public/zircon/device/hidctl.h
diff --git a/system/public/zircon/device/intel-hda.h b/zircon/system/public/zircon/device/intel-hda.h
similarity index 100%
rename from system/public/zircon/device/intel-hda.h
rename to zircon/system/public/zircon/device/intel-hda.h
diff --git a/system/public/zircon/device/ioctl-wrapper.h b/zircon/system/public/zircon/device/ioctl-wrapper.h
similarity index 100%
rename from system/public/zircon/device/ioctl-wrapper.h
rename to zircon/system/public/zircon/device/ioctl-wrapper.h
diff --git a/system/public/zircon/device/ioctl.h b/zircon/system/public/zircon/device/ioctl.h
similarity index 100%
rename from system/public/zircon/device/ioctl.h
rename to zircon/system/public/zircon/device/ioctl.h
diff --git a/system/public/zircon/device/ktrace.h b/zircon/system/public/zircon/device/ktrace.h
similarity index 100%
rename from system/public/zircon/device/ktrace.h
rename to zircon/system/public/zircon/device/ktrace.h
diff --git a/system/public/zircon/device/media-codec.h b/zircon/system/public/zircon/device/media-codec.h
similarity index 100%
rename from system/public/zircon/device/media-codec.h
rename to zircon/system/public/zircon/device/media-codec.h
diff --git a/system/public/zircon/device/midi.h b/zircon/system/public/zircon/device/midi.h
similarity index 100%
rename from system/public/zircon/device/midi.h
rename to zircon/system/public/zircon/device/midi.h
diff --git a/system/public/zircon/device/nand.h b/zircon/system/public/zircon/device/nand.h
similarity index 100%
rename from system/public/zircon/device/nand.h
rename to zircon/system/public/zircon/device/nand.h
diff --git a/system/public/zircon/device/pty.h b/zircon/system/public/zircon/device/pty.h
similarity index 100%
rename from system/public/zircon/device/pty.h
rename to zircon/system/public/zircon/device/pty.h
diff --git a/system/public/zircon/device/qmi-transport.h b/zircon/system/public/zircon/device/qmi-transport.h
similarity index 100%
rename from system/public/zircon/device/qmi-transport.h
rename to zircon/system/public/zircon/device/qmi-transport.h
diff --git a/system/public/zircon/device/serial.h b/zircon/system/public/zircon/device/serial.h
similarity index 100%
rename from system/public/zircon/device/serial.h
rename to zircon/system/public/zircon/device/serial.h
diff --git a/system/public/zircon/device/sysmem.h b/zircon/system/public/zircon/device/sysmem.h
similarity index 100%
rename from system/public/zircon/device/sysmem.h
rename to zircon/system/public/zircon/device/sysmem.h
diff --git a/system/public/zircon/device/thermal.h b/zircon/system/public/zircon/device/thermal.h
similarity index 100%
rename from system/public/zircon/device/thermal.h
rename to zircon/system/public/zircon/device/thermal.h
diff --git a/system/public/zircon/device/usb-peripheral-test.h b/zircon/system/public/zircon/device/usb-peripheral-test.h
similarity index 100%
rename from system/public/zircon/device/usb-peripheral-test.h
rename to zircon/system/public/zircon/device/usb-peripheral-test.h
diff --git a/system/public/zircon/device/usb-peripheral.h b/zircon/system/public/zircon/device/usb-peripheral.h
similarity index 100%
rename from system/public/zircon/device/usb-peripheral.h
rename to zircon/system/public/zircon/device/usb-peripheral.h
diff --git a/system/public/zircon/device/vfs.h b/zircon/system/public/zircon/device/vfs.h
similarity index 100%
rename from system/public/zircon/device/vfs.h
rename to zircon/system/public/zircon/device/vfs.h
diff --git a/system/public/zircon/driver/binding.h b/zircon/system/public/zircon/driver/binding.h
similarity index 100%
rename from system/public/zircon/driver/binding.h
rename to zircon/system/public/zircon/driver/binding.h
diff --git a/system/public/zircon/errors.h b/zircon/system/public/zircon/errors.h
similarity index 100%
rename from system/public/zircon/errors.h
rename to zircon/system/public/zircon/errors.h
diff --git a/system/public/zircon/features.h b/zircon/system/public/zircon/features.h
similarity index 100%
rename from system/public/zircon/features.h
rename to zircon/system/public/zircon/features.h
diff --git a/system/public/zircon/fidl.h b/zircon/system/public/zircon/fidl.h
similarity index 100%
rename from system/public/zircon/fidl.h
rename to zircon/system/public/zircon/fidl.h
diff --git a/system/public/zircon/hw/gpt.h b/zircon/system/public/zircon/hw/gpt.h
similarity index 100%
rename from system/public/zircon/hw/gpt.h
rename to zircon/system/public/zircon/hw/gpt.h
diff --git a/system/public/zircon/hw/i2c.h b/zircon/system/public/zircon/hw/i2c.h
similarity index 100%
rename from system/public/zircon/hw/i2c.h
rename to zircon/system/public/zircon/hw/i2c.h
diff --git a/system/public/zircon/hw/pci.h b/zircon/system/public/zircon/hw/pci.h
similarity index 100%
rename from system/public/zircon/hw/pci.h
rename to zircon/system/public/zircon/hw/pci.h
diff --git a/system/public/zircon/hw/usb.h b/zircon/system/public/zircon/hw/usb.h
similarity index 100%
rename from system/public/zircon/hw/usb.h
rename to zircon/system/public/zircon/hw/usb.h
diff --git a/system/public/zircon/hw/usb/audio.h b/zircon/system/public/zircon/hw/usb/audio.h
similarity index 100%
rename from system/public/zircon/hw/usb/audio.h
rename to zircon/system/public/zircon/hw/usb/audio.h
diff --git a/system/public/zircon/hw/usb/cdc.h b/zircon/system/public/zircon/hw/usb/cdc.h
similarity index 100%
rename from system/public/zircon/hw/usb/cdc.h
rename to zircon/system/public/zircon/hw/usb/cdc.h
diff --git a/system/public/zircon/hw/usb/dfu.h b/zircon/system/public/zircon/hw/usb/dfu.h
similarity index 100%
rename from system/public/zircon/hw/usb/dfu.h
rename to zircon/system/public/zircon/hw/usb/dfu.h
diff --git a/system/public/zircon/hw/usb/hid.h b/zircon/system/public/zircon/hw/usb/hid.h
similarity index 100%
rename from system/public/zircon/hw/usb/hid.h
rename to zircon/system/public/zircon/hw/usb/hid.h
diff --git a/system/public/zircon/hw/usb/hub.h b/zircon/system/public/zircon/hw/usb/hub.h
similarity index 100%
rename from system/public/zircon/hw/usb/hub.h
rename to zircon/system/public/zircon/hw/usb/hub.h
diff --git a/system/public/zircon/hw/usb/ums.h b/zircon/system/public/zircon/hw/usb/ums.h
similarity index 100%
rename from system/public/zircon/hw/usb/ums.h
rename to zircon/system/public/zircon/hw/usb/ums.h
diff --git a/system/public/zircon/hw/usb/video.h b/zircon/system/public/zircon/hw/usb/video.h
similarity index 100%
rename from system/public/zircon/hw/usb/video.h
rename to zircon/system/public/zircon/hw/usb/video.h
diff --git a/system/public/zircon/limits.h b/zircon/system/public/zircon/limits.h
similarity index 100%
rename from system/public/zircon/limits.h
rename to zircon/system/public/zircon/limits.h
diff --git a/system/public/zircon/listnode.h b/zircon/system/public/zircon/listnode.h
similarity index 100%
rename from system/public/zircon/listnode.h
rename to zircon/system/public/zircon/listnode.h
diff --git a/system/public/zircon/pixelformat.h b/zircon/system/public/zircon/pixelformat.h
similarity index 100%
rename from system/public/zircon/pixelformat.h
rename to zircon/system/public/zircon/pixelformat.h
diff --git a/system/public/zircon/process.h b/zircon/system/public/zircon/process.h
similarity index 100%
rename from system/public/zircon/process.h
rename to zircon/system/public/zircon/process.h
diff --git a/system/public/zircon/processargs.h b/zircon/system/public/zircon/processargs.h
similarity index 100%
rename from system/public/zircon/processargs.h
rename to zircon/system/public/zircon/processargs.h
diff --git a/system/public/zircon/rights.h b/zircon/system/public/zircon/rights.h
similarity index 100%
rename from system/public/zircon/rights.h
rename to zircon/system/public/zircon/rights.h
diff --git a/system/public/zircon/syscalls.abigen b/zircon/system/public/zircon/syscalls.abigen
similarity index 100%
rename from system/public/zircon/syscalls.abigen
rename to zircon/system/public/zircon/syscalls.abigen
diff --git a/system/public/zircon/syscalls.h b/zircon/system/public/zircon/syscalls.h
similarity index 100%
rename from system/public/zircon/syscalls.h
rename to zircon/system/public/zircon/syscalls.h
diff --git a/system/public/zircon/syscalls/debug.h b/zircon/system/public/zircon/syscalls/debug.h
similarity index 100%
rename from system/public/zircon/syscalls/debug.h
rename to zircon/system/public/zircon/syscalls/debug.h
diff --git a/system/public/zircon/syscalls/exception.h b/zircon/system/public/zircon/syscalls/exception.h
similarity index 100%
rename from system/public/zircon/syscalls/exception.h
rename to zircon/system/public/zircon/syscalls/exception.h
diff --git a/system/public/zircon/syscalls/hypervisor.h b/zircon/system/public/zircon/syscalls/hypervisor.h
similarity index 100%
rename from system/public/zircon/syscalls/hypervisor.h
rename to zircon/system/public/zircon/syscalls/hypervisor.h
diff --git a/system/public/zircon/syscalls/iommu.h b/zircon/system/public/zircon/syscalls/iommu.h
similarity index 100%
rename from system/public/zircon/syscalls/iommu.h
rename to zircon/system/public/zircon/syscalls/iommu.h
diff --git a/system/public/zircon/syscalls/log.h b/zircon/system/public/zircon/syscalls/log.h
similarity index 100%
rename from system/public/zircon/syscalls/log.h
rename to zircon/system/public/zircon/syscalls/log.h
diff --git a/system/public/zircon/syscalls/object.h b/zircon/system/public/zircon/syscalls/object.h
similarity index 100%
rename from system/public/zircon/syscalls/object.h
rename to zircon/system/public/zircon/syscalls/object.h
diff --git a/system/public/zircon/syscalls/pci.h b/zircon/system/public/zircon/syscalls/pci.h
similarity index 100%
rename from system/public/zircon/syscalls/pci.h
rename to zircon/system/public/zircon/syscalls/pci.h
diff --git a/system/public/zircon/syscalls/policy.h b/zircon/system/public/zircon/syscalls/policy.h
similarity index 100%
rename from system/public/zircon/syscalls/policy.h
rename to zircon/system/public/zircon/syscalls/policy.h
diff --git a/system/public/zircon/syscalls/port.h b/zircon/system/public/zircon/syscalls/port.h
similarity index 100%
rename from system/public/zircon/syscalls/port.h
rename to zircon/system/public/zircon/syscalls/port.h
diff --git a/system/public/zircon/syscalls/profile.h b/zircon/system/public/zircon/syscalls/profile.h
similarity index 100%
rename from system/public/zircon/syscalls/profile.h
rename to zircon/system/public/zircon/syscalls/profile.h
diff --git a/system/public/zircon/syscalls/resource.h b/zircon/system/public/zircon/syscalls/resource.h
similarity index 100%
rename from system/public/zircon/syscalls/resource.h
rename to zircon/system/public/zircon/syscalls/resource.h
diff --git a/system/public/zircon/syscalls/smc.h b/zircon/system/public/zircon/syscalls/smc.h
similarity index 100%
rename from system/public/zircon/syscalls/smc.h
rename to zircon/system/public/zircon/syscalls/smc.h
diff --git a/system/public/zircon/syscalls/system.h b/zircon/system/public/zircon/syscalls/system.h
similarity index 100%
rename from system/public/zircon/syscalls/system.h
rename to zircon/system/public/zircon/syscalls/system.h
diff --git a/system/public/zircon/syscalls/types.h b/zircon/system/public/zircon/syscalls/types.h
similarity index 100%
rename from system/public/zircon/syscalls/types.h
rename to zircon/system/public/zircon/syscalls/types.h
diff --git a/system/public/zircon/time.h b/zircon/system/public/zircon/time.h
similarity index 100%
rename from system/public/zircon/time.h
rename to zircon/system/public/zircon/time.h
diff --git a/system/public/zircon/tls.h b/zircon/system/public/zircon/tls.h
similarity index 100%
rename from system/public/zircon/tls.h
rename to zircon/system/public/zircon/tls.h
diff --git a/system/public/zircon/types.h b/zircon/system/public/zircon/types.h
similarity index 100%
rename from system/public/zircon/types.h
rename to zircon/system/public/zircon/types.h
diff --git a/system/uapp/MAINTAINERS b/zircon/system/uapp/MAINTAINERS
similarity index 100%
rename from system/uapp/MAINTAINERS
rename to zircon/system/uapp/MAINTAINERS
diff --git a/system/uapp/aslr-analysis/main.cpp b/zircon/system/uapp/aslr-analysis/main.cpp
similarity index 100%
rename from system/uapp/aslr-analysis/main.cpp
rename to zircon/system/uapp/aslr-analysis/main.cpp
diff --git a/system/uapp/aslr-analysis/rules.mk b/zircon/system/uapp/aslr-analysis/rules.mk
similarity index 100%
rename from system/uapp/aslr-analysis/rules.mk
rename to zircon/system/uapp/aslr-analysis/rules.mk
diff --git a/system/uapp/audio-codec/audio-codec.c b/zircon/system/uapp/audio-codec/audio-codec.c
similarity index 100%
rename from system/uapp/audio-codec/audio-codec.c
rename to zircon/system/uapp/audio-codec/audio-codec.c
diff --git a/system/uapp/audio-codec/rules.mk b/zircon/system/uapp/audio-codec/rules.mk
similarity index 100%
rename from system/uapp/audio-codec/rules.mk
rename to zircon/system/uapp/audio-codec/rules.mk
diff --git a/system/uapp/audio/audio.cpp b/zircon/system/uapp/audio/audio.cpp
similarity index 100%
rename from system/uapp/audio/audio.cpp
rename to zircon/system/uapp/audio/audio.cpp
diff --git a/system/uapp/audio/rules.mk b/zircon/system/uapp/audio/rules.mk
similarity index 100%
rename from system/uapp/audio/rules.mk
rename to zircon/system/uapp/audio/rules.mk
diff --git a/system/uapp/audio/sine-source.cpp b/zircon/system/uapp/audio/sine-source.cpp
similarity index 100%
rename from system/uapp/audio/sine-source.cpp
rename to zircon/system/uapp/audio/sine-source.cpp
diff --git a/system/uapp/audio/sine-source.h b/zircon/system/uapp/audio/sine-source.h
similarity index 100%
rename from system/uapp/audio/sine-source.h
rename to zircon/system/uapp/audio/sine-source.h
diff --git a/system/uapp/audio/wav-common.cpp b/zircon/system/uapp/audio/wav-common.cpp
similarity index 100%
rename from system/uapp/audio/wav-common.cpp
rename to zircon/system/uapp/audio/wav-common.cpp
diff --git a/system/uapp/audio/wav-common.h b/zircon/system/uapp/audio/wav-common.h
similarity index 100%
rename from system/uapp/audio/wav-common.h
rename to zircon/system/uapp/audio/wav-common.h
diff --git a/system/uapp/audio/wav-sink.cpp b/zircon/system/uapp/audio/wav-sink.cpp
similarity index 100%
rename from system/uapp/audio/wav-sink.cpp
rename to zircon/system/uapp/audio/wav-sink.cpp
diff --git a/system/uapp/audio/wav-sink.h b/zircon/system/uapp/audio/wav-sink.h
similarity index 100%
rename from system/uapp/audio/wav-sink.h
rename to zircon/system/uapp/audio/wav-sink.h
diff --git a/system/uapp/audio/wav-source.cpp b/zircon/system/uapp/audio/wav-source.cpp
similarity index 100%
rename from system/uapp/audio/wav-source.cpp
rename to zircon/system/uapp/audio/wav-source.cpp
diff --git a/system/uapp/audio/wav-source.h b/zircon/system/uapp/audio/wav-source.h
similarity index 100%
rename from system/uapp/audio/wav-source.h
rename to zircon/system/uapp/audio/wav-source.h
diff --git a/system/uapp/backlight/main.c b/zircon/system/uapp/backlight/main.c
similarity index 100%
rename from system/uapp/backlight/main.c
rename to zircon/system/uapp/backlight/main.c
diff --git a/system/uapp/backlight/rules.mk b/zircon/system/uapp/backlight/rules.mk
similarity index 100%
rename from system/uapp/backlight/rules.mk
rename to zircon/system/uapp/backlight/rules.mk
diff --git a/system/uapp/banjo-dummy/main.cpp b/zircon/system/uapp/banjo-dummy/main.cpp
similarity index 100%
rename from system/uapp/banjo-dummy/main.cpp
rename to zircon/system/uapp/banjo-dummy/main.cpp
diff --git a/system/uapp/banjo-dummy/rules.mk b/zircon/system/uapp/banjo-dummy/rules.mk
similarity index 100%
rename from system/uapp/banjo-dummy/rules.mk
rename to zircon/system/uapp/banjo-dummy/rules.mk
diff --git a/system/uapp/biotime/biotime.cpp b/zircon/system/uapp/biotime/biotime.cpp
similarity index 100%
rename from system/uapp/biotime/biotime.cpp
rename to zircon/system/uapp/biotime/biotime.cpp
diff --git a/system/uapp/biotime/rules.mk b/zircon/system/uapp/biotime/rules.mk
similarity index 100%
rename from system/uapp/biotime/rules.mk
rename to zircon/system/uapp/biotime/rules.mk
diff --git a/system/uapp/blktest/main.c b/zircon/system/uapp/blktest/main.c
similarity index 100%
rename from system/uapp/blktest/main.c
rename to zircon/system/uapp/blktest/main.c
diff --git a/system/uapp/blktest/rules.mk b/zircon/system/uapp/blktest/rules.mk
similarity index 100%
rename from system/uapp/blktest/rules.mk
rename to zircon/system/uapp/blktest/rules.mk
diff --git a/system/uapp/blobfs/main.cpp b/zircon/system/uapp/blobfs/main.cpp
similarity index 100%
rename from system/uapp/blobfs/main.cpp
rename to zircon/system/uapp/blobfs/main.cpp
diff --git a/system/uapp/blobfs/rules.mk b/zircon/system/uapp/blobfs/rules.mk
similarity index 100%
rename from system/uapp/blobfs/rules.mk
rename to zircon/system/uapp/blobfs/rules.mk
diff --git a/system/uapp/channel-perf/main.cpp b/zircon/system/uapp/channel-perf/main.cpp
similarity index 100%
rename from system/uapp/channel-perf/main.cpp
rename to zircon/system/uapp/channel-perf/main.cpp
diff --git a/system/uapp/channel-perf/rules.mk b/zircon/system/uapp/channel-perf/rules.mk
similarity index 100%
rename from system/uapp/channel-perf/rules.mk
rename to zircon/system/uapp/channel-perf/rules.mk
diff --git a/system/uapp/clock/clkctl.c b/zircon/system/uapp/clock/clkctl.c
similarity index 100%
rename from system/uapp/clock/clkctl.c
rename to zircon/system/uapp/clock/clkctl.c
diff --git a/system/uapp/clock/clock.c b/zircon/system/uapp/clock/clock.c
similarity index 100%
rename from system/uapp/clock/clock.c
rename to zircon/system/uapp/clock/clock.c
diff --git a/system/uapp/clock/rules.mk b/zircon/system/uapp/clock/rules.mk
similarity index 100%
rename from system/uapp/clock/rules.mk
rename to zircon/system/uapp/clock/rules.mk
diff --git a/system/uapp/crasher/cpp_specific.cpp b/zircon/system/uapp/crasher/cpp_specific.cpp
similarity index 100%
rename from system/uapp/crasher/cpp_specific.cpp
rename to zircon/system/uapp/crasher/cpp_specific.cpp
diff --git a/system/uapp/crasher/crasher.c b/zircon/system/uapp/crasher/crasher.c
similarity index 100%
rename from system/uapp/crasher/crasher.c
rename to zircon/system/uapp/crasher/crasher.c
diff --git a/system/uapp/crasher/rules.mk b/zircon/system/uapp/crasher/rules.mk
similarity index 100%
rename from system/uapp/crasher/rules.mk
rename to zircon/system/uapp/crasher/rules.mk
diff --git a/system/uapp/dd/main.c b/zircon/system/uapp/dd/main.c
similarity index 100%
rename from system/uapp/dd/main.c
rename to zircon/system/uapp/dd/main.c
diff --git a/system/uapp/dd/rules.mk b/zircon/system/uapp/dd/rules.mk
similarity index 100%
rename from system/uapp/dd/rules.mk
rename to zircon/system/uapp/dd/rules.mk
diff --git a/system/uapp/df/main.cpp b/zircon/system/uapp/df/main.cpp
similarity index 100%
rename from system/uapp/df/main.cpp
rename to zircon/system/uapp/df/main.cpp
diff --git a/system/uapp/df/rules.mk b/zircon/system/uapp/df/rules.mk
similarity index 100%
rename from system/uapp/df/rules.mk
rename to zircon/system/uapp/df/rules.mk
diff --git a/system/uapp/disk-pave/device-partitioner.cpp b/zircon/system/uapp/disk-pave/device-partitioner.cpp
similarity index 100%
rename from system/uapp/disk-pave/device-partitioner.cpp
rename to zircon/system/uapp/disk-pave/device-partitioner.cpp
diff --git a/system/uapp/disk-pave/device-partitioner.h b/zircon/system/uapp/disk-pave/device-partitioner.h
similarity index 100%
rename from system/uapp/disk-pave/device-partitioner.h
rename to zircon/system/uapp/disk-pave/device-partitioner.h
diff --git a/system/uapp/disk-pave/disk-pave.cpp b/zircon/system/uapp/disk-pave/disk-pave.cpp
similarity index 100%
rename from system/uapp/disk-pave/disk-pave.cpp
rename to zircon/system/uapp/disk-pave/disk-pave.cpp
diff --git a/system/uapp/disk-pave/pave-lib.cpp b/zircon/system/uapp/disk-pave/pave-lib.cpp
similarity index 100%
rename from system/uapp/disk-pave/pave-lib.cpp
rename to zircon/system/uapp/disk-pave/pave-lib.cpp
diff --git a/system/uapp/disk-pave/pave-lib.h b/zircon/system/uapp/disk-pave/pave-lib.h
similarity index 100%
rename from system/uapp/disk-pave/pave-lib.h
rename to zircon/system/uapp/disk-pave/pave-lib.h
diff --git a/system/uapp/disk-pave/pave-logging.h b/zircon/system/uapp/disk-pave/pave-logging.h
similarity index 100%
rename from system/uapp/disk-pave/pave-logging.h
rename to zircon/system/uapp/disk-pave/pave-logging.h
diff --git a/system/uapp/disk-pave/pave-utils.cpp b/zircon/system/uapp/disk-pave/pave-utils.cpp
similarity index 100%
rename from system/uapp/disk-pave/pave-utils.cpp
rename to zircon/system/uapp/disk-pave/pave-utils.cpp
diff --git a/system/uapp/disk-pave/pave-utils.h b/zircon/system/uapp/disk-pave/pave-utils.h
similarity index 100%
rename from system/uapp/disk-pave/pave-utils.h
rename to zircon/system/uapp/disk-pave/pave-utils.h
diff --git a/system/uapp/disk-pave/rules.mk b/zircon/system/uapp/disk-pave/rules.mk
similarity index 100%
rename from system/uapp/disk-pave/rules.mk
rename to zircon/system/uapp/disk-pave/rules.mk
diff --git a/system/uapp/disk-pave/test/device-partitioner-test.cpp b/zircon/system/uapp/disk-pave/test/device-partitioner-test.cpp
similarity index 100%
rename from system/uapp/disk-pave/test/device-partitioner-test.cpp
rename to zircon/system/uapp/disk-pave/test/device-partitioner-test.cpp
diff --git a/system/uapp/disk-pave/test/main.cpp b/zircon/system/uapp/disk-pave/test/main.cpp
similarity index 100%
rename from system/uapp/disk-pave/test/main.cpp
rename to zircon/system/uapp/disk-pave/test/main.cpp
diff --git a/system/uapp/display-test/display.cpp b/zircon/system/uapp/display-test/display.cpp
similarity index 100%
rename from system/uapp/display-test/display.cpp
rename to zircon/system/uapp/display-test/display.cpp
diff --git a/system/uapp/display-test/display.h b/zircon/system/uapp/display-test/display.h
similarity index 100%
rename from system/uapp/display-test/display.h
rename to zircon/system/uapp/display-test/display.h
diff --git a/system/uapp/display-test/image.cpp b/zircon/system/uapp/display-test/image.cpp
similarity index 100%
rename from system/uapp/display-test/image.cpp
rename to zircon/system/uapp/display-test/image.cpp
diff --git a/system/uapp/display-test/image.h b/zircon/system/uapp/display-test/image.h
similarity index 100%
rename from system/uapp/display-test/image.h
rename to zircon/system/uapp/display-test/image.h
diff --git a/system/uapp/display-test/main.cpp b/zircon/system/uapp/display-test/main.cpp
similarity index 100%
rename from system/uapp/display-test/main.cpp
rename to zircon/system/uapp/display-test/main.cpp
diff --git a/system/uapp/display-test/rules.mk b/zircon/system/uapp/display-test/rules.mk
similarity index 100%
rename from system/uapp/display-test/rules.mk
rename to zircon/system/uapp/display-test/rules.mk
diff --git a/system/uapp/display-test/utils.h b/zircon/system/uapp/display-test/utils.h
similarity index 100%
rename from system/uapp/display-test/utils.h
rename to zircon/system/uapp/display-test/utils.h
diff --git a/system/uapp/display-test/virtual-layer.cpp b/zircon/system/uapp/display-test/virtual-layer.cpp
similarity index 100%
rename from system/uapp/display-test/virtual-layer.cpp
rename to zircon/system/uapp/display-test/virtual-layer.cpp
diff --git a/system/uapp/display-test/virtual-layer.h b/zircon/system/uapp/display-test/virtual-layer.h
similarity index 100%
rename from system/uapp/display-test/virtual-layer.h
rename to zircon/system/uapp/display-test/virtual-layer.h
diff --git a/system/uapp/dlog/dlog.c b/zircon/system/uapp/dlog/dlog.c
similarity index 100%
rename from system/uapp/dlog/dlog.c
rename to zircon/system/uapp/dlog/dlog.c
diff --git a/system/uapp/dlog/rules.mk b/zircon/system/uapp/dlog/rules.mk
similarity index 100%
rename from system/uapp/dlog/rules.mk
rename to zircon/system/uapp/dlog/rules.mk
diff --git a/system/uapp/driverctl/driverctl.c b/zircon/system/uapp/driverctl/driverctl.c
similarity index 100%
rename from system/uapp/driverctl/driverctl.c
rename to zircon/system/uapp/driverctl/driverctl.c
diff --git a/system/uapp/driverctl/rules.mk b/zircon/system/uapp/driverctl/rules.mk
similarity index 100%
rename from system/uapp/driverctl/rules.mk
rename to zircon/system/uapp/driverctl/rules.mk
diff --git a/system/uapp/ethtool/ethtool.c b/zircon/system/uapp/ethtool/ethtool.c
similarity index 100%
rename from system/uapp/ethtool/ethtool.c
rename to zircon/system/uapp/ethtool/ethtool.c
diff --git a/system/uapp/ethtool/rules.mk b/zircon/system/uapp/ethtool/rules.mk
similarity index 100%
rename from system/uapp/ethtool/rules.mk
rename to zircon/system/uapp/ethtool/rules.mk
diff --git a/system/uapp/fs-fsck/main.c b/zircon/system/uapp/fs-fsck/main.c
similarity index 100%
rename from system/uapp/fs-fsck/main.c
rename to zircon/system/uapp/fs-fsck/main.c
diff --git a/system/uapp/fs-fsck/rules.mk b/zircon/system/uapp/fs-fsck/rules.mk
similarity index 100%
rename from system/uapp/fs-fsck/rules.mk
rename to zircon/system/uapp/fs-fsck/rules.mk
diff --git a/system/uapp/fs-mkfs/main.c b/zircon/system/uapp/fs-mkfs/main.c
similarity index 100%
rename from system/uapp/fs-mkfs/main.c
rename to zircon/system/uapp/fs-mkfs/main.c
diff --git a/system/uapp/fs-mkfs/rules.mk b/zircon/system/uapp/fs-mkfs/rules.mk
similarity index 100%
rename from system/uapp/fs-mkfs/rules.mk
rename to zircon/system/uapp/fs-mkfs/rules.mk
diff --git a/system/uapp/fs-mount/main.c b/zircon/system/uapp/fs-mount/main.c
similarity index 100%
rename from system/uapp/fs-mount/main.c
rename to zircon/system/uapp/fs-mount/main.c
diff --git a/system/uapp/fs-mount/rules.mk b/zircon/system/uapp/fs-mount/rules.mk
similarity index 100%
rename from system/uapp/fs-mount/rules.mk
rename to zircon/system/uapp/fs-mount/rules.mk
diff --git a/system/uapp/fs-umount/main.c b/zircon/system/uapp/fs-umount/main.c
similarity index 100%
rename from system/uapp/fs-umount/main.c
rename to zircon/system/uapp/fs-umount/main.c
diff --git a/system/uapp/fs-umount/rules.mk b/zircon/system/uapp/fs-umount/rules.mk
similarity index 100%
rename from system/uapp/fs-umount/rules.mk
rename to zircon/system/uapp/fs-umount/rules.mk
diff --git a/system/uapp/fuzz/fuzz.cpp b/zircon/system/uapp/fuzz/fuzz.cpp
similarity index 100%
rename from system/uapp/fuzz/fuzz.cpp
rename to zircon/system/uapp/fuzz/fuzz.cpp
diff --git a/system/uapp/fuzz/rules.mk b/zircon/system/uapp/fuzz/rules.mk
similarity index 100%
rename from system/uapp/fuzz/rules.mk
rename to zircon/system/uapp/fuzz/rules.mk
diff --git a/system/uapp/fvm-check/main.cpp b/zircon/system/uapp/fvm-check/main.cpp
similarity index 100%
rename from system/uapp/fvm-check/main.cpp
rename to zircon/system/uapp/fvm-check/main.cpp
diff --git a/system/uapp/fvm-check/rules.mk b/zircon/system/uapp/fvm-check/rules.mk
similarity index 100%
rename from system/uapp/fvm-check/rules.mk
rename to zircon/system/uapp/fvm-check/rules.mk
diff --git a/system/uapp/gfxfractal/main.c b/zircon/system/uapp/gfxfractal/main.c
similarity index 100%
rename from system/uapp/gfxfractal/main.c
rename to zircon/system/uapp/gfxfractal/main.c
diff --git a/system/uapp/gfxfractal/rules.mk b/zircon/system/uapp/gfxfractal/rules.mk
similarity index 100%
rename from system/uapp/gfxfractal/rules.mk
rename to zircon/system/uapp/gfxfractal/rules.mk
diff --git a/system/uapp/gfxlatency/background.inc b/zircon/system/uapp/gfxlatency/background.inc
similarity index 100%
rename from system/uapp/gfxlatency/background.inc
rename to zircon/system/uapp/gfxlatency/background.inc
diff --git a/system/uapp/gfxlatency/cursor.inc b/zircon/system/uapp/gfxlatency/cursor.inc
similarity index 100%
rename from system/uapp/gfxlatency/cursor.inc
rename to zircon/system/uapp/gfxlatency/cursor.inc
diff --git a/system/uapp/gfxlatency/main.cpp b/zircon/system/uapp/gfxlatency/main.cpp
similarity index 100%
rename from system/uapp/gfxlatency/main.cpp
rename to zircon/system/uapp/gfxlatency/main.cpp
diff --git a/system/uapp/gfxlatency/rules.mk b/zircon/system/uapp/gfxlatency/rules.mk
similarity index 100%
rename from system/uapp/gfxlatency/rules.mk
rename to zircon/system/uapp/gfxlatency/rules.mk
diff --git a/system/uapp/gfxtest/main.c b/zircon/system/uapp/gfxtest/main.c
similarity index 100%
rename from system/uapp/gfxtest/main.c
rename to zircon/system/uapp/gfxtest/main.c
diff --git a/system/uapp/gfxtest/rules.mk b/zircon/system/uapp/gfxtest/rules.mk
similarity index 100%
rename from system/uapp/gfxtest/rules.mk
rename to zircon/system/uapp/gfxtest/rules.mk
diff --git a/system/uapp/gpt/gpt.cpp b/zircon/system/uapp/gpt/gpt.cpp
similarity index 100%
rename from system/uapp/gpt/gpt.cpp
rename to zircon/system/uapp/gpt/gpt.cpp
diff --git a/system/uapp/gpt/rules.mk b/zircon/system/uapp/gpt/rules.mk
similarity index 100%
rename from system/uapp/gpt/rules.mk
rename to zircon/system/uapp/gpt/rules.mk
diff --git a/system/uapp/hid/main.cpp b/zircon/system/uapp/hid/main.cpp
similarity index 100%
rename from system/uapp/hid/main.cpp
rename to zircon/system/uapp/hid/main.cpp
diff --git a/system/uapp/hid/report.cpp b/zircon/system/uapp/hid/report.cpp
similarity index 100%
rename from system/uapp/hid/report.cpp
rename to zircon/system/uapp/hid/report.cpp
diff --git a/system/uapp/hid/rules.mk b/zircon/system/uapp/hid/rules.mk
similarity index 100%
rename from system/uapp/hid/rules.mk
rename to zircon/system/uapp/hid/rules.mk
diff --git a/system/uapp/hidsensor/main.c b/zircon/system/uapp/hidsensor/main.c
similarity index 100%
rename from system/uapp/hidsensor/main.c
rename to zircon/system/uapp/hidsensor/main.c
diff --git a/system/uapp/hidsensor/rules.mk b/zircon/system/uapp/hidsensor/rules.mk
similarity index 100%
rename from system/uapp/hidsensor/rules.mk
rename to zircon/system/uapp/hidsensor/rules.mk
diff --git a/system/uapp/hidtouch/main.c b/zircon/system/uapp/hidtouch/main.c
similarity index 100%
rename from system/uapp/hidtouch/main.c
rename to zircon/system/uapp/hidtouch/main.c
diff --git a/system/uapp/hidtouch/rules.mk b/zircon/system/uapp/hidtouch/rules.mk
similarity index 100%
rename from system/uapp/hidtouch/rules.mk
rename to zircon/system/uapp/hidtouch/rules.mk
diff --git a/system/uapp/i2c/i2c.c b/zircon/system/uapp/i2c/i2c.c
similarity index 100%
rename from system/uapp/i2c/i2c.c
rename to zircon/system/uapp/i2c/i2c.c
diff --git a/system/uapp/i2c/rules.mk b/zircon/system/uapp/i2c/rules.mk
similarity index 100%
rename from system/uapp/i2c/rules.mk
rename to zircon/system/uapp/i2c/rules.mk
diff --git a/system/uapp/ihda/codec_state.h b/zircon/system/uapp/ihda/codec_state.h
similarity index 100%
rename from system/uapp/ihda/codec_state.h
rename to zircon/system/uapp/ihda/codec_state.h
diff --git a/system/uapp/ihda/codec_state_fetcher.h b/zircon/system/uapp/ihda/codec_state_fetcher.h
similarity index 100%
rename from system/uapp/ihda/codec_state_fetcher.h
rename to zircon/system/uapp/ihda/codec_state_fetcher.h
diff --git a/system/uapp/ihda/ihda.cpp b/zircon/system/uapp/ihda/ihda.cpp
similarity index 100%
rename from system/uapp/ihda/ihda.cpp
rename to zircon/system/uapp/ihda/ihda.cpp
diff --git a/system/uapp/ihda/intel_hda_codec.cpp b/zircon/system/uapp/ihda/intel_hda_codec.cpp
similarity index 100%
rename from system/uapp/ihda/intel_hda_codec.cpp
rename to zircon/system/uapp/ihda/intel_hda_codec.cpp
diff --git a/system/uapp/ihda/intel_hda_codec.h b/zircon/system/uapp/ihda/intel_hda_codec.h
similarity index 100%
rename from system/uapp/ihda/intel_hda_codec.h
rename to zircon/system/uapp/ihda/intel_hda_codec.h
diff --git a/system/uapp/ihda/intel_hda_controller.cpp b/zircon/system/uapp/ihda/intel_hda_controller.cpp
similarity index 100%
rename from system/uapp/ihda/intel_hda_controller.cpp
rename to zircon/system/uapp/ihda/intel_hda_controller.cpp
diff --git a/system/uapp/ihda/intel_hda_controller.h b/zircon/system/uapp/ihda/intel_hda_controller.h
similarity index 100%
rename from system/uapp/ihda/intel_hda_controller.h
rename to zircon/system/uapp/ihda/intel_hda_controller.h
diff --git a/system/uapp/ihda/intel_hda_device.cpp b/zircon/system/uapp/ihda/intel_hda_device.cpp
similarity index 100%
rename from system/uapp/ihda/intel_hda_device.cpp
rename to zircon/system/uapp/ihda/intel_hda_device.cpp
diff --git a/system/uapp/ihda/intel_hda_device.h b/zircon/system/uapp/ihda/intel_hda_device.h
similarity index 100%
rename from system/uapp/ihda/intel_hda_device.h
rename to zircon/system/uapp/ihda/intel_hda_device.h
diff --git a/system/uapp/ihda/print_codec_state.cpp b/zircon/system/uapp/ihda/print_codec_state.cpp
similarity index 100%
rename from system/uapp/ihda/print_codec_state.cpp
rename to zircon/system/uapp/ihda/print_codec_state.cpp
diff --git a/system/uapp/ihda/rules.mk b/zircon/system/uapp/ihda/rules.mk
similarity index 100%
rename from system/uapp/ihda/rules.mk
rename to zircon/system/uapp/ihda/rules.mk
diff --git a/system/uapp/ihda/zircon_device.cpp b/zircon/system/uapp/ihda/zircon_device.cpp
similarity index 100%
rename from system/uapp/ihda/zircon_device.cpp
rename to zircon/system/uapp/ihda/zircon_device.cpp
diff --git a/system/uapp/ihda/zircon_device.h b/zircon/system/uapp/ihda/zircon_device.h
similarity index 100%
rename from system/uapp/ihda/zircon_device.h
rename to zircon/system/uapp/ihda/zircon_device.h
diff --git a/system/uapp/iochk/iochk.cpp b/zircon/system/uapp/iochk/iochk.cpp
similarity index 100%
rename from system/uapp/iochk/iochk.cpp
rename to zircon/system/uapp/iochk/iochk.cpp
diff --git a/system/uapp/iochk/rules.mk b/zircon/system/uapp/iochk/rules.mk
similarity index 100%
rename from system/uapp/iochk/rules.mk
rename to zircon/system/uapp/iochk/rules.mk
diff --git a/system/uapp/iotime/iotime.c b/zircon/system/uapp/iotime/iotime.c
similarity index 100%
rename from system/uapp/iotime/iotime.c
rename to zircon/system/uapp/iotime/iotime.c
diff --git a/system/uapp/iotime/rules.mk b/zircon/system/uapp/iotime/rules.mk
similarity index 100%
rename from system/uapp/iotime/rules.mk
rename to zircon/system/uapp/iotime/rules.mk
diff --git a/system/uapp/kcounter/kcounter.cpp b/zircon/system/uapp/kcounter/kcounter.cpp
similarity index 100%
rename from system/uapp/kcounter/kcounter.cpp
rename to zircon/system/uapp/kcounter/kcounter.cpp
diff --git a/system/uapp/kcounter/rules.mk b/zircon/system/uapp/kcounter/rules.mk
similarity index 100%
rename from system/uapp/kcounter/rules.mk
rename to zircon/system/uapp/kcounter/rules.mk
diff --git a/system/uapp/kstress/main.cpp b/zircon/system/uapp/kstress/main.cpp
similarity index 100%
rename from system/uapp/kstress/main.cpp
rename to zircon/system/uapp/kstress/main.cpp
diff --git a/system/uapp/kstress/rules.mk b/zircon/system/uapp/kstress/rules.mk
similarity index 100%
rename from system/uapp/kstress/rules.mk
rename to zircon/system/uapp/kstress/rules.mk
diff --git a/system/uapp/kstress/stress_test.cpp b/zircon/system/uapp/kstress/stress_test.cpp
similarity index 100%
rename from system/uapp/kstress/stress_test.cpp
rename to zircon/system/uapp/kstress/stress_test.cpp
diff --git a/system/uapp/kstress/stress_test.h b/zircon/system/uapp/kstress/stress_test.h
similarity index 100%
rename from system/uapp/kstress/stress_test.h
rename to zircon/system/uapp/kstress/stress_test.h
diff --git a/system/uapp/kstress/vmstress.cpp b/zircon/system/uapp/kstress/vmstress.cpp
similarity index 100%
rename from system/uapp/kstress/vmstress.cpp
rename to zircon/system/uapp/kstress/vmstress.cpp
diff --git a/system/uapp/loadgen/loadgen.cpp b/zircon/system/uapp/loadgen/loadgen.cpp
similarity index 100%
rename from system/uapp/loadgen/loadgen.cpp
rename to zircon/system/uapp/loadgen/loadgen.cpp
diff --git a/system/uapp/loadgen/rules.mk b/zircon/system/uapp/loadgen/rules.mk
similarity index 100%
rename from system/uapp/loadgen/rules.mk
rename to zircon/system/uapp/loadgen/rules.mk
diff --git a/system/uapp/lsblk/main.c b/zircon/system/uapp/lsblk/main.c
similarity index 100%
rename from system/uapp/lsblk/main.c
rename to zircon/system/uapp/lsblk/main.c
diff --git a/system/uapp/lsblk/rules.mk b/zircon/system/uapp/lsblk/rules.mk
similarity index 100%
rename from system/uapp/lsblk/rules.mk
rename to zircon/system/uapp/lsblk/rules.mk
diff --git a/system/uapp/lsdev/lsdev.c b/zircon/system/uapp/lsdev/lsdev.c
similarity index 100%
rename from system/uapp/lsdev/lsdev.c
rename to zircon/system/uapp/lsdev/lsdev.c
diff --git a/system/uapp/lsdev/rules.mk b/zircon/system/uapp/lsdev/rules.mk
similarity index 100%
rename from system/uapp/lsdev/rules.mk
rename to zircon/system/uapp/lsdev/rules.mk
diff --git a/system/uapp/lspwr/lspwr.cpp b/zircon/system/uapp/lspwr/lspwr.cpp
similarity index 100%
rename from system/uapp/lspwr/lspwr.cpp
rename to zircon/system/uapp/lspwr/lspwr.cpp
diff --git a/system/uapp/lspwr/rules.mk b/zircon/system/uapp/lspwr/rules.mk
similarity index 100%
rename from system/uapp/lspwr/rules.mk
rename to zircon/system/uapp/lspwr/rules.mk
diff --git a/system/uapp/lsusb/lsusb.c b/zircon/system/uapp/lsusb/lsusb.c
similarity index 100%
rename from system/uapp/lsusb/lsusb.c
rename to zircon/system/uapp/lsusb/lsusb.c
diff --git a/system/uapp/lsusb/rules.mk b/zircon/system/uapp/lsusb/rules.mk
similarity index 100%
rename from system/uapp/lsusb/rules.mk
rename to zircon/system/uapp/lsusb/rules.mk
diff --git a/system/uapp/lz4/main.c b/zircon/system/uapp/lz4/main.c
similarity index 100%
rename from system/uapp/lz4/main.c
rename to zircon/system/uapp/lz4/main.c
diff --git a/system/uapp/lz4/rules.mk b/zircon/system/uapp/lz4/rules.mk
similarity index 100%
rename from system/uapp/lz4/rules.mk
rename to zircon/system/uapp/lz4/rules.mk
diff --git a/system/uapp/midiecho/midiecho.c b/zircon/system/uapp/midiecho/midiecho.c
similarity index 100%
rename from system/uapp/midiecho/midiecho.c
rename to zircon/system/uapp/midiecho/midiecho.c
diff --git a/system/uapp/midiecho/rules.mk b/zircon/system/uapp/midiecho/rules.mk
similarity index 100%
rename from system/uapp/midiecho/rules.mk
rename to zircon/system/uapp/midiecho/rules.mk
diff --git a/system/uapp/minfs/main.cpp b/zircon/system/uapp/minfs/main.cpp
similarity index 100%
rename from system/uapp/minfs/main.cpp
rename to zircon/system/uapp/minfs/main.cpp
diff --git a/system/uapp/minfs/rules.mk b/zircon/system/uapp/minfs/rules.mk
similarity index 100%
rename from system/uapp/minfs/rules.mk
rename to zircon/system/uapp/minfs/rules.mk
diff --git a/system/uapp/namespace/namespace.c b/zircon/system/uapp/namespace/namespace.c
similarity index 100%
rename from system/uapp/namespace/namespace.c
rename to zircon/system/uapp/namespace/namespace.c
diff --git a/system/uapp/namespace/rules.mk b/zircon/system/uapp/namespace/rules.mk
similarity index 100%
rename from system/uapp/namespace/rules.mk
rename to zircon/system/uapp/namespace/rules.mk
diff --git a/system/uapp/nand-loader/main.cpp b/zircon/system/uapp/nand-loader/main.cpp
similarity index 100%
rename from system/uapp/nand-loader/main.cpp
rename to zircon/system/uapp/nand-loader/main.cpp
diff --git a/system/uapp/nand-loader/rules.mk b/zircon/system/uapp/nand-loader/rules.mk
similarity index 100%
rename from system/uapp/nand-loader/rules.mk
rename to zircon/system/uapp/nand-loader/rules.mk
diff --git a/system/uapp/nand-util/aml.cpp b/zircon/system/uapp/nand-util/aml.cpp
similarity index 100%
rename from system/uapp/nand-util/aml.cpp
rename to zircon/system/uapp/nand-util/aml.cpp
diff --git a/system/uapp/nand-util/aml.h b/zircon/system/uapp/nand-util/aml.h
similarity index 100%
rename from system/uapp/nand-util/aml.h
rename to zircon/system/uapp/nand-util/aml.h
diff --git a/system/uapp/nand-util/main.cpp b/zircon/system/uapp/nand-util/main.cpp
similarity index 100%
rename from system/uapp/nand-util/main.cpp
rename to zircon/system/uapp/nand-util/main.cpp
diff --git a/system/uapp/nand-util/rules.mk b/zircon/system/uapp/nand-util/rules.mk
similarity index 100%
rename from system/uapp/nand-util/rules.mk
rename to zircon/system/uapp/nand-util/rules.mk
diff --git a/system/uapp/netdump/netdump.c b/zircon/system/uapp/netdump/netdump.c
similarity index 100%
rename from system/uapp/netdump/netdump.c
rename to zircon/system/uapp/netdump/netdump.c
diff --git a/system/uapp/netdump/rules.mk b/zircon/system/uapp/netdump/rules.mk
similarity index 100%
rename from system/uapp/netdump/rules.mk
rename to zircon/system/uapp/netdump/rules.mk
diff --git a/system/uapp/ping/ping.cpp b/zircon/system/uapp/ping/ping.cpp
similarity index 100%
rename from system/uapp/ping/ping.cpp
rename to zircon/system/uapp/ping/ping.cpp
diff --git a/system/uapp/ping/rules.mk b/zircon/system/uapp/ping/rules.mk
similarity index 100%
rename from system/uapp/ping/rules.mk
rename to zircon/system/uapp/ping/rules.mk
diff --git a/system/uapp/psutils/kill.c b/zircon/system/uapp/psutils/kill.c
similarity index 100%
rename from system/uapp/psutils/kill.c
rename to zircon/system/uapp/psutils/kill.c
diff --git a/system/uapp/psutils/killall.c b/zircon/system/uapp/psutils/killall.c
similarity index 100%
rename from system/uapp/psutils/killall.c
rename to zircon/system/uapp/psutils/killall.c
diff --git a/system/uapp/psutils/kstats.c b/zircon/system/uapp/psutils/kstats.c
similarity index 100%
rename from system/uapp/psutils/kstats.c
rename to zircon/system/uapp/psutils/kstats.c
diff --git a/system/uapp/psutils/memgraph-schema.json b/zircon/system/uapp/psutils/memgraph-schema.json
similarity index 100%
rename from system/uapp/psutils/memgraph-schema.json
rename to zircon/system/uapp/psutils/memgraph-schema.json
diff --git a/system/uapp/psutils/memgraph.cpp b/zircon/system/uapp/psutils/memgraph.cpp
similarity index 100%
rename from system/uapp/psutils/memgraph.cpp
rename to zircon/system/uapp/psutils/memgraph.cpp
diff --git a/system/uapp/psutils/ps.c b/zircon/system/uapp/psutils/ps.c
similarity index 100%
rename from system/uapp/psutils/ps.c
rename to zircon/system/uapp/psutils/ps.c
diff --git a/system/uapp/psutils/resources.c b/zircon/system/uapp/psutils/resources.c
similarity index 100%
rename from system/uapp/psutils/resources.c
rename to zircon/system/uapp/psutils/resources.c
diff --git a/system/uapp/psutils/resources.h b/zircon/system/uapp/psutils/resources.h
similarity index 100%
rename from system/uapp/psutils/resources.h
rename to zircon/system/uapp/psutils/resources.h
diff --git a/system/uapp/psutils/rules.mk b/zircon/system/uapp/psutils/rules.mk
similarity index 100%
rename from system/uapp/psutils/rules.mk
rename to zircon/system/uapp/psutils/rules.mk
diff --git a/system/uapp/psutils/signal.c b/zircon/system/uapp/psutils/signal.c
similarity index 100%
rename from system/uapp/psutils/signal.c
rename to zircon/system/uapp/psutils/signal.c
diff --git a/system/uapp/psutils/threads.cpp b/zircon/system/uapp/psutils/threads.cpp
similarity index 100%
rename from system/uapp/psutils/threads.cpp
rename to zircon/system/uapp/psutils/threads.cpp
diff --git a/system/uapp/psutils/top.c b/zircon/system/uapp/psutils/top.c
similarity index 100%
rename from system/uapp/psutils/top.c
rename to zircon/system/uapp/psutils/top.c
diff --git a/system/uapp/psutils/vmaps.c b/zircon/system/uapp/psutils/vmaps.c
similarity index 100%
rename from system/uapp/psutils/vmaps.c
rename to zircon/system/uapp/psutils/vmaps.c
diff --git a/system/uapp/psutils/vmo-utils.c b/zircon/system/uapp/psutils/vmo-utils.c
similarity index 100%
rename from system/uapp/psutils/vmo-utils.c
rename to zircon/system/uapp/psutils/vmo-utils.c
diff --git a/system/uapp/psutils/vmo-utils.h b/zircon/system/uapp/psutils/vmo-utils.h
similarity index 100%
rename from system/uapp/psutils/vmo-utils.h
rename to zircon/system/uapp/psutils/vmo-utils.h
diff --git a/system/uapp/psutils/vmos.cpp b/zircon/system/uapp/psutils/vmos.cpp
similarity index 100%
rename from system/uapp/psutils/vmos.cpp
rename to zircon/system/uapp/psutils/vmos.cpp
diff --git a/system/uapp/rng-trials/rng-trials.c b/zircon/system/uapp/rng-trials/rng-trials.c
similarity index 100%
rename from system/uapp/rng-trials/rng-trials.c
rename to zircon/system/uapp/rng-trials/rng-trials.c
diff --git a/system/uapp/rng-trials/rules.mk b/zircon/system/uapp/rng-trials/rules.mk
similarity index 100%
rename from system/uapp/rng-trials/rules.mk
rename to zircon/system/uapp/rng-trials/rules.mk
diff --git a/system/uapp/run-vc/main.c b/zircon/system/uapp/run-vc/main.c
similarity index 100%
rename from system/uapp/run-vc/main.c
rename to zircon/system/uapp/run-vc/main.c
diff --git a/system/uapp/run-vc/rules.mk b/zircon/system/uapp/run-vc/rules.mk
similarity index 100%
rename from system/uapp/run-vc/rules.mk
rename to zircon/system/uapp/run-vc/rules.mk
diff --git a/system/uapp/runtests/rules.mk b/zircon/system/uapp/runtests/rules.mk
similarity index 100%
rename from system/uapp/runtests/rules.mk
rename to zircon/system/uapp/runtests/rules.mk
diff --git a/system/uapp/runtests/runtests.cpp b/zircon/system/uapp/runtests/runtests.cpp
similarity index 100%
rename from system/uapp/runtests/runtests.cpp
rename to zircon/system/uapp/runtests/runtests.cpp
diff --git a/system/uapp/serial-test/rules.mk b/zircon/system/uapp/serial-test/rules.mk
similarity index 100%
rename from system/uapp/serial-test/rules.mk
rename to zircon/system/uapp/serial-test/rules.mk
diff --git a/system/uapp/serial-test/serial-test.c b/zircon/system/uapp/serial-test/serial-test.c
similarity index 100%
rename from system/uapp/serial-test/serial-test.c
rename to zircon/system/uapp/serial-test/serial-test.c
diff --git a/system/uapp/spawn/main.c b/zircon/system/uapp/spawn/main.c
similarity index 100%
rename from system/uapp/spawn/main.c
rename to zircon/system/uapp/spawn/main.c
diff --git a/system/uapp/spawn/rules.mk b/zircon/system/uapp/spawn/rules.mk
similarity index 100%
rename from system/uapp/spawn/rules.mk
rename to zircon/system/uapp/spawn/rules.mk
diff --git a/system/uapp/storage-metrics/main.cpp b/zircon/system/uapp/storage-metrics/main.cpp
similarity index 100%
rename from system/uapp/storage-metrics/main.cpp
rename to zircon/system/uapp/storage-metrics/main.cpp
diff --git a/system/uapp/storage-metrics/rules.mk b/zircon/system/uapp/storage-metrics/rules.mk
similarity index 100%
rename from system/uapp/storage-metrics/rules.mk
rename to zircon/system/uapp/storage-metrics/rules.mk
diff --git a/system/uapp/strerror/rules.mk b/zircon/system/uapp/strerror/rules.mk
similarity index 100%
rename from system/uapp/strerror/rules.mk
rename to zircon/system/uapp/strerror/rules.mk
diff --git a/system/uapp/strerror/strerror.c b/zircon/system/uapp/strerror/strerror.c
similarity index 100%
rename from system/uapp/strerror/strerror.c
rename to zircon/system/uapp/strerror/strerror.c
diff --git a/system/uapp/suspendtest/rules.mk b/zircon/system/uapp/suspendtest/rules.mk
similarity index 100%
rename from system/uapp/suspendtest/rules.mk
rename to zircon/system/uapp/suspendtest/rules.mk
diff --git a/system/uapp/suspendtest/suspendtest.c b/zircon/system/uapp/suspendtest/suspendtest.c
similarity index 100%
rename from system/uapp/suspendtest/suspendtest.c
rename to zircon/system/uapp/suspendtest/suspendtest.c
diff --git a/system/uapp/sysconfig/rules.mk b/zircon/system/uapp/sysconfig/rules.mk
similarity index 100%
rename from system/uapp/sysconfig/rules.mk
rename to zircon/system/uapp/sysconfig/rules.mk
diff --git a/system/uapp/sysconfig/sysconfig.c b/zircon/system/uapp/sysconfig/sysconfig.c
similarity index 100%
rename from system/uapp/sysconfig/sysconfig.c
rename to zircon/system/uapp/sysconfig/sysconfig.c
diff --git a/system/uapp/system-version/main.c b/zircon/system/uapp/system-version/main.c
similarity index 100%
rename from system/uapp/system-version/main.c
rename to zircon/system/uapp/system-version/main.c
diff --git a/system/uapp/system-version/rules.mk b/zircon/system/uapp/system-version/rules.mk
similarity index 100%
rename from system/uapp/system-version/rules.mk
rename to zircon/system/uapp/system-version/rules.mk
diff --git a/system/uapp/tee-test/rules.mk b/zircon/system/uapp/tee-test/rules.mk
similarity index 100%
rename from system/uapp/tee-test/rules.mk
rename to zircon/system/uapp/tee-test/rules.mk
diff --git a/system/uapp/tee-test/tee-test.c b/zircon/system/uapp/tee-test/tee-test.c
similarity index 100%
rename from system/uapp/tee-test/tee-test.c
rename to zircon/system/uapp/tee-test/tee-test.c
diff --git a/system/uapp/thread-depth/rules.mk b/zircon/system/uapp/thread-depth/rules.mk
similarity index 100%
rename from system/uapp/thread-depth/rules.mk
rename to zircon/system/uapp/thread-depth/rules.mk
diff --git a/system/uapp/thread-depth/thread-depth.c b/zircon/system/uapp/thread-depth/thread-depth.c
similarity index 100%
rename from system/uapp/thread-depth/thread-depth.c
rename to zircon/system/uapp/thread-depth/thread-depth.c
diff --git a/system/uapp/thread-stress/rules.mk b/zircon/system/uapp/thread-stress/rules.mk
similarity index 100%
rename from system/uapp/thread-stress/rules.mk
rename to zircon/system/uapp/thread-stress/rules.mk
diff --git a/system/uapp/thread-stress/thread-stress.c b/zircon/system/uapp/thread-stress/thread-stress.c
similarity index 100%
rename from system/uapp/thread-stress/thread-stress.c
rename to zircon/system/uapp/thread-stress/thread-stress.c
diff --git a/system/uapp/trace-benchmark/MAINTAINERS b/zircon/system/uapp/trace-benchmark/MAINTAINERS
similarity index 100%
rename from system/uapp/trace-benchmark/MAINTAINERS
rename to zircon/system/uapp/trace-benchmark/MAINTAINERS
diff --git a/system/uapp/trace-benchmark/README.md b/zircon/system/uapp/trace-benchmark/README.md
similarity index 100%
rename from system/uapp/trace-benchmark/README.md
rename to zircon/system/uapp/trace-benchmark/README.md
diff --git a/system/uapp/trace-benchmark/benchmarks.cpp b/zircon/system/uapp/trace-benchmark/benchmarks.cpp
similarity index 100%
rename from system/uapp/trace-benchmark/benchmarks.cpp
rename to zircon/system/uapp/trace-benchmark/benchmarks.cpp
diff --git a/system/uapp/trace-benchmark/benchmarks.h b/zircon/system/uapp/trace-benchmark/benchmarks.h
similarity index 100%
rename from system/uapp/trace-benchmark/benchmarks.h
rename to zircon/system/uapp/trace-benchmark/benchmarks.h
diff --git a/system/uapp/trace-benchmark/benchmarks_ntrace.cpp b/zircon/system/uapp/trace-benchmark/benchmarks_ntrace.cpp
similarity index 100%
rename from system/uapp/trace-benchmark/benchmarks_ntrace.cpp
rename to zircon/system/uapp/trace-benchmark/benchmarks_ntrace.cpp
diff --git a/system/uapp/trace-benchmark/handler.h b/zircon/system/uapp/trace-benchmark/handler.h
similarity index 100%
rename from system/uapp/trace-benchmark/handler.h
rename to zircon/system/uapp/trace-benchmark/handler.h
diff --git a/system/uapp/trace-benchmark/main.cpp b/zircon/system/uapp/trace-benchmark/main.cpp
similarity index 100%
rename from system/uapp/trace-benchmark/main.cpp
rename to zircon/system/uapp/trace-benchmark/main.cpp
diff --git a/system/uapp/trace-benchmark/rules.mk b/zircon/system/uapp/trace-benchmark/rules.mk
similarity index 100%
rename from system/uapp/trace-benchmark/rules.mk
rename to zircon/system/uapp/trace-benchmark/rules.mk
diff --git a/system/uapp/trace-benchmark/runner.h b/zircon/system/uapp/trace-benchmark/runner.h
similarity index 100%
rename from system/uapp/trace-benchmark/runner.h
rename to zircon/system/uapp/trace-benchmark/runner.h
diff --git a/system/uapp/trace-example/MAINTAINERS b/zircon/system/uapp/trace-example/MAINTAINERS
similarity index 100%
rename from system/uapp/trace-example/MAINTAINERS
rename to zircon/system/uapp/trace-example/MAINTAINERS
diff --git a/system/uapp/trace-example/README.md b/zircon/system/uapp/trace-example/README.md
similarity index 100%
rename from system/uapp/trace-example/README.md
rename to zircon/system/uapp/trace-example/README.md
diff --git a/system/uapp/trace-example/main.cpp b/zircon/system/uapp/trace-example/main.cpp
similarity index 100%
rename from system/uapp/trace-example/main.cpp
rename to zircon/system/uapp/trace-example/main.cpp
diff --git a/system/uapp/trace-example/rules.mk b/zircon/system/uapp/trace-example/rules.mk
similarity index 100%
rename from system/uapp/trace-example/rules.mk
rename to zircon/system/uapp/trace-example/rules.mk
diff --git a/system/uapp/traceme/rules.mk b/zircon/system/uapp/traceme/rules.mk
similarity index 100%
rename from system/uapp/traceme/rules.mk
rename to zircon/system/uapp/traceme/rules.mk
diff --git a/system/uapp/traceme/traceme.c b/zircon/system/uapp/traceme/traceme.c
similarity index 100%
rename from system/uapp/traceme/traceme.c
rename to zircon/system/uapp/traceme/traceme.c
diff --git a/system/uapp/unbind/main.cpp b/zircon/system/uapp/unbind/main.cpp
similarity index 100%
rename from system/uapp/unbind/main.cpp
rename to zircon/system/uapp/unbind/main.cpp
diff --git a/system/uapp/unbind/rules.mk b/zircon/system/uapp/unbind/rules.mk
similarity index 100%
rename from system/uapp/unbind/rules.mk
rename to zircon/system/uapp/unbind/rules.mk
diff --git a/system/uapp/usb-fwloader/rules.mk b/zircon/system/uapp/usb-fwloader/rules.mk
similarity index 100%
rename from system/uapp/usb-fwloader/rules.mk
rename to zircon/system/uapp/usb-fwloader/rules.mk
diff --git a/system/uapp/usb-fwloader/usb-fwloader.cpp b/zircon/system/uapp/usb-fwloader/usb-fwloader.cpp
similarity index 100%
rename from system/uapp/usb-fwloader/usb-fwloader.cpp
rename to zircon/system/uapp/usb-fwloader/usb-fwloader.cpp
diff --git a/system/uapp/usbctl/rules.mk b/zircon/system/uapp/usbctl/rules.mk
similarity index 100%
rename from system/uapp/usbctl/rules.mk
rename to zircon/system/uapp/usbctl/rules.mk
diff --git a/system/uapp/usbctl/usbctl.c b/zircon/system/uapp/usbctl/usbctl.c
similarity index 100%
rename from system/uapp/usbctl/usbctl.c
rename to zircon/system/uapp/usbctl/usbctl.c
diff --git a/system/uapp/waitfor/rules.mk b/zircon/system/uapp/waitfor/rules.mk
similarity index 100%
rename from system/uapp/waitfor/rules.mk
rename to zircon/system/uapp/waitfor/rules.mk
diff --git a/system/uapp/waitfor/waitfor.c b/zircon/system/uapp/waitfor/waitfor.c
similarity index 100%
rename from system/uapp/waitfor/waitfor.c
rename to zircon/system/uapp/waitfor/waitfor.c
diff --git a/system/uapp/watch/rules.mk b/zircon/system/uapp/watch/rules.mk
similarity index 100%
rename from system/uapp/watch/rules.mk
rename to zircon/system/uapp/watch/rules.mk
diff --git a/system/uapp/watch/watch.c b/zircon/system/uapp/watch/watch.c
similarity index 100%
rename from system/uapp/watch/watch.c
rename to zircon/system/uapp/watch/watch.c
diff --git a/system/uapp/xdc-test/rules.mk b/zircon/system/uapp/xdc-test/rules.mk
similarity index 100%
rename from system/uapp/xdc-test/rules.mk
rename to zircon/system/uapp/xdc-test/rules.mk
diff --git a/system/uapp/xdc-test/xdc-device.cpp b/zircon/system/uapp/xdc-test/xdc-device.cpp
similarity index 100%
rename from system/uapp/xdc-test/xdc-device.cpp
rename to zircon/system/uapp/xdc-test/xdc-device.cpp
diff --git a/system/uapp/xdc-test/xdc-host.cpp b/zircon/system/uapp/xdc-test/xdc-host.cpp
similarity index 100%
rename from system/uapp/xdc-test/xdc-host.cpp
rename to zircon/system/uapp/xdc-test/xdc-host.cpp
diff --git a/system/uapp/xdc-test/xdc-init.h b/zircon/system/uapp/xdc-test/xdc-init.h
similarity index 100%
rename from system/uapp/xdc-test/xdc-init.h
rename to zircon/system/uapp/xdc-test/xdc-init.h
diff --git a/system/uapp/xdc-test/xdc-test.cpp b/zircon/system/uapp/xdc-test/xdc-test.cpp
similarity index 100%
rename from system/uapp/xdc-test/xdc-test.cpp
rename to zircon/system/uapp/xdc-test/xdc-test.cpp
diff --git a/system/ulib/MAINTAINERS b/zircon/system/ulib/MAINTAINERS
similarity index 100%
rename from system/ulib/MAINTAINERS
rename to zircon/system/ulib/MAINTAINERS
diff --git a/system/ulib/async-loop/MAINTAINERS b/zircon/system/ulib/async-loop/MAINTAINERS
similarity index 100%
rename from system/ulib/async-loop/MAINTAINERS
rename to zircon/system/ulib/async-loop/MAINTAINERS
diff --git a/system/ulib/async-loop/README.md b/zircon/system/ulib/async-loop/README.md
similarity index 100%
rename from system/ulib/async-loop/README.md
rename to zircon/system/ulib/async-loop/README.md
diff --git a/system/ulib/async-loop/include/lib/async-loop/cpp/loop.h b/zircon/system/ulib/async-loop/include/lib/async-loop/cpp/loop.h
similarity index 100%
rename from system/ulib/async-loop/include/lib/async-loop/cpp/loop.h
rename to zircon/system/ulib/async-loop/include/lib/async-loop/cpp/loop.h
diff --git a/system/ulib/async-loop/include/lib/async-loop/loop.h b/zircon/system/ulib/async-loop/include/lib/async-loop/loop.h
similarity index 100%
rename from system/ulib/async-loop/include/lib/async-loop/loop.h
rename to zircon/system/ulib/async-loop/include/lib/async-loop/loop.h
diff --git a/system/ulib/async-loop/loop.c b/zircon/system/ulib/async-loop/loop.c
similarity index 100%
rename from system/ulib/async-loop/loop.c
rename to zircon/system/ulib/async-loop/loop.c
diff --git a/system/ulib/async-loop/loop_wrapper.cpp b/zircon/system/ulib/async-loop/loop_wrapper.cpp
similarity index 100%
rename from system/ulib/async-loop/loop_wrapper.cpp
rename to zircon/system/ulib/async-loop/loop_wrapper.cpp
diff --git a/system/ulib/async-loop/rules.mk b/zircon/system/ulib/async-loop/rules.mk
similarity index 100%
rename from system/ulib/async-loop/rules.mk
rename to zircon/system/ulib/async-loop/rules.mk
diff --git a/system/ulib/async-testutils/MAINTAINERS b/zircon/system/ulib/async-testutils/MAINTAINERS
similarity index 100%
rename from system/ulib/async-testutils/MAINTAINERS
rename to zircon/system/ulib/async-testutils/MAINTAINERS
diff --git a/system/ulib/async-testutils/dispatcher_stub.cpp b/zircon/system/ulib/async-testutils/dispatcher_stub.cpp
similarity index 100%
rename from system/ulib/async-testutils/dispatcher_stub.cpp
rename to zircon/system/ulib/async-testutils/dispatcher_stub.cpp
diff --git a/system/ulib/async-testutils/include/lib/async-testutils/dispatcher_stub.h b/zircon/system/ulib/async-testutils/include/lib/async-testutils/dispatcher_stub.h
similarity index 100%
rename from system/ulib/async-testutils/include/lib/async-testutils/dispatcher_stub.h
rename to zircon/system/ulib/async-testutils/include/lib/async-testutils/dispatcher_stub.h
diff --git a/system/ulib/async-testutils/include/lib/async-testutils/test_loop.h b/zircon/system/ulib/async-testutils/include/lib/async-testutils/test_loop.h
similarity index 100%
rename from system/ulib/async-testutils/include/lib/async-testutils/test_loop.h
rename to zircon/system/ulib/async-testutils/include/lib/async-testutils/test_loop.h
diff --git a/system/ulib/async-testutils/include/lib/async-testutils/test_loop_dispatcher.h b/zircon/system/ulib/async-testutils/include/lib/async-testutils/test_loop_dispatcher.h
similarity index 100%
rename from system/ulib/async-testutils/include/lib/async-testutils/test_loop_dispatcher.h
rename to zircon/system/ulib/async-testutils/include/lib/async-testutils/test_loop_dispatcher.h
diff --git a/system/ulib/async-testutils/include/lib/async-testutils/time-keeper.h b/zircon/system/ulib/async-testutils/include/lib/async-testutils/time-keeper.h
similarity index 100%
rename from system/ulib/async-testutils/include/lib/async-testutils/time-keeper.h
rename to zircon/system/ulib/async-testutils/include/lib/async-testutils/time-keeper.h
diff --git a/system/ulib/async-testutils/rules.mk b/zircon/system/ulib/async-testutils/rules.mk
similarity index 100%
rename from system/ulib/async-testutils/rules.mk
rename to zircon/system/ulib/async-testutils/rules.mk
diff --git a/system/ulib/async-testutils/test_loop.cpp b/zircon/system/ulib/async-testutils/test_loop.cpp
similarity index 100%
rename from system/ulib/async-testutils/test_loop.cpp
rename to zircon/system/ulib/async-testutils/test_loop.cpp
diff --git a/system/ulib/async-testutils/test_loop_dispatcher.cpp b/zircon/system/ulib/async-testutils/test_loop_dispatcher.cpp
similarity index 100%
rename from system/ulib/async-testutils/test_loop_dispatcher.cpp
rename to zircon/system/ulib/async-testutils/test_loop_dispatcher.cpp
diff --git a/system/ulib/async/MAINTAINERS b/zircon/system/ulib/async/MAINTAINERS
similarity index 100%
rename from system/ulib/async/MAINTAINERS
rename to zircon/system/ulib/async/MAINTAINERS
diff --git a/system/ulib/async/README.md b/zircon/system/ulib/async/README.md
similarity index 100%
rename from system/ulib/async/README.md
rename to zircon/system/ulib/async/README.md
diff --git a/system/ulib/async/default.c b/zircon/system/ulib/async/default.c
similarity index 100%
rename from system/ulib/async/default.c
rename to zircon/system/ulib/async/default.c
diff --git a/system/ulib/async/exception.cpp b/zircon/system/ulib/async/exception.cpp
similarity index 100%
rename from system/ulib/async/exception.cpp
rename to zircon/system/ulib/async/exception.cpp
diff --git a/system/ulib/async/include/lib/async/cpp/exception.h b/zircon/system/ulib/async/include/lib/async/cpp/exception.h
similarity index 100%
rename from system/ulib/async/include/lib/async/cpp/exception.h
rename to zircon/system/ulib/async/include/lib/async/cpp/exception.h
diff --git a/system/ulib/async/include/lib/async/cpp/receiver.h b/zircon/system/ulib/async/include/lib/async/cpp/receiver.h
similarity index 100%
rename from system/ulib/async/include/lib/async/cpp/receiver.h
rename to zircon/system/ulib/async/include/lib/async/cpp/receiver.h
diff --git a/system/ulib/async/include/lib/async/cpp/task.h b/zircon/system/ulib/async/include/lib/async/cpp/task.h
similarity index 100%
rename from system/ulib/async/include/lib/async/cpp/task.h
rename to zircon/system/ulib/async/include/lib/async/cpp/task.h
diff --git a/system/ulib/async/include/lib/async/cpp/time.h b/zircon/system/ulib/async/include/lib/async/cpp/time.h
similarity index 100%
rename from system/ulib/async/include/lib/async/cpp/time.h
rename to zircon/system/ulib/async/include/lib/async/cpp/time.h
diff --git a/system/ulib/async/include/lib/async/cpp/trap.h b/zircon/system/ulib/async/include/lib/async/cpp/trap.h
similarity index 100%
rename from system/ulib/async/include/lib/async/cpp/trap.h
rename to zircon/system/ulib/async/include/lib/async/cpp/trap.h
diff --git a/system/ulib/async/include/lib/async/cpp/wait.h b/zircon/system/ulib/async/include/lib/async/cpp/wait.h
similarity index 100%
rename from system/ulib/async/include/lib/async/cpp/wait.h
rename to zircon/system/ulib/async/include/lib/async/cpp/wait.h
diff --git a/system/ulib/async/include/lib/async/default.h b/zircon/system/ulib/async/include/lib/async/default.h
similarity index 100%
rename from system/ulib/async/include/lib/async/default.h
rename to zircon/system/ulib/async/include/lib/async/default.h
diff --git a/system/ulib/async/include/lib/async/dispatcher.h b/zircon/system/ulib/async/include/lib/async/dispatcher.h
similarity index 100%
rename from system/ulib/async/include/lib/async/dispatcher.h
rename to zircon/system/ulib/async/include/lib/async/dispatcher.h
diff --git a/system/ulib/async/include/lib/async/exception.h b/zircon/system/ulib/async/include/lib/async/exception.h
similarity index 100%
rename from system/ulib/async/include/lib/async/exception.h
rename to zircon/system/ulib/async/include/lib/async/exception.h
diff --git a/system/ulib/async/include/lib/async/receiver.h b/zircon/system/ulib/async/include/lib/async/receiver.h
similarity index 100%
rename from system/ulib/async/include/lib/async/receiver.h
rename to zircon/system/ulib/async/include/lib/async/receiver.h
diff --git a/system/ulib/async/include/lib/async/task.h b/zircon/system/ulib/async/include/lib/async/task.h
similarity index 100%
rename from system/ulib/async/include/lib/async/task.h
rename to zircon/system/ulib/async/include/lib/async/task.h
diff --git a/system/ulib/async/include/lib/async/time.h b/zircon/system/ulib/async/include/lib/async/time.h
similarity index 100%
rename from system/ulib/async/include/lib/async/time.h
rename to zircon/system/ulib/async/include/lib/async/time.h
diff --git a/system/ulib/async/include/lib/async/trap.h b/zircon/system/ulib/async/include/lib/async/trap.h
similarity index 100%
rename from system/ulib/async/include/lib/async/trap.h
rename to zircon/system/ulib/async/include/lib/async/trap.h
diff --git a/system/ulib/async/include/lib/async/wait.h b/zircon/system/ulib/async/include/lib/async/wait.h
similarity index 100%
rename from system/ulib/async/include/lib/async/wait.h
rename to zircon/system/ulib/async/include/lib/async/wait.h
diff --git a/system/ulib/async/ops.c b/zircon/system/ulib/async/ops.c
similarity index 100%
rename from system/ulib/async/ops.c
rename to zircon/system/ulib/async/ops.c
diff --git a/system/ulib/async/receiver.cpp b/zircon/system/ulib/async/receiver.cpp
similarity index 100%
rename from system/ulib/async/receiver.cpp
rename to zircon/system/ulib/async/receiver.cpp
diff --git a/system/ulib/async/rules.mk b/zircon/system/ulib/async/rules.mk
similarity index 100%
rename from system/ulib/async/rules.mk
rename to zircon/system/ulib/async/rules.mk
diff --git a/system/ulib/async/task.cpp b/zircon/system/ulib/async/task.cpp
similarity index 100%
rename from system/ulib/async/task.cpp
rename to zircon/system/ulib/async/task.cpp
diff --git a/system/ulib/async/trap.cpp b/zircon/system/ulib/async/trap.cpp
similarity index 100%
rename from system/ulib/async/trap.cpp
rename to zircon/system/ulib/async/trap.cpp
diff --git a/system/ulib/async/wait.cpp b/zircon/system/ulib/async/wait.cpp
similarity index 100%
rename from system/ulib/async/wait.cpp
rename to zircon/system/ulib/async/wait.cpp
diff --git a/system/ulib/audio-driver-proto/audio-proto.cpp b/zircon/system/ulib/audio-driver-proto/audio-proto.cpp
similarity index 100%
rename from system/ulib/audio-driver-proto/audio-proto.cpp
rename to zircon/system/ulib/audio-driver-proto/audio-proto.cpp
diff --git a/system/ulib/audio-driver-proto/include/audio-proto/audio-proto.h b/zircon/system/ulib/audio-driver-proto/include/audio-proto/audio-proto.h
similarity index 100%
rename from system/ulib/audio-driver-proto/include/audio-proto/audio-proto.h
rename to zircon/system/ulib/audio-driver-proto/include/audio-proto/audio-proto.h
diff --git a/system/ulib/audio-driver-proto/rules.mk b/zircon/system/ulib/audio-driver-proto/rules.mk
similarity index 100%
rename from system/ulib/audio-driver-proto/rules.mk
rename to zircon/system/ulib/audio-driver-proto/rules.mk
diff --git a/system/ulib/audio-proto-utils/format-utils.cpp b/zircon/system/ulib/audio-proto-utils/format-utils.cpp
similarity index 100%
rename from system/ulib/audio-proto-utils/format-utils.cpp
rename to zircon/system/ulib/audio-proto-utils/format-utils.cpp
diff --git a/system/ulib/audio-proto-utils/include/audio-proto-utils/format-utils.h b/zircon/system/ulib/audio-proto-utils/include/audio-proto-utils/format-utils.h
similarity index 100%
rename from system/ulib/audio-proto-utils/include/audio-proto-utils/format-utils.h
rename to zircon/system/ulib/audio-proto-utils/include/audio-proto-utils/format-utils.h
diff --git a/system/ulib/audio-proto-utils/rules.mk b/zircon/system/ulib/audio-proto-utils/rules.mk
similarity index 100%
rename from system/ulib/audio-proto-utils/rules.mk
rename to zircon/system/ulib/audio-proto-utils/rules.mk
diff --git a/system/ulib/audio-utils/audio-device-stream.cpp b/zircon/system/ulib/audio-utils/audio-device-stream.cpp
similarity index 100%
rename from system/ulib/audio-utils/audio-device-stream.cpp
rename to zircon/system/ulib/audio-utils/audio-device-stream.cpp
diff --git a/system/ulib/audio-utils/audio-input.cpp b/zircon/system/ulib/audio-utils/audio-input.cpp
similarity index 100%
rename from system/ulib/audio-utils/audio-input.cpp
rename to zircon/system/ulib/audio-utils/audio-input.cpp
diff --git a/system/ulib/audio-utils/audio-output.cpp b/zircon/system/ulib/audio-utils/audio-output.cpp
similarity index 100%
rename from system/ulib/audio-utils/audio-output.cpp
rename to zircon/system/ulib/audio-utils/audio-output.cpp
diff --git a/system/ulib/audio-utils/include/audio-utils/audio-device-stream.h b/zircon/system/ulib/audio-utils/include/audio-utils/audio-device-stream.h
similarity index 100%
rename from system/ulib/audio-utils/include/audio-utils/audio-device-stream.h
rename to zircon/system/ulib/audio-utils/include/audio-utils/audio-device-stream.h
diff --git a/system/ulib/audio-utils/include/audio-utils/audio-input.h b/zircon/system/ulib/audio-utils/include/audio-utils/audio-input.h
similarity index 100%
rename from system/ulib/audio-utils/include/audio-utils/audio-input.h
rename to zircon/system/ulib/audio-utils/include/audio-utils/audio-input.h
diff --git a/system/ulib/audio-utils/include/audio-utils/audio-output.h b/zircon/system/ulib/audio-utils/include/audio-utils/audio-output.h
similarity index 100%
rename from system/ulib/audio-utils/include/audio-utils/audio-output.h
rename to zircon/system/ulib/audio-utils/include/audio-utils/audio-output.h
diff --git a/system/ulib/audio-utils/include/audio-utils/audio-stream.h b/zircon/system/ulib/audio-utils/include/audio-utils/audio-stream.h
similarity index 100%
rename from system/ulib/audio-utils/include/audio-utils/audio-stream.h
rename to zircon/system/ulib/audio-utils/include/audio-utils/audio-stream.h
diff --git a/system/ulib/audio-utils/rules.mk b/zircon/system/ulib/audio-utils/rules.mk
similarity index 100%
rename from system/ulib/audio-utils/rules.mk
rename to zircon/system/ulib/audio-utils/rules.mk
diff --git a/system/ulib/backtrace-request/empty.c b/zircon/system/ulib/backtrace-request/empty.c
similarity index 100%
rename from system/ulib/backtrace-request/empty.c
rename to zircon/system/ulib/backtrace-request/empty.c
diff --git a/system/ulib/backtrace-request/include/lib/backtrace-request/backtrace-request.h b/zircon/system/ulib/backtrace-request/include/lib/backtrace-request/backtrace-request.h
similarity index 100%
rename from system/ulib/backtrace-request/include/lib/backtrace-request/backtrace-request.h
rename to zircon/system/ulib/backtrace-request/include/lib/backtrace-request/backtrace-request.h
diff --git a/system/ulib/backtrace-request/rules.mk b/zircon/system/ulib/backtrace-request/rules.mk
similarity index 100%
rename from system/ulib/backtrace-request/rules.mk
rename to zircon/system/ulib/backtrace-request/rules.mk
diff --git a/system/ulib/bitmap/include/bitmap/bitmap.h b/zircon/system/ulib/bitmap/include/bitmap/bitmap.h
similarity index 100%
rename from system/ulib/bitmap/include/bitmap/bitmap.h
rename to zircon/system/ulib/bitmap/include/bitmap/bitmap.h
diff --git a/system/ulib/bitmap/include/bitmap/raw-bitmap.h b/zircon/system/ulib/bitmap/include/bitmap/raw-bitmap.h
similarity index 100%
rename from system/ulib/bitmap/include/bitmap/raw-bitmap.h
rename to zircon/system/ulib/bitmap/include/bitmap/raw-bitmap.h
diff --git a/system/ulib/bitmap/include/bitmap/rle-bitmap.h b/zircon/system/ulib/bitmap/include/bitmap/rle-bitmap.h
similarity index 100%
rename from system/ulib/bitmap/include/bitmap/rle-bitmap.h
rename to zircon/system/ulib/bitmap/include/bitmap/rle-bitmap.h
diff --git a/system/ulib/bitmap/include/bitmap/storage.h b/zircon/system/ulib/bitmap/include/bitmap/storage.h
similarity index 100%
rename from system/ulib/bitmap/include/bitmap/storage.h
rename to zircon/system/ulib/bitmap/include/bitmap/storage.h
diff --git a/system/ulib/bitmap/raw-bitmap.cpp b/zircon/system/ulib/bitmap/raw-bitmap.cpp
similarity index 100%
rename from system/ulib/bitmap/raw-bitmap.cpp
rename to zircon/system/ulib/bitmap/raw-bitmap.cpp
diff --git a/system/ulib/bitmap/rle-bitmap.cpp b/zircon/system/ulib/bitmap/rle-bitmap.cpp
similarity index 100%
rename from system/ulib/bitmap/rle-bitmap.cpp
rename to zircon/system/ulib/bitmap/rle-bitmap.cpp
diff --git a/system/ulib/bitmap/rules.mk b/zircon/system/ulib/bitmap/rules.mk
similarity index 100%
rename from system/ulib/bitmap/rules.mk
rename to zircon/system/ulib/bitmap/rules.mk
diff --git a/system/ulib/blktest/blktest.cpp b/zircon/system/ulib/blktest/blktest.cpp
similarity index 100%
rename from system/ulib/blktest/blktest.cpp
rename to zircon/system/ulib/blktest/blktest.cpp
diff --git a/system/ulib/blktest/include/blktest/blktest.h b/zircon/system/ulib/blktest/include/blktest/blktest.h
similarity index 100%
rename from system/ulib/blktest/include/blktest/blktest.h
rename to zircon/system/ulib/blktest/include/blktest/blktest.h
diff --git a/system/ulib/blktest/rules.mk b/zircon/system/ulib/blktest/rules.mk
similarity index 100%
rename from system/ulib/blktest/rules.mk
rename to zircon/system/ulib/blktest/rules.mk
diff --git a/system/ulib/blobfs/allocator.cpp b/zircon/system/ulib/blobfs/allocator.cpp
similarity index 100%
rename from system/ulib/blobfs/allocator.cpp
rename to zircon/system/ulib/blobfs/allocator.cpp
diff --git a/system/ulib/blobfs/blob-cache.cpp b/zircon/system/ulib/blobfs/blob-cache.cpp
similarity index 100%
rename from system/ulib/blobfs/blob-cache.cpp
rename to zircon/system/ulib/blobfs/blob-cache.cpp
diff --git a/system/ulib/blobfs/blob.cpp b/zircon/system/ulib/blobfs/blob.cpp
similarity index 100%
rename from system/ulib/blobfs/blob.cpp
rename to zircon/system/ulib/blobfs/blob.cpp
diff --git a/system/ulib/blobfs/blobfs.cpp b/zircon/system/ulib/blobfs/blobfs.cpp
similarity index 100%
rename from system/ulib/blobfs/blobfs.cpp
rename to zircon/system/ulib/blobfs/blobfs.cpp
diff --git a/system/ulib/blobfs/cache-node.cpp b/zircon/system/ulib/blobfs/cache-node.cpp
similarity index 100%
rename from system/ulib/blobfs/cache-node.cpp
rename to zircon/system/ulib/blobfs/cache-node.cpp
diff --git a/system/ulib/blobfs/common.cpp b/zircon/system/ulib/blobfs/common.cpp
similarity index 100%
rename from system/ulib/blobfs/common.cpp
rename to zircon/system/ulib/blobfs/common.cpp
diff --git a/system/ulib/blobfs/compression/blob-compressor.cpp b/zircon/system/ulib/blobfs/compression/blob-compressor.cpp
similarity index 100%
rename from system/ulib/blobfs/compression/blob-compressor.cpp
rename to zircon/system/ulib/blobfs/compression/blob-compressor.cpp
diff --git a/system/ulib/blobfs/compression/lz4.cpp b/zircon/system/ulib/blobfs/compression/lz4.cpp
similarity index 100%
rename from system/ulib/blobfs/compression/lz4.cpp
rename to zircon/system/ulib/blobfs/compression/lz4.cpp
diff --git a/system/ulib/blobfs/compression/zstd.cpp b/zircon/system/ulib/blobfs/compression/zstd.cpp
similarity index 100%
rename from system/ulib/blobfs/compression/zstd.cpp
rename to zircon/system/ulib/blobfs/compression/zstd.cpp
diff --git a/system/ulib/blobfs/directory.cpp b/zircon/system/ulib/blobfs/directory.cpp
similarity index 100%
rename from system/ulib/blobfs/directory.cpp
rename to zircon/system/ulib/blobfs/directory.cpp
diff --git a/system/ulib/blobfs/extent-reserver.cpp b/zircon/system/ulib/blobfs/extent-reserver.cpp
similarity index 100%
rename from system/ulib/blobfs/extent-reserver.cpp
rename to zircon/system/ulib/blobfs/extent-reserver.cpp
diff --git a/system/ulib/blobfs/fsck.cpp b/zircon/system/ulib/blobfs/fsck.cpp
similarity index 100%
rename from system/ulib/blobfs/fsck.cpp
rename to zircon/system/ulib/blobfs/fsck.cpp
diff --git a/system/ulib/blobfs/host.cpp b/zircon/system/ulib/blobfs/host.cpp
similarity index 100%
rename from system/ulib/blobfs/host.cpp
rename to zircon/system/ulib/blobfs/host.cpp
diff --git a/system/ulib/blobfs/include/blobfs/allocator.h b/zircon/system/ulib/blobfs/include/blobfs/allocator.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/allocator.h
rename to zircon/system/ulib/blobfs/include/blobfs/allocator.h
diff --git a/system/ulib/blobfs/include/blobfs/blob-cache.h b/zircon/system/ulib/blobfs/include/blobfs/blob-cache.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/blob-cache.h
rename to zircon/system/ulib/blobfs/include/blobfs/blob-cache.h
diff --git a/system/ulib/blobfs/include/blobfs/blob.h b/zircon/system/ulib/blobfs/include/blobfs/blob.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/blob.h
rename to zircon/system/ulib/blobfs/include/blobfs/blob.h
diff --git a/system/ulib/blobfs/include/blobfs/blobfs.h b/zircon/system/ulib/blobfs/include/blobfs/blobfs.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/blobfs.h
rename to zircon/system/ulib/blobfs/include/blobfs/blobfs.h
diff --git a/system/ulib/blobfs/include/blobfs/cache-node.h b/zircon/system/ulib/blobfs/include/blobfs/cache-node.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/cache-node.h
rename to zircon/system/ulib/blobfs/include/blobfs/cache-node.h
diff --git a/system/ulib/blobfs/include/blobfs/common.h b/zircon/system/ulib/blobfs/include/blobfs/common.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/common.h
rename to zircon/system/ulib/blobfs/include/blobfs/common.h
diff --git a/system/ulib/blobfs/include/blobfs/compression/blob-compressor.h b/zircon/system/ulib/blobfs/include/blobfs/compression/blob-compressor.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/compression/blob-compressor.h
rename to zircon/system/ulib/blobfs/include/blobfs/compression/blob-compressor.h
diff --git a/system/ulib/blobfs/include/blobfs/compression/compressor.h b/zircon/system/ulib/blobfs/include/blobfs/compression/compressor.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/compression/compressor.h
rename to zircon/system/ulib/blobfs/include/blobfs/compression/compressor.h
diff --git a/system/ulib/blobfs/include/blobfs/compression/lz4.h b/zircon/system/ulib/blobfs/include/blobfs/compression/lz4.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/compression/lz4.h
rename to zircon/system/ulib/blobfs/include/blobfs/compression/lz4.h
diff --git a/system/ulib/blobfs/include/blobfs/compression/zstd.h b/zircon/system/ulib/blobfs/include/blobfs/compression/zstd.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/compression/zstd.h
rename to zircon/system/ulib/blobfs/include/blobfs/compression/zstd.h
diff --git a/system/ulib/blobfs/include/blobfs/directory.h b/zircon/system/ulib/blobfs/include/blobfs/directory.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/directory.h
rename to zircon/system/ulib/blobfs/include/blobfs/directory.h
diff --git a/system/ulib/blobfs/include/blobfs/extent-reserver.h b/zircon/system/ulib/blobfs/include/blobfs/extent-reserver.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/extent-reserver.h
rename to zircon/system/ulib/blobfs/include/blobfs/extent-reserver.h
diff --git a/system/ulib/blobfs/include/blobfs/format.h b/zircon/system/ulib/blobfs/include/blobfs/format.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/format.h
rename to zircon/system/ulib/blobfs/include/blobfs/format.h
diff --git a/system/ulib/blobfs/include/blobfs/fsck.h b/zircon/system/ulib/blobfs/include/blobfs/fsck.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/fsck.h
rename to zircon/system/ulib/blobfs/include/blobfs/fsck.h
diff --git a/system/ulib/blobfs/include/blobfs/host.h b/zircon/system/ulib/blobfs/include/blobfs/host.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/host.h
rename to zircon/system/ulib/blobfs/include/blobfs/host.h
diff --git a/system/ulib/blobfs/include/blobfs/iterator/allocated-extent-iterator.h b/zircon/system/ulib/blobfs/include/blobfs/iterator/allocated-extent-iterator.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/iterator/allocated-extent-iterator.h
rename to zircon/system/ulib/blobfs/include/blobfs/iterator/allocated-extent-iterator.h
diff --git a/system/ulib/blobfs/include/blobfs/iterator/block-iterator.h b/zircon/system/ulib/blobfs/include/blobfs/iterator/block-iterator.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/iterator/block-iterator.h
rename to zircon/system/ulib/blobfs/include/blobfs/iterator/block-iterator.h
diff --git a/system/ulib/blobfs/include/blobfs/iterator/extent-iterator.h b/zircon/system/ulib/blobfs/include/blobfs/iterator/extent-iterator.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/iterator/extent-iterator.h
rename to zircon/system/ulib/blobfs/include/blobfs/iterator/extent-iterator.h
diff --git a/system/ulib/blobfs/include/blobfs/iterator/node-populator.h b/zircon/system/ulib/blobfs/include/blobfs/iterator/node-populator.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/iterator/node-populator.h
rename to zircon/system/ulib/blobfs/include/blobfs/iterator/node-populator.h
diff --git a/system/ulib/blobfs/include/blobfs/iterator/vector-extent-iterator.h b/zircon/system/ulib/blobfs/include/blobfs/iterator/vector-extent-iterator.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/iterator/vector-extent-iterator.h
rename to zircon/system/ulib/blobfs/include/blobfs/iterator/vector-extent-iterator.h
diff --git a/system/ulib/blobfs/include/blobfs/journal.h b/zircon/system/ulib/blobfs/include/blobfs/journal.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/journal.h
rename to zircon/system/ulib/blobfs/include/blobfs/journal.h
diff --git a/system/ulib/blobfs/include/blobfs/latency-event.h b/zircon/system/ulib/blobfs/include/blobfs/latency-event.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/latency-event.h
rename to zircon/system/ulib/blobfs/include/blobfs/latency-event.h
diff --git a/system/ulib/blobfs/include/blobfs/metrics.h b/zircon/system/ulib/blobfs/include/blobfs/metrics.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/metrics.h
rename to zircon/system/ulib/blobfs/include/blobfs/metrics.h
diff --git a/system/ulib/blobfs/include/blobfs/node-reserver.h b/zircon/system/ulib/blobfs/include/blobfs/node-reserver.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/node-reserver.h
rename to zircon/system/ulib/blobfs/include/blobfs/node-reserver.h
diff --git a/system/ulib/blobfs/include/blobfs/transaction-manager.h b/zircon/system/ulib/blobfs/include/blobfs/transaction-manager.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/transaction-manager.h
rename to zircon/system/ulib/blobfs/include/blobfs/transaction-manager.h
diff --git a/system/ulib/blobfs/include/blobfs/writeback.h b/zircon/system/ulib/blobfs/include/blobfs/writeback.h
similarity index 100%
rename from system/ulib/blobfs/include/blobfs/writeback.h
rename to zircon/system/ulib/blobfs/include/blobfs/writeback.h
diff --git a/system/ulib/blobfs/iterator/allocated-extent-iterator.cpp b/zircon/system/ulib/blobfs/iterator/allocated-extent-iterator.cpp
similarity index 100%
rename from system/ulib/blobfs/iterator/allocated-extent-iterator.cpp
rename to zircon/system/ulib/blobfs/iterator/allocated-extent-iterator.cpp
diff --git a/system/ulib/blobfs/iterator/block-iterator.cpp b/zircon/system/ulib/blobfs/iterator/block-iterator.cpp
similarity index 100%
rename from system/ulib/blobfs/iterator/block-iterator.cpp
rename to zircon/system/ulib/blobfs/iterator/block-iterator.cpp
diff --git a/system/ulib/blobfs/iterator/node-populator.cpp b/zircon/system/ulib/blobfs/iterator/node-populator.cpp
similarity index 100%
rename from system/ulib/blobfs/iterator/node-populator.cpp
rename to zircon/system/ulib/blobfs/iterator/node-populator.cpp
diff --git a/system/ulib/blobfs/iterator/vector-extent-iterator.cpp b/zircon/system/ulib/blobfs/iterator/vector-extent-iterator.cpp
similarity index 100%
rename from system/ulib/blobfs/iterator/vector-extent-iterator.cpp
rename to zircon/system/ulib/blobfs/iterator/vector-extent-iterator.cpp
diff --git a/system/ulib/blobfs/journal.cpp b/zircon/system/ulib/blobfs/journal.cpp
similarity index 100%
rename from system/ulib/blobfs/journal.cpp
rename to zircon/system/ulib/blobfs/journal.cpp
diff --git a/system/ulib/blobfs/metrics.cpp b/zircon/system/ulib/blobfs/metrics.cpp
similarity index 100%
rename from system/ulib/blobfs/metrics.cpp
rename to zircon/system/ulib/blobfs/metrics.cpp
diff --git a/system/ulib/blobfs/node-reserver.cpp b/zircon/system/ulib/blobfs/node-reserver.cpp
similarity index 100%
rename from system/ulib/blobfs/node-reserver.cpp
rename to zircon/system/ulib/blobfs/node-reserver.cpp
diff --git a/system/ulib/blobfs/rules.mk b/zircon/system/ulib/blobfs/rules.mk
similarity index 100%
rename from system/ulib/blobfs/rules.mk
rename to zircon/system/ulib/blobfs/rules.mk
diff --git a/system/ulib/blobfs/test/allocated-extent-iterator-test.cpp b/zircon/system/ulib/blobfs/test/allocated-extent-iterator-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/allocated-extent-iterator-test.cpp
rename to zircon/system/ulib/blobfs/test/allocated-extent-iterator-test.cpp
diff --git a/system/ulib/blobfs/test/allocator-test.cpp b/zircon/system/ulib/blobfs/test/allocator-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/allocator-test.cpp
rename to zircon/system/ulib/blobfs/test/allocator-test.cpp
diff --git a/system/ulib/blobfs/test/blob-cache-test.cpp b/zircon/system/ulib/blobfs/test/blob-cache-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/blob-cache-test.cpp
rename to zircon/system/ulib/blobfs/test/blob-cache-test.cpp
diff --git a/system/ulib/blobfs/test/compressor-test.cpp b/zircon/system/ulib/blobfs/test/compressor-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/compressor-test.cpp
rename to zircon/system/ulib/blobfs/test/compressor-test.cpp
diff --git a/system/ulib/blobfs/test/extent-reserver-test.cpp b/zircon/system/ulib/blobfs/test/extent-reserver-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/extent-reserver-test.cpp
rename to zircon/system/ulib/blobfs/test/extent-reserver-test.cpp
diff --git a/system/ulib/blobfs/test/get-allocated-regions-test.cpp b/zircon/system/ulib/blobfs/test/get-allocated-regions-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/get-allocated-regions-test.cpp
rename to zircon/system/ulib/blobfs/test/get-allocated-regions-test.cpp
diff --git a/system/ulib/blobfs/test/journal-test.cpp b/zircon/system/ulib/blobfs/test/journal-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/journal-test.cpp
rename to zircon/system/ulib/blobfs/test/journal-test.cpp
diff --git a/system/ulib/blobfs/test/main.cpp b/zircon/system/ulib/blobfs/test/main.cpp
similarity index 100%
rename from system/ulib/blobfs/test/main.cpp
rename to zircon/system/ulib/blobfs/test/main.cpp
diff --git a/system/ulib/blobfs/test/node-populator-test.cpp b/zircon/system/ulib/blobfs/test/node-populator-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/node-populator-test.cpp
rename to zircon/system/ulib/blobfs/test/node-populator-test.cpp
diff --git a/system/ulib/blobfs/test/node-reserver-test.cpp b/zircon/system/ulib/blobfs/test/node-reserver-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/node-reserver-test.cpp
rename to zircon/system/ulib/blobfs/test/node-reserver-test.cpp
diff --git a/system/ulib/blobfs/test/utils.cpp b/zircon/system/ulib/blobfs/test/utils.cpp
similarity index 100%
rename from system/ulib/blobfs/test/utils.cpp
rename to zircon/system/ulib/blobfs/test/utils.cpp
diff --git a/system/ulib/blobfs/test/utils.h b/zircon/system/ulib/blobfs/test/utils.h
similarity index 100%
rename from system/ulib/blobfs/test/utils.h
rename to zircon/system/ulib/blobfs/test/utils.h
diff --git a/system/ulib/blobfs/test/vector-extent-iterator-test.cpp b/zircon/system/ulib/blobfs/test/vector-extent-iterator-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/vector-extent-iterator-test.cpp
rename to zircon/system/ulib/blobfs/test/vector-extent-iterator-test.cpp
diff --git a/system/ulib/blobfs/test/writeback-test.cpp b/zircon/system/ulib/blobfs/test/writeback-test.cpp
similarity index 100%
rename from system/ulib/blobfs/test/writeback-test.cpp
rename to zircon/system/ulib/blobfs/test/writeback-test.cpp
diff --git a/system/ulib/blobfs/writeback.cpp b/zircon/system/ulib/blobfs/writeback.cpp
similarity index 100%
rename from system/ulib/blobfs/writeback.cpp
rename to zircon/system/ulib/blobfs/writeback.cpp
diff --git a/system/ulib/block-client/client.c b/zircon/system/ulib/block-client/client.c
similarity index 100%
rename from system/ulib/block-client/client.c
rename to zircon/system/ulib/block-client/client.c
diff --git a/system/ulib/block-client/client.cpp b/zircon/system/ulib/block-client/client.cpp
similarity index 100%
rename from system/ulib/block-client/client.cpp
rename to zircon/system/ulib/block-client/client.cpp
diff --git a/system/ulib/block-client/include/block-client/client.h b/zircon/system/ulib/block-client/include/block-client/client.h
similarity index 100%
rename from system/ulib/block-client/include/block-client/client.h
rename to zircon/system/ulib/block-client/include/block-client/client.h
diff --git a/system/ulib/block-client/include/block-client/cpp/client.h b/zircon/system/ulib/block-client/include/block-client/cpp/client.h
similarity index 100%
rename from system/ulib/block-client/include/block-client/cpp/client.h
rename to zircon/system/ulib/block-client/include/block-client/cpp/client.h
diff --git a/system/ulib/block-client/rules.mk b/zircon/system/ulib/block-client/rules.mk
similarity index 100%
rename from system/ulib/block-client/rules.mk
rename to zircon/system/ulib/block-client/rules.mk
diff --git a/system/ulib/bootdata/decompress.c b/zircon/system/ulib/bootdata/decompress.c
similarity index 100%
rename from system/ulib/bootdata/decompress.c
rename to zircon/system/ulib/bootdata/decompress.c
diff --git a/system/ulib/bootdata/include/bootdata/decompress.h b/zircon/system/ulib/bootdata/include/bootdata/decompress.h
similarity index 100%
rename from system/ulib/bootdata/include/bootdata/decompress.h
rename to zircon/system/ulib/bootdata/include/bootdata/decompress.h
diff --git a/system/ulib/bootdata/rules.mk b/zircon/system/ulib/bootdata/rules.mk
similarity index 100%
rename from system/ulib/bootdata/rules.mk
rename to zircon/system/ulib/bootdata/rules.mk
diff --git a/system/ulib/bootfs/include/lib/bootfs/parser.h b/zircon/system/ulib/bootfs/include/lib/bootfs/parser.h
similarity index 100%
rename from system/ulib/bootfs/include/lib/bootfs/parser.h
rename to zircon/system/ulib/bootfs/include/lib/bootfs/parser.h
diff --git a/system/ulib/bootfs/parser-test.cpp b/zircon/system/ulib/bootfs/parser-test.cpp
similarity index 100%
rename from system/ulib/bootfs/parser-test.cpp
rename to zircon/system/ulib/bootfs/parser-test.cpp
diff --git a/system/ulib/bootfs/parser.cpp b/zircon/system/ulib/bootfs/parser.cpp
similarity index 100%
rename from system/ulib/bootfs/parser.cpp
rename to zircon/system/ulib/bootfs/parser.cpp
diff --git a/system/ulib/bootfs/rules.mk b/zircon/system/ulib/bootfs/rules.mk
similarity index 100%
rename from system/ulib/bootfs/rules.mk
rename to zircon/system/ulib/bootfs/rules.mk
diff --git a/system/ulib/bootsvc-protocol/README.md b/zircon/system/ulib/bootsvc-protocol/README.md
similarity index 100%
rename from system/ulib/bootsvc-protocol/README.md
rename to zircon/system/ulib/bootsvc-protocol/README.md
diff --git a/system/ulib/bootsvc-protocol/empty.cpp b/zircon/system/ulib/bootsvc-protocol/empty.cpp
similarity index 100%
rename from system/ulib/bootsvc-protocol/empty.cpp
rename to zircon/system/ulib/bootsvc-protocol/empty.cpp
diff --git a/system/ulib/bootsvc-protocol/include/lib/bootsvc-protocol/processargs.h b/zircon/system/ulib/bootsvc-protocol/include/lib/bootsvc-protocol/processargs.h
similarity index 100%
rename from system/ulib/bootsvc-protocol/include/lib/bootsvc-protocol/processargs.h
rename to zircon/system/ulib/bootsvc-protocol/include/lib/bootsvc-protocol/processargs.h
diff --git a/system/ulib/bootsvc-protocol/rules.mk b/zircon/system/ulib/bootsvc-protocol/rules.mk
similarity index 100%
rename from system/ulib/bootsvc-protocol/rules.mk
rename to zircon/system/ulib/bootsvc-protocol/rules.mk
diff --git a/system/ulib/c/rules.mk b/zircon/system/ulib/c/rules.mk
similarity index 100%
rename from system/ulib/c/rules.mk
rename to zircon/system/ulib/c/rules.mk
diff --git a/system/ulib/chromeos-disk-setup/chromeos-disk-setup.cpp b/zircon/system/ulib/chromeos-disk-setup/chromeos-disk-setup.cpp
similarity index 100%
rename from system/ulib/chromeos-disk-setup/chromeos-disk-setup.cpp
rename to zircon/system/ulib/chromeos-disk-setup/chromeos-disk-setup.cpp
diff --git a/system/ulib/chromeos-disk-setup/include/chromeos-disk-setup/chromeos-disk-setup.h b/zircon/system/ulib/chromeos-disk-setup/include/chromeos-disk-setup/chromeos-disk-setup.h
similarity index 100%
rename from system/ulib/chromeos-disk-setup/include/chromeos-disk-setup/chromeos-disk-setup.h
rename to zircon/system/ulib/chromeos-disk-setup/include/chromeos-disk-setup/chromeos-disk-setup.h
diff --git a/system/ulib/chromeos-disk-setup/rules.mk b/zircon/system/ulib/chromeos-disk-setup/rules.mk
similarity index 100%
rename from system/ulib/chromeos-disk-setup/rules.mk
rename to zircon/system/ulib/chromeos-disk-setup/rules.mk
diff --git a/system/ulib/cobalt-client/README.md b/zircon/system/ulib/cobalt-client/README.md
similarity index 100%
rename from system/ulib/cobalt-client/README.md
rename to zircon/system/ulib/cobalt-client/README.md
diff --git a/system/ulib/cobalt-client/cobalt_logger.cpp b/zircon/system/ulib/cobalt-client/cobalt_logger.cpp
similarity index 100%
rename from system/ulib/cobalt-client/cobalt_logger.cpp
rename to zircon/system/ulib/cobalt-client/cobalt_logger.cpp
diff --git a/system/ulib/cobalt-client/collector.cpp b/zircon/system/ulib/cobalt-client/collector.cpp
similarity index 100%
rename from system/ulib/cobalt-client/collector.cpp
rename to zircon/system/ulib/cobalt-client/collector.cpp
diff --git a/system/ulib/cobalt-client/counter.cpp b/zircon/system/ulib/cobalt-client/counter.cpp
similarity index 100%
rename from system/ulib/cobalt-client/counter.cpp
rename to zircon/system/ulib/cobalt-client/counter.cpp
diff --git a/system/ulib/cobalt-client/histogram.cpp b/zircon/system/ulib/cobalt-client/histogram.cpp
similarity index 100%
rename from system/ulib/cobalt-client/histogram.cpp
rename to zircon/system/ulib/cobalt-client/histogram.cpp
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/collector-internal.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/collector-internal.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/collector-internal.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/collector-internal.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/collector.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/collector.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/collector.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/collector.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/counter-internal.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/counter-internal.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/counter-internal.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/counter-internal.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/counter.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/counter.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/counter.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/counter.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/histogram-internal.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/histogram-internal.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/histogram-internal.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/histogram-internal.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/histogram.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/histogram.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/histogram.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/histogram.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/metric-options.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/metric-options.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/metric-options.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/metric-options.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/timer.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/timer.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/timer.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/timer.h
diff --git a/system/ulib/cobalt-client/include/cobalt-client/cpp/types-internal.h b/zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/types-internal.h
similarity index 100%
rename from system/ulib/cobalt-client/include/cobalt-client/cpp/types-internal.h
rename to zircon/system/ulib/cobalt-client/include/cobalt-client/cpp/types-internal.h
diff --git a/system/ulib/cobalt-client/metric_info.cpp b/zircon/system/ulib/cobalt-client/metric_info.cpp
similarity index 100%
rename from system/ulib/cobalt-client/metric_info.cpp
rename to zircon/system/ulib/cobalt-client/metric_info.cpp
diff --git a/system/ulib/cobalt-client/rules.mk b/zircon/system/ulib/cobalt-client/rules.mk
similarity index 100%
rename from system/ulib/cobalt-client/rules.mk
rename to zircon/system/ulib/cobalt-client/rules.mk
diff --git a/system/ulib/crypto/aead.cpp b/zircon/system/ulib/crypto/aead.cpp
similarity index 100%
rename from system/ulib/crypto/aead.cpp
rename to zircon/system/ulib/crypto/aead.cpp
diff --git a/system/ulib/crypto/bytes.cpp b/zircon/system/ulib/crypto/bytes.cpp
similarity index 100%
rename from system/ulib/crypto/bytes.cpp
rename to zircon/system/ulib/crypto/bytes.cpp
diff --git a/system/ulib/crypto/cipher.cpp b/zircon/system/ulib/crypto/cipher.cpp
similarity index 100%
rename from system/ulib/crypto/cipher.cpp
rename to zircon/system/ulib/crypto/cipher.cpp
diff --git a/system/ulib/crypto/digest.cpp b/zircon/system/ulib/crypto/digest.cpp
similarity index 100%
rename from system/ulib/crypto/digest.cpp
rename to zircon/system/ulib/crypto/digest.cpp
diff --git a/system/ulib/crypto/error.cpp b/zircon/system/ulib/crypto/error.cpp
similarity index 100%
rename from system/ulib/crypto/error.cpp
rename to zircon/system/ulib/crypto/error.cpp
diff --git a/system/ulib/crypto/error.h b/zircon/system/ulib/crypto/error.h
similarity index 100%
rename from system/ulib/crypto/error.h
rename to zircon/system/ulib/crypto/error.h
diff --git a/system/ulib/crypto/hkdf.cpp b/zircon/system/ulib/crypto/hkdf.cpp
similarity index 100%
rename from system/ulib/crypto/hkdf.cpp
rename to zircon/system/ulib/crypto/hkdf.cpp
diff --git a/system/ulib/crypto/hmac.cpp b/zircon/system/ulib/crypto/hmac.cpp
similarity index 100%
rename from system/ulib/crypto/hmac.cpp
rename to zircon/system/ulib/crypto/hmac.cpp
diff --git a/system/ulib/crypto/include/crypto/aead.h b/zircon/system/ulib/crypto/include/crypto/aead.h
similarity index 100%
rename from system/ulib/crypto/include/crypto/aead.h
rename to zircon/system/ulib/crypto/include/crypto/aead.h
diff --git a/system/ulib/crypto/include/crypto/bytes.h b/zircon/system/ulib/crypto/include/crypto/bytes.h
similarity index 100%
rename from system/ulib/crypto/include/crypto/bytes.h
rename to zircon/system/ulib/crypto/include/crypto/bytes.h
diff --git a/system/ulib/crypto/include/crypto/cipher.h b/zircon/system/ulib/crypto/include/crypto/cipher.h
similarity index 100%
rename from system/ulib/crypto/include/crypto/cipher.h
rename to zircon/system/ulib/crypto/include/crypto/cipher.h
diff --git a/system/ulib/crypto/include/crypto/digest.h b/zircon/system/ulib/crypto/include/crypto/digest.h
similarity index 100%
rename from system/ulib/crypto/include/crypto/digest.h
rename to zircon/system/ulib/crypto/include/crypto/digest.h
diff --git a/system/ulib/crypto/include/crypto/hkdf.h b/zircon/system/ulib/crypto/include/crypto/hkdf.h
similarity index 100%
rename from system/ulib/crypto/include/crypto/hkdf.h
rename to zircon/system/ulib/crypto/include/crypto/hkdf.h
diff --git a/system/ulib/crypto/include/crypto/hmac.h b/zircon/system/ulib/crypto/include/crypto/hmac.h
similarity index 100%
rename from system/ulib/crypto/include/crypto/hmac.h
rename to zircon/system/ulib/crypto/include/crypto/hmac.h
diff --git a/system/ulib/crypto/include/crypto/secret.h b/zircon/system/ulib/crypto/include/crypto/secret.h
similarity index 100%
rename from system/ulib/crypto/include/crypto/secret.h
rename to zircon/system/ulib/crypto/include/crypto/secret.h
diff --git a/system/ulib/crypto/rules.mk b/zircon/system/ulib/crypto/rules.mk
similarity index 100%
rename from system/ulib/crypto/rules.mk
rename to zircon/system/ulib/crypto/rules.mk
diff --git a/system/ulib/crypto/secret.cpp b/zircon/system/ulib/crypto/secret.cpp
similarity index 100%
rename from system/ulib/crypto/secret.cpp
rename to zircon/system/ulib/crypto/secret.cpp
diff --git a/system/ulib/ddk/include/ddk/binding.h b/zircon/system/ulib/ddk/include/ddk/binding.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/binding.h
rename to zircon/system/ulib/ddk/include/ddk/binding.h
diff --git a/system/ulib/ddk/include/ddk/debug.h b/zircon/system/ulib/ddk/include/ddk/debug.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/debug.h
rename to zircon/system/ulib/ddk/include/ddk/debug.h
diff --git a/system/ulib/ddk/include/ddk/device.h b/zircon/system/ulib/ddk/include/ddk/device.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/device.h
rename to zircon/system/ulib/ddk/include/ddk/device.h
diff --git a/system/ulib/ddk/include/ddk/driver.h b/zircon/system/ulib/ddk/include/ddk/driver.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/driver.h
rename to zircon/system/ulib/ddk/include/ddk/driver.h
diff --git a/system/ulib/ddk/include/ddk/io-buffer.h b/zircon/system/ulib/ddk/include/ddk/io-buffer.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/io-buffer.h
rename to zircon/system/ulib/ddk/include/ddk/io-buffer.h
diff --git a/system/ulib/ddk/include/ddk/metadata.h b/zircon/system/ulib/ddk/include/ddk/metadata.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/metadata.h
rename to zircon/system/ulib/ddk/include/ddk/metadata.h
diff --git a/system/ulib/ddk/include/ddk/metadata/bad-block.h b/zircon/system/ulib/ddk/include/ddk/metadata/bad-block.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/metadata/bad-block.h
rename to zircon/system/ulib/ddk/include/ddk/metadata/bad-block.h
diff --git a/system/ulib/ddk/include/ddk/metadata/buttons.h b/zircon/system/ulib/ddk/include/ddk/metadata/buttons.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/metadata/buttons.h
rename to zircon/system/ulib/ddk/include/ddk/metadata/buttons.h
diff --git a/system/ulib/ddk/include/ddk/metadata/camera.h b/zircon/system/ulib/ddk/include/ddk/metadata/camera.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/metadata/camera.h
rename to zircon/system/ulib/ddk/include/ddk/metadata/camera.h
diff --git a/system/ulib/ddk/include/ddk/metadata/gpt.h b/zircon/system/ulib/ddk/include/ddk/metadata/gpt.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/metadata/gpt.h
rename to zircon/system/ulib/ddk/include/ddk/metadata/gpt.h
diff --git a/system/ulib/ddk/include/ddk/metadata/nand.h b/zircon/system/ulib/ddk/include/ddk/metadata/nand.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/metadata/nand.h
rename to zircon/system/ulib/ddk/include/ddk/metadata/nand.h
diff --git a/system/ulib/ddk/include/ddk/mmio-buffer.h b/zircon/system/ulib/ddk/include/ddk/mmio-buffer.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/mmio-buffer.h
rename to zircon/system/ulib/ddk/include/ddk/mmio-buffer.h
diff --git a/system/ulib/ddk/include/ddk/phys-iter.h b/zircon/system/ulib/ddk/include/ddk/phys-iter.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/phys-iter.h
rename to zircon/system/ulib/ddk/include/ddk/phys-iter.h
diff --git a/system/ulib/ddk/include/ddk/physiter.h b/zircon/system/ulib/ddk/include/ddk/physiter.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/physiter.h
rename to zircon/system/ulib/ddk/include/ddk/physiter.h
diff --git a/system/ulib/ddk/include/ddk/platform-defs.h b/zircon/system/ulib/ddk/include/ddk/platform-defs.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/platform-defs.h
rename to zircon/system/ulib/ddk/include/ddk/platform-defs.h
diff --git a/system/ulib/ddk/include/ddk/protocol/auxdata.h b/zircon/system/ulib/ddk/include/ddk/protocol/auxdata.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/protocol/auxdata.h
rename to zircon/system/ulib/ddk/include/ddk/protocol/auxdata.h
diff --git a/system/ulib/ddk/include/ddk/protocol/bt-gatt-svc-lib.h b/zircon/system/ulib/ddk/include/ddk/protocol/bt-gatt-svc-lib.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/protocol/bt-gatt-svc-lib.h
rename to zircon/system/ulib/ddk/include/ddk/protocol/bt-gatt-svc-lib.h
diff --git a/system/ulib/ddk/include/ddk/protocol/i2c-lib.h b/zircon/system/ulib/ddk/include/ddk/protocol/i2c-lib.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/protocol/i2c-lib.h
rename to zircon/system/ulib/ddk/include/ddk/protocol/i2c-lib.h
diff --git a/system/ulib/ddk/include/ddk/protocol/pci-lib.h b/zircon/system/ulib/ddk/include/ddk/protocol/pci-lib.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/protocol/pci-lib.h
rename to zircon/system/ulib/ddk/include/ddk/protocol/pci-lib.h
diff --git a/system/ulib/ddk/include/ddk/protocol/platform-device-lib.h b/zircon/system/ulib/ddk/include/ddk/protocol/platform-device-lib.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/protocol/platform-device-lib.h
rename to zircon/system/ulib/ddk/include/ddk/protocol/platform-device-lib.h
diff --git a/system/ulib/ddk/include/ddk/protodefs.h b/zircon/system/ulib/ddk/include/ddk/protodefs.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/protodefs.h
rename to zircon/system/ulib/ddk/include/ddk/protodefs.h
diff --git a/system/ulib/ddk/include/ddk/trace/event.h b/zircon/system/ulib/ddk/include/ddk/trace/event.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/trace/event.h
rename to zircon/system/ulib/ddk/include/ddk/trace/event.h
diff --git a/system/ulib/ddk/include/ddk/usb-peripheral-config.h b/zircon/system/ulib/ddk/include/ddk/usb-peripheral-config.h
similarity index 100%
rename from system/ulib/ddk/include/ddk/usb-peripheral-config.h
rename to zircon/system/ulib/ddk/include/ddk/usb-peripheral-config.h
diff --git a/system/ulib/ddk/include/hw/arch_ops.h b/zircon/system/ulib/ddk/include/hw/arch_ops.h
similarity index 100%
rename from system/ulib/ddk/include/hw/arch_ops.h
rename to zircon/system/ulib/ddk/include/hw/arch_ops.h
diff --git a/system/ulib/ddk/include/hw/inout.h b/zircon/system/ulib/ddk/include/hw/inout.h
similarity index 100%
rename from system/ulib/ddk/include/hw/inout.h
rename to zircon/system/ulib/ddk/include/hw/inout.h
diff --git a/system/ulib/ddk/include/hw/pci.h b/zircon/system/ulib/ddk/include/hw/pci.h
similarity index 100%
rename from system/ulib/ddk/include/hw/pci.h
rename to zircon/system/ulib/ddk/include/hw/pci.h
diff --git a/system/ulib/ddk/include/hw/reg.h b/zircon/system/ulib/ddk/include/hw/reg.h
similarity index 100%
rename from system/ulib/ddk/include/hw/reg.h
rename to zircon/system/ulib/ddk/include/hw/reg.h
diff --git a/system/ulib/ddk/include/hw/sdhci.h b/zircon/system/ulib/ddk/include/hw/sdhci.h
similarity index 100%
rename from system/ulib/ddk/include/hw/sdhci.h
rename to zircon/system/ulib/ddk/include/hw/sdhci.h
diff --git a/system/ulib/ddk/include/hw/sdio.h b/zircon/system/ulib/ddk/include/hw/sdio.h
similarity index 100%
rename from system/ulib/ddk/include/hw/sdio.h
rename to zircon/system/ulib/ddk/include/hw/sdio.h
diff --git a/system/ulib/ddk/include/hw/sdmmc.h b/zircon/system/ulib/ddk/include/hw/sdmmc.h
similarity index 100%
rename from system/ulib/ddk/include/hw/sdmmc.h
rename to zircon/system/ulib/ddk/include/hw/sdmmc.h
diff --git a/system/ulib/ddk/io-buffer.c b/zircon/system/ulib/ddk/io-buffer.c
similarity index 100%
rename from system/ulib/ddk/io-buffer.c
rename to zircon/system/ulib/ddk/io-buffer.c
diff --git a/system/ulib/ddk/mmio-buffer.c b/zircon/system/ulib/ddk/mmio-buffer.c
similarity index 100%
rename from system/ulib/ddk/mmio-buffer.c
rename to zircon/system/ulib/ddk/mmio-buffer.c
diff --git a/system/ulib/ddk/phys-iter.c b/zircon/system/ulib/ddk/phys-iter.c
similarity index 100%
rename from system/ulib/ddk/phys-iter.c
rename to zircon/system/ulib/ddk/phys-iter.c
diff --git a/system/ulib/ddk/rules.mk b/zircon/system/ulib/ddk/rules.mk
similarity index 100%
rename from system/ulib/ddk/rules.mk
rename to zircon/system/ulib/ddk/rules.mk
diff --git a/system/ulib/ddk/test/main.cpp b/zircon/system/ulib/ddk/test/main.cpp
similarity index 100%
rename from system/ulib/ddk/test/main.cpp
rename to zircon/system/ulib/ddk/test/main.cpp
diff --git a/system/ulib/ddk/test/phys-iter-test.cpp b/zircon/system/ulib/ddk/test/phys-iter-test.cpp
similarity index 100%
rename from system/ulib/ddk/test/phys-iter-test.cpp
rename to zircon/system/ulib/ddk/test/phys-iter-test.cpp
diff --git a/system/ulib/ddktl/include/ddktl/device-internal.h b/zircon/system/ulib/ddktl/include/ddktl/device-internal.h
similarity index 100%
rename from system/ulib/ddktl/include/ddktl/device-internal.h
rename to zircon/system/ulib/ddktl/include/ddktl/device-internal.h
diff --git a/system/ulib/ddktl/include/ddktl/device.h b/zircon/system/ulib/ddktl/include/ddktl/device.h
similarity index 100%
rename from system/ulib/ddktl/include/ddktl/device.h
rename to zircon/system/ulib/ddktl/include/ddktl/device.h
diff --git a/system/ulib/ddktl/include/ddktl/i2c-channel.h b/zircon/system/ulib/ddktl/include/ddktl/i2c-channel.h
similarity index 100%
rename from system/ulib/ddktl/include/ddktl/i2c-channel.h
rename to zircon/system/ulib/ddktl/include/ddktl/i2c-channel.h
diff --git a/system/ulib/ddktl/include/ddktl/mmio.h b/zircon/system/ulib/ddktl/include/ddktl/mmio.h
similarity index 100%
rename from system/ulib/ddktl/include/ddktl/mmio.h
rename to zircon/system/ulib/ddktl/include/ddktl/mmio.h
diff --git a/system/ulib/ddktl/include/ddktl/pdev.h b/zircon/system/ulib/ddktl/include/ddktl/pdev.h
similarity index 100%
rename from system/ulib/ddktl/include/ddktl/pdev.h
rename to zircon/system/ulib/ddktl/include/ddktl/pdev.h
diff --git a/system/ulib/ddktl/include/ddktl/protocol/empty-protocol.h b/zircon/system/ulib/ddktl/include/ddktl/protocol/empty-protocol.h
similarity index 100%
rename from system/ulib/ddktl/include/ddktl/protocol/empty-protocol.h
rename to zircon/system/ulib/ddktl/include/ddktl/protocol/empty-protocol.h
diff --git a/system/ulib/ddktl/pdev.cpp b/zircon/system/ulib/ddktl/pdev.cpp
similarity index 100%
rename from system/ulib/ddktl/pdev.cpp
rename to zircon/system/ulib/ddktl/pdev.cpp
diff --git a/system/ulib/ddktl/rules.mk b/zircon/system/ulib/ddktl/rules.mk
similarity index 100%
rename from system/ulib/ddktl/rules.mk
rename to zircon/system/ulib/ddktl/rules.mk
diff --git a/system/ulib/ddktl/test/ddktl-test-binding.c b/zircon/system/ulib/ddktl/test/ddktl-test-binding.c
similarity index 100%
rename from system/ulib/ddktl/test/ddktl-test-binding.c
rename to zircon/system/ulib/ddktl/test/ddktl-test-binding.c
diff --git a/system/ulib/ddktl/test/ddktl-test.cpp b/zircon/system/ulib/ddktl/test/ddktl-test.cpp
similarity index 100%
rename from system/ulib/ddktl/test/ddktl-test.cpp
rename to zircon/system/ulib/ddktl/test/ddktl-test.cpp
diff --git a/system/ulib/ddktl/test/device-tests.cpp b/zircon/system/ulib/ddktl/test/device-tests.cpp
similarity index 100%
rename from system/ulib/ddktl/test/device-tests.cpp
rename to zircon/system/ulib/ddktl/test/device-tests.cpp
diff --git a/system/ulib/ddktl/test/ethernet-tests.cpp b/zircon/system/ulib/ddktl/test/ethernet-tests.cpp
similarity index 100%
rename from system/ulib/ddktl/test/ethernet-tests.cpp
rename to zircon/system/ulib/ddktl/test/ethernet-tests.cpp
diff --git a/system/ulib/devmgr-integration-test/file-wait.cpp b/zircon/system/ulib/devmgr-integration-test/file-wait.cpp
similarity index 100%
rename from system/ulib/devmgr-integration-test/file-wait.cpp
rename to zircon/system/ulib/devmgr-integration-test/file-wait.cpp
diff --git a/system/ulib/devmgr-integration-test/include/lib/devmgr-integration-test/fixture.h b/zircon/system/ulib/devmgr-integration-test/include/lib/devmgr-integration-test/fixture.h
similarity index 100%
rename from system/ulib/devmgr-integration-test/include/lib/devmgr-integration-test/fixture.h
rename to zircon/system/ulib/devmgr-integration-test/include/lib/devmgr-integration-test/fixture.h
diff --git a/system/ulib/devmgr-integration-test/launcher.cpp b/zircon/system/ulib/devmgr-integration-test/launcher.cpp
similarity index 100%
rename from system/ulib/devmgr-integration-test/launcher.cpp
rename to zircon/system/ulib/devmgr-integration-test/launcher.cpp
diff --git a/system/ulib/devmgr-integration-test/rules.mk b/zircon/system/ulib/devmgr-integration-test/rules.mk
similarity index 100%
rename from system/ulib/devmgr-integration-test/rules.mk
rename to zircon/system/ulib/devmgr-integration-test/rules.mk
diff --git a/system/ulib/devmgr-launcher/include/lib/devmgr-launcher/launch.h b/zircon/system/ulib/devmgr-launcher/include/lib/devmgr-launcher/launch.h
similarity index 100%
rename from system/ulib/devmgr-launcher/include/lib/devmgr-launcher/launch.h
rename to zircon/system/ulib/devmgr-launcher/include/lib/devmgr-launcher/launch.h
diff --git a/system/ulib/devmgr-launcher/include/lib/devmgr-launcher/processargs.h b/zircon/system/ulib/devmgr-launcher/include/lib/devmgr-launcher/processargs.h
similarity index 100%
rename from system/ulib/devmgr-launcher/include/lib/devmgr-launcher/processargs.h
rename to zircon/system/ulib/devmgr-launcher/include/lib/devmgr-launcher/processargs.h
diff --git a/system/ulib/devmgr-launcher/launcher.cpp b/zircon/system/ulib/devmgr-launcher/launcher.cpp
similarity index 100%
rename from system/ulib/devmgr-launcher/launcher.cpp
rename to zircon/system/ulib/devmgr-launcher/launcher.cpp
diff --git a/system/ulib/devmgr-launcher/rules.mk b/zircon/system/ulib/devmgr-launcher/rules.mk
similarity index 100%
rename from system/ulib/devmgr-launcher/rules.mk
rename to zircon/system/ulib/devmgr-launcher/rules.mk
diff --git a/system/ulib/digest/digest.cpp b/zircon/system/ulib/digest/digest.cpp
similarity index 100%
rename from system/ulib/digest/digest.cpp
rename to zircon/system/ulib/digest/digest.cpp
diff --git a/system/ulib/digest/include/digest/digest.h b/zircon/system/ulib/digest/include/digest/digest.h
similarity index 100%
rename from system/ulib/digest/include/digest/digest.h
rename to zircon/system/ulib/digest/include/digest/digest.h
diff --git a/system/ulib/digest/include/digest/merkle-tree.h b/zircon/system/ulib/digest/include/digest/merkle-tree.h
similarity index 100%
rename from system/ulib/digest/include/digest/merkle-tree.h
rename to zircon/system/ulib/digest/include/digest/merkle-tree.h
diff --git a/system/ulib/digest/merkle-tree.cpp b/zircon/system/ulib/digest/merkle-tree.cpp
similarity index 100%
rename from system/ulib/digest/merkle-tree.cpp
rename to zircon/system/ulib/digest/merkle-tree.cpp
diff --git a/system/ulib/digest/rules.mk b/zircon/system/ulib/digest/rules.mk
similarity index 100%
rename from system/ulib/digest/rules.mk
rename to zircon/system/ulib/digest/rules.mk
diff --git a/system/ulib/dispatcher-pool/debug-logging.h b/zircon/system/ulib/dispatcher-pool/debug-logging.h
similarity index 100%
rename from system/ulib/dispatcher-pool/debug-logging.h
rename to zircon/system/ulib/dispatcher-pool/debug-logging.h
diff --git a/system/ulib/dispatcher-pool/dispatcher-channel.cpp b/zircon/system/ulib/dispatcher-pool/dispatcher-channel.cpp
similarity index 100%
rename from system/ulib/dispatcher-pool/dispatcher-channel.cpp
rename to zircon/system/ulib/dispatcher-pool/dispatcher-channel.cpp
diff --git a/system/ulib/dispatcher-pool/dispatcher-event-source.cpp b/zircon/system/ulib/dispatcher-pool/dispatcher-event-source.cpp
similarity index 100%
rename from system/ulib/dispatcher-pool/dispatcher-event-source.cpp
rename to zircon/system/ulib/dispatcher-pool/dispatcher-event-source.cpp
diff --git a/system/ulib/dispatcher-pool/dispatcher-execution-domain.cpp b/zircon/system/ulib/dispatcher-pool/dispatcher-execution-domain.cpp
similarity index 100%
rename from system/ulib/dispatcher-pool/dispatcher-execution-domain.cpp
rename to zircon/system/ulib/dispatcher-pool/dispatcher-execution-domain.cpp
diff --git a/system/ulib/dispatcher-pool/dispatcher-interrupt.cpp b/zircon/system/ulib/dispatcher-pool/dispatcher-interrupt.cpp
similarity index 100%
rename from system/ulib/dispatcher-pool/dispatcher-interrupt.cpp
rename to zircon/system/ulib/dispatcher-pool/dispatcher-interrupt.cpp
diff --git a/system/ulib/dispatcher-pool/dispatcher-thread-pool.cpp b/zircon/system/ulib/dispatcher-pool/dispatcher-thread-pool.cpp
similarity index 100%
rename from system/ulib/dispatcher-pool/dispatcher-thread-pool.cpp
rename to zircon/system/ulib/dispatcher-pool/dispatcher-thread-pool.cpp
diff --git a/system/ulib/dispatcher-pool/dispatcher-timer.cpp b/zircon/system/ulib/dispatcher-pool/dispatcher-timer.cpp
similarity index 100%
rename from system/ulib/dispatcher-pool/dispatcher-timer.cpp
rename to zircon/system/ulib/dispatcher-pool/dispatcher-timer.cpp
diff --git a/system/ulib/dispatcher-pool/dispatcher-wakeup-event.cpp b/zircon/system/ulib/dispatcher-pool/dispatcher-wakeup-event.cpp
similarity index 100%
rename from system/ulib/dispatcher-pool/dispatcher-wakeup-event.cpp
rename to zircon/system/ulib/dispatcher-pool/dispatcher-wakeup-event.cpp
diff --git a/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-channel.h b/zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-channel.h
similarity index 100%
rename from system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-channel.h
rename to zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-channel.h
diff --git a/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-event-source.h b/zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-event-source.h
similarity index 100%
rename from system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-event-source.h
rename to zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-event-source.h
diff --git a/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-execution-domain.h b/zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-execution-domain.h
similarity index 100%
rename from system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-execution-domain.h
rename to zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-execution-domain.h
diff --git a/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-interrupt.h b/zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-interrupt.h
similarity index 100%
rename from system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-interrupt.h
rename to zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-interrupt.h
diff --git a/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-thread-pool.h b/zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-thread-pool.h
similarity index 100%
rename from system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-thread-pool.h
rename to zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-thread-pool.h
diff --git a/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-timer.h b/zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-timer.h
similarity index 100%
rename from system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-timer.h
rename to zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-timer.h
diff --git a/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-wakeup-event.h b/zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-wakeup-event.h
similarity index 100%
rename from system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-wakeup-event.h
rename to zircon/system/ulib/dispatcher-pool/include/dispatcher-pool/dispatcher-wakeup-event.h
diff --git a/system/ulib/dispatcher-pool/rules.mk b/zircon/system/ulib/dispatcher-pool/rules.mk
similarity index 100%
rename from system/ulib/dispatcher-pool/rules.mk
rename to zircon/system/ulib/dispatcher-pool/rules.mk
diff --git a/system/ulib/driver-info/driver-info-app.c b/zircon/system/ulib/driver-info/driver-info-app.c
similarity index 100%
rename from system/ulib/driver-info/driver-info-app.c
rename to zircon/system/ulib/driver-info/driver-info-app.c
diff --git a/system/ulib/driver-info/driver-info.c b/zircon/system/ulib/driver-info/driver-info.c
similarity index 100%
rename from system/ulib/driver-info/driver-info.c
rename to zircon/system/ulib/driver-info/driver-info.c
diff --git a/system/ulib/driver-info/include/driver-info/driver-info.h b/zircon/system/ulib/driver-info/include/driver-info/driver-info.h
similarity index 100%
rename from system/ulib/driver-info/include/driver-info/driver-info.h
rename to zircon/system/ulib/driver-info/include/driver-info/driver-info.h
diff --git a/system/ulib/driver-info/rules.mk b/zircon/system/ulib/driver-info/rules.mk
similarity index 100%
rename from system/ulib/driver-info/rules.mk
rename to zircon/system/ulib/driver-info/rules.mk
diff --git a/system/ulib/driver/rules.mk b/zircon/system/ulib/driver/rules.mk
similarity index 100%
rename from system/ulib/driver/rules.mk
rename to zircon/system/ulib/driver/rules.mk
diff --git a/system/ulib/edid/edid.cpp b/zircon/system/ulib/edid/edid.cpp
similarity index 100%
rename from system/ulib/edid/edid.cpp
rename to zircon/system/ulib/edid/edid.cpp
diff --git a/system/ulib/edid/eisa_vid_lut.cpp b/zircon/system/ulib/edid/eisa_vid_lut.cpp
similarity index 100%
rename from system/ulib/edid/eisa_vid_lut.cpp
rename to zircon/system/ulib/edid/eisa_vid_lut.cpp
diff --git a/system/ulib/edid/eisa_vid_lut.h b/zircon/system/ulib/edid/eisa_vid_lut.h
similarity index 100%
rename from system/ulib/edid/eisa_vid_lut.h
rename to zircon/system/ulib/edid/eisa_vid_lut.h
diff --git a/system/ulib/edid/include/lib/edid/edid.h b/zircon/system/ulib/edid/include/lib/edid/edid.h
similarity index 100%
rename from system/ulib/edid/include/lib/edid/edid.h
rename to zircon/system/ulib/edid/include/lib/edid/edid.h
diff --git a/system/ulib/edid/include/lib/edid/timings.h b/zircon/system/ulib/edid/include/lib/edid/timings.h
similarity index 100%
rename from system/ulib/edid/include/lib/edid/timings.h
rename to zircon/system/ulib/edid/include/lib/edid/timings.h
diff --git a/system/ulib/edid/rules.mk b/zircon/system/ulib/edid/rules.mk
similarity index 100%
rename from system/ulib/edid/rules.mk
rename to zircon/system/ulib/edid/rules.mk
diff --git a/system/ulib/edid/timings.cpp b/zircon/system/ulib/edid/timings.cpp
similarity index 100%
rename from system/ulib/edid/timings.cpp
rename to zircon/system/ulib/edid/timings.cpp
diff --git a/system/ulib/elf-search/elf-search.cpp b/zircon/system/ulib/elf-search/elf-search.cpp
similarity index 100%
rename from system/ulib/elf-search/elf-search.cpp
rename to zircon/system/ulib/elf-search/elf-search.cpp
diff --git a/system/ulib/elf-search/include/elf-search.h b/zircon/system/ulib/elf-search/include/elf-search.h
similarity index 100%
rename from system/ulib/elf-search/include/elf-search.h
rename to zircon/system/ulib/elf-search/include/elf-search.h
diff --git a/system/ulib/elf-search/rules.mk b/zircon/system/ulib/elf-search/rules.mk
similarity index 100%
rename from system/ulib/elf-search/rules.mk
rename to zircon/system/ulib/elf-search/rules.mk
diff --git a/system/ulib/elfload/elf-load.c b/zircon/system/ulib/elfload/elf-load.c
similarity index 100%
rename from system/ulib/elfload/elf-load.c
rename to zircon/system/ulib/elfload/elf-load.c
diff --git a/system/ulib/elfload/include/elfload/elfload.h b/zircon/system/ulib/elfload/include/elfload/elfload.h
similarity index 100%
rename from system/ulib/elfload/include/elfload/elfload.h
rename to zircon/system/ulib/elfload/include/elfload/elfload.h
diff --git a/system/ulib/elfload/rules.mk b/zircon/system/ulib/elfload/rules.mk
similarity index 100%
rename from system/ulib/elfload/rules.mk
rename to zircon/system/ulib/elfload/rules.mk
diff --git a/system/ulib/explicit-memory/bytes.c b/zircon/system/ulib/explicit-memory/bytes.c
similarity index 100%
rename from system/ulib/explicit-memory/bytes.c
rename to zircon/system/ulib/explicit-memory/bytes.c
diff --git a/system/ulib/explicit-memory/include/explicit-memory/bytes.h b/zircon/system/ulib/explicit-memory/include/explicit-memory/bytes.h
similarity index 100%
rename from system/ulib/explicit-memory/include/explicit-memory/bytes.h
rename to zircon/system/ulib/explicit-memory/include/explicit-memory/bytes.h
diff --git a/system/ulib/explicit-memory/rules.mk b/zircon/system/ulib/explicit-memory/rules.mk
similarity index 100%
rename from system/ulib/explicit-memory/rules.mk
rename to zircon/system/ulib/explicit-memory/rules.mk
diff --git a/system/ulib/fbl/alloc_checker.cpp b/zircon/system/ulib/fbl/alloc_checker.cpp
similarity index 100%
rename from system/ulib/fbl/alloc_checker.cpp
rename to zircon/system/ulib/fbl/alloc_checker.cpp
diff --git a/system/ulib/fbl/include/fbl/algorithm.h b/zircon/system/ulib/fbl/include/fbl/algorithm.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/algorithm.h
rename to zircon/system/ulib/fbl/include/fbl/algorithm.h
diff --git a/system/ulib/fbl/include/fbl/alloc_checker.h b/zircon/system/ulib/fbl/include/fbl/alloc_checker.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/alloc_checker.h
rename to zircon/system/ulib/fbl/include/fbl/alloc_checker.h
diff --git a/system/ulib/fbl/include/fbl/array.h b/zircon/system/ulib/fbl/include/fbl/array.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/array.h
rename to zircon/system/ulib/fbl/include/fbl/array.h
diff --git a/system/ulib/fbl/include/fbl/auto_call.h b/zircon/system/ulib/fbl/include/fbl/auto_call.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/auto_call.h
rename to zircon/system/ulib/fbl/include/fbl/auto_call.h
diff --git a/system/ulib/fbl/include/fbl/auto_lock.h b/zircon/system/ulib/fbl/include/fbl/auto_lock.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/auto_lock.h
rename to zircon/system/ulib/fbl/include/fbl/auto_lock.h
diff --git a/system/ulib/fbl/include/fbl/canary.h b/zircon/system/ulib/fbl/include/fbl/canary.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/canary.h
rename to zircon/system/ulib/fbl/include/fbl/canary.h
diff --git a/system/ulib/fbl/include/fbl/condition_variable.h b/zircon/system/ulib/fbl/include/fbl/condition_variable.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/condition_variable.h
rename to zircon/system/ulib/fbl/include/fbl/condition_variable.h
diff --git a/system/ulib/fbl/include/fbl/deleter.h b/zircon/system/ulib/fbl/include/fbl/deleter.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/deleter.h
rename to zircon/system/ulib/fbl/include/fbl/deleter.h
diff --git a/system/ulib/fbl/include/fbl/function.h b/zircon/system/ulib/fbl/include/fbl/function.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/function.h
rename to zircon/system/ulib/fbl/include/fbl/function.h
diff --git a/system/ulib/fbl/include/fbl/intrusive_container_utils.h b/zircon/system/ulib/fbl/include/fbl/intrusive_container_utils.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/intrusive_container_utils.h
rename to zircon/system/ulib/fbl/include/fbl/intrusive_container_utils.h
diff --git a/system/ulib/fbl/include/fbl/intrusive_double_list.h b/zircon/system/ulib/fbl/include/fbl/intrusive_double_list.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/intrusive_double_list.h
rename to zircon/system/ulib/fbl/include/fbl/intrusive_double_list.h
diff --git a/system/ulib/fbl/include/fbl/intrusive_hash_table.h b/zircon/system/ulib/fbl/include/fbl/intrusive_hash_table.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/intrusive_hash_table.h
rename to zircon/system/ulib/fbl/include/fbl/intrusive_hash_table.h
diff --git a/system/ulib/fbl/include/fbl/intrusive_pointer_traits.h b/zircon/system/ulib/fbl/include/fbl/intrusive_pointer_traits.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/intrusive_pointer_traits.h
rename to zircon/system/ulib/fbl/include/fbl/intrusive_pointer_traits.h
diff --git a/system/ulib/fbl/include/fbl/intrusive_single_list.h b/zircon/system/ulib/fbl/include/fbl/intrusive_single_list.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/intrusive_single_list.h
rename to zircon/system/ulib/fbl/include/fbl/intrusive_single_list.h
diff --git a/system/ulib/fbl/include/fbl/intrusive_wavl_tree.h b/zircon/system/ulib/fbl/include/fbl/intrusive_wavl_tree.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/intrusive_wavl_tree.h
rename to zircon/system/ulib/fbl/include/fbl/intrusive_wavl_tree.h
diff --git a/system/ulib/fbl/include/fbl/intrusive_wavl_tree_internal.h b/zircon/system/ulib/fbl/include/fbl/intrusive_wavl_tree_internal.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/intrusive_wavl_tree_internal.h
rename to zircon/system/ulib/fbl/include/fbl/intrusive_wavl_tree_internal.h
diff --git a/system/ulib/fbl/include/fbl/limits.h b/zircon/system/ulib/fbl/include/fbl/limits.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/limits.h
rename to zircon/system/ulib/fbl/include/fbl/limits.h
diff --git a/system/ulib/fbl/include/fbl/macros.h b/zircon/system/ulib/fbl/include/fbl/macros.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/macros.h
rename to zircon/system/ulib/fbl/include/fbl/macros.h
diff --git a/system/ulib/fbl/include/fbl/mutex.h b/zircon/system/ulib/fbl/include/fbl/mutex.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/mutex.h
rename to zircon/system/ulib/fbl/include/fbl/mutex.h
diff --git a/system/ulib/fbl/include/fbl/null_lock.h b/zircon/system/ulib/fbl/include/fbl/null_lock.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/null_lock.h
rename to zircon/system/ulib/fbl/include/fbl/null_lock.h
diff --git a/system/ulib/fbl/include/fbl/recycler.h b/zircon/system/ulib/fbl/include/fbl/recycler.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/recycler.h
rename to zircon/system/ulib/fbl/include/fbl/recycler.h
diff --git a/system/ulib/fbl/include/fbl/ref_counted.h b/zircon/system/ulib/fbl/include/fbl/ref_counted.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/ref_counted.h
rename to zircon/system/ulib/fbl/include/fbl/ref_counted.h
diff --git a/system/ulib/fbl/include/fbl/ref_counted_internal.h b/zircon/system/ulib/fbl/include/fbl/ref_counted_internal.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/ref_counted_internal.h
rename to zircon/system/ulib/fbl/include/fbl/ref_counted_internal.h
diff --git a/system/ulib/fbl/include/fbl/ref_counted_upgradeable.h b/zircon/system/ulib/fbl/include/fbl/ref_counted_upgradeable.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/ref_counted_upgradeable.h
rename to zircon/system/ulib/fbl/include/fbl/ref_counted_upgradeable.h
diff --git a/system/ulib/fbl/include/fbl/ref_ptr.h b/zircon/system/ulib/fbl/include/fbl/ref_ptr.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/ref_ptr.h
rename to zircon/system/ulib/fbl/include/fbl/ref_ptr.h
diff --git a/system/ulib/fbl/include/fbl/slab_allocator.h b/zircon/system/ulib/fbl/include/fbl/slab_allocator.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/slab_allocator.h
rename to zircon/system/ulib/fbl/include/fbl/slab_allocator.h
diff --git a/system/ulib/fbl/include/fbl/slab_malloc.h b/zircon/system/ulib/fbl/include/fbl/slab_malloc.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/slab_malloc.h
rename to zircon/system/ulib/fbl/include/fbl/slab_malloc.h
diff --git a/system/ulib/fbl/include/fbl/string.h b/zircon/system/ulib/fbl/include/fbl/string.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/string.h
rename to zircon/system/ulib/fbl/include/fbl/string.h
diff --git a/system/ulib/fbl/include/fbl/string_buffer.h b/zircon/system/ulib/fbl/include/fbl/string_buffer.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/string_buffer.h
rename to zircon/system/ulib/fbl/include/fbl/string_buffer.h
diff --git a/system/ulib/fbl/include/fbl/string_piece.h b/zircon/system/ulib/fbl/include/fbl/string_piece.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/string_piece.h
rename to zircon/system/ulib/fbl/include/fbl/string_piece.h
diff --git a/system/ulib/fbl/include/fbl/string_printf.h b/zircon/system/ulib/fbl/include/fbl/string_printf.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/string_printf.h
rename to zircon/system/ulib/fbl/include/fbl/string_printf.h
diff --git a/system/ulib/fbl/include/fbl/string_traits.h b/zircon/system/ulib/fbl/include/fbl/string_traits.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/string_traits.h
rename to zircon/system/ulib/fbl/include/fbl/string_traits.h
diff --git a/system/ulib/fbl/include/fbl/type_info.h b/zircon/system/ulib/fbl/include/fbl/type_info.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/type_info.h
rename to zircon/system/ulib/fbl/include/fbl/type_info.h
diff --git a/system/ulib/fbl/include/fbl/type_support.h b/zircon/system/ulib/fbl/include/fbl/type_support.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/type_support.h
rename to zircon/system/ulib/fbl/include/fbl/type_support.h
diff --git a/system/ulib/fbl/include/fbl/unique_fd.h b/zircon/system/ulib/fbl/include/fbl/unique_fd.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/unique_fd.h
rename to zircon/system/ulib/fbl/include/fbl/unique_fd.h
diff --git a/system/ulib/fbl/include/fbl/unique_free_ptr.h b/zircon/system/ulib/fbl/include/fbl/unique_free_ptr.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/unique_free_ptr.h
rename to zircon/system/ulib/fbl/include/fbl/unique_free_ptr.h
diff --git a/system/ulib/fbl/include/fbl/unique_ptr.h b/zircon/system/ulib/fbl/include/fbl/unique_ptr.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/unique_ptr.h
rename to zircon/system/ulib/fbl/include/fbl/unique_ptr.h
diff --git a/system/ulib/fbl/include/fbl/vector.h b/zircon/system/ulib/fbl/include/fbl/vector.h
similarity index 100%
rename from system/ulib/fbl/include/fbl/vector.h
rename to zircon/system/ulib/fbl/include/fbl/vector.h
diff --git a/system/ulib/fbl/rules.mk b/zircon/system/ulib/fbl/rules.mk
similarity index 100%
rename from system/ulib/fbl/rules.mk
rename to zircon/system/ulib/fbl/rules.mk
diff --git a/system/ulib/fbl/string.cpp b/zircon/system/ulib/fbl/string.cpp
similarity index 100%
rename from system/ulib/fbl/string.cpp
rename to zircon/system/ulib/fbl/string.cpp
diff --git a/system/ulib/fbl/string_buffer.cpp b/zircon/system/ulib/fbl/string_buffer.cpp
similarity index 100%
rename from system/ulib/fbl/string_buffer.cpp
rename to zircon/system/ulib/fbl/string_buffer.cpp
diff --git a/system/ulib/fbl/string_piece.cpp b/zircon/system/ulib/fbl/string_piece.cpp
similarity index 100%
rename from system/ulib/fbl/string_piece.cpp
rename to zircon/system/ulib/fbl/string_piece.cpp
diff --git a/system/ulib/fbl/string_printf.cpp b/zircon/system/ulib/fbl/string_printf.cpp
similarity index 100%
rename from system/ulib/fbl/string_printf.cpp
rename to zircon/system/ulib/fbl/string_printf.cpp
diff --git a/system/ulib/fdio/MAINTAINERS b/zircon/system/ulib/fdio/MAINTAINERS
similarity index 100%
rename from system/ulib/fdio/MAINTAINERS
rename to zircon/system/ulib/fdio/MAINTAINERS
diff --git a/system/ulib/fdio/bsdsocket.c b/zircon/system/ulib/fdio/bsdsocket.c
similarity index 100%
rename from system/ulib/fdio/bsdsocket.c
rename to zircon/system/ulib/fdio/bsdsocket.c
diff --git a/system/ulib/fdio/debug.c b/zircon/system/ulib/fdio/debug.c
similarity index 100%
rename from system/ulib/fdio/debug.c
rename to zircon/system/ulib/fdio/debug.c
diff --git a/system/ulib/fdio/get-vmo.c b/zircon/system/ulib/fdio/get-vmo.c
similarity index 100%
rename from system/ulib/fdio/get-vmo.c
rename to zircon/system/ulib/fdio/get-vmo.c
diff --git a/system/ulib/fdio/include/lib/fdio/debug.h b/zircon/system/ulib/fdio/include/lib/fdio/debug.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/debug.h
rename to zircon/system/ulib/fdio/include/lib/fdio/debug.h
diff --git a/system/ulib/fdio/include/lib/fdio/io.h b/zircon/system/ulib/fdio/include/lib/fdio/io.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/io.h
rename to zircon/system/ulib/fdio/include/lib/fdio/io.h
diff --git a/system/ulib/fdio/include/lib/fdio/limits.h b/zircon/system/ulib/fdio/include/lib/fdio/limits.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/limits.h
rename to zircon/system/ulib/fdio/include/lib/fdio/limits.h
diff --git a/system/ulib/fdio/include/lib/fdio/namespace.h b/zircon/system/ulib/fdio/include/lib/fdio/namespace.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/namespace.h
rename to zircon/system/ulib/fdio/include/lib/fdio/namespace.h
diff --git a/system/ulib/fdio/include/lib/fdio/private.h b/zircon/system/ulib/fdio/include/lib/fdio/private.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/private.h
rename to zircon/system/ulib/fdio/include/lib/fdio/private.h
diff --git a/system/ulib/fdio/include/lib/fdio/spawn.h b/zircon/system/ulib/fdio/include/lib/fdio/spawn.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/spawn.h
rename to zircon/system/ulib/fdio/include/lib/fdio/spawn.h
diff --git a/system/ulib/fdio/include/lib/fdio/unsafe.h b/zircon/system/ulib/fdio/include/lib/fdio/unsafe.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/unsafe.h
rename to zircon/system/ulib/fdio/include/lib/fdio/unsafe.h
diff --git a/system/ulib/fdio/include/lib/fdio/util.h b/zircon/system/ulib/fdio/include/lib/fdio/util.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/util.h
rename to zircon/system/ulib/fdio/include/lib/fdio/util.h
diff --git a/system/ulib/fdio/include/lib/fdio/vfs.h b/zircon/system/ulib/fdio/include/lib/fdio/vfs.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/vfs.h
rename to zircon/system/ulib/fdio/include/lib/fdio/vfs.h
diff --git a/system/ulib/fdio/include/lib/fdio/watcher.h b/zircon/system/ulib/fdio/include/lib/fdio/watcher.h
similarity index 100%
rename from system/ulib/fdio/include/lib/fdio/watcher.h
rename to zircon/system/ulib/fdio/include/lib/fdio/watcher.h
diff --git a/system/ulib/fdio/namespace.c b/zircon/system/ulib/fdio/namespace.c
similarity index 100%
rename from system/ulib/fdio/namespace.c
rename to zircon/system/ulib/fdio/namespace.c
diff --git a/system/ulib/fdio/null.c b/zircon/system/ulib/fdio/null.c
similarity index 100%
rename from system/ulib/fdio/null.c
rename to zircon/system/ulib/fdio/null.c
diff --git a/system/ulib/fdio/private-remoteio.h b/zircon/system/ulib/fdio/private-remoteio.h
similarity index 100%
rename from system/ulib/fdio/private-remoteio.h
rename to zircon/system/ulib/fdio/private-remoteio.h
diff --git a/system/ulib/fdio/private-socket.h b/zircon/system/ulib/fdio/private-socket.h
similarity index 100%
rename from system/ulib/fdio/private-socket.h
rename to zircon/system/ulib/fdio/private-socket.h
diff --git a/system/ulib/fdio/private.h b/zircon/system/ulib/fdio/private.h
similarity index 100%
rename from system/ulib/fdio/private.h
rename to zircon/system/ulib/fdio/private.h
diff --git a/system/ulib/fdio/remoteio.c b/zircon/system/ulib/fdio/remoteio.c
similarity index 100%
rename from system/ulib/fdio/remoteio.c
rename to zircon/system/ulib/fdio/remoteio.c
diff --git a/system/ulib/fdio/rules.mk b/zircon/system/ulib/fdio/rules.mk
similarity index 100%
rename from system/ulib/fdio/rules.mk
rename to zircon/system/ulib/fdio/rules.mk
diff --git a/system/ulib/fdio/socket.c b/zircon/system/ulib/fdio/socket.c
similarity index 100%
rename from system/ulib/fdio/socket.c
rename to zircon/system/ulib/fdio/socket.c
diff --git a/system/ulib/fdio/spawn.c b/zircon/system/ulib/fdio/spawn.c
similarity index 100%
rename from system/ulib/fdio/spawn.c
rename to zircon/system/ulib/fdio/spawn.c
diff --git a/system/ulib/fdio/stubs.c b/zircon/system/ulib/fdio/stubs.c
similarity index 100%
rename from system/ulib/fdio/stubs.c
rename to zircon/system/ulib/fdio/stubs.c
diff --git a/system/ulib/fdio/uname.c b/zircon/system/ulib/fdio/uname.c
similarity index 100%
rename from system/ulib/fdio/uname.c
rename to zircon/system/ulib/fdio/uname.c
diff --git a/system/ulib/fdio/unistd.c b/zircon/system/ulib/fdio/unistd.c
similarity index 100%
rename from system/ulib/fdio/unistd.c
rename to zircon/system/ulib/fdio/unistd.c
diff --git a/system/ulib/fdio/unistd.h b/zircon/system/ulib/fdio/unistd.h
similarity index 100%
rename from system/ulib/fdio/unistd.h
rename to zircon/system/ulib/fdio/unistd.h
diff --git a/system/ulib/fdio/waitable.cpp b/zircon/system/ulib/fdio/waitable.cpp
similarity index 100%
rename from system/ulib/fdio/waitable.cpp
rename to zircon/system/ulib/fdio/waitable.cpp
diff --git a/system/ulib/fdio/watcher.c b/zircon/system/ulib/fdio/watcher.c
similarity index 100%
rename from system/ulib/fdio/watcher.c
rename to zircon/system/ulib/fdio/watcher.c
diff --git a/system/ulib/fdio/zxio.c b/zircon/system/ulib/fdio/zxio.c
similarity index 100%
rename from system/ulib/fdio/zxio.c
rename to zircon/system/ulib/fdio/zxio.c
diff --git a/system/ulib/fidl-async-2/README.md b/zircon/system/ulib/fidl-async-2/README.md
similarity index 100%
rename from system/ulib/fidl-async-2/README.md
rename to zircon/system/ulib/fidl-async-2/README.md
diff --git a/system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_server.h b/zircon/system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_server.h
similarity index 100%
rename from system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_server.h
rename to zircon/system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_server.h
diff --git a/system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_struct.h b/zircon/system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_struct.h
similarity index 100%
rename from system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_struct.h
rename to zircon/system/ulib/fidl-async-2/include/lib/fidl-async-2/fidl_struct.h
diff --git a/system/ulib/fidl-async-2/include/lib/fidl-async-2/simple_binding.h b/zircon/system/ulib/fidl-async-2/include/lib/fidl-async-2/simple_binding.h
similarity index 100%
rename from system/ulib/fidl-async-2/include/lib/fidl-async-2/simple_binding.h
rename to zircon/system/ulib/fidl-async-2/include/lib/fidl-async-2/simple_binding.h
diff --git a/system/ulib/fidl-async-2/rules.mk b/zircon/system/ulib/fidl-async-2/rules.mk
similarity index 100%
rename from system/ulib/fidl-async-2/rules.mk
rename to zircon/system/ulib/fidl-async-2/rules.mk
diff --git a/system/ulib/fidl-async/bind.c b/zircon/system/ulib/fidl-async/bind.c
similarity index 100%
rename from system/ulib/fidl-async/bind.c
rename to zircon/system/ulib/fidl-async/bind.c
diff --git a/system/ulib/fidl-async/include/lib/fidl-async/bind.h b/zircon/system/ulib/fidl-async/include/lib/fidl-async/bind.h
similarity index 100%
rename from system/ulib/fidl-async/include/lib/fidl-async/bind.h
rename to zircon/system/ulib/fidl-async/include/lib/fidl-async/bind.h
diff --git a/system/ulib/fidl-async/rules.mk b/zircon/system/ulib/fidl-async/rules.mk
similarity index 100%
rename from system/ulib/fidl-async/rules.mk
rename to zircon/system/ulib/fidl-async/rules.mk
diff --git a/system/ulib/fidl-utils/README.md b/zircon/system/ulib/fidl-utils/README.md
similarity index 100%
rename from system/ulib/fidl-utils/README.md
rename to zircon/system/ulib/fidl-utils/README.md
diff --git a/system/ulib/fidl-utils/empty.c b/zircon/system/ulib/fidl-utils/empty.c
similarity index 100%
rename from system/ulib/fidl-utils/empty.c
rename to zircon/system/ulib/fidl-utils/empty.c
diff --git a/system/ulib/fidl-utils/include/lib/fidl-utils/bind.h b/zircon/system/ulib/fidl-utils/include/lib/fidl-utils/bind.h
similarity index 100%
rename from system/ulib/fidl-utils/include/lib/fidl-utils/bind.h
rename to zircon/system/ulib/fidl-utils/include/lib/fidl-utils/bind.h
diff --git a/system/ulib/fidl-utils/rules.mk b/zircon/system/ulib/fidl-utils/rules.mk
similarity index 100%
rename from system/ulib/fidl-utils/rules.mk
rename to zircon/system/ulib/fidl-utils/rules.mk
diff --git a/system/ulib/fidl/MAINTAINERS b/zircon/system/ulib/fidl/MAINTAINERS
similarity index 100%
rename from system/ulib/fidl/MAINTAINERS
rename to zircon/system/ulib/fidl/MAINTAINERS
diff --git a/system/ulib/fidl/README.md b/zircon/system/ulib/fidl/README.md
similarity index 100%
rename from system/ulib/fidl/README.md
rename to zircon/system/ulib/fidl/README.md
diff --git a/system/ulib/fidl/builder.cpp b/zircon/system/ulib/fidl/builder.cpp
similarity index 100%
rename from system/ulib/fidl/builder.cpp
rename to zircon/system/ulib/fidl/builder.cpp
diff --git a/system/ulib/fidl/decoding.cpp b/zircon/system/ulib/fidl/decoding.cpp
similarity index 100%
rename from system/ulib/fidl/decoding.cpp
rename to zircon/system/ulib/fidl/decoding.cpp
diff --git a/system/ulib/fidl/encoding.cpp b/zircon/system/ulib/fidl/encoding.cpp
similarity index 100%
rename from system/ulib/fidl/encoding.cpp
rename to zircon/system/ulib/fidl/encoding.cpp
diff --git a/system/ulib/fidl/envelope_frames.h b/zircon/system/ulib/fidl/envelope_frames.h
similarity index 100%
rename from system/ulib/fidl/envelope_frames.h
rename to zircon/system/ulib/fidl/envelope_frames.h
diff --git a/system/ulib/fidl/epitaph.c b/zircon/system/ulib/fidl/epitaph.c
similarity index 100%
rename from system/ulib/fidl/epitaph.c
rename to zircon/system/ulib/fidl/epitaph.c
diff --git a/system/ulib/fidl/formatting.cpp b/zircon/system/ulib/fidl/formatting.cpp
similarity index 100%
rename from system/ulib/fidl/formatting.cpp
rename to zircon/system/ulib/fidl/formatting.cpp
diff --git a/system/ulib/fidl/handle_closing.cpp b/zircon/system/ulib/fidl/handle_closing.cpp
similarity index 100%
rename from system/ulib/fidl/handle_closing.cpp
rename to zircon/system/ulib/fidl/handle_closing.cpp
diff --git a/system/ulib/fidl/include/lib/fidl/coding.h b/zircon/system/ulib/fidl/include/lib/fidl/coding.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/coding.h
rename to zircon/system/ulib/fidl/include/lib/fidl/coding.h
diff --git a/system/ulib/fidl/include/lib/fidl/cpp/builder.h b/zircon/system/ulib/fidl/include/lib/fidl/cpp/builder.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/cpp/builder.h
rename to zircon/system/ulib/fidl/include/lib/fidl/cpp/builder.h
diff --git a/system/ulib/fidl/include/lib/fidl/cpp/message.h b/zircon/system/ulib/fidl/include/lib/fidl/cpp/message.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/cpp/message.h
rename to zircon/system/ulib/fidl/include/lib/fidl/cpp/message.h
diff --git a/system/ulib/fidl/include/lib/fidl/cpp/message_buffer.h b/zircon/system/ulib/fidl/include/lib/fidl/cpp/message_buffer.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/cpp/message_buffer.h
rename to zircon/system/ulib/fidl/include/lib/fidl/cpp/message_buffer.h
diff --git a/system/ulib/fidl/include/lib/fidl/cpp/message_builder.h b/zircon/system/ulib/fidl/include/lib/fidl/cpp/message_builder.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/cpp/message_builder.h
rename to zircon/system/ulib/fidl/include/lib/fidl/cpp/message_builder.h
diff --git a/system/ulib/fidl/include/lib/fidl/cpp/message_part.h b/zircon/system/ulib/fidl/include/lib/fidl/cpp/message_part.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/cpp/message_part.h
rename to zircon/system/ulib/fidl/include/lib/fidl/cpp/message_part.h
diff --git a/system/ulib/fidl/include/lib/fidl/cpp/string_view.h b/zircon/system/ulib/fidl/include/lib/fidl/cpp/string_view.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/cpp/string_view.h
rename to zircon/system/ulib/fidl/include/lib/fidl/cpp/string_view.h
diff --git a/system/ulib/fidl/include/lib/fidl/cpp/vector_view.h b/zircon/system/ulib/fidl/include/lib/fidl/cpp/vector_view.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/cpp/vector_view.h
rename to zircon/system/ulib/fidl/include/lib/fidl/cpp/vector_view.h
diff --git a/system/ulib/fidl/include/lib/fidl/epitaph.h b/zircon/system/ulib/fidl/include/lib/fidl/epitaph.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/epitaph.h
rename to zircon/system/ulib/fidl/include/lib/fidl/epitaph.h
diff --git a/system/ulib/fidl/include/lib/fidl/internal.h b/zircon/system/ulib/fidl/include/lib/fidl/internal.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/internal.h
rename to zircon/system/ulib/fidl/include/lib/fidl/internal.h
diff --git a/system/ulib/fidl/include/lib/fidl/internal_callable_traits.h b/zircon/system/ulib/fidl/include/lib/fidl/internal_callable_traits.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/internal_callable_traits.h
rename to zircon/system/ulib/fidl/include/lib/fidl/internal_callable_traits.h
diff --git a/system/ulib/fidl/include/lib/fidl/llcpp/array_wrapper.h b/zircon/system/ulib/fidl/include/lib/fidl/llcpp/array_wrapper.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/llcpp/array_wrapper.h
rename to zircon/system/ulib/fidl/include/lib/fidl/llcpp/array_wrapper.h
diff --git a/system/ulib/fidl/include/lib/fidl/llcpp/coding.h b/zircon/system/ulib/fidl/include/lib/fidl/llcpp/coding.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/llcpp/coding.h
rename to zircon/system/ulib/fidl/include/lib/fidl/llcpp/coding.h
diff --git a/system/ulib/fidl/include/lib/fidl/llcpp/decoded_message.h b/zircon/system/ulib/fidl/include/lib/fidl/llcpp/decoded_message.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/llcpp/decoded_message.h
rename to zircon/system/ulib/fidl/include/lib/fidl/llcpp/decoded_message.h
diff --git a/system/ulib/fidl/include/lib/fidl/llcpp/encoded_message.h b/zircon/system/ulib/fidl/include/lib/fidl/llcpp/encoded_message.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/llcpp/encoded_message.h
rename to zircon/system/ulib/fidl/include/lib/fidl/llcpp/encoded_message.h
diff --git a/system/ulib/fidl/include/lib/fidl/llcpp/traits.h b/zircon/system/ulib/fidl/include/lib/fidl/llcpp/traits.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/llcpp/traits.h
rename to zircon/system/ulib/fidl/include/lib/fidl/llcpp/traits.h
diff --git a/system/ulib/fidl/include/lib/fidl/transport.h b/zircon/system/ulib/fidl/include/lib/fidl/transport.h
similarity index 100%
rename from system/ulib/fidl/include/lib/fidl/transport.h
rename to zircon/system/ulib/fidl/include/lib/fidl/transport.h
diff --git a/system/ulib/fidl/linearizing.cpp b/zircon/system/ulib/fidl/linearizing.cpp
similarity index 100%
rename from system/ulib/fidl/linearizing.cpp
rename to zircon/system/ulib/fidl/linearizing.cpp
diff --git a/system/ulib/fidl/message.cpp b/zircon/system/ulib/fidl/message.cpp
similarity index 100%
rename from system/ulib/fidl/message.cpp
rename to zircon/system/ulib/fidl/message.cpp
diff --git a/system/ulib/fidl/message_buffer.cpp b/zircon/system/ulib/fidl/message_buffer.cpp
similarity index 100%
rename from system/ulib/fidl/message_buffer.cpp
rename to zircon/system/ulib/fidl/message_buffer.cpp
diff --git a/system/ulib/fidl/message_builder.cpp b/zircon/system/ulib/fidl/message_builder.cpp
similarity index 100%
rename from system/ulib/fidl/message_builder.cpp
rename to zircon/system/ulib/fidl/message_builder.cpp
diff --git a/system/ulib/fidl/rules.mk b/zircon/system/ulib/fidl/rules.mk
similarity index 100%
rename from system/ulib/fidl/rules.mk
rename to zircon/system/ulib/fidl/rules.mk
diff --git a/system/ulib/fidl/transport.cpp b/zircon/system/ulib/fidl/transport.cpp
similarity index 100%
rename from system/ulib/fidl/transport.cpp
rename to zircon/system/ulib/fidl/transport.cpp
diff --git a/system/ulib/fidl/validating.cpp b/zircon/system/ulib/fidl/validating.cpp
similarity index 100%
rename from system/ulib/fidl/validating.cpp
rename to zircon/system/ulib/fidl/validating.cpp
diff --git a/system/ulib/fidl/visitor.h b/zircon/system/ulib/fidl/visitor.h
similarity index 100%
rename from system/ulib/fidl/visitor.h
rename to zircon/system/ulib/fidl/visitor.h
diff --git a/system/ulib/fidl/walker.cpp b/zircon/system/ulib/fidl/walker.cpp
similarity index 100%
rename from system/ulib/fidl/walker.cpp
rename to zircon/system/ulib/fidl/walker.cpp
diff --git a/system/ulib/fidl/walker.h b/zircon/system/ulib/fidl/walker.h
similarity index 100%
rename from system/ulib/fidl/walker.h
rename to zircon/system/ulib/fidl/walker.h
diff --git a/system/ulib/fit/MAINTAINERS b/zircon/system/ulib/fit/MAINTAINERS
similarity index 100%
rename from system/ulib/fit/MAINTAINERS
rename to zircon/system/ulib/fit/MAINTAINERS
diff --git a/system/ulib/fit/README.md b/zircon/system/ulib/fit/README.md
similarity index 100%
rename from system/ulib/fit/README.md
rename to zircon/system/ulib/fit/README.md
diff --git a/system/ulib/fit/include/lib/fit/bridge.h b/zircon/system/ulib/fit/include/lib/fit/bridge.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/bridge.h
rename to zircon/system/ulib/fit/include/lib/fit/bridge.h
diff --git a/system/ulib/fit/include/lib/fit/bridge_internal.h b/zircon/system/ulib/fit/include/lib/fit/bridge_internal.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/bridge_internal.h
rename to zircon/system/ulib/fit/include/lib/fit/bridge_internal.h
diff --git a/system/ulib/fit/include/lib/fit/defer.h b/zircon/system/ulib/fit/include/lib/fit/defer.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/defer.h
rename to zircon/system/ulib/fit/include/lib/fit/defer.h
diff --git a/system/ulib/fit/include/lib/fit/function.h b/zircon/system/ulib/fit/include/lib/fit/function.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/function.h
rename to zircon/system/ulib/fit/include/lib/fit/function.h
diff --git a/system/ulib/fit/include/lib/fit/function_internal.h b/zircon/system/ulib/fit/include/lib/fit/function_internal.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/function_internal.h
rename to zircon/system/ulib/fit/include/lib/fit/function_internal.h
diff --git a/system/ulib/fit/include/lib/fit/function_traits.h b/zircon/system/ulib/fit/include/lib/fit/function_traits.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/function_traits.h
rename to zircon/system/ulib/fit/include/lib/fit/function_traits.h
diff --git a/system/ulib/fit/include/lib/fit/nullable.h b/zircon/system/ulib/fit/include/lib/fit/nullable.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/nullable.h
rename to zircon/system/ulib/fit/include/lib/fit/nullable.h
diff --git a/system/ulib/fit/include/lib/fit/optional.h b/zircon/system/ulib/fit/include/lib/fit/optional.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/optional.h
rename to zircon/system/ulib/fit/include/lib/fit/optional.h
diff --git a/system/ulib/fit/include/lib/fit/promise.h b/zircon/system/ulib/fit/include/lib/fit/promise.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/promise.h
rename to zircon/system/ulib/fit/include/lib/fit/promise.h
diff --git a/system/ulib/fit/include/lib/fit/promise_internal.h b/zircon/system/ulib/fit/include/lib/fit/promise_internal.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/promise_internal.h
rename to zircon/system/ulib/fit/include/lib/fit/promise_internal.h
diff --git a/system/ulib/fit/include/lib/fit/result.h b/zircon/system/ulib/fit/include/lib/fit/result.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/result.h
rename to zircon/system/ulib/fit/include/lib/fit/result.h
diff --git a/system/ulib/fit/include/lib/fit/scheduler.h b/zircon/system/ulib/fit/include/lib/fit/scheduler.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/scheduler.h
rename to zircon/system/ulib/fit/include/lib/fit/scheduler.h
diff --git a/system/ulib/fit/include/lib/fit/scope.h b/zircon/system/ulib/fit/include/lib/fit/scope.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/scope.h
rename to zircon/system/ulib/fit/include/lib/fit/scope.h
diff --git a/system/ulib/fit/include/lib/fit/sequencer.h b/zircon/system/ulib/fit/include/lib/fit/sequencer.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/sequencer.h
rename to zircon/system/ulib/fit/include/lib/fit/sequencer.h
diff --git a/system/ulib/fit/include/lib/fit/single_threaded_executor.h b/zircon/system/ulib/fit/include/lib/fit/single_threaded_executor.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/single_threaded_executor.h
rename to zircon/system/ulib/fit/include/lib/fit/single_threaded_executor.h
diff --git a/system/ulib/fit/include/lib/fit/thread_safety.h b/zircon/system/ulib/fit/include/lib/fit/thread_safety.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/thread_safety.h
rename to zircon/system/ulib/fit/include/lib/fit/thread_safety.h
diff --git a/system/ulib/fit/include/lib/fit/traits.h b/zircon/system/ulib/fit/include/lib/fit/traits.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/traits.h
rename to zircon/system/ulib/fit/include/lib/fit/traits.h
diff --git a/system/ulib/fit/include/lib/fit/variant.h b/zircon/system/ulib/fit/include/lib/fit/variant.h
similarity index 100%
rename from system/ulib/fit/include/lib/fit/variant.h
rename to zircon/system/ulib/fit/include/lib/fit/variant.h
diff --git a/system/ulib/fit/promise.cpp b/zircon/system/ulib/fit/promise.cpp
similarity index 100%
rename from system/ulib/fit/promise.cpp
rename to zircon/system/ulib/fit/promise.cpp
diff --git a/system/ulib/fit/rules.mk b/zircon/system/ulib/fit/rules.mk
similarity index 100%
rename from system/ulib/fit/rules.mk
rename to zircon/system/ulib/fit/rules.mk
diff --git a/system/ulib/fit/scheduler.cpp b/zircon/system/ulib/fit/scheduler.cpp
similarity index 100%
rename from system/ulib/fit/scheduler.cpp
rename to zircon/system/ulib/fit/scheduler.cpp
diff --git a/system/ulib/fit/scope.cpp b/zircon/system/ulib/fit/scope.cpp
similarity index 100%
rename from system/ulib/fit/scope.cpp
rename to zircon/system/ulib/fit/scope.cpp
diff --git a/system/ulib/fit/sequencer.cpp b/zircon/system/ulib/fit/sequencer.cpp
similarity index 100%
rename from system/ulib/fit/sequencer.cpp
rename to zircon/system/ulib/fit/sequencer.cpp
diff --git a/system/ulib/fit/single_threaded_executor.cpp b/zircon/system/ulib/fit/single_threaded_executor.cpp
similarity index 100%
rename from system/ulib/fit/single_threaded_executor.cpp
rename to zircon/system/ulib/fit/single_threaded_executor.cpp
diff --git a/system/ulib/framebuffer/README.md b/zircon/system/ulib/framebuffer/README.md
similarity index 100%
rename from system/ulib/framebuffer/README.md
rename to zircon/system/ulib/framebuffer/README.md
diff --git a/system/ulib/framebuffer/framebuffer.c b/zircon/system/ulib/framebuffer/framebuffer.c
similarity index 100%
rename from system/ulib/framebuffer/framebuffer.c
rename to zircon/system/ulib/framebuffer/framebuffer.c
diff --git a/system/ulib/framebuffer/include/lib/framebuffer/framebuffer.h b/zircon/system/ulib/framebuffer/include/lib/framebuffer/framebuffer.h
similarity index 100%
rename from system/ulib/framebuffer/include/lib/framebuffer/framebuffer.h
rename to zircon/system/ulib/framebuffer/include/lib/framebuffer/framebuffer.h
diff --git a/system/ulib/framebuffer/rules.mk b/zircon/system/ulib/framebuffer/rules.mk
similarity index 100%
rename from system/ulib/framebuffer/rules.mk
rename to zircon/system/ulib/framebuffer/rules.mk
diff --git a/system/ulib/fs-host/common.cpp b/zircon/system/ulib/fs-host/common.cpp
similarity index 100%
rename from system/ulib/fs-host/common.cpp
rename to zircon/system/ulib/fs-host/common.cpp
diff --git a/system/ulib/fs-host/file_size_recorder.cpp b/zircon/system/ulib/fs-host/file_size_recorder.cpp
similarity index 100%
rename from system/ulib/fs-host/file_size_recorder.cpp
rename to zircon/system/ulib/fs-host/file_size_recorder.cpp
diff --git a/system/ulib/fs-host/include/fs-host/common.h b/zircon/system/ulib/fs-host/include/fs-host/common.h
similarity index 100%
rename from system/ulib/fs-host/include/fs-host/common.h
rename to zircon/system/ulib/fs-host/include/fs-host/common.h
diff --git a/system/ulib/fs-host/include/fs-host/file_size_recorder.h b/zircon/system/ulib/fs-host/include/fs-host/file_size_recorder.h
similarity index 100%
rename from system/ulib/fs-host/include/fs-host/file_size_recorder.h
rename to zircon/system/ulib/fs-host/include/fs-host/file_size_recorder.h
diff --git a/system/ulib/fs-host/rules.mk b/zircon/system/ulib/fs-host/rules.mk
similarity index 100%
rename from system/ulib/fs-host/rules.mk
rename to zircon/system/ulib/fs-host/rules.mk
diff --git a/system/ulib/fs-management/fsck.cpp b/zircon/system/ulib/fs-management/fsck.cpp
similarity index 100%
rename from system/ulib/fs-management/fsck.cpp
rename to zircon/system/ulib/fs-management/fsck.cpp
diff --git a/system/ulib/fs-management/fvm.cpp b/zircon/system/ulib/fs-management/fvm.cpp
similarity index 100%
rename from system/ulib/fs-management/fvm.cpp
rename to zircon/system/ulib/fs-management/fvm.cpp
diff --git a/system/ulib/fs-management/include/fs-management/fvm.h b/zircon/system/ulib/fs-management/include/fs-management/fvm.h
similarity index 100%
rename from system/ulib/fs-management/include/fs-management/fvm.h
rename to zircon/system/ulib/fs-management/include/fs-management/fvm.h
diff --git a/system/ulib/fs-management/include/fs-management/mount.h b/zircon/system/ulib/fs-management/include/fs-management/mount.h
similarity index 100%
rename from system/ulib/fs-management/include/fs-management/mount.h
rename to zircon/system/ulib/fs-management/include/fs-management/mount.h
diff --git a/system/ulib/fs-management/include/fs-management/ram-nand.h b/zircon/system/ulib/fs-management/include/fs-management/ram-nand.h
similarity index 100%
rename from system/ulib/fs-management/include/fs-management/ram-nand.h
rename to zircon/system/ulib/fs-management/include/fs-management/ram-nand.h
diff --git a/system/ulib/fs-management/include/fs-management/ramdisk.h b/zircon/system/ulib/fs-management/include/fs-management/ramdisk.h
similarity index 100%
rename from system/ulib/fs-management/include/fs-management/ramdisk.h
rename to zircon/system/ulib/fs-management/include/fs-management/ramdisk.h
diff --git a/system/ulib/fs-management/launch.cpp b/zircon/system/ulib/fs-management/launch.cpp
similarity index 100%
rename from system/ulib/fs-management/launch.cpp
rename to zircon/system/ulib/fs-management/launch.cpp
diff --git a/system/ulib/fs-management/mkfs.cpp b/zircon/system/ulib/fs-management/mkfs.cpp
similarity index 100%
rename from system/ulib/fs-management/mkfs.cpp
rename to zircon/system/ulib/fs-management/mkfs.cpp
diff --git a/system/ulib/fs-management/mount.cpp b/zircon/system/ulib/fs-management/mount.cpp
similarity index 100%
rename from system/ulib/fs-management/mount.cpp
rename to zircon/system/ulib/fs-management/mount.cpp
diff --git a/system/ulib/fs-management/ram-nand.cpp b/zircon/system/ulib/fs-management/ram-nand.cpp
similarity index 100%
rename from system/ulib/fs-management/ram-nand.cpp
rename to zircon/system/ulib/fs-management/ram-nand.cpp
diff --git a/system/ulib/fs-management/ramdisk.cpp b/zircon/system/ulib/fs-management/ramdisk.cpp
similarity index 100%
rename from system/ulib/fs-management/ramdisk.cpp
rename to zircon/system/ulib/fs-management/ramdisk.cpp
diff --git a/system/ulib/fs-management/rules.mk b/zircon/system/ulib/fs-management/rules.mk
similarity index 100%
rename from system/ulib/fs-management/rules.mk
rename to zircon/system/ulib/fs-management/rules.mk
diff --git a/system/ulib/fs-test-utils/fixture.cpp b/zircon/system/ulib/fs-test-utils/fixture.cpp
similarity index 100%
rename from system/ulib/fs-test-utils/fixture.cpp
rename to zircon/system/ulib/fs-test-utils/fixture.cpp
diff --git a/system/ulib/fs-test-utils/include/fs-test-utils/fixture.h b/zircon/system/ulib/fs-test-utils/include/fs-test-utils/fixture.h
similarity index 100%
rename from system/ulib/fs-test-utils/include/fs-test-utils/fixture.h
rename to zircon/system/ulib/fs-test-utils/include/fs-test-utils/fixture.h
diff --git a/system/ulib/fs-test-utils/include/fs-test-utils/perftest.h b/zircon/system/ulib/fs-test-utils/include/fs-test-utils/perftest.h
similarity index 100%
rename from system/ulib/fs-test-utils/include/fs-test-utils/perftest.h
rename to zircon/system/ulib/fs-test-utils/include/fs-test-utils/perftest.h
diff --git a/system/ulib/fs-test-utils/include/fs-test-utils/unittest.h b/zircon/system/ulib/fs-test-utils/include/fs-test-utils/unittest.h
similarity index 100%
rename from system/ulib/fs-test-utils/include/fs-test-utils/unittest.h
rename to zircon/system/ulib/fs-test-utils/include/fs-test-utils/unittest.h
diff --git a/system/ulib/fs-test-utils/perftest.cpp b/zircon/system/ulib/fs-test-utils/perftest.cpp
similarity index 100%
rename from system/ulib/fs-test-utils/perftest.cpp
rename to zircon/system/ulib/fs-test-utils/perftest.cpp
diff --git a/system/ulib/fs-test-utils/rules.mk b/zircon/system/ulib/fs-test-utils/rules.mk
similarity index 100%
rename from system/ulib/fs-test-utils/rules.mk
rename to zircon/system/ulib/fs-test-utils/rules.mk
diff --git a/system/ulib/fs/block-txn.cpp b/zircon/system/ulib/fs/block-txn.cpp
similarity index 100%
rename from system/ulib/fs/block-txn.cpp
rename to zircon/system/ulib/fs/block-txn.cpp
diff --git a/system/ulib/fs/connection.cpp b/zircon/system/ulib/fs/connection.cpp
similarity index 100%
rename from system/ulib/fs/connection.cpp
rename to zircon/system/ulib/fs/connection.cpp
diff --git a/system/ulib/fs/fvm.cpp b/zircon/system/ulib/fs/fvm.cpp
similarity index 100%
rename from system/ulib/fs/fvm.cpp
rename to zircon/system/ulib/fs/fvm.cpp
diff --git a/system/ulib/fs/handler.cpp b/zircon/system/ulib/fs/handler.cpp
similarity index 100%
rename from system/ulib/fs/handler.cpp
rename to zircon/system/ulib/fs/handler.cpp
diff --git a/system/ulib/fs/include/fs/block-txn.h b/zircon/system/ulib/fs/include/fs/block-txn.h
similarity index 100%
rename from system/ulib/fs/include/fs/block-txn.h
rename to zircon/system/ulib/fs/include/fs/block-txn.h
diff --git a/system/ulib/fs/include/fs/client.h b/zircon/system/ulib/fs/include/fs/client.h
similarity index 100%
rename from system/ulib/fs/include/fs/client.h
rename to zircon/system/ulib/fs/include/fs/client.h
diff --git a/system/ulib/fs/include/fs/connection.h b/zircon/system/ulib/fs/include/fs/connection.h
similarity index 100%
rename from system/ulib/fs/include/fs/connection.h
rename to zircon/system/ulib/fs/include/fs/connection.h
diff --git a/system/ulib/fs/include/fs/fvm.h b/zircon/system/ulib/fs/include/fs/fvm.h
similarity index 100%
rename from system/ulib/fs/include/fs/fvm.h
rename to zircon/system/ulib/fs/include/fs/fvm.h
diff --git a/system/ulib/fs/include/fs/handler.h b/zircon/system/ulib/fs/include/fs/handler.h
similarity index 100%
rename from system/ulib/fs/include/fs/handler.h
rename to zircon/system/ulib/fs/include/fs/handler.h
diff --git a/system/ulib/fs/include/fs/lazy-dir.h b/zircon/system/ulib/fs/include/fs/lazy-dir.h
similarity index 100%
rename from system/ulib/fs/include/fs/lazy-dir.h
rename to zircon/system/ulib/fs/include/fs/lazy-dir.h
diff --git a/system/ulib/fs/include/fs/locking.h b/zircon/system/ulib/fs/include/fs/locking.h
similarity index 100%
rename from system/ulib/fs/include/fs/locking.h
rename to zircon/system/ulib/fs/include/fs/locking.h
diff --git a/system/ulib/fs/include/fs/managed-vfs.h b/zircon/system/ulib/fs/include/fs/managed-vfs.h
similarity index 100%
rename from system/ulib/fs/include/fs/managed-vfs.h
rename to zircon/system/ulib/fs/include/fs/managed-vfs.h
diff --git a/system/ulib/fs/include/fs/metrics.h b/zircon/system/ulib/fs/include/fs/metrics.h
similarity index 100%
rename from system/ulib/fs/include/fs/metrics.h
rename to zircon/system/ulib/fs/include/fs/metrics.h
diff --git a/system/ulib/fs/include/fs/mount_channel.h b/zircon/system/ulib/fs/include/fs/mount_channel.h
similarity index 100%
rename from system/ulib/fs/include/fs/mount_channel.h
rename to zircon/system/ulib/fs/include/fs/mount_channel.h
diff --git a/system/ulib/fs/include/fs/pseudo-dir.h b/zircon/system/ulib/fs/include/fs/pseudo-dir.h
similarity index 100%
rename from system/ulib/fs/include/fs/pseudo-dir.h
rename to zircon/system/ulib/fs/include/fs/pseudo-dir.h
diff --git a/system/ulib/fs/include/fs/pseudo-file.h b/zircon/system/ulib/fs/include/fs/pseudo-file.h
similarity index 100%
rename from system/ulib/fs/include/fs/pseudo-file.h
rename to zircon/system/ulib/fs/include/fs/pseudo-file.h
diff --git a/system/ulib/fs/include/fs/queue.h b/zircon/system/ulib/fs/include/fs/queue.h
similarity index 100%
rename from system/ulib/fs/include/fs/queue.h
rename to zircon/system/ulib/fs/include/fs/queue.h
diff --git a/system/ulib/fs/include/fs/ref_counted.h b/zircon/system/ulib/fs/include/fs/ref_counted.h
similarity index 100%
rename from system/ulib/fs/include/fs/ref_counted.h
rename to zircon/system/ulib/fs/include/fs/ref_counted.h
diff --git a/system/ulib/fs/include/fs/remote-dir.h b/zircon/system/ulib/fs/include/fs/remote-dir.h
similarity index 100%
rename from system/ulib/fs/include/fs/remote-dir.h
rename to zircon/system/ulib/fs/include/fs/remote-dir.h
diff --git a/system/ulib/fs/include/fs/remote.h b/zircon/system/ulib/fs/include/fs/remote.h
similarity index 100%
rename from system/ulib/fs/include/fs/remote.h
rename to zircon/system/ulib/fs/include/fs/remote.h
diff --git a/system/ulib/fs/include/fs/service.h b/zircon/system/ulib/fs/include/fs/service.h
similarity index 100%
rename from system/ulib/fs/include/fs/service.h
rename to zircon/system/ulib/fs/include/fs/service.h
diff --git a/system/ulib/fs/include/fs/synchronous-vfs.h b/zircon/system/ulib/fs/include/fs/synchronous-vfs.h
similarity index 100%
rename from system/ulib/fs/include/fs/synchronous-vfs.h
rename to zircon/system/ulib/fs/include/fs/synchronous-vfs.h
diff --git a/system/ulib/fs/include/fs/ticker.h b/zircon/system/ulib/fs/include/fs/ticker.h
similarity index 100%
rename from system/ulib/fs/include/fs/ticker.h
rename to zircon/system/ulib/fs/include/fs/ticker.h
diff --git a/system/ulib/fs/include/fs/trace.h b/zircon/system/ulib/fs/include/fs/trace.h
similarity index 100%
rename from system/ulib/fs/include/fs/trace.h
rename to zircon/system/ulib/fs/include/fs/trace.h
diff --git a/system/ulib/fs/include/fs/vfs.h b/zircon/system/ulib/fs/include/fs/vfs.h
similarity index 100%
rename from system/ulib/fs/include/fs/vfs.h
rename to zircon/system/ulib/fs/include/fs/vfs.h
diff --git a/system/ulib/fs/include/fs/vmo-file.h b/zircon/system/ulib/fs/include/fs/vmo-file.h
similarity index 100%
rename from system/ulib/fs/include/fs/vmo-file.h
rename to zircon/system/ulib/fs/include/fs/vmo-file.h
diff --git a/system/ulib/fs/include/fs/vnode.h b/zircon/system/ulib/fs/include/fs/vnode.h
similarity index 100%
rename from system/ulib/fs/include/fs/vnode.h
rename to zircon/system/ulib/fs/include/fs/vnode.h
diff --git a/system/ulib/fs/include/fs/watcher.h b/zircon/system/ulib/fs/include/fs/watcher.h
similarity index 100%
rename from system/ulib/fs/include/fs/watcher.h
rename to zircon/system/ulib/fs/include/fs/watcher.h
diff --git a/system/ulib/fs/lazy-dir.cpp b/zircon/system/ulib/fs/lazy-dir.cpp
similarity index 100%
rename from system/ulib/fs/lazy-dir.cpp
rename to zircon/system/ulib/fs/lazy-dir.cpp
diff --git a/system/ulib/fs/managed-vfs.cpp b/zircon/system/ulib/fs/managed-vfs.cpp
similarity index 100%
rename from system/ulib/fs/managed-vfs.cpp
rename to zircon/system/ulib/fs/managed-vfs.cpp
diff --git a/system/ulib/fs/metrics.cpp b/zircon/system/ulib/fs/metrics.cpp
similarity index 100%
rename from system/ulib/fs/metrics.cpp
rename to zircon/system/ulib/fs/metrics.cpp
diff --git a/system/ulib/fs/mount.cpp b/zircon/system/ulib/fs/mount.cpp
similarity index 100%
rename from system/ulib/fs/mount.cpp
rename to zircon/system/ulib/fs/mount.cpp
diff --git a/system/ulib/fs/pseudo-dir.cpp b/zircon/system/ulib/fs/pseudo-dir.cpp
similarity index 100%
rename from system/ulib/fs/pseudo-dir.cpp
rename to zircon/system/ulib/fs/pseudo-dir.cpp
diff --git a/system/ulib/fs/pseudo-file.cpp b/zircon/system/ulib/fs/pseudo-file.cpp
similarity index 100%
rename from system/ulib/fs/pseudo-file.cpp
rename to zircon/system/ulib/fs/pseudo-file.cpp
diff --git a/system/ulib/fs/remote-dir.cpp b/zircon/system/ulib/fs/remote-dir.cpp
similarity index 100%
rename from system/ulib/fs/remote-dir.cpp
rename to zircon/system/ulib/fs/remote-dir.cpp
diff --git a/system/ulib/fs/rules.mk b/zircon/system/ulib/fs/rules.mk
similarity index 100%
rename from system/ulib/fs/rules.mk
rename to zircon/system/ulib/fs/rules.mk
diff --git a/system/ulib/fs/service.cpp b/zircon/system/ulib/fs/service.cpp
similarity index 100%
rename from system/ulib/fs/service.cpp
rename to zircon/system/ulib/fs/service.cpp
diff --git a/system/ulib/fs/synchronous-vfs.cpp b/zircon/system/ulib/fs/synchronous-vfs.cpp
similarity index 100%
rename from system/ulib/fs/synchronous-vfs.cpp
rename to zircon/system/ulib/fs/synchronous-vfs.cpp
diff --git a/system/ulib/fs/unmount.cpp b/zircon/system/ulib/fs/unmount.cpp
similarity index 100%
rename from system/ulib/fs/unmount.cpp
rename to zircon/system/ulib/fs/unmount.cpp
diff --git a/system/ulib/fs/vfs.cpp b/zircon/system/ulib/fs/vfs.cpp
similarity index 100%
rename from system/ulib/fs/vfs.cpp
rename to zircon/system/ulib/fs/vfs.cpp
diff --git a/system/ulib/fs/vmo-file.cpp b/zircon/system/ulib/fs/vmo-file.cpp
similarity index 100%
rename from system/ulib/fs/vmo-file.cpp
rename to zircon/system/ulib/fs/vmo-file.cpp
diff --git a/system/ulib/fs/vnode.cpp b/zircon/system/ulib/fs/vnode.cpp
similarity index 100%
rename from system/ulib/fs/vnode.cpp
rename to zircon/system/ulib/fs/vnode.cpp
diff --git a/system/ulib/fs/watcher.cpp b/zircon/system/ulib/fs/watcher.cpp
similarity index 100%
rename from system/ulib/fs/watcher.cpp
rename to zircon/system/ulib/fs/watcher.cpp
diff --git a/system/ulib/ftl/ftln/ftln_init.c b/zircon/system/ulib/ftl/ftln/ftln_init.c
similarity index 100%
rename from system/ulib/ftl/ftln/ftln_init.c
rename to zircon/system/ulib/ftl/ftln/ftln_init.c
diff --git a/system/ulib/ftl/ftln/ftln_intrnl.c b/zircon/system/ulib/ftl/ftln/ftln_intrnl.c
similarity index 100%
rename from system/ulib/ftl/ftln/ftln_intrnl.c
rename to zircon/system/ulib/ftl/ftln/ftln_intrnl.c
diff --git a/system/ulib/ftl/ftln/ftln_rd.c b/zircon/system/ulib/ftl/ftln/ftln_rd.c
similarity index 100%
rename from system/ulib/ftl/ftln/ftln_rd.c
rename to zircon/system/ulib/ftl/ftln/ftln_rd.c
diff --git a/system/ulib/ftl/ftln/ftln_util.c b/zircon/system/ulib/ftl/ftln/ftln_util.c
similarity index 100%
rename from system/ulib/ftl/ftln/ftln_util.c
rename to zircon/system/ulib/ftl/ftln/ftln_util.c
diff --git a/system/ulib/ftl/ftln/ftlnp.h b/zircon/system/ulib/ftl/ftln/ftlnp.h
similarity index 100%
rename from system/ulib/ftl/ftln/ftlnp.h
rename to zircon/system/ulib/ftl/ftln/ftlnp.h
diff --git a/system/ulib/ftl/ftln/ndm-driver.cpp b/zircon/system/ulib/ftl/ftln/ndm-driver.cpp
similarity index 100%
rename from system/ulib/ftl/ftln/ndm-driver.cpp
rename to zircon/system/ulib/ftl/ftln/ndm-driver.cpp
diff --git a/system/ulib/ftl/ftln/volume.cpp b/zircon/system/ulib/ftl/ftln/volume.cpp
similarity index 100%
rename from system/ulib/ftl/ftln/volume.cpp
rename to zircon/system/ulib/ftl/ftln/volume.cpp
diff --git a/system/ulib/ftl/inc/config.h b/zircon/system/ulib/ftl/inc/config.h
similarity index 100%
rename from system/ulib/ftl/inc/config.h
rename to zircon/system/ulib/ftl/inc/config.h
diff --git a/system/ulib/ftl/inc/kprivate/fsdriver.h b/zircon/system/ulib/ftl/inc/kprivate/fsdriver.h
similarity index 100%
rename from system/ulib/ftl/inc/kprivate/fsdriver.h
rename to zircon/system/ulib/ftl/inc/kprivate/fsdriver.h
diff --git a/system/ulib/ftl/inc/kprivate/fsprivate.h b/zircon/system/ulib/ftl/inc/kprivate/fsprivate.h
similarity index 100%
rename from system/ulib/ftl/inc/kprivate/fsprivate.h
rename to zircon/system/ulib/ftl/inc/kprivate/fsprivate.h
diff --git a/system/ulib/ftl/inc/kprivate/ftl_mc.h b/zircon/system/ulib/ftl/inc/kprivate/ftl_mc.h
similarity index 100%
rename from system/ulib/ftl/inc/kprivate/ftl_mc.h
rename to zircon/system/ulib/ftl/inc/kprivate/ftl_mc.h
diff --git a/system/ulib/ftl/inc/kprivate/ftl_vc.h b/zircon/system/ulib/ftl/inc/kprivate/ftl_vc.h
similarity index 100%
rename from system/ulib/ftl/inc/kprivate/ftl_vc.h
rename to zircon/system/ulib/ftl/inc/kprivate/ftl_vc.h
diff --git a/system/ulib/ftl/inc/kprivate/ndm.h b/zircon/system/ulib/ftl/inc/kprivate/ndm.h
similarity index 100%
rename from system/ulib/ftl/inc/kprivate/ndm.h
rename to zircon/system/ulib/ftl/inc/kprivate/ndm.h
diff --git a/system/ulib/ftl/inc/posix.h b/zircon/system/ulib/ftl/inc/posix.h
similarity index 100%
rename from system/ulib/ftl/inc/posix.h
rename to zircon/system/ulib/ftl/inc/posix.h
diff --git a/system/ulib/ftl/inc/sys.h b/zircon/system/ulib/ftl/inc/sys.h
similarity index 100%
rename from system/ulib/ftl/inc/sys.h
rename to zircon/system/ulib/ftl/inc/sys.h
diff --git a/system/ulib/ftl/inc/targetos.h b/zircon/system/ulib/ftl/inc/targetos.h
similarity index 100%
rename from system/ulib/ftl/inc/targetos.h
rename to zircon/system/ulib/ftl/inc/targetos.h
diff --git a/system/ulib/ftl/include/lib/ftl/ndm-driver.h b/zircon/system/ulib/ftl/include/lib/ftl/ndm-driver.h
similarity index 100%
rename from system/ulib/ftl/include/lib/ftl/ndm-driver.h
rename to zircon/system/ulib/ftl/include/lib/ftl/ndm-driver.h
diff --git a/system/ulib/ftl/include/lib/ftl/volume.h b/zircon/system/ulib/ftl/include/lib/ftl/volume.h
similarity index 100%
rename from system/ulib/ftl/include/lib/ftl/volume.h
rename to zircon/system/ulib/ftl/include/lib/ftl/volume.h
diff --git a/system/ulib/ftl/ndm/ndm_init.c b/zircon/system/ulib/ftl/ndm/ndm_init.c
similarity index 100%
rename from system/ulib/ftl/ndm/ndm_init.c
rename to zircon/system/ulib/ftl/ndm/ndm_init.c
diff --git a/system/ulib/ftl/ndm/ndm_intrnl.c b/zircon/system/ulib/ftl/ndm/ndm_intrnl.c
similarity index 100%
rename from system/ulib/ftl/ndm/ndm_intrnl.c
rename to zircon/system/ulib/ftl/ndm/ndm_intrnl.c
diff --git a/system/ulib/ftl/ndm/ndm_vols.c b/zircon/system/ulib/ftl/ndm/ndm_vols.c
similarity index 100%
rename from system/ulib/ftl/ndm/ndm_vols.c
rename to zircon/system/ulib/ftl/ndm/ndm_vols.c
diff --git a/system/ulib/ftl/ndm/ndmp.h b/zircon/system/ulib/ftl/ndm/ndmp.h
similarity index 100%
rename from system/ulib/ftl/ndm/ndmp.h
rename to zircon/system/ulib/ftl/ndm/ndmp.h
diff --git a/system/ulib/ftl/rules.mk b/zircon/system/ulib/ftl/rules.mk
similarity index 100%
rename from system/ulib/ftl/rules.mk
rename to zircon/system/ulib/ftl/rules.mk
diff --git a/system/ulib/ftl/utils/aalloc.c b/zircon/system/ulib/ftl/utils/aalloc.c
similarity index 100%
rename from system/ulib/ftl/utils/aalloc.c
rename to zircon/system/ulib/ftl/utils/aalloc.c
diff --git a/system/ulib/ftl/utils/bsp.h b/zircon/system/ulib/ftl/utils/bsp.h
similarity index 100%
rename from system/ulib/ftl/utils/bsp.h
rename to zircon/system/ulib/ftl/utils/bsp.h
diff --git a/system/ulib/ftl/utils/crc32_tbl.c b/zircon/system/ulib/ftl/utils/crc32_tbl.c
similarity index 100%
rename from system/ulib/ftl/utils/crc32_tbl.c
rename to zircon/system/ulib/ftl/utils/crc32_tbl.c
diff --git a/system/ulib/ftl/utils/fscache.h b/zircon/system/ulib/ftl/utils/fscache.h
similarity index 100%
rename from system/ulib/ftl/utils/fscache.h
rename to zircon/system/ulib/ftl/utils/fscache.h
diff --git a/system/ulib/ftl/utils/fsmem.c b/zircon/system/ulib/ftl/utils/fsmem.c
similarity index 100%
rename from system/ulib/ftl/utils/fsmem.c
rename to zircon/system/ulib/ftl/utils/fsmem.c
diff --git a/system/ulib/ftl/utils/fsys.c b/zircon/system/ulib/ftl/utils/fsys.c
similarity index 100%
rename from system/ulib/ftl/utils/fsys.c
rename to zircon/system/ulib/ftl/utils/fsys.c
diff --git a/system/ulib/ftl/utils/fsysinit.c b/zircon/system/ulib/ftl/utils/fsysinit.c
similarity index 100%
rename from system/ulib/ftl/utils/fsysinit.c
rename to zircon/system/ulib/ftl/utils/fsysinit.c
diff --git a/system/ulib/ftl/utils/ftl_mc.c b/zircon/system/ulib/ftl/utils/ftl_mc.c
similarity index 100%
rename from system/ulib/ftl/utils/ftl_mc.c
rename to zircon/system/ulib/ftl/utils/ftl_mc.c
diff --git a/system/ulib/ftl/utils/kernel.h b/zircon/system/ulib/ftl/utils/kernel.h
similarity index 100%
rename from system/ulib/ftl/utils/kernel.h
rename to zircon/system/ulib/ftl/utils/kernel.h
diff --git a/system/ulib/ftl/utils/modules.h b/zircon/system/ulib/ftl/utils/modules.h
similarity index 100%
rename from system/ulib/ftl/utils/modules.h
rename to zircon/system/ulib/ftl/utils/modules.h
diff --git a/system/ulib/ftl/utils/semaphore.cpp b/zircon/system/ulib/ftl/utils/semaphore.cpp
similarity index 100%
rename from system/ulib/ftl/utils/semaphore.cpp
rename to zircon/system/ulib/ftl/utils/semaphore.cpp
diff --git a/system/ulib/ftl/utils/stdio_tfs.h b/zircon/system/ulib/ftl/utils/stdio_tfs.h
similarity index 100%
rename from system/ulib/ftl/utils/stdio_tfs.h
rename to zircon/system/ulib/ftl/utils/stdio_tfs.h
diff --git a/system/ulib/ftl/utils/sys.c b/zircon/system/ulib/ftl/utils/sys.c
similarity index 100%
rename from system/ulib/ftl/utils/sys.c
rename to zircon/system/ulib/ftl/utils/sys.c
diff --git a/system/ulib/fuzz-utils/fuzzer.cpp b/zircon/system/ulib/fuzz-utils/fuzzer.cpp
similarity index 100%
rename from system/ulib/fuzz-utils/fuzzer.cpp
rename to zircon/system/ulib/fuzz-utils/fuzzer.cpp
diff --git a/system/ulib/fuzz-utils/include/fuzz-utils/fuzzer.h b/zircon/system/ulib/fuzz-utils/include/fuzz-utils/fuzzer.h
similarity index 100%
rename from system/ulib/fuzz-utils/include/fuzz-utils/fuzzer.h
rename to zircon/system/ulib/fuzz-utils/include/fuzz-utils/fuzzer.h
diff --git a/system/ulib/fuzz-utils/include/fuzz-utils/path.h b/zircon/system/ulib/fuzz-utils/include/fuzz-utils/path.h
similarity index 100%
rename from system/ulib/fuzz-utils/include/fuzz-utils/path.h
rename to zircon/system/ulib/fuzz-utils/include/fuzz-utils/path.h
diff --git a/system/ulib/fuzz-utils/include/fuzz-utils/string-list.h b/zircon/system/ulib/fuzz-utils/include/fuzz-utils/string-list.h
similarity index 100%
rename from system/ulib/fuzz-utils/include/fuzz-utils/string-list.h
rename to zircon/system/ulib/fuzz-utils/include/fuzz-utils/string-list.h
diff --git a/system/ulib/fuzz-utils/include/fuzz-utils/string-map.h b/zircon/system/ulib/fuzz-utils/include/fuzz-utils/string-map.h
similarity index 100%
rename from system/ulib/fuzz-utils/include/fuzz-utils/string-map.h
rename to zircon/system/ulib/fuzz-utils/include/fuzz-utils/string-map.h
diff --git a/system/ulib/fuzz-utils/path.cpp b/zircon/system/ulib/fuzz-utils/path.cpp
similarity index 100%
rename from system/ulib/fuzz-utils/path.cpp
rename to zircon/system/ulib/fuzz-utils/path.cpp
diff --git a/system/ulib/fuzz-utils/rules.mk b/zircon/system/ulib/fuzz-utils/rules.mk
similarity index 100%
rename from system/ulib/fuzz-utils/rules.mk
rename to zircon/system/ulib/fuzz-utils/rules.mk
diff --git a/system/ulib/fuzz-utils/string-list.cpp b/zircon/system/ulib/fuzz-utils/string-list.cpp
similarity index 100%
rename from system/ulib/fuzz-utils/string-list.cpp
rename to zircon/system/ulib/fuzz-utils/string-list.cpp
diff --git a/system/ulib/fuzz-utils/string-map.cpp b/zircon/system/ulib/fuzz-utils/string-map.cpp
similarity index 100%
rename from system/ulib/fuzz-utils/string-map.cpp
rename to zircon/system/ulib/fuzz-utils/string-map.cpp
diff --git a/system/ulib/fvm-host/container/container.cpp b/zircon/system/ulib/fvm-host/container/container.cpp
similarity index 100%
rename from system/ulib/fvm-host/container/container.cpp
rename to zircon/system/ulib/fvm-host/container/container.cpp
diff --git a/system/ulib/fvm-host/container/fvm.cpp b/zircon/system/ulib/fvm-host/container/fvm.cpp
similarity index 100%
rename from system/ulib/fvm-host/container/fvm.cpp
rename to zircon/system/ulib/fvm-host/container/fvm.cpp
diff --git a/system/ulib/fvm-host/container/sparse.cpp b/zircon/system/ulib/fvm-host/container/sparse.cpp
similarity index 100%
rename from system/ulib/fvm-host/container/sparse.cpp
rename to zircon/system/ulib/fvm-host/container/sparse.cpp
diff --git a/system/ulib/fvm-host/format/blobfs.cpp b/zircon/system/ulib/fvm-host/format/blobfs.cpp
similarity index 100%
rename from system/ulib/fvm-host/format/blobfs.cpp
rename to zircon/system/ulib/fvm-host/format/blobfs.cpp
diff --git a/system/ulib/fvm-host/format/format.cpp b/zircon/system/ulib/fvm-host/format/format.cpp
similarity index 100%
rename from system/ulib/fvm-host/format/format.cpp
rename to zircon/system/ulib/fvm-host/format/format.cpp
diff --git a/system/ulib/fvm-host/format/minfs.cpp b/zircon/system/ulib/fvm-host/format/minfs.cpp
similarity index 100%
rename from system/ulib/fvm-host/format/minfs.cpp
rename to zircon/system/ulib/fvm-host/format/minfs.cpp
diff --git a/system/ulib/fvm-host/fvm-info.cpp b/zircon/system/ulib/fvm-host/fvm-info.cpp
similarity index 100%
rename from system/ulib/fvm-host/fvm-info.cpp
rename to zircon/system/ulib/fvm-host/fvm-info.cpp
diff --git a/system/ulib/fvm-host/include/fvm-host/container.h b/zircon/system/ulib/fvm-host/include/fvm-host/container.h
similarity index 100%
rename from system/ulib/fvm-host/include/fvm-host/container.h
rename to zircon/system/ulib/fvm-host/include/fvm-host/container.h
diff --git a/system/ulib/fvm-host/include/fvm-host/format.h b/zircon/system/ulib/fvm-host/include/fvm-host/format.h
similarity index 100%
rename from system/ulib/fvm-host/include/fvm-host/format.h
rename to zircon/system/ulib/fvm-host/include/fvm-host/format.h
diff --git a/system/ulib/fvm-host/include/fvm-host/fvm-info.h b/zircon/system/ulib/fvm-host/include/fvm-host/fvm-info.h
similarity index 100%
rename from system/ulib/fvm-host/include/fvm-host/fvm-info.h
rename to zircon/system/ulib/fvm-host/include/fvm-host/fvm-info.h
diff --git a/system/ulib/fvm-host/include/fvm-host/sparse-paver.h b/zircon/system/ulib/fvm-host/include/fvm-host/sparse-paver.h
similarity index 100%
rename from system/ulib/fvm-host/include/fvm-host/sparse-paver.h
rename to zircon/system/ulib/fvm-host/include/fvm-host/sparse-paver.h
diff --git a/system/ulib/fvm-host/rules.mk b/zircon/system/ulib/fvm-host/rules.mk
similarity index 100%
rename from system/ulib/fvm-host/rules.mk
rename to zircon/system/ulib/fvm-host/rules.mk
diff --git a/system/ulib/fvm-host/sparse-paver.cpp b/zircon/system/ulib/fvm-host/sparse-paver.cpp
similarity index 100%
rename from system/ulib/fvm-host/sparse-paver.cpp
rename to zircon/system/ulib/fvm-host/sparse-paver.cpp
diff --git a/system/ulib/fvm/fvm-check.cpp b/zircon/system/ulib/fvm/fvm-check.cpp
similarity index 100%
rename from system/ulib/fvm/fvm-check.cpp
rename to zircon/system/ulib/fvm/fvm-check.cpp
diff --git a/system/ulib/fvm/fvm.cpp b/zircon/system/ulib/fvm/fvm.cpp
similarity index 100%
rename from system/ulib/fvm/fvm.cpp
rename to zircon/system/ulib/fvm/fvm.cpp
diff --git a/system/ulib/fvm/include/fvm/fvm-check.h b/zircon/system/ulib/fvm/include/fvm/fvm-check.h
similarity index 100%
rename from system/ulib/fvm/include/fvm/fvm-check.h
rename to zircon/system/ulib/fvm/include/fvm/fvm-check.h
diff --git a/system/ulib/fvm/include/fvm/fvm-sparse.h b/zircon/system/ulib/fvm/include/fvm/fvm-sparse.h
similarity index 100%
rename from system/ulib/fvm/include/fvm/fvm-sparse.h
rename to zircon/system/ulib/fvm/include/fvm/fvm-sparse.h
diff --git a/system/ulib/fvm/include/fvm/fvm.h b/zircon/system/ulib/fvm/include/fvm/fvm.h
similarity index 100%
rename from system/ulib/fvm/include/fvm/fvm.h
rename to zircon/system/ulib/fvm/include/fvm/fvm.h
diff --git a/system/ulib/fvm/include/fvm/sparse-reader.h b/zircon/system/ulib/fvm/include/fvm/sparse-reader.h
similarity index 100%
rename from system/ulib/fvm/include/fvm/sparse-reader.h
rename to zircon/system/ulib/fvm/include/fvm/sparse-reader.h
diff --git a/system/ulib/fvm/rules.mk b/zircon/system/ulib/fvm/rules.mk
similarity index 100%
rename from system/ulib/fvm/rules.mk
rename to zircon/system/ulib/fvm/rules.mk
diff --git a/system/ulib/fvm/sparse-reader.cpp b/zircon/system/ulib/fvm/sparse-reader.cpp
similarity index 100%
rename from system/ulib/fvm/sparse-reader.cpp
rename to zircon/system/ulib/fvm/sparse-reader.cpp
diff --git a/system/ulib/fzl/include/lib/fzl/fdio.h b/zircon/system/ulib/fzl/include/lib/fzl/fdio.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/fdio.h
rename to zircon/system/ulib/fzl/include/lib/fzl/fdio.h
diff --git a/system/ulib/fzl/include/lib/fzl/fifo.h b/zircon/system/ulib/fzl/include/lib/fzl/fifo.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/fifo.h
rename to zircon/system/ulib/fzl/include/lib/fzl/fifo.h
diff --git a/system/ulib/fzl/include/lib/fzl/memory-probe.h b/zircon/system/ulib/fzl/include/lib/fzl/memory-probe.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/memory-probe.h
rename to zircon/system/ulib/fzl/include/lib/fzl/memory-probe.h
diff --git a/system/ulib/fzl/include/lib/fzl/owned-vmo-mapper.h b/zircon/system/ulib/fzl/include/lib/fzl/owned-vmo-mapper.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/owned-vmo-mapper.h
rename to zircon/system/ulib/fzl/include/lib/fzl/owned-vmo-mapper.h
diff --git a/system/ulib/fzl/include/lib/fzl/pinned-vmo.h b/zircon/system/ulib/fzl/include/lib/fzl/pinned-vmo.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/pinned-vmo.h
rename to zircon/system/ulib/fzl/include/lib/fzl/pinned-vmo.h
diff --git a/system/ulib/fzl/include/lib/fzl/resizeable-vmo-mapper.h b/zircon/system/ulib/fzl/include/lib/fzl/resizeable-vmo-mapper.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/resizeable-vmo-mapper.h
rename to zircon/system/ulib/fzl/include/lib/fzl/resizeable-vmo-mapper.h
diff --git a/system/ulib/fzl/include/lib/fzl/time.h b/zircon/system/ulib/fzl/include/lib/fzl/time.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/time.h
rename to zircon/system/ulib/fzl/include/lib/fzl/time.h
diff --git a/system/ulib/fzl/include/lib/fzl/vmar-manager.h b/zircon/system/ulib/fzl/include/lib/fzl/vmar-manager.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/vmar-manager.h
rename to zircon/system/ulib/fzl/include/lib/fzl/vmar-manager.h
diff --git a/system/ulib/fzl/include/lib/fzl/vmo-mapper.h b/zircon/system/ulib/fzl/include/lib/fzl/vmo-mapper.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/vmo-mapper.h
rename to zircon/system/ulib/fzl/include/lib/fzl/vmo-mapper.h
diff --git a/system/ulib/fzl/include/lib/fzl/vmo-pool.h b/zircon/system/ulib/fzl/include/lib/fzl/vmo-pool.h
similarity index 100%
rename from system/ulib/fzl/include/lib/fzl/vmo-pool.h
rename to zircon/system/ulib/fzl/include/lib/fzl/vmo-pool.h
diff --git a/system/ulib/fzl/memory-probe.cpp b/zircon/system/ulib/fzl/memory-probe.cpp
similarity index 100%
rename from system/ulib/fzl/memory-probe.cpp
rename to zircon/system/ulib/fzl/memory-probe.cpp
diff --git a/system/ulib/fzl/owned-vmo-mapper.cpp b/zircon/system/ulib/fzl/owned-vmo-mapper.cpp
similarity index 100%
rename from system/ulib/fzl/owned-vmo-mapper.cpp
rename to zircon/system/ulib/fzl/owned-vmo-mapper.cpp
diff --git a/system/ulib/fzl/pinned-vmo.cpp b/zircon/system/ulib/fzl/pinned-vmo.cpp
similarity index 100%
rename from system/ulib/fzl/pinned-vmo.cpp
rename to zircon/system/ulib/fzl/pinned-vmo.cpp
diff --git a/system/ulib/fzl/resizeable-vmo-mapper.cpp b/zircon/system/ulib/fzl/resizeable-vmo-mapper.cpp
similarity index 100%
rename from system/ulib/fzl/resizeable-vmo-mapper.cpp
rename to zircon/system/ulib/fzl/resizeable-vmo-mapper.cpp
diff --git a/system/ulib/fzl/rules.mk b/zircon/system/ulib/fzl/rules.mk
similarity index 100%
rename from system/ulib/fzl/rules.mk
rename to zircon/system/ulib/fzl/rules.mk
diff --git a/system/ulib/fzl/time.cpp b/zircon/system/ulib/fzl/time.cpp
similarity index 100%
rename from system/ulib/fzl/time.cpp
rename to zircon/system/ulib/fzl/time.cpp
diff --git a/system/ulib/fzl/vmar-manager.cpp b/zircon/system/ulib/fzl/vmar-manager.cpp
similarity index 100%
rename from system/ulib/fzl/vmar-manager.cpp
rename to zircon/system/ulib/fzl/vmar-manager.cpp
diff --git a/system/ulib/fzl/vmo-mapper.cpp b/zircon/system/ulib/fzl/vmo-mapper.cpp
similarity index 100%
rename from system/ulib/fzl/vmo-mapper.cpp
rename to zircon/system/ulib/fzl/vmo-mapper.cpp
diff --git a/system/ulib/fzl/vmo-pool.cpp b/zircon/system/ulib/fzl/vmo-pool.cpp
similarity index 100%
rename from system/ulib/fzl/vmo-pool.cpp
rename to zircon/system/ulib/fzl/vmo-pool.cpp
diff --git a/system/ulib/gfx/gfx.c b/zircon/system/ulib/gfx/gfx.c
similarity index 100%
rename from system/ulib/gfx/gfx.c
rename to zircon/system/ulib/gfx/gfx.c
diff --git a/system/ulib/gfx/include/gfx/gfx.h b/zircon/system/ulib/gfx/include/gfx/gfx.h
similarity index 100%
rename from system/ulib/gfx/include/gfx/gfx.h
rename to zircon/system/ulib/gfx/include/gfx/gfx.h
diff --git a/system/ulib/gfx/rules.mk b/zircon/system/ulib/gfx/rules.mk
similarity index 100%
rename from system/ulib/gfx/rules.mk
rename to zircon/system/ulib/gfx/rules.mk
diff --git a/system/ulib/gpt/cros.cpp b/zircon/system/ulib/gpt/cros.cpp
similarity index 100%
rename from system/ulib/gpt/cros.cpp
rename to zircon/system/ulib/gpt/cros.cpp
diff --git a/system/ulib/gpt/gpt.cpp b/zircon/system/ulib/gpt/gpt.cpp
similarity index 100%
rename from system/ulib/gpt/gpt.cpp
rename to zircon/system/ulib/gpt/gpt.cpp
diff --git a/system/ulib/gpt/include/gpt/c/gpt.h b/zircon/system/ulib/gpt/include/gpt/c/gpt.h
similarity index 100%
rename from system/ulib/gpt/include/gpt/c/gpt.h
rename to zircon/system/ulib/gpt/include/gpt/c/gpt.h
diff --git a/system/ulib/gpt/include/gpt/cros.h b/zircon/system/ulib/gpt/include/gpt/cros.h
similarity index 100%
rename from system/ulib/gpt/include/gpt/cros.h
rename to zircon/system/ulib/gpt/include/gpt/cros.h
diff --git a/system/ulib/gpt/include/gpt/gpt.h b/zircon/system/ulib/gpt/include/gpt/gpt.h
similarity index 100%
rename from system/ulib/gpt/include/gpt/gpt.h
rename to zircon/system/ulib/gpt/include/gpt/gpt.h
diff --git a/system/ulib/gpt/rules.mk b/zircon/system/ulib/gpt/rules.mk
similarity index 100%
rename from system/ulib/gpt/rules.mk
rename to zircon/system/ulib/gpt/rules.mk
diff --git a/system/ulib/hid-parser/include/hid-parser/item.h b/zircon/system/ulib/hid-parser/include/hid-parser/item.h
similarity index 100%
rename from system/ulib/hid-parser/include/hid-parser/item.h
rename to zircon/system/ulib/hid-parser/include/hid-parser/item.h
diff --git a/system/ulib/hid-parser/include/hid-parser/parser.h b/zircon/system/ulib/hid-parser/include/hid-parser/parser.h
similarity index 100%
rename from system/ulib/hid-parser/include/hid-parser/parser.h
rename to zircon/system/ulib/hid-parser/include/hid-parser/parser.h
diff --git a/system/ulib/hid-parser/include/hid-parser/report.h b/zircon/system/ulib/hid-parser/include/hid-parser/report.h
similarity index 100%
rename from system/ulib/hid-parser/include/hid-parser/report.h
rename to zircon/system/ulib/hid-parser/include/hid-parser/report.h
diff --git a/system/ulib/hid-parser/include/hid-parser/units.h b/zircon/system/ulib/hid-parser/include/hid-parser/units.h
similarity index 100%
rename from system/ulib/hid-parser/include/hid-parser/units.h
rename to zircon/system/ulib/hid-parser/include/hid-parser/units.h
diff --git a/system/ulib/hid-parser/include/hid-parser/usages.h b/zircon/system/ulib/hid-parser/include/hid-parser/usages.h
similarity index 100%
rename from system/ulib/hid-parser/include/hid-parser/usages.h
rename to zircon/system/ulib/hid-parser/include/hid-parser/usages.h
diff --git a/system/ulib/hid-parser/item.cpp b/zircon/system/ulib/hid-parser/item.cpp
similarity index 100%
rename from system/ulib/hid-parser/item.cpp
rename to zircon/system/ulib/hid-parser/item.cpp
diff --git a/system/ulib/hid-parser/parser.cpp b/zircon/system/ulib/hid-parser/parser.cpp
similarity index 100%
rename from system/ulib/hid-parser/parser.cpp
rename to zircon/system/ulib/hid-parser/parser.cpp
diff --git a/system/ulib/hid-parser/report.cpp b/zircon/system/ulib/hid-parser/report.cpp
similarity index 100%
rename from system/ulib/hid-parser/report.cpp
rename to zircon/system/ulib/hid-parser/report.cpp
diff --git a/system/ulib/hid-parser/rules.mk b/zircon/system/ulib/hid-parser/rules.mk
similarity index 100%
rename from system/ulib/hid-parser/rules.mk
rename to zircon/system/ulib/hid-parser/rules.mk
diff --git a/system/ulib/hid-parser/units.cpp b/zircon/system/ulib/hid-parser/units.cpp
similarity index 100%
rename from system/ulib/hid-parser/units.cpp
rename to zircon/system/ulib/hid-parser/units.cpp
diff --git a/system/ulib/hid/acer12.c b/zircon/system/ulib/hid/acer12.c
similarity index 100%
rename from system/ulib/hid/acer12.c
rename to zircon/system/ulib/hid/acer12.c
diff --git a/system/ulib/hid/ambient-light.c b/zircon/system/ulib/hid/ambient-light.c
similarity index 100%
rename from system/ulib/hid/ambient-light.c
rename to zircon/system/ulib/hid/ambient-light.c
diff --git a/system/ulib/hid/bma253.c b/zircon/system/ulib/hid/bma253.c
similarity index 100%
rename from system/ulib/hid/bma253.c
rename to zircon/system/ulib/hid/bma253.c
diff --git a/system/ulib/hid/buttons.c b/zircon/system/ulib/hid/buttons.c
similarity index 100%
rename from system/ulib/hid/buttons.c
rename to zircon/system/ulib/hid/buttons.c
diff --git a/system/ulib/hid/egalax.c b/zircon/system/ulib/hid/egalax.c
similarity index 100%
rename from system/ulib/hid/egalax.c
rename to zircon/system/ulib/hid/egalax.c
diff --git a/system/ulib/hid/eyoyo.c b/zircon/system/ulib/hid/eyoyo.c
similarity index 100%
rename from system/ulib/hid/eyoyo.c
rename to zircon/system/ulib/hid/eyoyo.c
diff --git a/system/ulib/hid/ft3x27.c b/zircon/system/ulib/hid/ft3x27.c
similarity index 100%
rename from system/ulib/hid/ft3x27.c
rename to zircon/system/ulib/hid/ft3x27.c
diff --git a/system/ulib/hid/ft6336.c b/zircon/system/ulib/hid/ft6336.c
similarity index 100%
rename from system/ulib/hid/ft6336.c
rename to zircon/system/ulib/hid/ft6336.c
diff --git a/system/ulib/hid/gt92xx.c b/zircon/system/ulib/hid/gt92xx.c
similarity index 100%
rename from system/ulib/hid/gt92xx.c
rename to zircon/system/ulib/hid/gt92xx.c
diff --git a/system/ulib/hid/hid.c b/zircon/system/ulib/hid/hid.c
similarity index 100%
rename from system/ulib/hid/hid.c
rename to zircon/system/ulib/hid/hid.c
diff --git a/system/ulib/hid/include/hid/acer12.h b/zircon/system/ulib/hid/include/hid/acer12.h
similarity index 100%
rename from system/ulib/hid/include/hid/acer12.h
rename to zircon/system/ulib/hid/include/hid/acer12.h
diff --git a/system/ulib/hid/include/hid/ambient-light.h b/zircon/system/ulib/hid/include/hid/ambient-light.h
similarity index 100%
rename from system/ulib/hid/include/hid/ambient-light.h
rename to zircon/system/ulib/hid/include/hid/ambient-light.h
diff --git a/system/ulib/hid/include/hid/bma253.h b/zircon/system/ulib/hid/include/hid/bma253.h
similarity index 100%
rename from system/ulib/hid/include/hid/bma253.h
rename to zircon/system/ulib/hid/include/hid/bma253.h
diff --git a/system/ulib/hid/include/hid/boot.h b/zircon/system/ulib/hid/include/hid/boot.h
similarity index 100%
rename from system/ulib/hid/include/hid/boot.h
rename to zircon/system/ulib/hid/include/hid/boot.h
diff --git a/system/ulib/hid/include/hid/buttons.h b/zircon/system/ulib/hid/include/hid/buttons.h
similarity index 100%
rename from system/ulib/hid/include/hid/buttons.h
rename to zircon/system/ulib/hid/include/hid/buttons.h
diff --git a/system/ulib/hid/include/hid/descriptor.h b/zircon/system/ulib/hid/include/hid/descriptor.h
similarity index 100%
rename from system/ulib/hid/include/hid/descriptor.h
rename to zircon/system/ulib/hid/include/hid/descriptor.h
diff --git a/system/ulib/hid/include/hid/egalax.h b/zircon/system/ulib/hid/include/hid/egalax.h
similarity index 100%
rename from system/ulib/hid/include/hid/egalax.h
rename to zircon/system/ulib/hid/include/hid/egalax.h
diff --git a/system/ulib/hid/include/hid/eyoyo.h b/zircon/system/ulib/hid/include/hid/eyoyo.h
similarity index 100%
rename from system/ulib/hid/include/hid/eyoyo.h
rename to zircon/system/ulib/hid/include/hid/eyoyo.h
diff --git a/system/ulib/hid/include/hid/ft3x27.h b/zircon/system/ulib/hid/include/hid/ft3x27.h
similarity index 100%
rename from system/ulib/hid/include/hid/ft3x27.h
rename to zircon/system/ulib/hid/include/hid/ft3x27.h
diff --git a/system/ulib/hid/include/hid/ft6336.h b/zircon/system/ulib/hid/include/hid/ft6336.h
similarity index 100%
rename from system/ulib/hid/include/hid/ft6336.h
rename to zircon/system/ulib/hid/include/hid/ft6336.h
diff --git a/system/ulib/hid/include/hid/gt92xx.h b/zircon/system/ulib/hid/include/hid/gt92xx.h
similarity index 100%
rename from system/ulib/hid/include/hid/gt92xx.h
rename to zircon/system/ulib/hid/include/hid/gt92xx.h
diff --git a/system/ulib/hid/include/hid/hid.h b/zircon/system/ulib/hid/include/hid/hid.h
similarity index 100%
rename from system/ulib/hid/include/hid/hid.h
rename to zircon/system/ulib/hid/include/hid/hid.h
diff --git a/system/ulib/hid/include/hid/ltr-578als.h b/zircon/system/ulib/hid/include/hid/ltr-578als.h
similarity index 100%
rename from system/ulib/hid/include/hid/ltr-578als.h
rename to zircon/system/ulib/hid/include/hid/ltr-578als.h
diff --git a/system/ulib/hid/include/hid/paradise.h b/zircon/system/ulib/hid/include/hid/paradise.h
similarity index 100%
rename from system/ulib/hid/include/hid/paradise.h
rename to zircon/system/ulib/hid/include/hid/paradise.h
diff --git a/system/ulib/hid/include/hid/samsung.h b/zircon/system/ulib/hid/include/hid/samsung.h
similarity index 100%
rename from system/ulib/hid/include/hid/samsung.h
rename to zircon/system/ulib/hid/include/hid/samsung.h
diff --git a/system/ulib/hid/include/hid/usages.h b/zircon/system/ulib/hid/include/hid/usages.h
similarity index 100%
rename from system/ulib/hid/include/hid/usages.h
rename to zircon/system/ulib/hid/include/hid/usages.h
diff --git a/system/ulib/hid/keymaps.c b/zircon/system/ulib/hid/keymaps.c
similarity index 100%
rename from system/ulib/hid/keymaps.c
rename to zircon/system/ulib/hid/keymaps.c
diff --git a/system/ulib/hid/ltr-578als.c b/zircon/system/ulib/hid/ltr-578als.c
similarity index 100%
rename from system/ulib/hid/ltr-578als.c
rename to zircon/system/ulib/hid/ltr-578als.c
diff --git a/system/ulib/hid/paradise.c b/zircon/system/ulib/hid/paradise.c
similarity index 100%
rename from system/ulib/hid/paradise.c
rename to zircon/system/ulib/hid/paradise.c
diff --git a/system/ulib/hid/rules.mk b/zircon/system/ulib/hid/rules.mk
similarity index 100%
rename from system/ulib/hid/rules.mk
rename to zircon/system/ulib/hid/rules.mk
diff --git a/system/ulib/hid/samsung.c b/zircon/system/ulib/hid/samsung.c
similarity index 100%
rename from system/ulib/hid/samsung.c
rename to zircon/system/ulib/hid/samsung.c
diff --git a/system/ulib/hwreg/MAINTAINERS b/zircon/system/ulib/hwreg/MAINTAINERS
similarity index 100%
rename from system/ulib/hwreg/MAINTAINERS
rename to zircon/system/ulib/hwreg/MAINTAINERS
diff --git a/system/ulib/hwreg/include/hwreg/bitfields.h b/zircon/system/ulib/hwreg/include/hwreg/bitfields.h
similarity index 100%
rename from system/ulib/hwreg/include/hwreg/bitfields.h
rename to zircon/system/ulib/hwreg/include/hwreg/bitfields.h
diff --git a/system/ulib/hwreg/include/hwreg/internal.h b/zircon/system/ulib/hwreg/include/hwreg/internal.h
similarity index 100%
rename from system/ulib/hwreg/include/hwreg/internal.h
rename to zircon/system/ulib/hwreg/include/hwreg/internal.h
diff --git a/system/ulib/hwreg/include/hwreg/mmio.h b/zircon/system/ulib/hwreg/include/hwreg/mmio.h
similarity index 100%
rename from system/ulib/hwreg/include/hwreg/mmio.h
rename to zircon/system/ulib/hwreg/include/hwreg/mmio.h
diff --git a/system/ulib/hwreg/printers.cpp b/zircon/system/ulib/hwreg/printers.cpp
similarity index 100%
rename from system/ulib/hwreg/printers.cpp
rename to zircon/system/ulib/hwreg/printers.cpp
diff --git a/system/ulib/hwreg/rules.mk b/zircon/system/ulib/hwreg/rules.mk
similarity index 100%
rename from system/ulib/hwreg/rules.mk
rename to zircon/system/ulib/hwreg/rules.mk
diff --git a/system/ulib/image-format/README.md b/zircon/system/ulib/image-format/README.md
similarity index 100%
rename from system/ulib/image-format/README.md
rename to zircon/system/ulib/image-format/README.md
diff --git a/system/ulib/image-format/image_format.cpp b/zircon/system/ulib/image-format/image_format.cpp
similarity index 100%
rename from system/ulib/image-format/image_format.cpp
rename to zircon/system/ulib/image-format/image_format.cpp
diff --git a/system/ulib/image-format/include/lib/image-format/image_format.h b/zircon/system/ulib/image-format/include/lib/image-format/image_format.h
similarity index 100%
rename from system/ulib/image-format/include/lib/image-format/image_format.h
rename to zircon/system/ulib/image-format/include/lib/image-format/image_format.h
diff --git a/system/ulib/image-format/rules.mk b/zircon/system/ulib/image-format/rules.mk
similarity index 100%
rename from system/ulib/image-format/rules.mk
rename to zircon/system/ulib/image-format/rules.mk
diff --git a/system/ulib/inet6/checksum.c b/zircon/system/ulib/inet6/checksum.c
similarity index 100%
rename from system/ulib/inet6/checksum.c
rename to zircon/system/ulib/inet6/checksum.c
diff --git a/system/ulib/inet6/eth-client.c b/zircon/system/ulib/inet6/eth-client.c
similarity index 100%
rename from system/ulib/inet6/eth-client.c
rename to zircon/system/ulib/inet6/eth-client.c
diff --git a/system/ulib/inet6/eth-client.h b/zircon/system/ulib/inet6/eth-client.h
similarity index 100%
rename from system/ulib/inet6/eth-client.h
rename to zircon/system/ulib/inet6/eth-client.h
diff --git a/system/ulib/inet6/include/inet6/inet6.h b/zircon/system/ulib/inet6/include/inet6/inet6.h
similarity index 100%
rename from system/ulib/inet6/include/inet6/inet6.h
rename to zircon/system/ulib/inet6/include/inet6/inet6.h
diff --git a/system/ulib/inet6/include/inet6/netifc.h b/zircon/system/ulib/inet6/include/inet6/netifc.h
similarity index 100%
rename from system/ulib/inet6/include/inet6/netifc.h
rename to zircon/system/ulib/inet6/include/inet6/netifc.h
diff --git a/system/ulib/inet6/inet6.c b/zircon/system/ulib/inet6/inet6.c
similarity index 100%
rename from system/ulib/inet6/inet6.c
rename to zircon/system/ulib/inet6/inet6.c
diff --git a/system/ulib/inet6/netifc.c b/zircon/system/ulib/inet6/netifc.c
similarity index 100%
rename from system/ulib/inet6/netifc.c
rename to zircon/system/ulib/inet6/netifc.c
diff --git a/system/ulib/inet6/rules.mk b/zircon/system/ulib/inet6/rules.mk
similarity index 100%
rename from system/ulib/inet6/rules.mk
rename to zircon/system/ulib/inet6/rules.mk
diff --git a/system/ulib/inspect/heap.cpp b/zircon/system/ulib/inspect/heap.cpp
similarity index 100%
rename from system/ulib/inspect/heap.cpp
rename to zircon/system/ulib/inspect/heap.cpp
diff --git a/system/ulib/inspect/include/lib/inspect/block.h b/zircon/system/ulib/inspect/include/lib/inspect/block.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/block.h
rename to zircon/system/ulib/inspect/include/lib/inspect/block.h
diff --git a/system/ulib/inspect/include/lib/inspect/heap.h b/zircon/system/ulib/inspect/include/lib/inspect/heap.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/heap.h
rename to zircon/system/ulib/inspect/include/lib/inspect/heap.h
diff --git a/system/ulib/inspect/include/lib/inspect/inspect.h b/zircon/system/ulib/inspect/include/lib/inspect/inspect.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/inspect.h
rename to zircon/system/ulib/inspect/include/lib/inspect/inspect.h
diff --git a/system/ulib/inspect/include/lib/inspect/limits.h b/zircon/system/ulib/inspect/include/lib/inspect/limits.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/limits.h
rename to zircon/system/ulib/inspect/include/lib/inspect/limits.h
diff --git a/system/ulib/inspect/include/lib/inspect/scanner.h b/zircon/system/ulib/inspect/include/lib/inspect/scanner.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/scanner.h
rename to zircon/system/ulib/inspect/include/lib/inspect/scanner.h
diff --git a/system/ulib/inspect/include/lib/inspect/snapshot.h b/zircon/system/ulib/inspect/include/lib/inspect/snapshot.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/snapshot.h
rename to zircon/system/ulib/inspect/include/lib/inspect/snapshot.h
diff --git a/system/ulib/inspect/include/lib/inspect/state.h b/zircon/system/ulib/inspect/include/lib/inspect/state.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/state.h
rename to zircon/system/ulib/inspect/include/lib/inspect/state.h
diff --git a/system/ulib/inspect/include/lib/inspect/types.h b/zircon/system/ulib/inspect/include/lib/inspect/types.h
similarity index 100%
rename from system/ulib/inspect/include/lib/inspect/types.h
rename to zircon/system/ulib/inspect/include/lib/inspect/types.h
diff --git a/system/ulib/inspect/inspect.cpp b/zircon/system/ulib/inspect/inspect.cpp
similarity index 100%
rename from system/ulib/inspect/inspect.cpp
rename to zircon/system/ulib/inspect/inspect.cpp
diff --git a/system/ulib/inspect/rules.mk b/zircon/system/ulib/inspect/rules.mk
similarity index 100%
rename from system/ulib/inspect/rules.mk
rename to zircon/system/ulib/inspect/rules.mk
diff --git a/system/ulib/inspect/scanner.cpp b/zircon/system/ulib/inspect/scanner.cpp
similarity index 100%
rename from system/ulib/inspect/scanner.cpp
rename to zircon/system/ulib/inspect/scanner.cpp
diff --git a/system/ulib/inspect/snapshot.cpp b/zircon/system/ulib/inspect/snapshot.cpp
similarity index 100%
rename from system/ulib/inspect/snapshot.cpp
rename to zircon/system/ulib/inspect/snapshot.cpp
diff --git a/system/ulib/inspect/state.cpp b/zircon/system/ulib/inspect/state.cpp
similarity index 100%
rename from system/ulib/inspect/state.cpp
rename to zircon/system/ulib/inspect/state.cpp
diff --git a/system/ulib/inspect/test/heap_tests.cpp b/zircon/system/ulib/inspect/test/heap_tests.cpp
similarity index 100%
rename from system/ulib/inspect/test/heap_tests.cpp
rename to zircon/system/ulib/inspect/test/heap_tests.cpp
diff --git a/system/ulib/inspect/test/inspect_tests.cpp b/zircon/system/ulib/inspect/test/inspect_tests.cpp
similarity index 100%
rename from system/ulib/inspect/test/inspect_tests.cpp
rename to zircon/system/ulib/inspect/test/inspect_tests.cpp
diff --git a/system/ulib/inspect/test/main.cpp b/zircon/system/ulib/inspect/test/main.cpp
similarity index 100%
rename from system/ulib/inspect/test/main.cpp
rename to zircon/system/ulib/inspect/test/main.cpp
diff --git a/system/ulib/inspect/test/scanner_tests.cpp b/zircon/system/ulib/inspect/test/scanner_tests.cpp
similarity index 100%
rename from system/ulib/inspect/test/scanner_tests.cpp
rename to zircon/system/ulib/inspect/test/scanner_tests.cpp
diff --git a/system/ulib/inspect/test/snapshot_tests.cpp b/zircon/system/ulib/inspect/test/snapshot_tests.cpp
similarity index 100%
rename from system/ulib/inspect/test/snapshot_tests.cpp
rename to zircon/system/ulib/inspect/test/snapshot_tests.cpp
diff --git a/system/ulib/inspect/test/state_tests.cpp b/zircon/system/ulib/inspect/test/state_tests.cpp
similarity index 100%
rename from system/ulib/inspect/test/state_tests.cpp
rename to zircon/system/ulib/inspect/test/state_tests.cpp
diff --git a/system/ulib/inspect/types.cpp b/zircon/system/ulib/inspect/types.cpp
similarity index 100%
rename from system/ulib/inspect/types.cpp
rename to zircon/system/ulib/inspect/types.cpp
diff --git a/system/ulib/inspector/backtrace.cpp b/zircon/system/ulib/inspector/backtrace.cpp
similarity index 100%
rename from system/ulib/inspector/backtrace.cpp
rename to zircon/system/ulib/inspector/backtrace.cpp
diff --git a/system/ulib/inspector/debug-info.cpp b/zircon/system/ulib/inspector/debug-info.cpp
similarity index 100%
rename from system/ulib/inspector/debug-info.cpp
rename to zircon/system/ulib/inspector/debug-info.cpp
diff --git a/system/ulib/inspector/dso-list-impl.h b/zircon/system/ulib/inspector/dso-list-impl.h
similarity index 100%
rename from system/ulib/inspector/dso-list-impl.h
rename to zircon/system/ulib/inspector/dso-list-impl.h
diff --git a/system/ulib/inspector/dso-list.cpp b/zircon/system/ulib/inspector/dso-list.cpp
similarity index 100%
rename from system/ulib/inspector/dso-list.cpp
rename to zircon/system/ulib/inspector/dso-list.cpp
diff --git a/system/ulib/inspector/include/inspector/inspector.h b/zircon/system/ulib/inspector/include/inspector/inspector.h
similarity index 100%
rename from system/ulib/inspector/include/inspector/inspector.h
rename to zircon/system/ulib/inspector/include/inspector/inspector.h
diff --git a/system/ulib/inspector/registers.cpp b/zircon/system/ulib/inspector/registers.cpp
similarity index 100%
rename from system/ulib/inspector/registers.cpp
rename to zircon/system/ulib/inspector/registers.cpp
diff --git a/system/ulib/inspector/rules.mk b/zircon/system/ulib/inspector/rules.mk
similarity index 100%
rename from system/ulib/inspector/rules.mk
rename to zircon/system/ulib/inspector/rules.mk
diff --git a/system/ulib/inspector/utils-impl.h b/zircon/system/ulib/inspector/utils-impl.h
similarity index 100%
rename from system/ulib/inspector/utils-impl.h
rename to zircon/system/ulib/inspector/utils-impl.h
diff --git a/system/ulib/inspector/utils.cpp b/zircon/system/ulib/inspector/utils.cpp
similarity index 100%
rename from system/ulib/inspector/utils.cpp
rename to zircon/system/ulib/inspector/utils.cpp
diff --git a/system/ulib/intel-hda/codec-utils/codec-driver-base.cpp b/zircon/system/ulib/intel-hda/codec-utils/codec-driver-base.cpp
similarity index 100%
rename from system/ulib/intel-hda/codec-utils/codec-driver-base.cpp
rename to zircon/system/ulib/intel-hda/codec-utils/codec-driver-base.cpp
diff --git a/system/ulib/intel-hda/codec-utils/debug-logging.h b/zircon/system/ulib/intel-hda/codec-utils/debug-logging.h
similarity index 100%
rename from system/ulib/intel-hda/codec-utils/debug-logging.h
rename to zircon/system/ulib/intel-hda/codec-utils/debug-logging.h
diff --git a/system/ulib/intel-hda/codec-utils/stream-base.cpp b/zircon/system/ulib/intel-hda/codec-utils/stream-base.cpp
similarity index 100%
rename from system/ulib/intel-hda/codec-utils/stream-base.cpp
rename to zircon/system/ulib/intel-hda/codec-utils/stream-base.cpp
diff --git a/system/ulib/intel-hda/include/intel-hda/codec-utils/codec-driver-base.h b/zircon/system/ulib/intel-hda/include/intel-hda/codec-utils/codec-driver-base.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/codec-utils/codec-driver-base.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/codec-utils/codec-driver-base.h
diff --git a/system/ulib/intel-hda/include/intel-hda/codec-utils/stream-base.h b/zircon/system/ulib/intel-hda/include/intel-hda/codec-utils/stream-base.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/codec-utils/stream-base.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/codec-utils/stream-base.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/codec-caps.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/codec-caps.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/codec-caps.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/codec-caps.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/codec-commands.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/codec-commands.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/codec-commands.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/codec-commands.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/codec-state.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/codec-state.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/codec-state.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/codec-state.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/intel-audio-dsp-ipc.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/intel-audio-dsp-ipc.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/intel-audio-dsp-ipc.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/intel-audio-dsp-ipc.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/intel-hda-proto.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/intel-hda-proto.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/intel-hda-proto.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/intel-hda-proto.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/intel-hda-registers.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/intel-hda-registers.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/intel-hda-registers.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/intel-hda-registers.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/nhlt.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/nhlt.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/nhlt.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/nhlt.h
diff --git a/system/ulib/intel-hda/include/intel-hda/utils/utils.h b/zircon/system/ulib/intel-hda/include/intel-hda/utils/utils.h
similarity index 100%
rename from system/ulib/intel-hda/include/intel-hda/utils/utils.h
rename to zircon/system/ulib/intel-hda/include/intel-hda/utils/utils.h
diff --git a/system/ulib/intel-hda/rules.mk b/zircon/system/ulib/intel-hda/rules.mk
similarity index 100%
rename from system/ulib/intel-hda/rules.mk
rename to zircon/system/ulib/intel-hda/rules.mk
diff --git a/system/ulib/intel-hda/utils/codec-caps.cpp b/zircon/system/ulib/intel-hda/utils/codec-caps.cpp
similarity index 100%
rename from system/ulib/intel-hda/utils/codec-caps.cpp
rename to zircon/system/ulib/intel-hda/utils/codec-caps.cpp
diff --git a/system/ulib/intel-hda/utils/utils.cpp b/zircon/system/ulib/intel-hda/utils/utils.cpp
similarity index 100%
rename from system/ulib/intel-hda/utils/utils.cpp
rename to zircon/system/ulib/intel-hda/utils/utils.cpp
diff --git a/system/ulib/kvstore/include/kvstore/kvstore.h b/zircon/system/ulib/kvstore/include/kvstore/kvstore.h
similarity index 100%
rename from system/ulib/kvstore/include/kvstore/kvstore.h
rename to zircon/system/ulib/kvstore/include/kvstore/kvstore.h
diff --git a/system/ulib/kvstore/kvstore-test.c b/zircon/system/ulib/kvstore/kvstore-test.c
similarity index 100%
rename from system/ulib/kvstore/kvstore-test.c
rename to zircon/system/ulib/kvstore/kvstore-test.c
diff --git a/system/ulib/kvstore/kvstore.c b/zircon/system/ulib/kvstore/kvstore.c
similarity index 100%
rename from system/ulib/kvstore/kvstore.c
rename to zircon/system/ulib/kvstore/kvstore.c
diff --git a/system/ulib/kvstore/rules.mk b/zircon/system/ulib/kvstore/rules.mk
similarity index 100%
rename from system/ulib/kvstore/rules.mk
rename to zircon/system/ulib/kvstore/rules.mk
diff --git a/system/ulib/launchpad/elf.c b/zircon/system/ulib/launchpad/elf.c
similarity index 100%
rename from system/ulib/launchpad/elf.c
rename to zircon/system/ulib/launchpad/elf.c
diff --git a/system/ulib/launchpad/elf.h b/zircon/system/ulib/launchpad/elf.h
similarity index 100%
rename from system/ulib/launchpad/elf.h
rename to zircon/system/ulib/launchpad/elf.h
diff --git a/system/ulib/launchpad/fdio.c b/zircon/system/ulib/launchpad/fdio.c
similarity index 100%
rename from system/ulib/launchpad/fdio.c
rename to zircon/system/ulib/launchpad/fdio.c
diff --git a/system/ulib/launchpad/include/launchpad/launchpad.h b/zircon/system/ulib/launchpad/include/launchpad/launchpad.h
similarity index 100%
rename from system/ulib/launchpad/include/launchpad/launchpad.h
rename to zircon/system/ulib/launchpad/include/launchpad/launchpad.h
diff --git a/system/ulib/launchpad/include/launchpad/vmo.h b/zircon/system/ulib/launchpad/include/launchpad/vmo.h
similarity index 100%
rename from system/ulib/launchpad/include/launchpad/vmo.h
rename to zircon/system/ulib/launchpad/include/launchpad/vmo.h
diff --git a/system/ulib/launchpad/launchpad.c b/zircon/system/ulib/launchpad/launchpad.c
similarity index 100%
rename from system/ulib/launchpad/launchpad.c
rename to zircon/system/ulib/launchpad/launchpad.c
diff --git a/system/ulib/launchpad/rules.mk b/zircon/system/ulib/launchpad/rules.mk
similarity index 100%
rename from system/ulib/launchpad/rules.mk
rename to zircon/system/ulib/launchpad/rules.mk
diff --git a/system/ulib/launchpad/vmo.c b/zircon/system/ulib/launchpad/vmo.c
similarity index 100%
rename from system/ulib/launchpad/vmo.c
rename to zircon/system/ulib/launchpad/vmo.c
diff --git a/system/ulib/ldmsg/MAINTAINERS b/zircon/system/ulib/ldmsg/MAINTAINERS
similarity index 100%
rename from system/ulib/ldmsg/MAINTAINERS
rename to zircon/system/ulib/ldmsg/MAINTAINERS
diff --git a/system/ulib/ldmsg/include/ldmsg/ldmsg.h b/zircon/system/ulib/ldmsg/include/ldmsg/ldmsg.h
similarity index 100%
rename from system/ulib/ldmsg/include/ldmsg/ldmsg.h
rename to zircon/system/ulib/ldmsg/include/ldmsg/ldmsg.h
diff --git a/system/ulib/ldmsg/ldmsg.c b/zircon/system/ulib/ldmsg/ldmsg.c
similarity index 100%
rename from system/ulib/ldmsg/ldmsg.c
rename to zircon/system/ulib/ldmsg/ldmsg.c
diff --git a/system/ulib/ldmsg/rules.mk b/zircon/system/ulib/ldmsg/rules.mk
similarity index 100%
rename from system/ulib/ldmsg/rules.mk
rename to zircon/system/ulib/ldmsg/rules.mk
diff --git a/system/ulib/libzbi/include/libzbi/zbi-cpp.h b/zircon/system/ulib/libzbi/include/libzbi/zbi-cpp.h
similarity index 100%
rename from system/ulib/libzbi/include/libzbi/zbi-cpp.h
rename to zircon/system/ulib/libzbi/include/libzbi/zbi-cpp.h
diff --git a/system/ulib/libzbi/include/libzbi/zbi-split.h b/zircon/system/ulib/libzbi/include/libzbi/zbi-split.h
similarity index 100%
rename from system/ulib/libzbi/include/libzbi/zbi-split.h
rename to zircon/system/ulib/libzbi/include/libzbi/zbi-split.h
diff --git a/system/ulib/libzbi/include/libzbi/zbi-zx.h b/zircon/system/ulib/libzbi/include/libzbi/zbi-zx.h
similarity index 100%
rename from system/ulib/libzbi/include/libzbi/zbi-zx.h
rename to zircon/system/ulib/libzbi/include/libzbi/zbi-zx.h
diff --git a/system/ulib/libzbi/include/libzbi/zbi.h b/zircon/system/ulib/libzbi/include/libzbi/zbi.h
similarity index 100%
rename from system/ulib/libzbi/include/libzbi/zbi.h
rename to zircon/system/ulib/libzbi/include/libzbi/zbi.h
diff --git a/system/ulib/libzbi/rules.mk b/zircon/system/ulib/libzbi/rules.mk
similarity index 100%
rename from system/ulib/libzbi/rules.mk
rename to zircon/system/ulib/libzbi/rules.mk
diff --git a/system/ulib/libzbi/zbi-zx.cpp b/zircon/system/ulib/libzbi/zbi-zx.cpp
similarity index 100%
rename from system/ulib/libzbi/zbi-zx.cpp
rename to zircon/system/ulib/libzbi/zbi-zx.cpp
diff --git a/system/ulib/libzbi/zbi.c b/zircon/system/ulib/libzbi/zbi.c
similarity index 100%
rename from system/ulib/libzbi/zbi.c
rename to zircon/system/ulib/libzbi/zbi.c
diff --git a/system/ulib/loader-service/include/loader-service/loader-service.h b/zircon/system/ulib/loader-service/include/loader-service/loader-service.h
similarity index 100%
rename from system/ulib/loader-service/include/loader-service/loader-service.h
rename to zircon/system/ulib/loader-service/include/loader-service/loader-service.h
diff --git a/system/ulib/loader-service/loader-service.c b/zircon/system/ulib/loader-service/loader-service.c
similarity index 100%
rename from system/ulib/loader-service/loader-service.c
rename to zircon/system/ulib/loader-service/loader-service.c
diff --git a/system/ulib/loader-service/rules.mk b/zircon/system/ulib/loader-service/rules.mk
similarity index 100%
rename from system/ulib/loader-service/rules.mk
rename to zircon/system/ulib/loader-service/rules.mk
diff --git a/system/ulib/lockdep/MAINTAINERS b/zircon/system/ulib/lockdep/MAINTAINERS
similarity index 100%
rename from system/ulib/lockdep/MAINTAINERS
rename to zircon/system/ulib/lockdep/MAINTAINERS
diff --git a/system/ulib/lockdep/include/lockdep/common.h b/zircon/system/ulib/lockdep/include/lockdep/common.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/common.h
rename to zircon/system/ulib/lockdep/include/lockdep/common.h
diff --git a/system/ulib/lockdep/include/lockdep/global_reference.h b/zircon/system/ulib/lockdep/include/lockdep/global_reference.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/global_reference.h
rename to zircon/system/ulib/lockdep/include/lockdep/global_reference.h
diff --git a/system/ulib/lockdep/include/lockdep/guard.h b/zircon/system/ulib/lockdep/include/lockdep/guard.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/guard.h
rename to zircon/system/ulib/lockdep/include/lockdep/guard.h
diff --git a/system/ulib/lockdep/include/lockdep/guard_multiple.h b/zircon/system/ulib/lockdep/include/lockdep/guard_multiple.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/guard_multiple.h
rename to zircon/system/ulib/lockdep/include/lockdep/guard_multiple.h
diff --git a/system/ulib/lockdep/include/lockdep/lock_class.h b/zircon/system/ulib/lockdep/include/lockdep/lock_class.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/lock_class.h
rename to zircon/system/ulib/lockdep/include/lockdep/lock_class.h
diff --git a/system/ulib/lockdep/include/lockdep/lock_class_state.h b/zircon/system/ulib/lockdep/include/lockdep/lock_class_state.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/lock_class_state.h
rename to zircon/system/ulib/lockdep/include/lockdep/lock_class_state.h
diff --git a/system/ulib/lockdep/include/lockdep/lock_dependency_set.h b/zircon/system/ulib/lockdep/include/lockdep/lock_dependency_set.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/lock_dependency_set.h
rename to zircon/system/ulib/lockdep/include/lockdep/lock_dependency_set.h
diff --git a/system/ulib/lockdep/include/lockdep/lock_policy.h b/zircon/system/ulib/lockdep/include/lockdep/lock_policy.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/lock_policy.h
rename to zircon/system/ulib/lockdep/include/lockdep/lock_policy.h
diff --git a/system/ulib/lockdep/include/lockdep/lock_traits.h b/zircon/system/ulib/lockdep/include/lockdep/lock_traits.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/lock_traits.h
rename to zircon/system/ulib/lockdep/include/lockdep/lock_traits.h
diff --git a/system/ulib/lockdep/include/lockdep/lockdep.h b/zircon/system/ulib/lockdep/include/lockdep/lockdep.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/lockdep.h
rename to zircon/system/ulib/lockdep/include/lockdep/lockdep.h
diff --git a/system/ulib/lockdep/include/lockdep/runtime_api.h b/zircon/system/ulib/lockdep/include/lockdep/runtime_api.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/runtime_api.h
rename to zircon/system/ulib/lockdep/include/lockdep/runtime_api.h
diff --git a/system/ulib/lockdep/include/lockdep/thread_lock_state.h b/zircon/system/ulib/lockdep/include/lockdep/thread_lock_state.h
similarity index 100%
rename from system/ulib/lockdep/include/lockdep/thread_lock_state.h
rename to zircon/system/ulib/lockdep/include/lockdep/thread_lock_state.h
diff --git a/system/ulib/lockdep/lock_dep.cpp b/zircon/system/ulib/lockdep/lock_dep.cpp
similarity index 100%
rename from system/ulib/lockdep/lock_dep.cpp
rename to zircon/system/ulib/lockdep/lock_dep.cpp
diff --git a/system/ulib/lockdep/rules.mk b/zircon/system/ulib/lockdep/rules.mk
similarity index 100%
rename from system/ulib/lockdep/rules.mk
rename to zircon/system/ulib/lockdep/rules.mk
diff --git a/system/ulib/logger/include/lib/logger/logger.h b/zircon/system/ulib/logger/include/lib/logger/logger.h
similarity index 100%
rename from system/ulib/logger/include/lib/logger/logger.h
rename to zircon/system/ulib/logger/include/lib/logger/logger.h
diff --git a/system/ulib/logger/include/lib/logger/provider.h b/zircon/system/ulib/logger/include/lib/logger/provider.h
similarity index 100%
rename from system/ulib/logger/include/lib/logger/provider.h
rename to zircon/system/ulib/logger/include/lib/logger/provider.h
diff --git a/system/ulib/logger/logger.cpp b/zircon/system/ulib/logger/logger.cpp
similarity index 100%
rename from system/ulib/logger/logger.cpp
rename to zircon/system/ulib/logger/logger.cpp
diff --git a/system/ulib/logger/provider.cpp b/zircon/system/ulib/logger/provider.cpp
similarity index 100%
rename from system/ulib/logger/provider.cpp
rename to zircon/system/ulib/logger/provider.cpp
diff --git a/system/ulib/logger/rules.mk b/zircon/system/ulib/logger/rules.mk
similarity index 100%
rename from system/ulib/logger/rules.mk
rename to zircon/system/ulib/logger/rules.mk
diff --git a/system/ulib/memfs/directory.cpp b/zircon/system/ulib/memfs/directory.cpp
similarity index 100%
rename from system/ulib/memfs/directory.cpp
rename to zircon/system/ulib/memfs/directory.cpp
diff --git a/system/ulib/memfs/dnode.cpp b/zircon/system/ulib/memfs/dnode.cpp
similarity index 100%
rename from system/ulib/memfs/dnode.cpp
rename to zircon/system/ulib/memfs/dnode.cpp
diff --git a/system/ulib/memfs/dnode.h b/zircon/system/ulib/memfs/dnode.h
similarity index 100%
rename from system/ulib/memfs/dnode.h
rename to zircon/system/ulib/memfs/dnode.h
diff --git a/system/ulib/memfs/file.cpp b/zircon/system/ulib/memfs/file.cpp
similarity index 100%
rename from system/ulib/memfs/file.cpp
rename to zircon/system/ulib/memfs/file.cpp
diff --git a/system/ulib/memfs/include/lib/memfs/cpp/vnode.h b/zircon/system/ulib/memfs/include/lib/memfs/cpp/vnode.h
similarity index 100%
rename from system/ulib/memfs/include/lib/memfs/cpp/vnode.h
rename to zircon/system/ulib/memfs/include/lib/memfs/cpp/vnode.h
diff --git a/system/ulib/memfs/include/lib/memfs/memfs.h b/zircon/system/ulib/memfs/include/lib/memfs/memfs.h
similarity index 100%
rename from system/ulib/memfs/include/lib/memfs/memfs.h
rename to zircon/system/ulib/memfs/include/lib/memfs/memfs.h
diff --git a/system/ulib/memfs/memfs-local.cpp b/zircon/system/ulib/memfs/memfs-local.cpp
similarity index 100%
rename from system/ulib/memfs/memfs-local.cpp
rename to zircon/system/ulib/memfs/memfs-local.cpp
diff --git a/system/ulib/memfs/memfs.cpp b/zircon/system/ulib/memfs/memfs.cpp
similarity index 100%
rename from system/ulib/memfs/memfs.cpp
rename to zircon/system/ulib/memfs/memfs.cpp
diff --git a/system/ulib/memfs/rules.mk b/zircon/system/ulib/memfs/rules.mk
similarity index 100%
rename from system/ulib/memfs/rules.mk
rename to zircon/system/ulib/memfs/rules.mk
diff --git a/system/ulib/memfs/vmo.cpp b/zircon/system/ulib/memfs/vmo.cpp
similarity index 100%
rename from system/ulib/memfs/vmo.cpp
rename to zircon/system/ulib/memfs/vmo.cpp
diff --git a/system/ulib/minfs/allocator.cpp b/zircon/system/ulib/minfs/allocator.cpp
similarity index 100%
rename from system/ulib/minfs/allocator.cpp
rename to zircon/system/ulib/minfs/allocator.cpp
diff --git a/system/ulib/minfs/bcache.cpp b/zircon/system/ulib/minfs/bcache.cpp
similarity index 100%
rename from system/ulib/minfs/bcache.cpp
rename to zircon/system/ulib/minfs/bcache.cpp
diff --git a/system/ulib/minfs/fsck.cpp b/zircon/system/ulib/minfs/fsck.cpp
similarity index 100%
rename from system/ulib/minfs/fsck.cpp
rename to zircon/system/ulib/minfs/fsck.cpp
diff --git a/system/ulib/minfs/host.cpp b/zircon/system/ulib/minfs/host.cpp
similarity index 100%
rename from system/ulib/minfs/host.cpp
rename to zircon/system/ulib/minfs/host.cpp
diff --git a/system/ulib/minfs/include/minfs/allocator.h b/zircon/system/ulib/minfs/include/minfs/allocator.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/allocator.h
rename to zircon/system/ulib/minfs/include/minfs/allocator.h
diff --git a/system/ulib/minfs/include/minfs/bcache.h b/zircon/system/ulib/minfs/include/minfs/bcache.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/bcache.h
rename to zircon/system/ulib/minfs/include/minfs/bcache.h
diff --git a/system/ulib/minfs/include/minfs/block-txn.h b/zircon/system/ulib/minfs/include/minfs/block-txn.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/block-txn.h
rename to zircon/system/ulib/minfs/include/minfs/block-txn.h
diff --git a/system/ulib/minfs/include/minfs/format.h b/zircon/system/ulib/minfs/include/minfs/format.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/format.h
rename to zircon/system/ulib/minfs/include/minfs/format.h
diff --git a/system/ulib/minfs/include/minfs/fsck.h b/zircon/system/ulib/minfs/include/minfs/fsck.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/fsck.h
rename to zircon/system/ulib/minfs/include/minfs/fsck.h
diff --git a/system/ulib/minfs/include/minfs/host.h b/zircon/system/ulib/minfs/include/minfs/host.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/host.h
rename to zircon/system/ulib/minfs/include/minfs/host.h
diff --git a/system/ulib/minfs/include/minfs/inode-manager.h b/zircon/system/ulib/minfs/include/minfs/inode-manager.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/inode-manager.h
rename to zircon/system/ulib/minfs/include/minfs/inode-manager.h
diff --git a/system/ulib/minfs/include/minfs/minfs.h b/zircon/system/ulib/minfs/include/minfs/minfs.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/minfs.h
rename to zircon/system/ulib/minfs/include/minfs/minfs.h
diff --git a/system/ulib/minfs/include/minfs/superblock.h b/zircon/system/ulib/minfs/include/minfs/superblock.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/superblock.h
rename to zircon/system/ulib/minfs/include/minfs/superblock.h
diff --git a/system/ulib/minfs/include/minfs/transaction-limits.h b/zircon/system/ulib/minfs/include/minfs/transaction-limits.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/transaction-limits.h
rename to zircon/system/ulib/minfs/include/minfs/transaction-limits.h
diff --git a/system/ulib/minfs/include/minfs/writeback.h b/zircon/system/ulib/minfs/include/minfs/writeback.h
similarity index 100%
rename from system/ulib/minfs/include/minfs/writeback.h
rename to zircon/system/ulib/minfs/include/minfs/writeback.h
diff --git a/system/ulib/minfs/inode-manager.cpp b/zircon/system/ulib/minfs/inode-manager.cpp
similarity index 100%
rename from system/ulib/minfs/inode-manager.cpp
rename to zircon/system/ulib/minfs/inode-manager.cpp
diff --git a/system/ulib/minfs/minfs-private.h b/zircon/system/ulib/minfs/minfs-private.h
similarity index 100%
rename from system/ulib/minfs/minfs-private.h
rename to zircon/system/ulib/minfs/minfs-private.h
diff --git a/system/ulib/minfs/minfs.cpp b/zircon/system/ulib/minfs/minfs.cpp
similarity index 100%
rename from system/ulib/minfs/minfs.cpp
rename to zircon/system/ulib/minfs/minfs.cpp
diff --git a/system/ulib/minfs/rules.mk b/zircon/system/ulib/minfs/rules.mk
similarity index 100%
rename from system/ulib/minfs/rules.mk
rename to zircon/system/ulib/minfs/rules.mk
diff --git a/system/ulib/minfs/superblock.cpp b/zircon/system/ulib/minfs/superblock.cpp
similarity index 100%
rename from system/ulib/minfs/superblock.cpp
rename to zircon/system/ulib/minfs/superblock.cpp
diff --git a/system/ulib/minfs/transaction-limits.cpp b/zircon/system/ulib/minfs/transaction-limits.cpp
similarity index 100%
rename from system/ulib/minfs/transaction-limits.cpp
rename to zircon/system/ulib/minfs/transaction-limits.cpp
diff --git a/system/ulib/minfs/vnode.cpp b/zircon/system/ulib/minfs/vnode.cpp
similarity index 100%
rename from system/ulib/minfs/vnode.cpp
rename to zircon/system/ulib/minfs/vnode.cpp
diff --git a/system/ulib/minfs/writeback.cpp b/zircon/system/ulib/minfs/writeback.cpp
similarity index 100%
rename from system/ulib/minfs/writeback.cpp
rename to zircon/system/ulib/minfs/writeback.cpp
diff --git a/system/ulib/mini-process/include/mini-process/mini-process.h b/zircon/system/ulib/mini-process/include/mini-process/mini-process.h
similarity index 100%
rename from system/ulib/mini-process/include/mini-process/mini-process.h
rename to zircon/system/ulib/mini-process/include/mini-process/mini-process.h
diff --git a/system/ulib/mini-process/mini-process.c b/zircon/system/ulib/mini-process/mini-process.c
similarity index 100%
rename from system/ulib/mini-process/mini-process.c
rename to zircon/system/ulib/mini-process/mini-process.c
diff --git a/system/ulib/mini-process/rules.mk b/zircon/system/ulib/mini-process/rules.mk
similarity index 100%
rename from system/ulib/mini-process/rules.mk
rename to zircon/system/ulib/mini-process/rules.mk
diff --git a/system/ulib/mini-process/subprocess.c b/zircon/system/ulib/mini-process/subprocess.c
similarity index 100%
rename from system/ulib/mini-process/subprocess.c
rename to zircon/system/ulib/mini-process/subprocess.c
diff --git a/system/ulib/mini-process/subprocess.h b/zircon/system/ulib/mini-process/subprocess.h
similarity index 100%
rename from system/ulib/mini-process/subprocess.h
rename to zircon/system/ulib/mini-process/subprocess.h
diff --git a/system/ulib/pci/MAINTAINERS b/zircon/system/ulib/pci/MAINTAINERS
similarity index 100%
rename from system/ulib/pci/MAINTAINERS
rename to zircon/system/ulib/pci/MAINTAINERS
diff --git a/system/ulib/pci/include/pci/pio.h b/zircon/system/ulib/pci/include/pci/pio.h
similarity index 100%
rename from system/ulib/pci/include/pci/pio.h
rename to zircon/system/ulib/pci/include/pci/pio.h
diff --git a/system/ulib/pci/pio.cpp b/zircon/system/ulib/pci/pio.cpp
similarity index 100%
rename from system/ulib/pci/pio.cpp
rename to zircon/system/ulib/pci/pio.cpp
diff --git a/system/ulib/pci/rules.mk b/zircon/system/ulib/pci/rules.mk
similarity index 100%
rename from system/ulib/pci/rules.mk
rename to zircon/system/ulib/pci/rules.mk
diff --git a/system/ulib/perftest/README.md b/zircon/system/ulib/perftest/README.md
similarity index 100%
rename from system/ulib/perftest/README.md
rename to zircon/system/ulib/perftest/README.md
diff --git a/system/ulib/perftest/include/perftest/perftest.h b/zircon/system/ulib/perftest/include/perftest/perftest.h
similarity index 100%
rename from system/ulib/perftest/include/perftest/perftest.h
rename to zircon/system/ulib/perftest/include/perftest/perftest.h
diff --git a/system/ulib/perftest/include/perftest/results.h b/zircon/system/ulib/perftest/include/perftest/results.h
similarity index 100%
rename from system/ulib/perftest/include/perftest/results.h
rename to zircon/system/ulib/perftest/include/perftest/results.h
diff --git a/system/ulib/perftest/include/perftest/runner.h b/zircon/system/ulib/perftest/include/perftest/runner.h
similarity index 100%
rename from system/ulib/perftest/include/perftest/runner.h
rename to zircon/system/ulib/perftest/include/perftest/runner.h
diff --git a/system/ulib/perftest/performance-results-schema.json b/zircon/system/ulib/perftest/performance-results-schema.json
similarity index 100%
rename from system/ulib/perftest/performance-results-schema.json
rename to zircon/system/ulib/perftest/performance-results-schema.json
diff --git a/system/ulib/perftest/results.cpp b/zircon/system/ulib/perftest/results.cpp
similarity index 100%
rename from system/ulib/perftest/results.cpp
rename to zircon/system/ulib/perftest/results.cpp
diff --git a/system/ulib/perftest/rules.mk b/zircon/system/ulib/perftest/rules.mk
similarity index 100%
rename from system/ulib/perftest/rules.mk
rename to zircon/system/ulib/perftest/rules.mk
diff --git a/system/ulib/perftest/runner.cpp b/zircon/system/ulib/perftest/runner.cpp
similarity index 100%
rename from system/ulib/perftest/runner.cpp
rename to zircon/system/ulib/perftest/runner.cpp
diff --git a/system/ulib/port/include/port/port.h b/zircon/system/ulib/port/include/port/port.h
similarity index 100%
rename from system/ulib/port/include/port/port.h
rename to zircon/system/ulib/port/include/port/port.h
diff --git a/system/ulib/port/port.c b/zircon/system/ulib/port/port.c
similarity index 100%
rename from system/ulib/port/port.c
rename to zircon/system/ulib/port/port.c
diff --git a/system/ulib/port/rules.mk b/zircon/system/ulib/port/rules.mk
similarity index 100%
rename from system/ulib/port/rules.mk
rename to zircon/system/ulib/port/rules.mk
diff --git a/system/ulib/pretty/hexdump.c b/zircon/system/ulib/pretty/hexdump.c
similarity index 100%
rename from system/ulib/pretty/hexdump.c
rename to zircon/system/ulib/pretty/hexdump.c
diff --git a/system/ulib/pretty/include/pretty/hexdump.h b/zircon/system/ulib/pretty/include/pretty/hexdump.h
similarity index 100%
rename from system/ulib/pretty/include/pretty/hexdump.h
rename to zircon/system/ulib/pretty/include/pretty/hexdump.h
diff --git a/system/ulib/pretty/include/pretty/sizes.h b/zircon/system/ulib/pretty/include/pretty/sizes.h
similarity index 100%
rename from system/ulib/pretty/include/pretty/sizes.h
rename to zircon/system/ulib/pretty/include/pretty/sizes.h
diff --git a/system/ulib/pretty/rules.mk b/zircon/system/ulib/pretty/rules.mk
similarity index 100%
rename from system/ulib/pretty/rules.mk
rename to zircon/system/ulib/pretty/rules.mk
diff --git a/system/ulib/pretty/sizes.c b/zircon/system/ulib/pretty/sizes.c
similarity index 100%
rename from system/ulib/pretty/sizes.c
rename to zircon/system/ulib/pretty/sizes.c
diff --git a/system/ulib/pretty/test.c b/zircon/system/ulib/pretty/test.c
similarity index 100%
rename from system/ulib/pretty/test.c
rename to zircon/system/ulib/pretty/test.c
diff --git a/system/ulib/process-launcher/MAINTAINERS b/zircon/system/ulib/process-launcher/MAINTAINERS
similarity index 100%
rename from system/ulib/process-launcher/MAINTAINERS
rename to zircon/system/ulib/process-launcher/MAINTAINERS
diff --git a/system/ulib/process-launcher/include/lib/process-launcher/launcher.h b/zircon/system/ulib/process-launcher/include/lib/process-launcher/launcher.h
similarity index 100%
rename from system/ulib/process-launcher/include/lib/process-launcher/launcher.h
rename to zircon/system/ulib/process-launcher/include/lib/process-launcher/launcher.h
diff --git a/system/ulib/process-launcher/launcher.cpp b/zircon/system/ulib/process-launcher/launcher.cpp
similarity index 100%
rename from system/ulib/process-launcher/launcher.cpp
rename to zircon/system/ulib/process-launcher/launcher.cpp
diff --git a/system/ulib/process-launcher/launcher.h b/zircon/system/ulib/process-launcher/launcher.h
similarity index 100%
rename from system/ulib/process-launcher/launcher.h
rename to zircon/system/ulib/process-launcher/launcher.h
diff --git a/system/ulib/process-launcher/provider.cpp b/zircon/system/ulib/process-launcher/provider.cpp
similarity index 100%
rename from system/ulib/process-launcher/provider.cpp
rename to zircon/system/ulib/process-launcher/provider.cpp
diff --git a/system/ulib/process-launcher/rules.mk b/zircon/system/ulib/process-launcher/rules.mk
similarity index 100%
rename from system/ulib/process-launcher/rules.mk
rename to zircon/system/ulib/process-launcher/rules.mk
diff --git a/system/ulib/profile/include/lib/profile/profile.h b/zircon/system/ulib/profile/include/lib/profile/profile.h
similarity index 100%
rename from system/ulib/profile/include/lib/profile/profile.h
rename to zircon/system/ulib/profile/include/lib/profile/profile.h
diff --git a/system/ulib/profile/profile.cpp b/zircon/system/ulib/profile/profile.cpp
similarity index 100%
rename from system/ulib/profile/profile.cpp
rename to zircon/system/ulib/profile/profile.cpp
diff --git a/system/ulib/profile/rules.mk b/zircon/system/ulib/profile/rules.mk
similarity index 100%
rename from system/ulib/profile/rules.mk
rename to zircon/system/ulib/profile/rules.mk
diff --git a/system/ulib/region-alloc/include/region-alloc/region-alloc.h b/zircon/system/ulib/region-alloc/include/region-alloc/region-alloc.h
similarity index 100%
rename from system/ulib/region-alloc/include/region-alloc/region-alloc.h
rename to zircon/system/ulib/region-alloc/include/region-alloc/region-alloc.h
diff --git a/system/ulib/region-alloc/region-alloc-c-api.cpp b/zircon/system/ulib/region-alloc/region-alloc-c-api.cpp
similarity index 100%
rename from system/ulib/region-alloc/region-alloc-c-api.cpp
rename to zircon/system/ulib/region-alloc/region-alloc-c-api.cpp
diff --git a/system/ulib/region-alloc/region-alloc.cpp b/zircon/system/ulib/region-alloc/region-alloc.cpp
similarity index 100%
rename from system/ulib/region-alloc/region-alloc.cpp
rename to zircon/system/ulib/region-alloc/region-alloc.cpp
diff --git a/system/ulib/region-alloc/rules.mk b/zircon/system/ulib/region-alloc/rules.mk
similarity index 100%
rename from system/ulib/region-alloc/rules.mk
rename to zircon/system/ulib/region-alloc/rules.mk
diff --git a/system/ulib/rtc/include/librtc.h b/zircon/system/ulib/rtc/include/librtc.h
similarity index 100%
rename from system/ulib/rtc/include/librtc.h
rename to zircon/system/ulib/rtc/include/librtc.h
diff --git a/system/ulib/rtc/librtc.c b/zircon/system/ulib/rtc/librtc.c
similarity index 100%
rename from system/ulib/rtc/librtc.c
rename to zircon/system/ulib/rtc/librtc.c
diff --git a/system/ulib/rtc/rules.mk b/zircon/system/ulib/rtc/rules.mk
similarity index 100%
rename from system/ulib/rtc/rules.mk
rename to zircon/system/ulib/rtc/rules.mk
diff --git a/system/ulib/runtests-utils/README.md b/zircon/system/ulib/runtests-utils/README.md
similarity index 100%
rename from system/ulib/runtests-utils/README.md
rename to zircon/system/ulib/runtests-utils/README.md
diff --git a/system/ulib/runtests-utils/discover-and-run-tests.cpp b/zircon/system/ulib/runtests-utils/discover-and-run-tests.cpp
similarity index 100%
rename from system/ulib/runtests-utils/discover-and-run-tests.cpp
rename to zircon/system/ulib/runtests-utils/discover-and-run-tests.cpp
diff --git a/system/ulib/runtests-utils/fuchsia-run-test.cpp b/zircon/system/ulib/runtests-utils/fuchsia-run-test.cpp
similarity index 100%
rename from system/ulib/runtests-utils/fuchsia-run-test.cpp
rename to zircon/system/ulib/runtests-utils/fuchsia-run-test.cpp
diff --git a/system/ulib/runtests-utils/include/runtests-utils/fuchsia-run-test.h b/zircon/system/ulib/runtests-utils/include/runtests-utils/fuchsia-run-test.h
similarity index 100%
rename from system/ulib/runtests-utils/include/runtests-utils/fuchsia-run-test.h
rename to zircon/system/ulib/runtests-utils/include/runtests-utils/fuchsia-run-test.h
diff --git a/system/ulib/runtests-utils/include/runtests-utils/log-exporter.h b/zircon/system/ulib/runtests-utils/include/runtests-utils/log-exporter.h
similarity index 100%
rename from system/ulib/runtests-utils/include/runtests-utils/log-exporter.h
rename to zircon/system/ulib/runtests-utils/include/runtests-utils/log-exporter.h
diff --git a/system/ulib/runtests-utils/include/runtests-utils/posix-run-test.h b/zircon/system/ulib/runtests-utils/include/runtests-utils/posix-run-test.h
similarity index 100%
rename from system/ulib/runtests-utils/include/runtests-utils/posix-run-test.h
rename to zircon/system/ulib/runtests-utils/include/runtests-utils/posix-run-test.h
diff --git a/system/ulib/runtests-utils/include/runtests-utils/runtests-utils.h b/zircon/system/ulib/runtests-utils/include/runtests-utils/runtests-utils.h
similarity index 100%
rename from system/ulib/runtests-utils/include/runtests-utils/runtests-utils.h
rename to zircon/system/ulib/runtests-utils/include/runtests-utils/runtests-utils.h
diff --git a/system/ulib/runtests-utils/log-exporter.cpp b/zircon/system/ulib/runtests-utils/log-exporter.cpp
similarity index 100%
rename from system/ulib/runtests-utils/log-exporter.cpp
rename to zircon/system/ulib/runtests-utils/log-exporter.cpp
diff --git a/system/ulib/runtests-utils/posix-run-test.cpp b/zircon/system/ulib/runtests-utils/posix-run-test.cpp
similarity index 100%
rename from system/ulib/runtests-utils/posix-run-test.cpp
rename to zircon/system/ulib/runtests-utils/posix-run-test.cpp
diff --git a/system/ulib/runtests-utils/rules.mk b/zircon/system/ulib/runtests-utils/rules.mk
similarity index 100%
rename from system/ulib/runtests-utils/rules.mk
rename to zircon/system/ulib/runtests-utils/rules.mk
diff --git a/system/ulib/runtests-utils/runtests-utils.cpp b/zircon/system/ulib/runtests-utils/runtests-utils.cpp
similarity index 100%
rename from system/ulib/runtests-utils/runtests-utils.cpp
rename to zircon/system/ulib/runtests-utils/runtests-utils.cpp
diff --git a/system/ulib/runtests-utils/summary-schema.json b/zircon/system/ulib/runtests-utils/summary-schema.json
similarity index 100%
rename from system/ulib/runtests-utils/summary-schema.json
rename to zircon/system/ulib/runtests-utils/summary-schema.json
diff --git a/system/ulib/runtime/include/runtime/message.h b/zircon/system/ulib/runtime/include/runtime/message.h
similarity index 100%
rename from system/ulib/runtime/include/runtime/message.h
rename to zircon/system/ulib/runtime/include/runtime/message.h
diff --git a/system/ulib/runtime/include/runtime/processargs.h b/zircon/system/ulib/runtime/include/runtime/processargs.h
similarity index 100%
rename from system/ulib/runtime/include/runtime/processargs.h
rename to zircon/system/ulib/runtime/include/runtime/processargs.h
diff --git a/system/ulib/runtime/include/runtime/thread.h b/zircon/system/ulib/runtime/include/runtime/thread.h
similarity index 100%
rename from system/ulib/runtime/include/runtime/thread.h
rename to zircon/system/ulib/runtime/include/runtime/thread.h
diff --git a/system/ulib/runtime/include/runtime/tls.h b/zircon/system/ulib/runtime/include/runtime/tls.h
similarity index 100%
rename from system/ulib/runtime/include/runtime/tls.h
rename to zircon/system/ulib/runtime/include/runtime/tls.h
diff --git a/system/ulib/runtime/message.c b/zircon/system/ulib/runtime/message.c
similarity index 100%
rename from system/ulib/runtime/message.c
rename to zircon/system/ulib/runtime/message.c
diff --git a/system/ulib/runtime/processargs.c b/zircon/system/ulib/runtime/processargs.c
similarity index 100%
rename from system/ulib/runtime/processargs.c
rename to zircon/system/ulib/runtime/processargs.c
diff --git a/system/ulib/runtime/rules.mk b/zircon/system/ulib/runtime/rules.mk
similarity index 100%
rename from system/ulib/runtime/rules.mk
rename to zircon/system/ulib/runtime/rules.mk
diff --git a/system/ulib/runtime/thread.c b/zircon/system/ulib/runtime/thread.c
similarity index 100%
rename from system/ulib/runtime/thread.c
rename to zircon/system/ulib/runtime/thread.c
diff --git a/system/ulib/simplehid/empty.c b/zircon/system/ulib/simplehid/empty.c
similarity index 100%
rename from system/ulib/simplehid/empty.c
rename to zircon/system/ulib/simplehid/empty.c
diff --git a/system/ulib/simplehid/include/lib/simplehid/simplehid.h b/zircon/system/ulib/simplehid/include/lib/simplehid/simplehid.h
similarity index 100%
rename from system/ulib/simplehid/include/lib/simplehid/simplehid.h
rename to zircon/system/ulib/simplehid/include/lib/simplehid/simplehid.h
diff --git a/system/ulib/simplehid/rules.mk b/zircon/system/ulib/simplehid/rules.mk
similarity index 100%
rename from system/ulib/simplehid/rules.mk
rename to zircon/system/ulib/simplehid/rules.mk
diff --git a/system/ulib/simplehid/test/simplehid-test.cpp b/zircon/system/ulib/simplehid/test/simplehid-test.cpp
similarity index 100%
rename from system/ulib/simplehid/test/simplehid-test.cpp
rename to zircon/system/ulib/simplehid/test/simplehid-test.cpp
diff --git a/system/ulib/smbios/include/lib/smbios/smbios.h b/zircon/system/ulib/smbios/include/lib/smbios/smbios.h
similarity index 100%
rename from system/ulib/smbios/include/lib/smbios/smbios.h
rename to zircon/system/ulib/smbios/include/lib/smbios/smbios.h
diff --git a/system/ulib/smbios/rules.mk b/zircon/system/ulib/smbios/rules.mk
similarity index 100%
rename from system/ulib/smbios/rules.mk
rename to zircon/system/ulib/smbios/rules.mk
diff --git a/system/ulib/smbios/smbios.cpp b/zircon/system/ulib/smbios/smbios.cpp
similarity index 100%
rename from system/ulib/smbios/smbios.cpp
rename to zircon/system/ulib/smbios/smbios.cpp
diff --git a/system/ulib/svc/MAINTAINERS b/zircon/system/ulib/svc/MAINTAINERS
similarity index 100%
rename from system/ulib/svc/MAINTAINERS
rename to zircon/system/ulib/svc/MAINTAINERS
diff --git a/system/ulib/svc/include/lib/svc/outgoing.h b/zircon/system/ulib/svc/include/lib/svc/outgoing.h
similarity index 100%
rename from system/ulib/svc/include/lib/svc/outgoing.h
rename to zircon/system/ulib/svc/include/lib/svc/outgoing.h
diff --git a/system/ulib/svc/include/lib/svc/service.h b/zircon/system/ulib/svc/include/lib/svc/service.h
similarity index 100%
rename from system/ulib/svc/include/lib/svc/service.h
rename to zircon/system/ulib/svc/include/lib/svc/service.h
diff --git a/system/ulib/svc/outgoing.cpp b/zircon/system/ulib/svc/outgoing.cpp
similarity index 100%
rename from system/ulib/svc/outgoing.cpp
rename to zircon/system/ulib/svc/outgoing.cpp
diff --git a/system/ulib/svc/rules.mk b/zircon/system/ulib/svc/rules.mk
similarity index 100%
rename from system/ulib/svc/rules.mk
rename to zircon/system/ulib/svc/rules.mk
diff --git a/system/ulib/sync/README.md b/zircon/system/ulib/sync/README.md
similarity index 100%
rename from system/ulib/sync/README.md
rename to zircon/system/ulib/sync/README.md
diff --git a/system/ulib/sync/completion.c b/zircon/system/ulib/sync/completion.c
similarity index 100%
rename from system/ulib/sync/completion.c
rename to zircon/system/ulib/sync/completion.c
diff --git a/system/ulib/sync/condition.cpp b/zircon/system/ulib/sync/condition.cpp
similarity index 100%
rename from system/ulib/sync/condition.cpp
rename to zircon/system/ulib/sync/condition.cpp
diff --git a/system/ulib/sync/include/lib/sync/completion.h b/zircon/system/ulib/sync/include/lib/sync/completion.h
similarity index 100%
rename from system/ulib/sync/include/lib/sync/completion.h
rename to zircon/system/ulib/sync/include/lib/sync/completion.h
diff --git a/system/ulib/sync/include/lib/sync/condition.h b/zircon/system/ulib/sync/include/lib/sync/condition.h
similarity index 100%
rename from system/ulib/sync/include/lib/sync/condition.h
rename to zircon/system/ulib/sync/include/lib/sync/condition.h
diff --git a/system/ulib/sync/include/lib/sync/internal/condition-template.h b/zircon/system/ulib/sync/include/lib/sync/internal/condition-template.h
similarity index 100%
rename from system/ulib/sync/include/lib/sync/internal/condition-template.h
rename to zircon/system/ulib/sync/include/lib/sync/internal/condition-template.h
diff --git a/system/ulib/sync/include/lib/sync/mutex.h b/zircon/system/ulib/sync/include/lib/sync/mutex.h
similarity index 100%
rename from system/ulib/sync/include/lib/sync/mutex.h
rename to zircon/system/ulib/sync/include/lib/sync/mutex.h
diff --git a/system/ulib/sync/mutex.c b/zircon/system/ulib/sync/mutex.c
similarity index 100%
rename from system/ulib/sync/mutex.c
rename to zircon/system/ulib/sync/mutex.c
diff --git a/system/ulib/sync/rules.mk b/zircon/system/ulib/sync/rules.mk
similarity index 100%
rename from system/ulib/sync/rules.mk
rename to zircon/system/ulib/sync/rules.mk
diff --git a/system/ulib/syslog/README.md b/zircon/system/ulib/syslog/README.md
similarity index 100%
rename from system/ulib/syslog/README.md
rename to zircon/system/ulib/syslog/README.md
diff --git a/system/ulib/syslog/fx_logger.cpp b/zircon/system/ulib/syslog/fx_logger.cpp
similarity index 100%
rename from system/ulib/syslog/fx_logger.cpp
rename to zircon/system/ulib/syslog/fx_logger.cpp
diff --git a/system/ulib/syslog/fx_logger.h b/zircon/system/ulib/syslog/fx_logger.h
similarity index 100%
rename from system/ulib/syslog/fx_logger.h
rename to zircon/system/ulib/syslog/fx_logger.h
diff --git a/system/ulib/syslog/global.cpp b/zircon/system/ulib/syslog/global.cpp
similarity index 100%
rename from system/ulib/syslog/global.cpp
rename to zircon/system/ulib/syslog/global.cpp
diff --git a/system/ulib/syslog/include/lib/syslog/global.h b/zircon/system/ulib/syslog/include/lib/syslog/global.h
similarity index 100%
rename from system/ulib/syslog/include/lib/syslog/global.h
rename to zircon/system/ulib/syslog/include/lib/syslog/global.h
diff --git a/system/ulib/syslog/include/lib/syslog/logger.h b/zircon/system/ulib/syslog/include/lib/syslog/logger.h
similarity index 100%
rename from system/ulib/syslog/include/lib/syslog/logger.h
rename to zircon/system/ulib/syslog/include/lib/syslog/logger.h
diff --git a/system/ulib/syslog/include/lib/syslog/wire_format.h b/zircon/system/ulib/syslog/include/lib/syslog/wire_format.h
similarity index 100%
rename from system/ulib/syslog/include/lib/syslog/wire_format.h
rename to zircon/system/ulib/syslog/include/lib/syslog/wire_format.h
diff --git a/system/ulib/syslog/logger.cpp b/zircon/system/ulib/syslog/logger.cpp
similarity index 100%
rename from system/ulib/syslog/logger.cpp
rename to zircon/system/ulib/syslog/logger.cpp
diff --git a/system/ulib/syslog/rules.mk b/zircon/system/ulib/syslog/rules.mk
similarity index 100%
rename from system/ulib/syslog/rules.mk
rename to zircon/system/ulib/syslog/rules.mk
diff --git a/system/ulib/sysmem-connector/include/lib/sysmem-connector/sysmem-connector.h b/zircon/system/ulib/sysmem-connector/include/lib/sysmem-connector/sysmem-connector.h
similarity index 100%
rename from system/ulib/sysmem-connector/include/lib/sysmem-connector/sysmem-connector.h
rename to zircon/system/ulib/sysmem-connector/include/lib/sysmem-connector/sysmem-connector.h
diff --git a/system/ulib/sysmem-connector/rules.mk b/zircon/system/ulib/sysmem-connector/rules.mk
similarity index 100%
rename from system/ulib/sysmem-connector/rules.mk
rename to zircon/system/ulib/sysmem-connector/rules.mk
diff --git a/system/ulib/sysmem-connector/sysmem-connector.cpp b/zircon/system/ulib/sysmem-connector/sysmem-connector.cpp
similarity index 100%
rename from system/ulib/sysmem-connector/sysmem-connector.cpp
rename to zircon/system/ulib/sysmem-connector/sysmem-connector.cpp
diff --git a/system/ulib/sysmem/include/lib/sysmem/sysmem.h b/zircon/system/ulib/sysmem/include/lib/sysmem/sysmem.h
similarity index 100%
rename from system/ulib/sysmem/include/lib/sysmem/sysmem.h
rename to zircon/system/ulib/sysmem/include/lib/sysmem/sysmem.h
diff --git a/system/ulib/sysmem/rules.mk b/zircon/system/ulib/sysmem/rules.mk
similarity index 100%
rename from system/ulib/sysmem/rules.mk
rename to zircon/system/ulib/sysmem/rules.mk
diff --git a/system/ulib/sysmem/sysmem.cpp b/zircon/system/ulib/sysmem/sysmem.cpp
similarity index 100%
rename from system/ulib/sysmem/sysmem.cpp
rename to zircon/system/ulib/sysmem/sysmem.cpp
diff --git a/system/ulib/task-utils/get.c b/zircon/system/ulib/task-utils/get.c
similarity index 100%
rename from system/ulib/task-utils/get.c
rename to zircon/system/ulib/task-utils/get.c
diff --git a/system/ulib/task-utils/include/task-utils/get.h b/zircon/system/ulib/task-utils/include/task-utils/get.h
similarity index 100%
rename from system/ulib/task-utils/include/task-utils/get.h
rename to zircon/system/ulib/task-utils/include/task-utils/get.h
diff --git a/system/ulib/task-utils/include/task-utils/walker.h b/zircon/system/ulib/task-utils/include/task-utils/walker.h
similarity index 100%
rename from system/ulib/task-utils/include/task-utils/walker.h
rename to zircon/system/ulib/task-utils/include/task-utils/walker.h
diff --git a/system/ulib/task-utils/rules.mk b/zircon/system/ulib/task-utils/rules.mk
similarity index 100%
rename from system/ulib/task-utils/rules.mk
rename to zircon/system/ulib/task-utils/rules.mk
diff --git a/system/ulib/task-utils/walker.cpp b/zircon/system/ulib/task-utils/walker.cpp
similarity index 100%
rename from system/ulib/task-utils/walker.cpp
rename to zircon/system/ulib/task-utils/walker.cpp
diff --git a/system/ulib/tee-client-api/README.md b/zircon/system/ulib/tee-client-api/README.md
similarity index 100%
rename from system/ulib/tee-client-api/README.md
rename to zircon/system/ulib/tee-client-api/README.md
diff --git a/system/ulib/tee-client-api/include/tee-client-api/tee-client-impl.h b/zircon/system/ulib/tee-client-api/include/tee-client-api/tee-client-impl.h
similarity index 100%
rename from system/ulib/tee-client-api/include/tee-client-api/tee-client-impl.h
rename to zircon/system/ulib/tee-client-api/include/tee-client-api/tee-client-impl.h
diff --git a/system/ulib/tee-client-api/include/tee-client-api/tee-client-types.h b/zircon/system/ulib/tee-client-api/include/tee-client-api/tee-client-types.h
similarity index 100%
rename from system/ulib/tee-client-api/include/tee-client-api/tee-client-types.h
rename to zircon/system/ulib/tee-client-api/include/tee-client-api/tee-client-types.h
diff --git a/system/ulib/tee-client-api/include/tee-client-api/tee_client_api.h b/zircon/system/ulib/tee-client-api/include/tee-client-api/tee_client_api.h
similarity index 100%
rename from system/ulib/tee-client-api/include/tee-client-api/tee_client_api.h
rename to zircon/system/ulib/tee-client-api/include/tee-client-api/tee_client_api.h
diff --git a/system/ulib/tee-client-api/rules.mk b/zircon/system/ulib/tee-client-api/rules.mk
similarity index 100%
rename from system/ulib/tee-client-api/rules.mk
rename to zircon/system/ulib/tee-client-api/rules.mk
diff --git a/system/ulib/tee-client-api/tee-client-api.c b/zircon/system/ulib/tee-client-api/tee-client-api.c
similarity index 100%
rename from system/ulib/tee-client-api/tee-client-api.c
rename to zircon/system/ulib/tee-client-api/tee-client-api.c
diff --git a/system/ulib/test-utils/README.md b/zircon/system/ulib/test-utils/README.md
similarity index 100%
rename from system/ulib/test-utils/README.md
rename to zircon/system/ulib/test-utils/README.md
diff --git a/system/ulib/test-utils/include/test-utils/test-utils.h b/zircon/system/ulib/test-utils/include/test-utils/test-utils.h
similarity index 100%
rename from system/ulib/test-utils/include/test-utils/test-utils.h
rename to zircon/system/ulib/test-utils/include/test-utils/test-utils.h
diff --git a/system/ulib/test-utils/rules.mk b/zircon/system/ulib/test-utils/rules.mk
similarity index 100%
rename from system/ulib/test-utils/rules.mk
rename to zircon/system/ulib/test-utils/rules.mk
diff --git a/system/ulib/test-utils/test-utils.c b/zircon/system/ulib/test-utils/test-utils.c
similarity index 100%
rename from system/ulib/test-utils/test-utils.c
rename to zircon/system/ulib/test-utils/test-utils.c
diff --git a/system/ulib/tftp/include/tftp/tftp.h b/zircon/system/ulib/tftp/include/tftp/tftp.h
similarity index 100%
rename from system/ulib/tftp/include/tftp/tftp.h
rename to zircon/system/ulib/tftp/include/tftp/tftp.h
diff --git a/system/ulib/tftp/internal.h b/zircon/system/ulib/tftp/internal.h
similarity index 100%
rename from system/ulib/tftp/internal.h
rename to zircon/system/ulib/tftp/internal.h
diff --git a/system/ulib/tftp/rules.mk b/zircon/system/ulib/tftp/rules.mk
similarity index 100%
rename from system/ulib/tftp/rules.mk
rename to zircon/system/ulib/tftp/rules.mk
diff --git a/system/ulib/tftp/tftp-example.c b/zircon/system/ulib/tftp/tftp-example.c
similarity index 100%
rename from system/ulib/tftp/tftp-example.c
rename to zircon/system/ulib/tftp/tftp-example.c
diff --git a/system/ulib/tftp/tftp-file-test.cpp b/zircon/system/ulib/tftp/tftp-file-test.cpp
similarity index 100%
rename from system/ulib/tftp/tftp-file-test.cpp
rename to zircon/system/ulib/tftp/tftp-file-test.cpp
diff --git a/system/ulib/tftp/tftp-fuzztest.cpp b/zircon/system/ulib/tftp/tftp-fuzztest.cpp
similarity index 100%
rename from system/ulib/tftp/tftp-fuzztest.cpp
rename to zircon/system/ulib/tftp/tftp-fuzztest.cpp
diff --git a/system/ulib/tftp/tftp-test.cpp b/zircon/system/ulib/tftp/tftp-test.cpp
similarity index 100%
rename from system/ulib/tftp/tftp-test.cpp
rename to zircon/system/ulib/tftp/tftp-test.cpp
diff --git a/system/ulib/tftp/tftp.c b/zircon/system/ulib/tftp/tftp.c
similarity index 100%
rename from system/ulib/tftp/tftp.c
rename to zircon/system/ulib/tftp/tftp.c
diff --git a/system/ulib/trace-engine/MAINTAINERS b/zircon/system/ulib/trace-engine/MAINTAINERS
similarity index 100%
rename from system/ulib/trace-engine/MAINTAINERS
rename to zircon/system/ulib/trace-engine/MAINTAINERS
diff --git a/system/ulib/trace-engine/README.md b/zircon/system/ulib/trace-engine/README.md
similarity index 100%
rename from system/ulib/trace-engine/README.md
rename to zircon/system/ulib/trace-engine/README.md
diff --git a/system/ulib/trace-engine/context.cpp b/zircon/system/ulib/trace-engine/context.cpp
similarity index 100%
rename from system/ulib/trace-engine/context.cpp
rename to zircon/system/ulib/trace-engine/context.cpp
diff --git a/system/ulib/trace-engine/context_api.cpp b/zircon/system/ulib/trace-engine/context_api.cpp
similarity index 100%
rename from system/ulib/trace-engine/context_api.cpp
rename to zircon/system/ulib/trace-engine/context_api.cpp
diff --git a/system/ulib/trace-engine/context_impl.h b/zircon/system/ulib/trace-engine/context_impl.h
similarity index 100%
rename from system/ulib/trace-engine/context_impl.h
rename to zircon/system/ulib/trace-engine/context_impl.h
diff --git a/system/ulib/trace-engine/ddk-disabled-exports.ld b/zircon/system/ulib/trace-engine/ddk-disabled-exports.ld
similarity index 100%
rename from system/ulib/trace-engine/ddk-disabled-exports.ld
rename to zircon/system/ulib/trace-engine/ddk-disabled-exports.ld
diff --git a/system/ulib/trace-engine/ddk-exports.ld b/zircon/system/ulib/trace-engine/ddk-exports.ld
similarity index 100%
rename from system/ulib/trace-engine/ddk-exports.ld
rename to zircon/system/ulib/trace-engine/ddk-exports.ld
diff --git a/system/ulib/trace-engine/engine.cpp b/zircon/system/ulib/trace-engine/engine.cpp
similarity index 100%
rename from system/ulib/trace-engine/engine.cpp
rename to zircon/system/ulib/trace-engine/engine.cpp
diff --git a/system/ulib/trace-engine/include/trace-engine/buffer_internal.h b/zircon/system/ulib/trace-engine/include/trace-engine/buffer_internal.h
similarity index 100%
rename from system/ulib/trace-engine/include/trace-engine/buffer_internal.h
rename to zircon/system/ulib/trace-engine/include/trace-engine/buffer_internal.h
diff --git a/system/ulib/trace-engine/include/trace-engine/context.h b/zircon/system/ulib/trace-engine/include/trace-engine/context.h
similarity index 100%
rename from system/ulib/trace-engine/include/trace-engine/context.h
rename to zircon/system/ulib/trace-engine/include/trace-engine/context.h
diff --git a/system/ulib/trace-engine/include/trace-engine/fields.h b/zircon/system/ulib/trace-engine/include/trace-engine/fields.h
similarity index 100%
rename from system/ulib/trace-engine/include/trace-engine/fields.h
rename to zircon/system/ulib/trace-engine/include/trace-engine/fields.h
diff --git a/system/ulib/trace-engine/include/trace-engine/handler.h b/zircon/system/ulib/trace-engine/include/trace-engine/handler.h
similarity index 100%
rename from system/ulib/trace-engine/include/trace-engine/handler.h
rename to zircon/system/ulib/trace-engine/include/trace-engine/handler.h
diff --git a/system/ulib/trace-engine/include/trace-engine/instrumentation.h b/zircon/system/ulib/trace-engine/include/trace-engine/instrumentation.h
similarity index 100%
rename from system/ulib/trace-engine/include/trace-engine/instrumentation.h
rename to zircon/system/ulib/trace-engine/include/trace-engine/instrumentation.h
diff --git a/system/ulib/trace-engine/include/trace-engine/types.h b/zircon/system/ulib/trace-engine/include/trace-engine/types.h
similarity index 100%
rename from system/ulib/trace-engine/include/trace-engine/types.h
rename to zircon/system/ulib/trace-engine/include/trace-engine/types.h
diff --git a/system/ulib/trace-engine/nonce.cpp b/zircon/system/ulib/trace-engine/nonce.cpp
similarity index 100%
rename from system/ulib/trace-engine/nonce.cpp
rename to zircon/system/ulib/trace-engine/nonce.cpp
diff --git a/system/ulib/trace-engine/rules.mk b/zircon/system/ulib/trace-engine/rules.mk
similarity index 100%
rename from system/ulib/trace-engine/rules.mk
rename to zircon/system/ulib/trace-engine/rules.mk
diff --git a/system/ulib/trace-provider/MAINTAINERS b/zircon/system/ulib/trace-provider/MAINTAINERS
similarity index 100%
rename from system/ulib/trace-provider/MAINTAINERS
rename to zircon/system/ulib/trace-provider/MAINTAINERS
diff --git a/system/ulib/trace-provider/README.md b/zircon/system/ulib/trace-provider/README.md
similarity index 100%
rename from system/ulib/trace-provider/README.md
rename to zircon/system/ulib/trace-provider/README.md
diff --git a/system/ulib/trace-provider/fdio_connect.cpp b/zircon/system/ulib/trace-provider/fdio_connect.cpp
similarity index 100%
rename from system/ulib/trace-provider/fdio_connect.cpp
rename to zircon/system/ulib/trace-provider/fdio_connect.cpp
diff --git a/system/ulib/trace-provider/handler.cpp b/zircon/system/ulib/trace-provider/handler.cpp
similarity index 100%
rename from system/ulib/trace-provider/handler.cpp
rename to zircon/system/ulib/trace-provider/handler.cpp
diff --git a/system/ulib/trace-provider/include/trace-provider/fdio_connect.h b/zircon/system/ulib/trace-provider/include/trace-provider/fdio_connect.h
similarity index 100%
rename from system/ulib/trace-provider/include/trace-provider/fdio_connect.h
rename to zircon/system/ulib/trace-provider/include/trace-provider/fdio_connect.h
diff --git a/system/ulib/trace-provider/include/trace-provider/handler.h b/zircon/system/ulib/trace-provider/include/trace-provider/handler.h
similarity index 100%
rename from system/ulib/trace-provider/include/trace-provider/handler.h
rename to zircon/system/ulib/trace-provider/include/trace-provider/handler.h
diff --git a/system/ulib/trace-provider/include/trace-provider/provider.h b/zircon/system/ulib/trace-provider/include/trace-provider/provider.h
similarity index 100%
rename from system/ulib/trace-provider/include/trace-provider/provider.h
rename to zircon/system/ulib/trace-provider/include/trace-provider/provider.h
diff --git a/system/ulib/trace-provider/provider_impl.cpp b/zircon/system/ulib/trace-provider/provider_impl.cpp
similarity index 100%
rename from system/ulib/trace-provider/provider_impl.cpp
rename to zircon/system/ulib/trace-provider/provider_impl.cpp
diff --git a/system/ulib/trace-provider/provider_impl.h b/zircon/system/ulib/trace-provider/provider_impl.h
similarity index 100%
rename from system/ulib/trace-provider/provider_impl.h
rename to zircon/system/ulib/trace-provider/provider_impl.h
diff --git a/system/ulib/trace-provider/provider_with_fdio.cpp b/zircon/system/ulib/trace-provider/provider_with_fdio.cpp
similarity index 100%
rename from system/ulib/trace-provider/provider_with_fdio.cpp
rename to zircon/system/ulib/trace-provider/provider_with_fdio.cpp
diff --git a/system/ulib/trace-provider/rules.mk b/zircon/system/ulib/trace-provider/rules.mk
similarity index 100%
rename from system/ulib/trace-provider/rules.mk
rename to zircon/system/ulib/trace-provider/rules.mk
diff --git a/system/ulib/trace-provider/session.cpp b/zircon/system/ulib/trace-provider/session.cpp
similarity index 100%
rename from system/ulib/trace-provider/session.cpp
rename to zircon/system/ulib/trace-provider/session.cpp
diff --git a/system/ulib/trace-provider/session.h b/zircon/system/ulib/trace-provider/session.h
similarity index 100%
rename from system/ulib/trace-provider/session.h
rename to zircon/system/ulib/trace-provider/session.h
diff --git a/system/ulib/trace-provider/trace_provider.fidl.client.cpp b/zircon/system/ulib/trace-provider/trace_provider.fidl.client.cpp
similarity index 100%
rename from system/ulib/trace-provider/trace_provider.fidl.client.cpp
rename to zircon/system/ulib/trace-provider/trace_provider.fidl.client.cpp
diff --git a/system/ulib/trace-provider/trace_provider.fidl.h b/zircon/system/ulib/trace-provider/trace_provider.fidl.h
similarity index 100%
rename from system/ulib/trace-provider/trace_provider.fidl.h
rename to zircon/system/ulib/trace-provider/trace_provider.fidl.h
diff --git a/system/ulib/trace-provider/trace_provider.fidl.tables.cpp b/zircon/system/ulib/trace-provider/trace_provider.fidl.tables.cpp
similarity index 100%
rename from system/ulib/trace-provider/trace_provider.fidl.tables.cpp
rename to zircon/system/ulib/trace-provider/trace_provider.fidl.tables.cpp
diff --git a/system/ulib/trace-provider/utils.cpp b/zircon/system/ulib/trace-provider/utils.cpp
similarity index 100%
rename from system/ulib/trace-provider/utils.cpp
rename to zircon/system/ulib/trace-provider/utils.cpp
diff --git a/system/ulib/trace-provider/utils.h b/zircon/system/ulib/trace-provider/utils.h
similarity index 100%
rename from system/ulib/trace-provider/utils.h
rename to zircon/system/ulib/trace-provider/utils.h
diff --git a/system/ulib/trace-reader/MAINTAINERS b/zircon/system/ulib/trace-reader/MAINTAINERS
similarity index 100%
rename from system/ulib/trace-reader/MAINTAINERS
rename to zircon/system/ulib/trace-reader/MAINTAINERS
diff --git a/system/ulib/trace-reader/README.md b/zircon/system/ulib/trace-reader/README.md
similarity index 100%
rename from system/ulib/trace-reader/README.md
rename to zircon/system/ulib/trace-reader/README.md
diff --git a/system/ulib/trace-reader/include/trace-reader/reader.h b/zircon/system/ulib/trace-reader/include/trace-reader/reader.h
similarity index 100%
rename from system/ulib/trace-reader/include/trace-reader/reader.h
rename to zircon/system/ulib/trace-reader/include/trace-reader/reader.h
diff --git a/system/ulib/trace-reader/include/trace-reader/reader_internal.h b/zircon/system/ulib/trace-reader/include/trace-reader/reader_internal.h
similarity index 100%
rename from system/ulib/trace-reader/include/trace-reader/reader_internal.h
rename to zircon/system/ulib/trace-reader/include/trace-reader/reader_internal.h
diff --git a/system/ulib/trace-reader/include/trace-reader/records.h b/zircon/system/ulib/trace-reader/include/trace-reader/records.h
similarity index 100%
rename from system/ulib/trace-reader/include/trace-reader/records.h
rename to zircon/system/ulib/trace-reader/include/trace-reader/records.h
diff --git a/system/ulib/trace-reader/reader.cpp b/zircon/system/ulib/trace-reader/reader.cpp
similarity index 100%
rename from system/ulib/trace-reader/reader.cpp
rename to zircon/system/ulib/trace-reader/reader.cpp
diff --git a/system/ulib/trace-reader/reader_internal.cpp b/zircon/system/ulib/trace-reader/reader_internal.cpp
similarity index 100%
rename from system/ulib/trace-reader/reader_internal.cpp
rename to zircon/system/ulib/trace-reader/reader_internal.cpp
diff --git a/system/ulib/trace-reader/records.cpp b/zircon/system/ulib/trace-reader/records.cpp
similarity index 100%
rename from system/ulib/trace-reader/records.cpp
rename to zircon/system/ulib/trace-reader/records.cpp
diff --git a/system/ulib/trace-reader/rules.mk b/zircon/system/ulib/trace-reader/rules.mk
similarity index 100%
rename from system/ulib/trace-reader/rules.mk
rename to zircon/system/ulib/trace-reader/rules.mk
diff --git a/system/ulib/trace-test-utils/MAINTAINERS b/zircon/system/ulib/trace-test-utils/MAINTAINERS
similarity index 100%
rename from system/ulib/trace-test-utils/MAINTAINERS
rename to zircon/system/ulib/trace-test-utils/MAINTAINERS
diff --git a/system/ulib/trace-test-utils/compare_records.cpp b/zircon/system/ulib/trace-test-utils/compare_records.cpp
similarity index 100%
rename from system/ulib/trace-test-utils/compare_records.cpp
rename to zircon/system/ulib/trace-test-utils/compare_records.cpp
diff --git a/system/ulib/trace-test-utils/include/trace-test-utils/compare_records.h b/zircon/system/ulib/trace-test-utils/include/trace-test-utils/compare_records.h
similarity index 100%
rename from system/ulib/trace-test-utils/include/trace-test-utils/compare_records.h
rename to zircon/system/ulib/trace-test-utils/include/trace-test-utils/compare_records.h
diff --git a/system/ulib/trace-test-utils/include/trace-test-utils/read_records.h b/zircon/system/ulib/trace-test-utils/include/trace-test-utils/read_records.h
similarity index 100%
rename from system/ulib/trace-test-utils/include/trace-test-utils/read_records.h
rename to zircon/system/ulib/trace-test-utils/include/trace-test-utils/read_records.h
diff --git a/system/ulib/trace-test-utils/include/trace-test-utils/squelch.h b/zircon/system/ulib/trace-test-utils/include/trace-test-utils/squelch.h
similarity index 100%
rename from system/ulib/trace-test-utils/include/trace-test-utils/squelch.h
rename to zircon/system/ulib/trace-test-utils/include/trace-test-utils/squelch.h
diff --git a/system/ulib/trace-test-utils/read_records.cpp b/zircon/system/ulib/trace-test-utils/read_records.cpp
similarity index 100%
rename from system/ulib/trace-test-utils/read_records.cpp
rename to zircon/system/ulib/trace-test-utils/read_records.cpp
diff --git a/system/ulib/trace-test-utils/rules.mk b/zircon/system/ulib/trace-test-utils/rules.mk
similarity index 100%
rename from system/ulib/trace-test-utils/rules.mk
rename to zircon/system/ulib/trace-test-utils/rules.mk
diff --git a/system/ulib/trace-test-utils/squelch.cpp b/zircon/system/ulib/trace-test-utils/squelch.cpp
similarity index 100%
rename from system/ulib/trace-test-utils/squelch.cpp
rename to zircon/system/ulib/trace-test-utils/squelch.cpp
diff --git a/system/ulib/trace-vthread/README.md b/zircon/system/ulib/trace-vthread/README.md
similarity index 100%
rename from system/ulib/trace-vthread/README.md
rename to zircon/system/ulib/trace-vthread/README.md
diff --git a/system/ulib/trace-vthread/event_vthread.cpp b/zircon/system/ulib/trace-vthread/event_vthread.cpp
similarity index 100%
rename from system/ulib/trace-vthread/event_vthread.cpp
rename to zircon/system/ulib/trace-vthread/event_vthread.cpp
diff --git a/system/ulib/trace-vthread/event_vthread_tests.cpp b/zircon/system/ulib/trace-vthread/event_vthread_tests.cpp
similarity index 100%
rename from system/ulib/trace-vthread/event_vthread_tests.cpp
rename to zircon/system/ulib/trace-vthread/event_vthread_tests.cpp
diff --git a/system/ulib/trace-vthread/include/trace-vthread/event_vthread.h b/zircon/system/ulib/trace-vthread/include/trace-vthread/event_vthread.h
similarity index 100%
rename from system/ulib/trace-vthread/include/trace-vthread/event_vthread.h
rename to zircon/system/ulib/trace-vthread/include/trace-vthread/event_vthread.h
diff --git a/system/ulib/trace-vthread/include/trace-vthread/internal/event_vthread.h b/zircon/system/ulib/trace-vthread/include/trace-vthread/internal/event_vthread.h
similarity index 100%
rename from system/ulib/trace-vthread/include/trace-vthread/internal/event_vthread.h
rename to zircon/system/ulib/trace-vthread/include/trace-vthread/internal/event_vthread.h
diff --git a/system/ulib/trace-vthread/rules.mk b/zircon/system/ulib/trace-vthread/rules.mk
similarity index 100%
rename from system/ulib/trace-vthread/rules.mk
rename to zircon/system/ulib/trace-vthread/rules.mk
diff --git a/system/ulib/trace/MAINTAINERS b/zircon/system/ulib/trace/MAINTAINERS
similarity index 100%
rename from system/ulib/trace/MAINTAINERS
rename to zircon/system/ulib/trace/MAINTAINERS
diff --git a/system/ulib/trace/README.md b/zircon/system/ulib/trace/README.md
similarity index 100%
rename from system/ulib/trace/README.md
rename to zircon/system/ulib/trace/README.md
diff --git a/system/ulib/trace/event.cpp b/zircon/system/ulib/trace/event.cpp
similarity index 100%
rename from system/ulib/trace/event.cpp
rename to zircon/system/ulib/trace/event.cpp
diff --git a/system/ulib/trace/include/trace/event.h b/zircon/system/ulib/trace/include/trace/event.h
similarity index 100%
rename from system/ulib/trace/include/trace/event.h
rename to zircon/system/ulib/trace/include/trace/event.h
diff --git a/system/ulib/trace/include/trace/event_args.h b/zircon/system/ulib/trace/include/trace/event_args.h
similarity index 100%
rename from system/ulib/trace/include/trace/event_args.h
rename to zircon/system/ulib/trace/include/trace/event_args.h
diff --git a/system/ulib/trace/include/trace/internal/event_args.h b/zircon/system/ulib/trace/include/trace/internal/event_args.h
similarity index 100%
rename from system/ulib/trace/include/trace/internal/event_args.h
rename to zircon/system/ulib/trace/include/trace/internal/event_args.h
diff --git a/system/ulib/trace/include/trace/internal/event_common.h b/zircon/system/ulib/trace/include/trace/internal/event_common.h
similarity index 100%
rename from system/ulib/trace/include/trace/internal/event_common.h
rename to zircon/system/ulib/trace/include/trace/internal/event_common.h
diff --git a/system/ulib/trace/include/trace/internal/event_internal.h b/zircon/system/ulib/trace/include/trace/internal/event_internal.h
similarity index 100%
rename from system/ulib/trace/include/trace/internal/event_internal.h
rename to zircon/system/ulib/trace/include/trace/internal/event_internal.h
diff --git a/system/ulib/trace/include/trace/internal/pairs_internal.h b/zircon/system/ulib/trace/include/trace/internal/pairs_internal.h
similarity index 100%
rename from system/ulib/trace/include/trace/internal/pairs_internal.h
rename to zircon/system/ulib/trace/include/trace/internal/pairs_internal.h
diff --git a/system/ulib/trace/include/trace/observer.h b/zircon/system/ulib/trace/include/trace/observer.h
similarity index 100%
rename from system/ulib/trace/include/trace/observer.h
rename to zircon/system/ulib/trace/include/trace/observer.h
diff --git a/system/ulib/trace/observer.cpp b/zircon/system/ulib/trace/observer.cpp
similarity index 100%
rename from system/ulib/trace/observer.cpp
rename to zircon/system/ulib/trace/observer.cpp
diff --git a/system/ulib/trace/rules.mk b/zircon/system/ulib/trace/rules.mk
similarity index 100%
rename from system/ulib/trace/rules.mk
rename to zircon/system/ulib/trace/rules.mk
diff --git a/system/ulib/unittest/README.md b/zircon/system/ulib/unittest/README.md
similarity index 100%
rename from system/ulib/unittest/README.md
rename to zircon/system/ulib/unittest/README.md
diff --git a/system/ulib/unittest/all-tests.cpp b/zircon/system/ulib/unittest/all-tests.cpp
similarity index 100%
rename from system/ulib/unittest/all-tests.cpp
rename to zircon/system/ulib/unittest/all-tests.cpp
diff --git a/system/ulib/unittest/crash-handler.cpp b/zircon/system/ulib/unittest/crash-handler.cpp
similarity index 100%
rename from system/ulib/unittest/crash-handler.cpp
rename to zircon/system/ulib/unittest/crash-handler.cpp
diff --git a/system/ulib/unittest/crash-handler.h b/zircon/system/ulib/unittest/crash-handler.h
similarity index 100%
rename from system/ulib/unittest/crash-handler.h
rename to zircon/system/ulib/unittest/crash-handler.h
diff --git a/system/ulib/unittest/crash-list.cpp b/zircon/system/ulib/unittest/crash-list.cpp
similarity index 100%
rename from system/ulib/unittest/crash-list.cpp
rename to zircon/system/ulib/unittest/crash-list.cpp
diff --git a/system/ulib/unittest/crash-list.h b/zircon/system/ulib/unittest/crash-list.h
similarity index 100%
rename from system/ulib/unittest/crash-list.h
rename to zircon/system/ulib/unittest/crash-list.h
diff --git a/system/ulib/unittest/include/unittest/unittest.h b/zircon/system/ulib/unittest/include/unittest/unittest.h
similarity index 100%
rename from system/ulib/unittest/include/unittest/unittest.h
rename to zircon/system/ulib/unittest/include/unittest/unittest.h
diff --git a/system/ulib/unittest/rules.mk b/zircon/system/ulib/unittest/rules.mk
similarity index 100%
rename from system/ulib/unittest/rules.mk
rename to zircon/system/ulib/unittest/rules.mk
diff --git a/system/ulib/unittest/unittest.cpp b/zircon/system/ulib/unittest/unittest.cpp
similarity index 100%
rename from system/ulib/unittest/unittest.cpp
rename to zircon/system/ulib/unittest/unittest.cpp
diff --git a/system/ulib/unittest/watchdog.cpp b/zircon/system/ulib/unittest/watchdog.cpp
similarity index 100%
rename from system/ulib/unittest/watchdog.cpp
rename to zircon/system/ulib/unittest/watchdog.cpp
diff --git a/system/ulib/unittest/watchdog.h b/zircon/system/ulib/unittest/watchdog.h
similarity index 100%
rename from system/ulib/unittest/watchdog.h
rename to zircon/system/ulib/unittest/watchdog.h
diff --git a/system/ulib/utf_conversion/include/utf_conversion/utf_conversion.h b/zircon/system/ulib/utf_conversion/include/utf_conversion/utf_conversion.h
similarity index 100%
rename from system/ulib/utf_conversion/include/utf_conversion/utf_conversion.h
rename to zircon/system/ulib/utf_conversion/include/utf_conversion/utf_conversion.h
diff --git a/system/ulib/utf_conversion/rules.mk b/zircon/system/ulib/utf_conversion/rules.mk
similarity index 100%
rename from system/ulib/utf_conversion/rules.mk
rename to zircon/system/ulib/utf_conversion/rules.mk
diff --git a/system/ulib/utf_conversion/utf_conversion.cpp b/zircon/system/ulib/utf_conversion/utf_conversion.cpp
similarity index 100%
rename from system/ulib/utf_conversion/utf_conversion.cpp
rename to zircon/system/ulib/utf_conversion/utf_conversion.cpp
diff --git a/system/ulib/virtio/include/virtio/balloon.h b/zircon/system/ulib/virtio/include/virtio/balloon.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/balloon.h
rename to zircon/system/ulib/virtio/include/virtio/balloon.h
diff --git a/system/ulib/virtio/include/virtio/block.h b/zircon/system/ulib/virtio/include/virtio/block.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/block.h
rename to zircon/system/ulib/virtio/include/virtio/block.h
diff --git a/system/ulib/virtio/include/virtio/console.h b/zircon/system/ulib/virtio/include/virtio/console.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/console.h
rename to zircon/system/ulib/virtio/include/virtio/console.h
diff --git a/system/ulib/virtio/include/virtio/gpu.h b/zircon/system/ulib/virtio/include/virtio/gpu.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/gpu.h
rename to zircon/system/ulib/virtio/include/virtio/gpu.h
diff --git a/system/ulib/virtio/include/virtio/input.h b/zircon/system/ulib/virtio/include/virtio/input.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/input.h
rename to zircon/system/ulib/virtio/include/virtio/input.h
diff --git a/system/ulib/virtio/include/virtio/net.h b/zircon/system/ulib/virtio/include/virtio/net.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/net.h
rename to zircon/system/ulib/virtio/include/virtio/net.h
diff --git a/system/ulib/virtio/include/virtio/scsi.h b/zircon/system/ulib/virtio/include/virtio/scsi.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/scsi.h
rename to zircon/system/ulib/virtio/include/virtio/scsi.h
diff --git a/system/ulib/virtio/include/virtio/virtio.h b/zircon/system/ulib/virtio/include/virtio/virtio.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/virtio.h
rename to zircon/system/ulib/virtio/include/virtio/virtio.h
diff --git a/system/ulib/virtio/include/virtio/virtio_ids.h b/zircon/system/ulib/virtio/include/virtio/virtio_ids.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/virtio_ids.h
rename to zircon/system/ulib/virtio/include/virtio/virtio_ids.h
diff --git a/system/ulib/virtio/include/virtio/virtio_ring.h b/zircon/system/ulib/virtio/include/virtio/virtio_ring.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/virtio_ring.h
rename to zircon/system/ulib/virtio/include/virtio/virtio_ring.h
diff --git a/system/ulib/virtio/include/virtio/vsock.h b/zircon/system/ulib/virtio/include/virtio/vsock.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/vsock.h
rename to zircon/system/ulib/virtio/include/virtio/vsock.h
diff --git a/system/ulib/virtio/include/virtio/wl.h b/zircon/system/ulib/virtio/include/virtio/wl.h
similarity index 100%
rename from system/ulib/virtio/include/virtio/wl.h
rename to zircon/system/ulib/virtio/include/virtio/wl.h
diff --git a/system/ulib/virtio/rules.mk b/zircon/system/ulib/virtio/rules.mk
similarity index 100%
rename from system/ulib/virtio/rules.mk
rename to zircon/system/ulib/virtio/rules.mk
diff --git a/system/ulib/xdc-host-utils/client.cpp b/zircon/system/ulib/xdc-host-utils/client.cpp
similarity index 100%
rename from system/ulib/xdc-host-utils/client.cpp
rename to zircon/system/ulib/xdc-host-utils/client.cpp
diff --git a/system/ulib/xdc-host-utils/include/xdc-host-utils/client.h b/zircon/system/ulib/xdc-host-utils/include/xdc-host-utils/client.h
similarity index 100%
rename from system/ulib/xdc-host-utils/include/xdc-host-utils/client.h
rename to zircon/system/ulib/xdc-host-utils/include/xdc-host-utils/client.h
diff --git a/system/ulib/xdc-host-utils/include/xdc-host-utils/conn.h b/zircon/system/ulib/xdc-host-utils/include/xdc-host-utils/conn.h
similarity index 100%
rename from system/ulib/xdc-host-utils/include/xdc-host-utils/conn.h
rename to zircon/system/ulib/xdc-host-utils/include/xdc-host-utils/conn.h
diff --git a/system/ulib/xdc-host-utils/rules.mk b/zircon/system/ulib/xdc-host-utils/rules.mk
similarity index 100%
rename from system/ulib/xdc-host-utils/rules.mk
rename to zircon/system/ulib/xdc-host-utils/rules.mk
diff --git a/system/ulib/xdc-server-utils/include/xdc-server-utils/msg.h b/zircon/system/ulib/xdc-server-utils/include/xdc-server-utils/msg.h
similarity index 100%
rename from system/ulib/xdc-server-utils/include/xdc-server-utils/msg.h
rename to zircon/system/ulib/xdc-server-utils/include/xdc-server-utils/msg.h
diff --git a/system/ulib/xdc-server-utils/include/xdc-server-utils/packet.h b/zircon/system/ulib/xdc-server-utils/include/xdc-server-utils/packet.h
similarity index 100%
rename from system/ulib/xdc-server-utils/include/xdc-server-utils/packet.h
rename to zircon/system/ulib/xdc-server-utils/include/xdc-server-utils/packet.h
diff --git a/system/ulib/xdc-server-utils/include/xdc-server-utils/stream.h b/zircon/system/ulib/xdc-server-utils/include/xdc-server-utils/stream.h
similarity index 100%
rename from system/ulib/xdc-server-utils/include/xdc-server-utils/stream.h
rename to zircon/system/ulib/xdc-server-utils/include/xdc-server-utils/stream.h
diff --git a/system/ulib/xdc-server-utils/packet.c b/zircon/system/ulib/xdc-server-utils/packet.c
similarity index 100%
rename from system/ulib/xdc-server-utils/packet.c
rename to zircon/system/ulib/xdc-server-utils/packet.c
diff --git a/system/ulib/xdc-server-utils/rules.mk b/zircon/system/ulib/xdc-server-utils/rules.mk
similarity index 100%
rename from system/ulib/xdc-server-utils/rules.mk
rename to zircon/system/ulib/xdc-server-utils/rules.mk
diff --git a/system/ulib/zircon-internal/MAINTAINERS b/zircon/system/ulib/zircon-internal/MAINTAINERS
similarity index 100%
rename from system/ulib/zircon-internal/MAINTAINERS
rename to zircon/system/ulib/zircon-internal/MAINTAINERS
diff --git a/system/ulib/zircon-internal/empty.c b/zircon/system/ulib/zircon-internal/empty.c
similarity index 100%
rename from system/ulib/zircon-internal/empty.c
rename to zircon/system/ulib/zircon-internal/empty.c
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/cpu-perf.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/cpu-perf.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/cpu-perf.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/cpu-perf.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm-events.inc b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm-events.inc
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm-events.inc
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm-events.inc
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pm.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pt.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pt.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pt.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/intel-pt.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-misc-events.inc b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-misc-events.inc
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-misc-events.inc
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-misc-events.inc
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-pm-events.inc b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-pm-events.inc
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-pm-events.inc
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/device/cpu-trace/skylake-pm-events.inc
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/fnv1hash.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/fnv1hash.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/fnv1hash.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/fnv1hash.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/ktrace-def.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/ktrace-def.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/ktrace-def.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/ktrace-def.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/ktrace.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/ktrace.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/ktrace.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/ktrace.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/macros.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/macros.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/macros.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/macros.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/mtrace.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/mtrace.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/mtrace.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/mtrace.h
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/xorshiftrand.h b/zircon/system/ulib/zircon-internal/include/lib/zircon-internal/xorshiftrand.h
similarity index 100%
rename from system/ulib/zircon-internal/include/lib/zircon-internal/xorshiftrand.h
rename to zircon/system/ulib/zircon-internal/include/lib/zircon-internal/xorshiftrand.h
diff --git a/system/ulib/zircon-internal/rules.mk b/zircon/system/ulib/zircon-internal/rules.mk
similarity index 100%
rename from system/ulib/zircon-internal/rules.mk
rename to zircon/system/ulib/zircon-internal/rules.mk
diff --git a/system/ulib/zircon/alternates.ld b/zircon/system/ulib/zircon/alternates.ld
similarity index 100%
rename from system/ulib/zircon/alternates.ld
rename to zircon/system/ulib/zircon/alternates.ld
diff --git a/system/ulib/zircon/data.S b/zircon/system/ulib/zircon/data.S
similarity index 100%
rename from system/ulib/zircon/data.S
rename to zircon/system/ulib/zircon/data.S
diff --git a/system/ulib/zircon/include/zircon/status.h b/zircon/system/ulib/zircon/include/zircon/status.h
similarity index 100%
rename from system/ulib/zircon/include/zircon/status.h
rename to zircon/system/ulib/zircon/include/zircon/status.h
diff --git a/system/ulib/zircon/private.h b/zircon/system/ulib/zircon/private.h
similarity index 100%
rename from system/ulib/zircon/private.h
rename to zircon/system/ulib/zircon/private.h
diff --git a/system/ulib/zircon/rules.mk b/zircon/system/ulib/zircon/rules.mk
similarity index 100%
rename from system/ulib/zircon/rules.mk
rename to zircon/system/ulib/zircon/rules.mk
diff --git a/system/ulib/zircon/syscall-entry.h b/zircon/system/ulib/zircon/syscall-entry.h
similarity index 100%
rename from system/ulib/zircon/syscall-entry.h
rename to zircon/system/ulib/zircon/syscall-entry.h
diff --git a/system/ulib/zircon/syscall-wrappers.cpp b/zircon/system/ulib/zircon/syscall-wrappers.cpp
similarity index 100%
rename from system/ulib/zircon/syscall-wrappers.cpp
rename to zircon/system/ulib/zircon/syscall-wrappers.cpp
diff --git a/system/ulib/zircon/syscalls-arm64.S b/zircon/system/ulib/zircon/syscalls-arm64.S
similarity index 100%
rename from system/ulib/zircon/syscalls-arm64.S
rename to zircon/system/ulib/zircon/syscalls-arm64.S
diff --git a/system/ulib/zircon/syscalls-stubs.S b/zircon/system/ulib/zircon/syscalls-stubs.S
similarity index 100%
rename from system/ulib/zircon/syscalls-stubs.S
rename to zircon/system/ulib/zircon/syscalls-stubs.S
diff --git a/system/ulib/zircon/syscalls-x86-64.S b/zircon/system/ulib/zircon/syscalls-x86-64.S
similarity index 100%
rename from system/ulib/zircon/syscalls-x86-64.S
rename to zircon/system/ulib/zircon/syscalls-x86-64.S
diff --git a/system/ulib/zircon/zircon-syscall-arm64.S b/zircon/system/ulib/zircon/zircon-syscall-arm64.S
similarity index 100%
rename from system/ulib/zircon/zircon-syscall-arm64.S
rename to zircon/system/ulib/zircon/zircon-syscall-arm64.S
diff --git a/system/ulib/zircon/zircon-syscall-x86-64.S b/zircon/system/ulib/zircon/zircon-syscall-x86-64.S
similarity index 100%
rename from system/ulib/zircon/zircon-syscall-x86-64.S
rename to zircon/system/ulib/zircon/zircon-syscall-x86-64.S
diff --git a/system/ulib/zircon/zx_cache_flush.cpp b/zircon/system/ulib/zircon/zx_cache_flush.cpp
similarity index 100%
rename from system/ulib/zircon/zx_cache_flush.cpp
rename to zircon/system/ulib/zircon/zx_cache_flush.cpp
diff --git a/system/ulib/zircon/zx_channel_call.cpp b/zircon/system/ulib/zircon/zx_channel_call.cpp
similarity index 100%
rename from system/ulib/zircon/zx_channel_call.cpp
rename to zircon/system/ulib/zircon/zx_channel_call.cpp
diff --git a/system/ulib/zircon/zx_cprng_draw.cpp b/zircon/system/ulib/zircon/zx_cprng_draw.cpp
similarity index 100%
rename from system/ulib/zircon/zx_cprng_draw.cpp
rename to zircon/system/ulib/zircon/zx_cprng_draw.cpp
diff --git a/system/ulib/zircon/zx_deadline_after.cpp b/zircon/system/ulib/zircon/zx_deadline_after.cpp
similarity index 100%
rename from system/ulib/zircon/zx_deadline_after.cpp
rename to zircon/system/ulib/zircon/zx_deadline_after.cpp
diff --git a/system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-arm64.S b/zircon/system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-arm64.S
similarity index 100%
rename from system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-arm64.S
rename to zircon/system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-arm64.S
diff --git a/system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-x86-64.S b/zircon/system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-x86-64.S
similarity index 100%
rename from system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-x86-64.S
rename to zircon/system/ulib/zircon/zx_futex_wake_handle_close_thread_exit-x86-64.S
diff --git a/system/ulib/zircon/zx_status_get_string.cpp b/zircon/system/ulib/zircon/zx_status_get_string.cpp
similarity index 100%
rename from system/ulib/zircon/zx_status_get_string.cpp
rename to zircon/system/ulib/zircon/zx_status_get_string.cpp
diff --git a/system/ulib/zircon/zx_system_get_dcache_line_size.cpp b/zircon/system/ulib/zircon/zx_system_get_dcache_line_size.cpp
similarity index 100%
rename from system/ulib/zircon/zx_system_get_dcache_line_size.cpp
rename to zircon/system/ulib/zircon/zx_system_get_dcache_line_size.cpp
diff --git a/system/ulib/zircon/zx_system_get_features.cpp b/zircon/system/ulib/zircon/zx_system_get_features.cpp
similarity index 100%
rename from system/ulib/zircon/zx_system_get_features.cpp
rename to zircon/system/ulib/zircon/zx_system_get_features.cpp
diff --git a/system/ulib/zircon/zx_system_get_num_cpus.cpp b/zircon/system/ulib/zircon/zx_system_get_num_cpus.cpp
similarity index 100%
rename from system/ulib/zircon/zx_system_get_num_cpus.cpp
rename to zircon/system/ulib/zircon/zx_system_get_num_cpus.cpp
diff --git a/system/ulib/zircon/zx_system_get_physmem.cpp b/zircon/system/ulib/zircon/zx_system_get_physmem.cpp
similarity index 100%
rename from system/ulib/zircon/zx_system_get_physmem.cpp
rename to zircon/system/ulib/zircon/zx_system_get_physmem.cpp
diff --git a/system/ulib/zircon/zx_system_get_version.cpp b/zircon/system/ulib/zircon/zx_system_get_version.cpp
similarity index 100%
rename from system/ulib/zircon/zx_system_get_version.cpp
rename to zircon/system/ulib/zircon/zx_system_get_version.cpp
diff --git a/system/ulib/zircon/zx_ticks_get.cpp b/zircon/system/ulib/zircon/zx_ticks_get.cpp
similarity index 100%
rename from system/ulib/zircon/zx_ticks_get.cpp
rename to zircon/system/ulib/zircon/zx_ticks_get.cpp
diff --git a/system/ulib/zircon/zx_ticks_per_second.cpp b/zircon/system/ulib/zircon/zx_ticks_per_second.cpp
similarity index 100%
rename from system/ulib/zircon/zx_ticks_per_second.cpp
rename to zircon/system/ulib/zircon/zx_ticks_per_second.cpp
diff --git a/system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-arm64.S b/zircon/system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-arm64.S
similarity index 100%
rename from system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-arm64.S
rename to zircon/system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-arm64.S
diff --git a/system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-x86-64.S b/zircon/system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-x86-64.S
similarity index 100%
rename from system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-x86-64.S
rename to zircon/system/ulib/zircon/zx_vmar_unmap_handle_close_thread_exit-x86-64.S
diff --git a/system/ulib/zx/MAINTAINERS b/zircon/system/ulib/zx/MAINTAINERS
similarity index 100%
rename from system/ulib/zx/MAINTAINERS
rename to zircon/system/ulib/zx/MAINTAINERS
diff --git a/system/ulib/zx/README.md b/zircon/system/ulib/zx/README.md
similarity index 100%
rename from system/ulib/zx/README.md
rename to zircon/system/ulib/zx/README.md
diff --git a/system/ulib/zx/bti.cpp b/zircon/system/ulib/zx/bti.cpp
similarity index 100%
rename from system/ulib/zx/bti.cpp
rename to zircon/system/ulib/zx/bti.cpp
diff --git a/system/ulib/zx/channel.cpp b/zircon/system/ulib/zx/channel.cpp
similarity index 100%
rename from system/ulib/zx/channel.cpp
rename to zircon/system/ulib/zx/channel.cpp
diff --git a/system/ulib/zx/debuglog.cpp b/zircon/system/ulib/zx/debuglog.cpp
similarity index 100%
rename from system/ulib/zx/debuglog.cpp
rename to zircon/system/ulib/zx/debuglog.cpp
diff --git a/system/ulib/zx/event.cpp b/zircon/system/ulib/zx/event.cpp
similarity index 100%
rename from system/ulib/zx/event.cpp
rename to zircon/system/ulib/zx/event.cpp
diff --git a/system/ulib/zx/eventpair.cpp b/zircon/system/ulib/zx/eventpair.cpp
similarity index 100%
rename from system/ulib/zx/eventpair.cpp
rename to zircon/system/ulib/zx/eventpair.cpp
diff --git a/system/ulib/zx/fifo.cpp b/zircon/system/ulib/zx/fifo.cpp
similarity index 100%
rename from system/ulib/zx/fifo.cpp
rename to zircon/system/ulib/zx/fifo.cpp
diff --git a/system/ulib/zx/guest.cpp b/zircon/system/ulib/zx/guest.cpp
similarity index 100%
rename from system/ulib/zx/guest.cpp
rename to zircon/system/ulib/zx/guest.cpp
diff --git a/system/ulib/zx/include/lib/zx/bti.h b/zircon/system/ulib/zx/include/lib/zx/bti.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/bti.h
rename to zircon/system/ulib/zx/include/lib/zx/bti.h
diff --git a/system/ulib/zx/include/lib/zx/channel.h b/zircon/system/ulib/zx/include/lib/zx/channel.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/channel.h
rename to zircon/system/ulib/zx/include/lib/zx/channel.h
diff --git a/system/ulib/zx/include/lib/zx/debuglog.h b/zircon/system/ulib/zx/include/lib/zx/debuglog.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/debuglog.h
rename to zircon/system/ulib/zx/include/lib/zx/debuglog.h
diff --git a/system/ulib/zx/include/lib/zx/event.h b/zircon/system/ulib/zx/include/lib/zx/event.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/event.h
rename to zircon/system/ulib/zx/include/lib/zx/event.h
diff --git a/system/ulib/zx/include/lib/zx/eventpair.h b/zircon/system/ulib/zx/include/lib/zx/eventpair.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/eventpair.h
rename to zircon/system/ulib/zx/include/lib/zx/eventpair.h
diff --git a/system/ulib/zx/include/lib/zx/fifo.h b/zircon/system/ulib/zx/include/lib/zx/fifo.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/fifo.h
rename to zircon/system/ulib/zx/include/lib/zx/fifo.h
diff --git a/system/ulib/zx/include/lib/zx/guest.h b/zircon/system/ulib/zx/include/lib/zx/guest.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/guest.h
rename to zircon/system/ulib/zx/include/lib/zx/guest.h
diff --git a/system/ulib/zx/include/lib/zx/handle.h b/zircon/system/ulib/zx/include/lib/zx/handle.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/handle.h
rename to zircon/system/ulib/zx/include/lib/zx/handle.h
diff --git a/system/ulib/zx/include/lib/zx/interrupt.h b/zircon/system/ulib/zx/include/lib/zx/interrupt.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/interrupt.h
rename to zircon/system/ulib/zx/include/lib/zx/interrupt.h
diff --git a/system/ulib/zx/include/lib/zx/iommu.h b/zircon/system/ulib/zx/include/lib/zx/iommu.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/iommu.h
rename to zircon/system/ulib/zx/include/lib/zx/iommu.h
diff --git a/system/ulib/zx/include/lib/zx/job.h b/zircon/system/ulib/zx/include/lib/zx/job.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/job.h
rename to zircon/system/ulib/zx/include/lib/zx/job.h
diff --git a/system/ulib/zx/include/lib/zx/object.h b/zircon/system/ulib/zx/include/lib/zx/object.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/object.h
rename to zircon/system/ulib/zx/include/lib/zx/object.h
diff --git a/system/ulib/zx/include/lib/zx/object_traits.h b/zircon/system/ulib/zx/include/lib/zx/object_traits.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/object_traits.h
rename to zircon/system/ulib/zx/include/lib/zx/object_traits.h
diff --git a/system/ulib/zx/include/lib/zx/pmt.h b/zircon/system/ulib/zx/include/lib/zx/pmt.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/pmt.h
rename to zircon/system/ulib/zx/include/lib/zx/pmt.h
diff --git a/system/ulib/zx/include/lib/zx/port.h b/zircon/system/ulib/zx/include/lib/zx/port.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/port.h
rename to zircon/system/ulib/zx/include/lib/zx/port.h
diff --git a/system/ulib/zx/include/lib/zx/process.h b/zircon/system/ulib/zx/include/lib/zx/process.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/process.h
rename to zircon/system/ulib/zx/include/lib/zx/process.h
diff --git a/system/ulib/zx/include/lib/zx/profile.h b/zircon/system/ulib/zx/include/lib/zx/profile.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/profile.h
rename to zircon/system/ulib/zx/include/lib/zx/profile.h
diff --git a/system/ulib/zx/include/lib/zx/resource.h b/zircon/system/ulib/zx/include/lib/zx/resource.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/resource.h
rename to zircon/system/ulib/zx/include/lib/zx/resource.h
diff --git a/system/ulib/zx/include/lib/zx/socket.h b/zircon/system/ulib/zx/include/lib/zx/socket.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/socket.h
rename to zircon/system/ulib/zx/include/lib/zx/socket.h
diff --git a/system/ulib/zx/include/lib/zx/suspend_token.h b/zircon/system/ulib/zx/include/lib/zx/suspend_token.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/suspend_token.h
rename to zircon/system/ulib/zx/include/lib/zx/suspend_token.h
diff --git a/system/ulib/zx/include/lib/zx/task.h b/zircon/system/ulib/zx/include/lib/zx/task.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/task.h
rename to zircon/system/ulib/zx/include/lib/zx/task.h
diff --git a/system/ulib/zx/include/lib/zx/thread.h b/zircon/system/ulib/zx/include/lib/zx/thread.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/thread.h
rename to zircon/system/ulib/zx/include/lib/zx/thread.h
diff --git a/system/ulib/zx/include/lib/zx/time.h b/zircon/system/ulib/zx/include/lib/zx/time.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/time.h
rename to zircon/system/ulib/zx/include/lib/zx/time.h
diff --git a/system/ulib/zx/include/lib/zx/timer.h b/zircon/system/ulib/zx/include/lib/zx/timer.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/timer.h
rename to zircon/system/ulib/zx/include/lib/zx/timer.h
diff --git a/system/ulib/zx/include/lib/zx/vcpu.h b/zircon/system/ulib/zx/include/lib/zx/vcpu.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/vcpu.h
rename to zircon/system/ulib/zx/include/lib/zx/vcpu.h
diff --git a/system/ulib/zx/include/lib/zx/vmar.h b/zircon/system/ulib/zx/include/lib/zx/vmar.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/vmar.h
rename to zircon/system/ulib/zx/include/lib/zx/vmar.h
diff --git a/system/ulib/zx/include/lib/zx/vmo.h b/zircon/system/ulib/zx/include/lib/zx/vmo.h
similarity index 100%
rename from system/ulib/zx/include/lib/zx/vmo.h
rename to zircon/system/ulib/zx/include/lib/zx/vmo.h
diff --git a/system/ulib/zx/interrupt.cpp b/zircon/system/ulib/zx/interrupt.cpp
similarity index 100%
rename from system/ulib/zx/interrupt.cpp
rename to zircon/system/ulib/zx/interrupt.cpp
diff --git a/system/ulib/zx/iommu.cpp b/zircon/system/ulib/zx/iommu.cpp
similarity index 100%
rename from system/ulib/zx/iommu.cpp
rename to zircon/system/ulib/zx/iommu.cpp
diff --git a/system/ulib/zx/job.cpp b/zircon/system/ulib/zx/job.cpp
similarity index 100%
rename from system/ulib/zx/job.cpp
rename to zircon/system/ulib/zx/job.cpp
diff --git a/system/ulib/zx/port.cpp b/zircon/system/ulib/zx/port.cpp
similarity index 100%
rename from system/ulib/zx/port.cpp
rename to zircon/system/ulib/zx/port.cpp
diff --git a/system/ulib/zx/process.cpp b/zircon/system/ulib/zx/process.cpp
similarity index 100%
rename from system/ulib/zx/process.cpp
rename to zircon/system/ulib/zx/process.cpp
diff --git a/system/ulib/zx/profile.cpp b/zircon/system/ulib/zx/profile.cpp
similarity index 100%
rename from system/ulib/zx/profile.cpp
rename to zircon/system/ulib/zx/profile.cpp
diff --git a/system/ulib/zx/resource.cpp b/zircon/system/ulib/zx/resource.cpp
similarity index 100%
rename from system/ulib/zx/resource.cpp
rename to zircon/system/ulib/zx/resource.cpp
diff --git a/system/ulib/zx/rules.mk b/zircon/system/ulib/zx/rules.mk
similarity index 100%
rename from system/ulib/zx/rules.mk
rename to zircon/system/ulib/zx/rules.mk
diff --git a/system/ulib/zx/socket.cpp b/zircon/system/ulib/zx/socket.cpp
similarity index 100%
rename from system/ulib/zx/socket.cpp
rename to zircon/system/ulib/zx/socket.cpp
diff --git a/system/ulib/zx/thread.cpp b/zircon/system/ulib/zx/thread.cpp
similarity index 100%
rename from system/ulib/zx/thread.cpp
rename to zircon/system/ulib/zx/thread.cpp
diff --git a/system/ulib/zx/timer.cpp b/zircon/system/ulib/zx/timer.cpp
similarity index 100%
rename from system/ulib/zx/timer.cpp
rename to zircon/system/ulib/zx/timer.cpp
diff --git a/system/ulib/zx/vcpu.cpp b/zircon/system/ulib/zx/vcpu.cpp
similarity index 100%
rename from system/ulib/zx/vcpu.cpp
rename to zircon/system/ulib/zx/vcpu.cpp
diff --git a/system/ulib/zx/vmar.cpp b/zircon/system/ulib/zx/vmar.cpp
similarity index 100%
rename from system/ulib/zx/vmar.cpp
rename to zircon/system/ulib/zx/vmar.cpp
diff --git a/system/ulib/zx/vmo.cpp b/zircon/system/ulib/zx/vmo.cpp
similarity index 100%
rename from system/ulib/zx/vmo.cpp
rename to zircon/system/ulib/zx/vmo.cpp
diff --git a/system/ulib/zxcpp/new.cpp b/zircon/system/ulib/zxcpp/new.cpp
similarity index 100%
rename from system/ulib/zxcpp/new.cpp
rename to zircon/system/ulib/zxcpp/new.cpp
diff --git a/system/ulib/zxcpp/pure_virtual.cpp b/zircon/system/ulib/zxcpp/pure_virtual.cpp
similarity index 100%
rename from system/ulib/zxcpp/pure_virtual.cpp
rename to zircon/system/ulib/zxcpp/pure_virtual.cpp
diff --git a/system/ulib/zxcpp/rules.mk b/zircon/system/ulib/zxcpp/rules.mk
similarity index 100%
rename from system/ulib/zxcpp/rules.mk
rename to zircon/system/ulib/zxcpp/rules.mk
diff --git a/system/ulib/zxcpp/thread_atexit.cpp b/zircon/system/ulib/zxcpp/thread_atexit.cpp
similarity index 100%
rename from system/ulib/zxcpp/thread_atexit.cpp
rename to zircon/system/ulib/zxcpp/thread_atexit.cpp
diff --git a/system/ulib/zxcrypt/include/zxcrypt/volume.h b/zircon/system/ulib/zxcrypt/include/zxcrypt/volume.h
similarity index 100%
rename from system/ulib/zxcrypt/include/zxcrypt/volume.h
rename to zircon/system/ulib/zxcrypt/include/zxcrypt/volume.h
diff --git a/system/ulib/zxcrypt/rules.mk b/zircon/system/ulib/zxcrypt/rules.mk
similarity index 100%
rename from system/ulib/zxcrypt/rules.mk
rename to zircon/system/ulib/zxcrypt/rules.mk
diff --git a/system/ulib/zxcrypt/volume.cpp b/zircon/system/ulib/zxcrypt/volume.cpp
similarity index 100%
rename from system/ulib/zxcrypt/volume.cpp
rename to zircon/system/ulib/zxcrypt/volume.cpp
diff --git a/system/ulib/zxio/MAINTAINERS b/zircon/system/ulib/zxio/MAINTAINERS
similarity index 100%
rename from system/ulib/zxio/MAINTAINERS
rename to zircon/system/ulib/zxio/MAINTAINERS
diff --git a/system/ulib/zxio/debuglog.cpp b/zircon/system/ulib/zxio/debuglog.cpp
similarity index 100%
rename from system/ulib/zxio/debuglog.cpp
rename to zircon/system/ulib/zxio/debuglog.cpp
diff --git a/system/ulib/zxio/include/lib/zxio/inception.h b/zircon/system/ulib/zxio/include/lib/zxio/inception.h
similarity index 100%
rename from system/ulib/zxio/include/lib/zxio/inception.h
rename to zircon/system/ulib/zxio/include/lib/zxio/inception.h
diff --git a/system/ulib/zxio/include/lib/zxio/null.h b/zircon/system/ulib/zxio/include/lib/zxio/null.h
similarity index 100%
rename from system/ulib/zxio/include/lib/zxio/null.h
rename to zircon/system/ulib/zxio/include/lib/zxio/null.h
diff --git a/system/ulib/zxio/include/lib/zxio/ops.h b/zircon/system/ulib/zxio/include/lib/zxio/ops.h
similarity index 100%
rename from system/ulib/zxio/include/lib/zxio/ops.h
rename to zircon/system/ulib/zxio/include/lib/zxio/ops.h
diff --git a/system/ulib/zxio/include/lib/zxio/types.h b/zircon/system/ulib/zxio/include/lib/zxio/types.h
similarity index 100%
rename from system/ulib/zxio/include/lib/zxio/types.h
rename to zircon/system/ulib/zxio/include/lib/zxio/types.h
diff --git a/system/ulib/zxio/include/lib/zxio/zxio.h b/zircon/system/ulib/zxio/include/lib/zxio/zxio.h
similarity index 100%
rename from system/ulib/zxio/include/lib/zxio/zxio.h
rename to zircon/system/ulib/zxio/include/lib/zxio/zxio.h
diff --git a/system/ulib/zxio/null.cpp b/zircon/system/ulib/zxio/null.cpp
similarity index 100%
rename from system/ulib/zxio/null.cpp
rename to zircon/system/ulib/zxio/null.cpp
diff --git a/system/ulib/zxio/pipe.cpp b/zircon/system/ulib/zxio/pipe.cpp
similarity index 100%
rename from system/ulib/zxio/pipe.cpp
rename to zircon/system/ulib/zxio/pipe.cpp
diff --git a/system/ulib/zxio/remote.cpp b/zircon/system/ulib/zxio/remote.cpp
similarity index 100%
rename from system/ulib/zxio/remote.cpp
rename to zircon/system/ulib/zxio/remote.cpp
diff --git a/system/ulib/zxio/rules.mk b/zircon/system/ulib/zxio/rules.mk
similarity index 100%
rename from system/ulib/zxio/rules.mk
rename to zircon/system/ulib/zxio/rules.mk
diff --git a/system/ulib/zxio/socket.cpp b/zircon/system/ulib/zxio/socket.cpp
similarity index 100%
rename from system/ulib/zxio/socket.cpp
rename to zircon/system/ulib/zxio/socket.cpp
diff --git a/system/ulib/zxio/vmofile.cpp b/zircon/system/ulib/zxio/vmofile.cpp
similarity index 100%
rename from system/ulib/zxio/vmofile.cpp
rename to zircon/system/ulib/zxio/vmofile.cpp
diff --git a/system/ulib/zxio/zxio.cpp b/zircon/system/ulib/zxio/zxio.cpp
similarity index 100%
rename from system/ulib/zxio/zxio.cpp
rename to zircon/system/ulib/zxio/zxio.cpp
diff --git a/system/ulib/zxs/MAINTAINERS b/zircon/system/ulib/zxs/MAINTAINERS
similarity index 100%
rename from system/ulib/zxs/MAINTAINERS
rename to zircon/system/ulib/zxs/MAINTAINERS
diff --git a/system/ulib/zxs/include/lib/zxs/protocol.h b/zircon/system/ulib/zxs/include/lib/zxs/protocol.h
similarity index 100%
rename from system/ulib/zxs/include/lib/zxs/protocol.h
rename to zircon/system/ulib/zxs/include/lib/zxs/protocol.h
diff --git a/system/ulib/zxs/include/lib/zxs/zxs.h b/zircon/system/ulib/zxs/include/lib/zxs/zxs.h
similarity index 100%
rename from system/ulib/zxs/include/lib/zxs/zxs.h
rename to zircon/system/ulib/zxs/include/lib/zxs/zxs.h
diff --git a/system/ulib/zxs/rules.mk b/zircon/system/ulib/zxs/rules.mk
similarity index 100%
rename from system/ulib/zxs/rules.mk
rename to zircon/system/ulib/zxs/rules.mk
diff --git a/system/ulib/zxs/zxs.cpp b/zircon/system/ulib/zxs/zxs.cpp
similarity index 100%
rename from system/ulib/zxs/zxs.cpp
rename to zircon/system/ulib/zxs/zxs.cpp
diff --git a/system/ulib/zxtest/assertion.cpp b/zircon/system/ulib/zxtest/assertion.cpp
similarity index 100%
rename from system/ulib/zxtest/assertion.cpp
rename to zircon/system/ulib/zxtest/assertion.cpp
diff --git a/system/ulib/zxtest/c-wrappers.cpp b/zircon/system/ulib/zxtest/c-wrappers.cpp
similarity index 100%
rename from system/ulib/zxtest/c-wrappers.cpp
rename to zircon/system/ulib/zxtest/c-wrappers.cpp
diff --git a/system/ulib/zxtest/event-broadcaster.cpp b/zircon/system/ulib/zxtest/event-broadcaster.cpp
similarity index 100%
rename from system/ulib/zxtest/event-broadcaster.cpp
rename to zircon/system/ulib/zxtest/event-broadcaster.cpp
diff --git a/system/ulib/zxtest/include/zxtest/base/assertion.h b/zircon/system/ulib/zxtest/include/zxtest/base/assertion.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/assertion.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/assertion.h
diff --git a/system/ulib/zxtest/include/zxtest/base/event-broadcaster.h b/zircon/system/ulib/zxtest/include/zxtest/base/event-broadcaster.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/event-broadcaster.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/event-broadcaster.h
diff --git a/system/ulib/zxtest/include/zxtest/base/observer.h b/zircon/system/ulib/zxtest/include/zxtest/base/observer.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/observer.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/observer.h
diff --git a/system/ulib/zxtest/include/zxtest/base/reporter.h b/zircon/system/ulib/zxtest/include/zxtest/base/reporter.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/reporter.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/reporter.h
diff --git a/system/ulib/zxtest/include/zxtest/base/runner.h b/zircon/system/ulib/zxtest/include/zxtest/base/runner.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/runner.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/runner.h
diff --git a/system/ulib/zxtest/include/zxtest/base/test-case.h b/zircon/system/ulib/zxtest/include/zxtest/base/test-case.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/test-case.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/test-case.h
diff --git a/system/ulib/zxtest/include/zxtest/base/test-driver.h b/zircon/system/ulib/zxtest/include/zxtest/base/test-driver.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/test-driver.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/test-driver.h
diff --git a/system/ulib/zxtest/include/zxtest/base/test-info.h b/zircon/system/ulib/zxtest/include/zxtest/base/test-info.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/test-info.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/test-info.h
diff --git a/system/ulib/zxtest/include/zxtest/base/test-internal.h b/zircon/system/ulib/zxtest/include/zxtest/base/test-internal.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/test-internal.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/test-internal.h
diff --git a/system/ulib/zxtest/include/zxtest/base/test.h b/zircon/system/ulib/zxtest/include/zxtest/base/test.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/test.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/test.h
diff --git a/system/ulib/zxtest/include/zxtest/base/types.h b/zircon/system/ulib/zxtest/include/zxtest/base/types.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/base/types.h
rename to zircon/system/ulib/zxtest/include/zxtest/base/types.h
diff --git a/system/ulib/zxtest/include/zxtest/c/zxtest.h b/zircon/system/ulib/zxtest/include/zxtest/c/zxtest.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/c/zxtest.h
rename to zircon/system/ulib/zxtest/include/zxtest/c/zxtest.h
diff --git a/system/ulib/zxtest/include/zxtest/cpp/zxtest.h b/zircon/system/ulib/zxtest/include/zxtest/cpp/zxtest.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/cpp/zxtest.h
rename to zircon/system/ulib/zxtest/include/zxtest/cpp/zxtest.h
diff --git a/system/ulib/zxtest/include/zxtest/zxtest.h b/zircon/system/ulib/zxtest/include/zxtest/zxtest.h
similarity index 100%
rename from system/ulib/zxtest/include/zxtest/zxtest.h
rename to zircon/system/ulib/zxtest/include/zxtest/zxtest.h
diff --git a/system/ulib/zxtest/reporter.cpp b/zircon/system/ulib/zxtest/reporter.cpp
similarity index 100%
rename from system/ulib/zxtest/reporter.cpp
rename to zircon/system/ulib/zxtest/reporter.cpp
diff --git a/system/ulib/zxtest/rules.mk b/zircon/system/ulib/zxtest/rules.mk
similarity index 100%
rename from system/ulib/zxtest/rules.mk
rename to zircon/system/ulib/zxtest/rules.mk
diff --git a/system/ulib/zxtest/runner-options.cpp b/zircon/system/ulib/zxtest/runner-options.cpp
similarity index 100%
rename from system/ulib/zxtest/runner-options.cpp
rename to zircon/system/ulib/zxtest/runner-options.cpp
diff --git a/system/ulib/zxtest/runner.cpp b/zircon/system/ulib/zxtest/runner.cpp
similarity index 100%
rename from system/ulib/zxtest/runner.cpp
rename to zircon/system/ulib/zxtest/runner.cpp
diff --git a/system/ulib/zxtest/test-case.cpp b/zircon/system/ulib/zxtest/test-case.cpp
similarity index 100%
rename from system/ulib/zxtest/test-case.cpp
rename to zircon/system/ulib/zxtest/test-case.cpp
diff --git a/system/ulib/zxtest/test-info.cpp b/zircon/system/ulib/zxtest/test-info.cpp
similarity index 100%
rename from system/ulib/zxtest/test-info.cpp
rename to zircon/system/ulib/zxtest/test-info.cpp
diff --git a/system/ulib/zxtest/test.cpp b/zircon/system/ulib/zxtest/test.cpp
similarity index 100%
rename from system/ulib/zxtest/test.cpp
rename to zircon/system/ulib/zxtest/test.cpp
diff --git a/system/ulib/zxtest/test/event-broadcaster_test.cpp b/zircon/system/ulib/zxtest/test/event-broadcaster_test.cpp
similarity index 100%
rename from system/ulib/zxtest/test/event-broadcaster_test.cpp
rename to zircon/system/ulib/zxtest/test/event-broadcaster_test.cpp
diff --git a/system/ulib/zxtest/test/integration/assertions_test.c b/zircon/system/ulib/zxtest/test/integration/assertions_test.c
similarity index 100%
rename from system/ulib/zxtest/test/integration/assertions_test.c
rename to zircon/system/ulib/zxtest/test/integration/assertions_test.c
diff --git a/system/ulib/zxtest/test/integration/assertions_test.cpp b/zircon/system/ulib/zxtest/test/integration/assertions_test.cpp
similarity index 100%
rename from system/ulib/zxtest/test/integration/assertions_test.cpp
rename to zircon/system/ulib/zxtest/test/integration/assertions_test.cpp
diff --git a/system/ulib/zxtest/test/integration/helper.cpp b/zircon/system/ulib/zxtest/test/integration/helper.cpp
similarity index 100%
rename from system/ulib/zxtest/test/integration/helper.cpp
rename to zircon/system/ulib/zxtest/test/integration/helper.cpp
diff --git a/system/ulib/zxtest/test/integration/helper.h b/zircon/system/ulib/zxtest/test/integration/helper.h
similarity index 100%
rename from system/ulib/zxtest/test/integration/helper.h
rename to zircon/system/ulib/zxtest/test/integration/helper.h
diff --git a/system/ulib/zxtest/test/integration/main.cpp b/zircon/system/ulib/zxtest/test/integration/main.cpp
similarity index 100%
rename from system/ulib/zxtest/test/integration/main.cpp
rename to zircon/system/ulib/zxtest/test/integration/main.cpp
diff --git a/system/ulib/zxtest/test/integration/register_test.c b/zircon/system/ulib/zxtest/test/integration/register_test.c
similarity index 100%
rename from system/ulib/zxtest/test/integration/register_test.c
rename to zircon/system/ulib/zxtest/test/integration/register_test.c
diff --git a/system/ulib/zxtest/test/integration/register_test.cpp b/zircon/system/ulib/zxtest/test/integration/register_test.cpp
similarity index 100%
rename from system/ulib/zxtest/test/integration/register_test.cpp
rename to zircon/system/ulib/zxtest/test/integration/register_test.cpp
diff --git a/system/ulib/zxtest/test/main.cpp b/zircon/system/ulib/zxtest/test/main.cpp
similarity index 100%
rename from system/ulib/zxtest/test/main.cpp
rename to zircon/system/ulib/zxtest/test/main.cpp
diff --git a/system/ulib/zxtest/test/runner_test.cpp b/zircon/system/ulib/zxtest/test/runner_test.cpp
similarity index 100%
rename from system/ulib/zxtest/test/runner_test.cpp
rename to zircon/system/ulib/zxtest/test/runner_test.cpp
diff --git a/system/ulib/zxtest/test/test-case_test.cpp b/zircon/system/ulib/zxtest/test/test-case_test.cpp
similarity index 100%
rename from system/ulib/zxtest/test/test-case_test.cpp
rename to zircon/system/ulib/zxtest/test/test-case_test.cpp
diff --git a/system/ulib/zxtest/test/test-info_test.cpp b/zircon/system/ulib/zxtest/test/test-info_test.cpp
similarity index 100%
rename from system/ulib/zxtest/test/test-info_test.cpp
rename to zircon/system/ulib/zxtest/test/test-info_test.cpp
diff --git a/system/ulib/zxtest/test/test-registry.h b/zircon/system/ulib/zxtest/test/test-registry.h
similarity index 100%
rename from system/ulib/zxtest/test/test-registry.h
rename to zircon/system/ulib/zxtest/test/test-registry.h
diff --git a/system/ulib/zxtest/test/test_test.cpp b/zircon/system/ulib/zxtest/test/test_test.cpp
similarity index 100%
rename from system/ulib/zxtest/test/test_test.cpp
rename to zircon/system/ulib/zxtest/test/test_test.cpp
diff --git a/system/utest/MAINTAINERS b/zircon/system/utest/MAINTAINERS
similarity index 100%
rename from system/utest/MAINTAINERS
rename to zircon/system/utest/MAINTAINERS
diff --git a/system/utest/abigen/abigen.c b/zircon/system/utest/abigen/abigen.c
similarity index 100%
rename from system/utest/abigen/abigen.c
rename to zircon/system/utest/abigen/abigen.c
diff --git a/system/utest/abigen/rules.mk b/zircon/system/utest/abigen/rules.mk
similarity index 100%
rename from system/utest/abigen/rules.mk
rename to zircon/system/utest/abigen/rules.mk
diff --git a/system/utest/async-loop/loop_tests.cpp b/zircon/system/utest/async-loop/loop_tests.cpp
similarity index 100%
rename from system/utest/async-loop/loop_tests.cpp
rename to zircon/system/utest/async-loop/loop_tests.cpp
diff --git a/system/utest/async-loop/main.c b/zircon/system/utest/async-loop/main.c
similarity index 100%
rename from system/utest/async-loop/main.c
rename to zircon/system/utest/async-loop/main.c
diff --git a/system/utest/async-loop/rules.mk b/zircon/system/utest/async-loop/rules.mk
similarity index 100%
rename from system/utest/async-loop/rules.mk
rename to zircon/system/utest/async-loop/rules.mk
diff --git a/system/utest/async-testutils/main.c b/zircon/system/utest/async-testutils/main.c
similarity index 100%
rename from system/utest/async-testutils/main.c
rename to zircon/system/utest/async-testutils/main.c
diff --git a/system/utest/async-testutils/rules.mk b/zircon/system/utest/async-testutils/rules.mk
similarity index 100%
rename from system/utest/async-testutils/rules.mk
rename to zircon/system/utest/async-testutils/rules.mk
diff --git a/system/utest/async-testutils/test_loop_tests.cpp b/zircon/system/utest/async-testutils/test_loop_tests.cpp
similarity index 100%
rename from system/utest/async-testutils/test_loop_tests.cpp
rename to zircon/system/utest/async-testutils/test_loop_tests.cpp
diff --git a/system/utest/async/default_tests.cpp b/zircon/system/utest/async/default_tests.cpp
similarity index 100%
rename from system/utest/async/default_tests.cpp
rename to zircon/system/utest/async/default_tests.cpp
diff --git a/system/utest/async/exception_tests.cpp b/zircon/system/utest/async/exception_tests.cpp
similarity index 100%
rename from system/utest/async/exception_tests.cpp
rename to zircon/system/utest/async/exception_tests.cpp
diff --git a/system/utest/async/main.c b/zircon/system/utest/async/main.c
similarity index 100%
rename from system/utest/async/main.c
rename to zircon/system/utest/async/main.c
diff --git a/system/utest/async/receiver_tests.cpp b/zircon/system/utest/async/receiver_tests.cpp
similarity index 100%
rename from system/utest/async/receiver_tests.cpp
rename to zircon/system/utest/async/receiver_tests.cpp
diff --git a/system/utest/async/rules.mk b/zircon/system/utest/async/rules.mk
similarity index 100%
rename from system/utest/async/rules.mk
rename to zircon/system/utest/async/rules.mk
diff --git a/system/utest/async/task_tests.cpp b/zircon/system/utest/async/task_tests.cpp
similarity index 100%
rename from system/utest/async/task_tests.cpp
rename to zircon/system/utest/async/task_tests.cpp
diff --git a/system/utest/async/time_tests.cpp b/zircon/system/utest/async/time_tests.cpp
similarity index 100%
rename from system/utest/async/time_tests.cpp
rename to zircon/system/utest/async/time_tests.cpp
diff --git a/system/utest/async/trap_tests.cpp b/zircon/system/utest/async/trap_tests.cpp
similarity index 100%
rename from system/utest/async/trap_tests.cpp
rename to zircon/system/utest/async/trap_tests.cpp
diff --git a/system/utest/async/wait_tests.cpp b/zircon/system/utest/async/wait_tests.cpp
similarity index 100%
rename from system/utest/async/wait_tests.cpp
rename to zircon/system/utest/async/wait_tests.cpp
diff --git a/system/utest/backtrace-request/main.cpp b/zircon/system/utest/backtrace-request/main.cpp
similarity index 100%
rename from system/utest/backtrace-request/main.cpp
rename to zircon/system/utest/backtrace-request/main.cpp
diff --git a/system/utest/backtrace-request/rules.mk b/zircon/system/utest/backtrace-request/rules.mk
similarity index 100%
rename from system/utest/backtrace-request/rules.mk
rename to zircon/system/utest/backtrace-request/rules.mk
diff --git a/system/utest/bad-kernel-access/bad-kernel-access.c b/zircon/system/utest/bad-kernel-access/bad-kernel-access.c
similarity index 100%
rename from system/utest/bad-kernel-access/bad-kernel-access.c
rename to zircon/system/utest/bad-kernel-access/bad-kernel-access.c
diff --git a/system/utest/bad-kernel-access/rules.mk b/zircon/system/utest/bad-kernel-access/rules.mk
similarity index 100%
rename from system/utest/bad-kernel-access/rules.mk
rename to zircon/system/utest/bad-kernel-access/rules.mk
diff --git a/system/utest/banjo-compiler/dup_attributes_tests.cpp b/zircon/system/utest/banjo-compiler/dup_attributes_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/dup_attributes_tests.cpp
rename to zircon/system/utest/banjo-compiler/dup_attributes_tests.cpp
diff --git a/system/utest/banjo-compiler/examples.h b/zircon/system/utest/banjo-compiler/examples.h
similarity index 100%
rename from system/utest/banjo-compiler/examples.h
rename to zircon/system/utest/banjo-compiler/examples.h
diff --git a/system/utest/banjo-compiler/flat_ast_tests.cpp b/zircon/system/utest/banjo-compiler/flat_ast_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/flat_ast_tests.cpp
rename to zircon/system/utest/banjo-compiler/flat_ast_tests.cpp
diff --git a/system/utest/banjo-compiler/formatter_unittests.cpp b/zircon/system/utest/banjo-compiler/formatter_unittests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/formatter_unittests.cpp
rename to zircon/system/utest/banjo-compiler/formatter_unittests.cpp
diff --git a/system/utest/banjo-compiler/json_generator_tests.cpp b/zircon/system/utest/banjo-compiler/json_generator_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/json_generator_tests.cpp
rename to zircon/system/utest/banjo-compiler/json_generator_tests.cpp
diff --git a/system/utest/banjo-compiler/main.cpp b/zircon/system/utest/banjo-compiler/main.cpp
similarity index 100%
rename from system/utest/banjo-compiler/main.cpp
rename to zircon/system/utest/banjo-compiler/main.cpp
diff --git a/system/utest/banjo-compiler/max_bytes_tests.cpp b/zircon/system/utest/banjo-compiler/max_bytes_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/max_bytes_tests.cpp
rename to zircon/system/utest/banjo-compiler/max_bytes_tests.cpp
diff --git a/system/utest/banjo-compiler/max_handle_tests.cpp b/zircon/system/utest/banjo-compiler/max_handle_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/max_handle_tests.cpp
rename to zircon/system/utest/banjo-compiler/max_handle_tests.cpp
diff --git a/system/utest/banjo-compiler/parsing_tests.cpp b/zircon/system/utest/banjo-compiler/parsing_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/parsing_tests.cpp
rename to zircon/system/utest/banjo-compiler/parsing_tests.cpp
diff --git a/system/utest/banjo-compiler/rules.mk b/zircon/system/utest/banjo-compiler/rules.mk
similarity index 100%
rename from system/utest/banjo-compiler/rules.mk
rename to zircon/system/utest/banjo-compiler/rules.mk
diff --git a/system/utest/banjo-compiler/superinterface_tests.cpp b/zircon/system/utest/banjo-compiler/superinterface_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/superinterface_tests.cpp
rename to zircon/system/utest/banjo-compiler/superinterface_tests.cpp
diff --git a/system/utest/banjo-compiler/table_tests.cpp b/zircon/system/utest/banjo-compiler/table_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/table_tests.cpp
rename to zircon/system/utest/banjo-compiler/table_tests.cpp
diff --git a/system/utest/banjo-compiler/test_library.h b/zircon/system/utest/banjo-compiler/test_library.h
similarity index 100%
rename from system/utest/banjo-compiler/test_library.h
rename to zircon/system/utest/banjo-compiler/test_library.h
diff --git a/system/utest/banjo-compiler/testdata/badformat.banjo.noformat b/zircon/system/utest/banjo-compiler/testdata/badformat.banjo.noformat
similarity index 100%
rename from system/utest/banjo-compiler/testdata/badformat.banjo.noformat
rename to zircon/system/utest/banjo-compiler/testdata/badformat.banjo.noformat
diff --git a/system/utest/banjo-compiler/testdata/goodformat.banjo b/zircon/system/utest/banjo-compiler/testdata/goodformat.banjo
similarity index 100%
rename from system/utest/banjo-compiler/testdata/goodformat.banjo
rename to zircon/system/utest/banjo-compiler/testdata/goodformat.banjo
diff --git a/system/utest/banjo-compiler/using_tests.cpp b/zircon/system/utest/banjo-compiler/using_tests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/using_tests.cpp
rename to zircon/system/utest/banjo-compiler/using_tests.cpp
diff --git a/system/utest/banjo-compiler/visitor_unittests.cpp b/zircon/system/utest/banjo-compiler/visitor_unittests.cpp
similarity index 100%
rename from system/utest/banjo-compiler/visitor_unittests.cpp
rename to zircon/system/utest/banjo-compiler/visitor_unittests.cpp
diff --git a/system/utest/biotime/biotime-test.cpp b/zircon/system/utest/biotime/biotime-test.cpp
similarity index 100%
rename from system/utest/biotime/biotime-test.cpp
rename to zircon/system/utest/biotime/biotime-test.cpp
diff --git a/system/utest/biotime/rules.mk b/zircon/system/utest/biotime/rules.mk
similarity index 100%
rename from system/utest/biotime/rules.mk
rename to zircon/system/utest/biotime/rules.mk
diff --git a/system/utest/bitmap/main.c b/zircon/system/utest/bitmap/main.c
similarity index 100%
rename from system/utest/bitmap/main.c
rename to zircon/system/utest/bitmap/main.c
diff --git a/system/utest/bitmap/raw-bitmap-tests.cpp b/zircon/system/utest/bitmap/raw-bitmap-tests.cpp
similarity index 100%
rename from system/utest/bitmap/raw-bitmap-tests.cpp
rename to zircon/system/utest/bitmap/raw-bitmap-tests.cpp
diff --git a/system/utest/bitmap/rle-bitmap-tests.cpp b/zircon/system/utest/bitmap/rle-bitmap-tests.cpp
similarity index 100%
rename from system/utest/bitmap/rle-bitmap-tests.cpp
rename to zircon/system/utest/bitmap/rle-bitmap-tests.cpp
diff --git a/system/utest/bitmap/rules.mk b/zircon/system/utest/bitmap/rules.mk
similarity index 100%
rename from system/utest/bitmap/rules.mk
rename to zircon/system/utest/bitmap/rules.mk
diff --git a/system/utest/blobfs-bench/blobfs-bench.cpp b/zircon/system/utest/blobfs-bench/blobfs-bench.cpp
similarity index 100%
rename from system/utest/blobfs-bench/blobfs-bench.cpp
rename to zircon/system/utest/blobfs-bench/blobfs-bench.cpp
diff --git a/system/utest/blobfs-bench/rules.mk b/zircon/system/utest/blobfs-bench/rules.mk
similarity index 100%
rename from system/utest/blobfs-bench/rules.mk
rename to zircon/system/utest/blobfs-bench/rules.mk
diff --git a/system/utest/blobfs/blobfs-test.h b/zircon/system/utest/blobfs/blobfs-test.h
similarity index 100%
rename from system/utest/blobfs/blobfs-test.h
rename to zircon/system/utest/blobfs/blobfs-test.h
diff --git a/system/utest/blobfs/blobfs.cpp b/zircon/system/utest/blobfs/blobfs.cpp
similarity index 100%
rename from system/utest/blobfs/blobfs.cpp
rename to zircon/system/utest/blobfs/blobfs.cpp
diff --git a/system/utest/blobfs/rules.mk b/zircon/system/utest/blobfs/rules.mk
similarity index 100%
rename from system/utest/blobfs/rules.mk
rename to zircon/system/utest/blobfs/rules.mk
diff --git a/system/utest/channel-fatal/channel-fatal-test.c b/zircon/system/utest/channel-fatal/channel-fatal-test.c
similarity index 100%
rename from system/utest/channel-fatal/channel-fatal-test.c
rename to zircon/system/utest/channel-fatal/channel-fatal-test.c
diff --git a/system/utest/channel-fatal/rules.mk b/zircon/system/utest/channel-fatal/rules.mk
similarity index 100%
rename from system/utest/channel-fatal/rules.mk
rename to zircon/system/utest/channel-fatal/rules.mk
diff --git a/system/utest/chromeos-disk-setup/chromeos-disk-setup.cpp b/zircon/system/utest/chromeos-disk-setup/chromeos-disk-setup.cpp
similarity index 100%
rename from system/utest/chromeos-disk-setup/chromeos-disk-setup.cpp
rename to zircon/system/utest/chromeos-disk-setup/chromeos-disk-setup.cpp
diff --git a/system/utest/chromeos-disk-setup/rules.mk b/zircon/system/utest/chromeos-disk-setup/rules.mk
similarity index 100%
rename from system/utest/chromeos-disk-setup/rules.mk
rename to zircon/system/utest/chromeos-disk-setup/rules.mk
diff --git a/system/utest/cleanup/cleanup.c b/zircon/system/utest/cleanup/cleanup.c
similarity index 100%
rename from system/utest/cleanup/cleanup.c
rename to zircon/system/utest/cleanup/cleanup.c
diff --git a/system/utest/cleanup/rules.mk b/zircon/system/utest/cleanup/rules.mk
similarity index 100%
rename from system/utest/cleanup/rules.mk
rename to zircon/system/utest/cleanup/rules.mk
diff --git a/system/utest/cobalt-client/cobalt_logger_test.cpp b/zircon/system/utest/cobalt-client/cobalt_logger_test.cpp
similarity index 100%
rename from system/utest/cobalt-client/cobalt_logger_test.cpp
rename to zircon/system/utest/cobalt-client/cobalt_logger_test.cpp
diff --git a/system/utest/cobalt-client/collector_test.cpp b/zircon/system/utest/cobalt-client/collector_test.cpp
similarity index 100%
rename from system/utest/cobalt-client/collector_test.cpp
rename to zircon/system/utest/cobalt-client/collector_test.cpp
diff --git a/system/utest/cobalt-client/counter_test.cpp b/zircon/system/utest/cobalt-client/counter_test.cpp
similarity index 100%
rename from system/utest/cobalt-client/counter_test.cpp
rename to zircon/system/utest/cobalt-client/counter_test.cpp
diff --git a/system/utest/cobalt-client/fake_logger.h b/zircon/system/utest/cobalt-client/fake_logger.h
similarity index 100%
rename from system/utest/cobalt-client/fake_logger.h
rename to zircon/system/utest/cobalt-client/fake_logger.h
diff --git a/system/utest/cobalt-client/histogram_test.cpp b/zircon/system/utest/cobalt-client/histogram_test.cpp
similarity index 100%
rename from system/utest/cobalt-client/histogram_test.cpp
rename to zircon/system/utest/cobalt-client/histogram_test.cpp
diff --git a/system/utest/cobalt-client/metric_options_test.cpp b/zircon/system/utest/cobalt-client/metric_options_test.cpp
similarity index 100%
rename from system/utest/cobalt-client/metric_options_test.cpp
rename to zircon/system/utest/cobalt-client/metric_options_test.cpp
diff --git a/system/utest/cobalt-client/rules.mk b/zircon/system/utest/cobalt-client/rules.mk
similarity index 100%
rename from system/utest/cobalt-client/rules.mk
rename to zircon/system/utest/cobalt-client/rules.mk
diff --git a/system/utest/cobalt-client/test_main.cpp b/zircon/system/utest/cobalt-client/test_main.cpp
similarity index 100%
rename from system/utest/cobalt-client/test_main.cpp
rename to zircon/system/utest/cobalt-client/test_main.cpp
diff --git a/system/utest/cobalt-client/timer_test.cpp b/zircon/system/utest/cobalt-client/timer_test.cpp
similarity index 100%
rename from system/utest/cobalt-client/timer_test.cpp
rename to zircon/system/utest/cobalt-client/timer_test.cpp
diff --git a/system/utest/cobalt-client/types_internal_test.cpp b/zircon/system/utest/cobalt-client/types_internal_test.cpp
similarity index 100%
rename from system/utest/cobalt-client/types_internal_test.cpp
rename to zircon/system/utest/cobalt-client/types_internal_test.cpp
diff --git a/system/utest/compiler/integer.cpp b/zircon/system/utest/compiler/integer.cpp
similarity index 100%
rename from system/utest/compiler/integer.cpp
rename to zircon/system/utest/compiler/integer.cpp
diff --git a/system/utest/compiler/rules.mk b/zircon/system/utest/compiler/rules.mk
similarity index 100%
rename from system/utest/compiler/rules.mk
rename to zircon/system/utest/compiler/rules.mk
diff --git a/system/utest/core/README.md b/zircon/system/utest/core/README.md
similarity index 100%
rename from system/utest/core/README.md
rename to zircon/system/utest/core/README.md
diff --git a/system/utest/core/bad-syscall/bad-syscall.c b/zircon/system/utest/core/bad-syscall/bad-syscall.c
similarity index 100%
rename from system/utest/core/bad-syscall/bad-syscall.c
rename to zircon/system/utest/core/bad-syscall/bad-syscall.c
diff --git a/system/utest/core/bad-syscall/rules.mk b/zircon/system/utest/core/bad-syscall/rules.mk
similarity index 100%
rename from system/utest/core/bad-syscall/rules.mk
rename to zircon/system/utest/core/bad-syscall/rules.mk
diff --git a/system/utest/core/bad-syscall/syscall.S b/zircon/system/utest/core/bad-syscall/syscall.S
similarity index 100%
rename from system/utest/core/bad-syscall/syscall.S
rename to zircon/system/utest/core/bad-syscall/syscall.S
diff --git a/system/utest/core/c11-condvar/condvar.c b/zircon/system/utest/core/c11-condvar/condvar.c
similarity index 100%
rename from system/utest/core/c11-condvar/condvar.c
rename to zircon/system/utest/core/c11-condvar/condvar.c
diff --git a/system/utest/core/c11-condvar/rules.mk b/zircon/system/utest/core/c11-condvar/rules.mk
similarity index 100%
rename from system/utest/core/c11-condvar/rules.mk
rename to zircon/system/utest/core/c11-condvar/rules.mk
diff --git a/system/utest/core/c11-mutex/mutex.c b/zircon/system/utest/core/c11-mutex/mutex.c
similarity index 100%
rename from system/utest/core/c11-mutex/mutex.c
rename to zircon/system/utest/core/c11-mutex/mutex.c
diff --git a/system/utest/core/c11-mutex/rules.mk b/zircon/system/utest/core/c11-mutex/rules.mk
similarity index 100%
rename from system/utest/core/c11-mutex/rules.mk
rename to zircon/system/utest/core/c11-mutex/rules.mk
diff --git a/system/utest/core/c11-thread/rules.mk b/zircon/system/utest/core/c11-thread/rules.mk
similarity index 100%
rename from system/utest/core/c11-thread/rules.mk
rename to zircon/system/utest/core/c11-thread/rules.mk
diff --git a/system/utest/core/c11-thread/thread.c b/zircon/system/utest/core/c11-thread/thread.c
similarity index 100%
rename from system/utest/core/c11-thread/thread.c
rename to zircon/system/utest/core/c11-thread/thread.c
diff --git a/system/utest/core/channel/channel.c b/zircon/system/utest/core/channel/channel.c
similarity index 100%
rename from system/utest/core/channel/channel.c
rename to zircon/system/utest/core/channel/channel.c
diff --git a/system/utest/core/channel/rules.mk b/zircon/system/utest/core/channel/rules.mk
similarity index 100%
rename from system/utest/core/channel/rules.mk
rename to zircon/system/utest/core/channel/rules.mk
diff --git a/system/utest/core/clock/clock.c b/zircon/system/utest/core/clock/clock.c
similarity index 100%
rename from system/utest/core/clock/clock.c
rename to zircon/system/utest/core/clock/clock.c
diff --git a/system/utest/core/clock/rules.mk b/zircon/system/utest/core/clock/rules.mk
similarity index 100%
rename from system/utest/core/clock/rules.mk
rename to zircon/system/utest/core/clock/rules.mk
diff --git a/system/utest/core/condition-generic/condition-generic.h b/zircon/system/utest/core/condition-generic/condition-generic.h
similarity index 100%
rename from system/utest/core/condition-generic/condition-generic.h
rename to zircon/system/utest/core/condition-generic/condition-generic.h
diff --git a/system/utest/core/cookies/cookies.c b/zircon/system/utest/core/cookies/cookies.c
similarity index 100%
rename from system/utest/core/cookies/cookies.c
rename to zircon/system/utest/core/cookies/cookies.c
diff --git a/system/utest/core/cookies/rules.mk b/zircon/system/utest/core/cookies/rules.mk
similarity index 100%
rename from system/utest/core/cookies/rules.mk
rename to zircon/system/utest/core/cookies/rules.mk
diff --git a/system/utest/core/echo/README b/zircon/system/utest/core/echo/README
similarity index 100%
rename from system/utest/core/echo/README
rename to zircon/system/utest/core/echo/README
diff --git a/system/utest/core/echo/echo.c b/zircon/system/utest/core/echo/echo.c
similarity index 100%
rename from system/utest/core/echo/echo.c
rename to zircon/system/utest/core/echo/echo.c
diff --git a/system/utest/core/echo/echo.h b/zircon/system/utest/core/echo/echo.h
similarity index 100%
rename from system/utest/core/echo/echo.h
rename to zircon/system/utest/core/echo/echo.h
diff --git a/system/utest/core/echo/message.c b/zircon/system/utest/core/echo/message.c
similarity index 100%
rename from system/utest/core/echo/message.c
rename to zircon/system/utest/core/echo/message.c
diff --git a/system/utest/core/echo/message.h b/zircon/system/utest/core/echo/message.h
similarity index 100%
rename from system/utest/core/echo/message.h
rename to zircon/system/utest/core/echo/message.h
diff --git a/system/utest/core/echo/rules.mk b/zircon/system/utest/core/echo/rules.mk
similarity index 100%
rename from system/utest/core/echo/rules.mk
rename to zircon/system/utest/core/echo/rules.mk
diff --git a/system/utest/core/echo/struct.c b/zircon/system/utest/core/echo/struct.c
similarity index 100%
rename from system/utest/core/echo/struct.c
rename to zircon/system/utest/core/echo/struct.c
diff --git a/system/utest/core/echo/struct.h b/zircon/system/utest/core/echo/struct.h
similarity index 100%
rename from system/utest/core/echo/struct.h
rename to zircon/system/utest/core/echo/struct.h
diff --git a/system/utest/core/elf-tls/rules.mk b/zircon/system/utest/core/elf-tls/rules.mk
similarity index 100%
rename from system/utest/core/elf-tls/rules.mk
rename to zircon/system/utest/core/elf-tls/rules.mk
diff --git a/system/utest/core/elf-tls/tls.cpp b/zircon/system/utest/core/elf-tls/tls.cpp
similarity index 100%
rename from system/utest/core/elf-tls/tls.cpp
rename to zircon/system/utest/core/elf-tls/tls.cpp
diff --git a/system/utest/core/event-pair/event-pair.c b/zircon/system/utest/core/event-pair/event-pair.c
similarity index 100%
rename from system/utest/core/event-pair/event-pair.c
rename to zircon/system/utest/core/event-pair/event-pair.c
diff --git a/system/utest/core/event-pair/rules.mk b/zircon/system/utest/core/event-pair/rules.mk
similarity index 100%
rename from system/utest/core/event-pair/rules.mk
rename to zircon/system/utest/core/event-pair/rules.mk
diff --git a/system/utest/core/fifo/fifo.c b/zircon/system/utest/core/fifo/fifo.c
similarity index 100%
rename from system/utest/core/fifo/fifo.c
rename to zircon/system/utest/core/fifo/fifo.c
diff --git a/system/utest/core/fifo/rules.mk b/zircon/system/utest/core/fifo/rules.mk
similarity index 100%
rename from system/utest/core/fifo/rules.mk
rename to zircon/system/utest/core/fifo/rules.mk
diff --git a/system/utest/core/futex/futex.cpp b/zircon/system/utest/core/futex/futex.cpp
similarity index 100%
rename from system/utest/core/futex/futex.cpp
rename to zircon/system/utest/core/futex/futex.cpp
diff --git a/system/utest/core/futex/rules.mk b/zircon/system/utest/core/futex/rules.mk
similarity index 100%
rename from system/utest/core/futex/rules.mk
rename to zircon/system/utest/core/futex/rules.mk
diff --git a/system/utest/core/handle-close/handle-close.c b/zircon/system/utest/core/handle-close/handle-close.c
similarity index 100%
rename from system/utest/core/handle-close/handle-close.c
rename to zircon/system/utest/core/handle-close/handle-close.c
diff --git a/system/utest/core/handle-close/rules.mk b/zircon/system/utest/core/handle-close/rules.mk
similarity index 100%
rename from system/utest/core/handle-close/rules.mk
rename to zircon/system/utest/core/handle-close/rules.mk
diff --git a/system/utest/core/handle-info/handle-info.c b/zircon/system/utest/core/handle-info/handle-info.c
similarity index 100%
rename from system/utest/core/handle-info/handle-info.c
rename to zircon/system/utest/core/handle-info/handle-info.c
diff --git a/system/utest/core/handle-info/rules.mk b/zircon/system/utest/core/handle-info/rules.mk
similarity index 100%
rename from system/utest/core/handle-info/rules.mk
rename to zircon/system/utest/core/handle-info/rules.mk
diff --git a/system/utest/core/handle-transfer/handle-transfer.c b/zircon/system/utest/core/handle-transfer/handle-transfer.c
similarity index 100%
rename from system/utest/core/handle-transfer/handle-transfer.c
rename to zircon/system/utest/core/handle-transfer/handle-transfer.c
diff --git a/system/utest/core/handle-transfer/rules.mk b/zircon/system/utest/core/handle-transfer/rules.mk
similarity index 100%
rename from system/utest/core/handle-transfer/rules.mk
rename to zircon/system/utest/core/handle-transfer/rules.mk
diff --git a/system/utest/core/handle-wait/handle-wait.c b/zircon/system/utest/core/handle-wait/handle-wait.c
similarity index 100%
rename from system/utest/core/handle-wait/handle-wait.c
rename to zircon/system/utest/core/handle-wait/handle-wait.c
diff --git a/system/utest/core/handle-wait/rules.mk b/zircon/system/utest/core/handle-wait/rules.mk
similarity index 100%
rename from system/utest/core/handle-wait/rules.mk
rename to zircon/system/utest/core/handle-wait/rules.mk
diff --git a/system/utest/core/interrupt/interrupt-test.cpp b/zircon/system/utest/core/interrupt/interrupt-test.cpp
similarity index 100%
rename from system/utest/core/interrupt/interrupt-test.cpp
rename to zircon/system/utest/core/interrupt/interrupt-test.cpp
diff --git a/system/utest/core/job/jobs.cpp b/zircon/system/utest/core/job/jobs.cpp
similarity index 100%
rename from system/utest/core/job/jobs.cpp
rename to zircon/system/utest/core/job/jobs.cpp
diff --git a/system/utest/core/job/rules.mk b/zircon/system/utest/core/job/rules.mk
similarity index 100%
rename from system/utest/core/job/rules.mk
rename to zircon/system/utest/core/job/rules.mk
diff --git a/system/utest/core/main.c b/zircon/system/utest/core/main.c
similarity index 100%
rename from system/utest/core/main.c
rename to zircon/system/utest/core/main.c
diff --git a/system/utest/core/memory-mapping/memory-mapping.cpp b/zircon/system/utest/core/memory-mapping/memory-mapping.cpp
similarity index 100%
rename from system/utest/core/memory-mapping/memory-mapping.cpp
rename to zircon/system/utest/core/memory-mapping/memory-mapping.cpp
diff --git a/system/utest/core/memory-mapping/rules.mk b/zircon/system/utest/core/memory-mapping/rules.mk
similarity index 100%
rename from system/utest/core/memory-mapping/rules.mk
rename to zircon/system/utest/core/memory-mapping/rules.mk
diff --git a/system/utest/core/object-child/object-child.cpp b/zircon/system/utest/core/object-child/object-child.cpp
similarity index 100%
rename from system/utest/core/object-child/object-child.cpp
rename to zircon/system/utest/core/object-child/object-child.cpp
diff --git a/system/utest/core/object-child/rules.mk b/zircon/system/utest/core/object-child/rules.mk
similarity index 100%
rename from system/utest/core/object-child/rules.mk
rename to zircon/system/utest/core/object-child/rules.mk
diff --git a/system/utest/core/object-info/object-info.cpp b/zircon/system/utest/core/object-info/object-info.cpp
similarity index 100%
rename from system/utest/core/object-info/object-info.cpp
rename to zircon/system/utest/core/object-info/object-info.cpp
diff --git a/system/utest/core/object-info/rules.mk b/zircon/system/utest/core/object-info/rules.mk
similarity index 100%
rename from system/utest/core/object-info/rules.mk
rename to zircon/system/utest/core/object-info/rules.mk
diff --git a/system/utest/core/pager/pager.cpp b/zircon/system/utest/core/pager/pager.cpp
similarity index 100%
rename from system/utest/core/pager/pager.cpp
rename to zircon/system/utest/core/pager/pager.cpp
diff --git a/system/utest/core/pager/rules.mk b/zircon/system/utest/core/pager/rules.mk
similarity index 100%
rename from system/utest/core/pager/rules.mk
rename to zircon/system/utest/core/pager/rules.mk
diff --git a/system/utest/core/pager/test_thread.cpp b/zircon/system/utest/core/pager/test_thread.cpp
similarity index 100%
rename from system/utest/core/pager/test_thread.cpp
rename to zircon/system/utest/core/pager/test_thread.cpp
diff --git a/system/utest/core/pager/test_thread.h b/zircon/system/utest/core/pager/test_thread.h
similarity index 100%
rename from system/utest/core/pager/test_thread.h
rename to zircon/system/utest/core/pager/test_thread.h
diff --git a/system/utest/core/pager/userpager.cpp b/zircon/system/utest/core/pager/userpager.cpp
similarity index 100%
rename from system/utest/core/pager/userpager.cpp
rename to zircon/system/utest/core/pager/userpager.cpp
diff --git a/system/utest/core/pager/userpager.h b/zircon/system/utest/core/pager/userpager.h
similarity index 100%
rename from system/utest/core/pager/userpager.h
rename to zircon/system/utest/core/pager/userpager.h
diff --git a/system/utest/core/port/ports.cpp b/zircon/system/utest/core/port/ports.cpp
similarity index 100%
rename from system/utest/core/port/ports.cpp
rename to zircon/system/utest/core/port/ports.cpp
diff --git a/system/utest/core/port/rules.mk b/zircon/system/utest/core/port/rules.mk
similarity index 100%
rename from system/utest/core/port/rules.mk
rename to zircon/system/utest/core/port/rules.mk
diff --git a/system/utest/core/process/process.cpp b/zircon/system/utest/core/process/process.cpp
similarity index 100%
rename from system/utest/core/process/process.cpp
rename to zircon/system/utest/core/process/process.cpp
diff --git a/system/utest/core/process/rules.mk b/zircon/system/utest/core/process/rules.mk
similarity index 100%
rename from system/utest/core/process/rules.mk
rename to zircon/system/utest/core/process/rules.mk
diff --git a/system/utest/core/profile/profile.c b/zircon/system/utest/core/profile/profile.c
similarity index 100%
rename from system/utest/core/profile/profile.c
rename to zircon/system/utest/core/profile/profile.c
diff --git a/system/utest/core/profile/profile.cpp b/zircon/system/utest/core/profile/profile.cpp
similarity index 100%
rename from system/utest/core/profile/profile.cpp
rename to zircon/system/utest/core/profile/profile.cpp
diff --git a/system/utest/core/pthread-barrier/barrier.c b/zircon/system/utest/core/pthread-barrier/barrier.c
similarity index 100%
rename from system/utest/core/pthread-barrier/barrier.c
rename to zircon/system/utest/core/pthread-barrier/barrier.c
diff --git a/system/utest/core/pthread-barrier/rules.mk b/zircon/system/utest/core/pthread-barrier/rules.mk
similarity index 100%
rename from system/utest/core/pthread-barrier/rules.mk
rename to zircon/system/utest/core/pthread-barrier/rules.mk
diff --git a/system/utest/core/pthread-tls/rules.mk b/zircon/system/utest/core/pthread-tls/rules.mk
similarity index 100%
rename from system/utest/core/pthread-tls/rules.mk
rename to zircon/system/utest/core/pthread-tls/rules.mk
diff --git a/system/utest/core/pthread-tls/tls-test.c b/zircon/system/utest/core/pthread-tls/tls-test.c
similarity index 100%
rename from system/utest/core/pthread-tls/tls-test.c
rename to zircon/system/utest/core/pthread-tls/tls-test.c
diff --git a/system/utest/core/pthread/pthread.cpp b/zircon/system/utest/core/pthread/pthread.cpp
similarity index 100%
rename from system/utest/core/pthread/pthread.cpp
rename to zircon/system/utest/core/pthread/pthread.cpp
diff --git a/system/utest/core/pthread/rules.mk b/zircon/system/utest/core/pthread/rules.mk
similarity index 100%
rename from system/utest/core/pthread/rules.mk
rename to zircon/system/utest/core/pthread/rules.mk
diff --git a/system/utest/core/resource/resource.cpp b/zircon/system/utest/core/resource/resource.cpp
similarity index 100%
rename from system/utest/core/resource/resource.cpp
rename to zircon/system/utest/core/resource/resource.cpp
diff --git a/system/utest/core/rules.mk b/zircon/system/utest/core/rules.mk
similarity index 100%
rename from system/utest/core/rules.mk
rename to zircon/system/utest/core/rules.mk
diff --git a/system/utest/core/socket/rules.mk b/zircon/system/utest/core/socket/rules.mk
similarity index 100%
rename from system/utest/core/socket/rules.mk
rename to zircon/system/utest/core/socket/rules.mk
diff --git a/system/utest/core/socket/socket.cpp b/zircon/system/utest/core/socket/socket.cpp
similarity index 100%
rename from system/utest/core/socket/socket.cpp
rename to zircon/system/utest/core/socket/socket.cpp
diff --git a/system/utest/core/stack/rules.mk b/zircon/system/utest/core/stack/rules.mk
similarity index 100%
rename from system/utest/core/stack/rules.mk
rename to zircon/system/utest/core/stack/rules.mk
diff --git a/system/utest/core/stack/stack-test.c b/zircon/system/utest/core/stack/stack-test.c
similarity index 100%
rename from system/utest/core/stack/stack-test.c
rename to zircon/system/utest/core/stack/stack-test.c
diff --git a/system/utest/core/sync-completion/completion.cpp b/zircon/system/utest/core/sync-completion/completion.cpp
similarity index 100%
rename from system/utest/core/sync-completion/completion.cpp
rename to zircon/system/utest/core/sync-completion/completion.cpp
diff --git a/system/utest/core/sync-completion/main.c b/zircon/system/utest/core/sync-completion/main.c
similarity index 100%
rename from system/utest/core/sync-completion/main.c
rename to zircon/system/utest/core/sync-completion/main.c
diff --git a/system/utest/core/sync-completion/rules.mk b/zircon/system/utest/core/sync-completion/rules.mk
similarity index 100%
rename from system/utest/core/sync-completion/rules.mk
rename to zircon/system/utest/core/sync-completion/rules.mk
diff --git a/system/utest/core/sync-condition/condition.cpp b/zircon/system/utest/core/sync-condition/condition.cpp
similarity index 100%
rename from system/utest/core/sync-condition/condition.cpp
rename to zircon/system/utest/core/sync-condition/condition.cpp
diff --git a/system/utest/core/sync-condition/rules.mk b/zircon/system/utest/core/sync-condition/rules.mk
similarity index 100%
rename from system/utest/core/sync-condition/rules.mk
rename to zircon/system/utest/core/sync-condition/rules.mk
diff --git a/system/utest/core/sync-mutex/mutex.c b/zircon/system/utest/core/sync-mutex/mutex.c
similarity index 100%
rename from system/utest/core/sync-mutex/mutex.c
rename to zircon/system/utest/core/sync-mutex/mutex.c
diff --git a/system/utest/core/sync-mutex/rules.mk b/zircon/system/utest/core/sync-mutex/rules.mk
similarity index 100%
rename from system/utest/core/sync-mutex/rules.mk
rename to zircon/system/utest/core/sync-mutex/rules.mk
diff --git a/system/utest/core/threads/register-set.cpp b/zircon/system/utest/core/threads/register-set.cpp
similarity index 100%
rename from system/utest/core/threads/register-set.cpp
rename to zircon/system/utest/core/threads/register-set.cpp
diff --git a/system/utest/core/threads/register-set.h b/zircon/system/utest/core/threads/register-set.h
similarity index 100%
rename from system/utest/core/threads/register-set.h
rename to zircon/system/utest/core/threads/register-set.h
diff --git a/system/utest/core/threads/rules.mk b/zircon/system/utest/core/threads/rules.mk
similarity index 100%
rename from system/utest/core/threads/rules.mk
rename to zircon/system/utest/core/threads/rules.mk
diff --git a/system/utest/core/threads/thread-functions/rules.mk b/zircon/system/utest/core/threads/thread-functions/rules.mk
similarity index 100%
rename from system/utest/core/threads/thread-functions/rules.mk
rename to zircon/system/utest/core/threads/thread-functions/rules.mk
diff --git a/system/utest/core/threads/thread-functions/thread-functions.cpp b/zircon/system/utest/core/threads/thread-functions/thread-functions.cpp
similarity index 100%
rename from system/utest/core/threads/thread-functions/thread-functions.cpp
rename to zircon/system/utest/core/threads/thread-functions/thread-functions.cpp
diff --git a/system/utest/core/threads/thread-functions/thread-functions.h b/zircon/system/utest/core/threads/thread-functions/thread-functions.h
similarity index 100%
rename from system/utest/core/threads/thread-functions/thread-functions.h
rename to zircon/system/utest/core/threads/thread-functions/thread-functions.h
diff --git a/system/utest/core/threads/threads.cpp b/zircon/system/utest/core/threads/threads.cpp
similarity index 100%
rename from system/utest/core/threads/threads.cpp
rename to zircon/system/utest/core/threads/threads.cpp
diff --git a/system/utest/core/time/rules.mk b/zircon/system/utest/core/time/rules.mk
similarity index 100%
rename from system/utest/core/time/rules.mk
rename to zircon/system/utest/core/time/rules.mk
diff --git a/system/utest/core/time/ticks.c b/zircon/system/utest/core/time/ticks.c
similarity index 100%
rename from system/utest/core/time/ticks.c
rename to zircon/system/utest/core/time/ticks.c
diff --git a/system/utest/core/vmar/rules.mk b/zircon/system/utest/core/vmar/rules.mk
similarity index 100%
rename from system/utest/core/vmar/rules.mk
rename to zircon/system/utest/core/vmar/rules.mk
diff --git a/system/utest/core/vmar/vmar.cpp b/zircon/system/utest/core/vmar/vmar.cpp
similarity index 100%
rename from system/utest/core/vmar/vmar.cpp
rename to zircon/system/utest/core/vmar/vmar.cpp
diff --git a/system/utest/core/vmo-signal/rules.mk b/zircon/system/utest/core/vmo-signal/rules.mk
similarity index 100%
rename from system/utest/core/vmo-signal/rules.mk
rename to zircon/system/utest/core/vmo-signal/rules.mk
diff --git a/system/utest/core/vmo-signal/vmo-signal.c b/zircon/system/utest/core/vmo-signal/vmo-signal.c
similarity index 100%
rename from system/utest/core/vmo-signal/vmo-signal.c
rename to zircon/system/utest/core/vmo-signal/vmo-signal.c
diff --git a/system/utest/cprng/cprng.c b/zircon/system/utest/cprng/cprng.c
similarity index 100%
rename from system/utest/cprng/cprng.c
rename to zircon/system/utest/cprng/cprng.c
diff --git a/system/utest/cprng/rules.mk b/zircon/system/utest/cprng/rules.mk
similarity index 100%
rename from system/utest/cprng/rules.mk
rename to zircon/system/utest/cprng/rules.mk
diff --git a/system/utest/crypto/aead.cpp b/zircon/system/utest/crypto/aead.cpp
similarity index 100%
rename from system/utest/crypto/aead.cpp
rename to zircon/system/utest/crypto/aead.cpp
diff --git a/system/utest/crypto/bytes.cpp b/zircon/system/utest/crypto/bytes.cpp
similarity index 100%
rename from system/utest/crypto/bytes.cpp
rename to zircon/system/utest/crypto/bytes.cpp
diff --git a/system/utest/crypto/cipher.cpp b/zircon/system/utest/crypto/cipher.cpp
similarity index 100%
rename from system/utest/crypto/cipher.cpp
rename to zircon/system/utest/crypto/cipher.cpp
diff --git a/system/utest/crypto/hkdf.cpp b/zircon/system/utest/crypto/hkdf.cpp
similarity index 100%
rename from system/utest/crypto/hkdf.cpp
rename to zircon/system/utest/crypto/hkdf.cpp
diff --git a/system/utest/crypto/hmac.cpp b/zircon/system/utest/crypto/hmac.cpp
similarity index 100%
rename from system/utest/crypto/hmac.cpp
rename to zircon/system/utest/crypto/hmac.cpp
diff --git a/system/utest/crypto/main.c b/zircon/system/utest/crypto/main.c
similarity index 100%
rename from system/utest/crypto/main.c
rename to zircon/system/utest/crypto/main.c
diff --git a/system/utest/crypto/rules.mk b/zircon/system/utest/crypto/rules.mk
similarity index 100%
rename from system/utest/crypto/rules.mk
rename to zircon/system/utest/crypto/rules.mk
diff --git a/system/utest/crypto/secret.cpp b/zircon/system/utest/crypto/secret.cpp
similarity index 100%
rename from system/utest/crypto/secret.cpp
rename to zircon/system/utest/crypto/secret.cpp
diff --git a/system/utest/crypto/utils.cpp b/zircon/system/utest/crypto/utils.cpp
similarity index 100%
rename from system/utest/crypto/utils.cpp
rename to zircon/system/utest/crypto/utils.cpp
diff --git a/system/utest/crypto/utils.h b/zircon/system/utest/crypto/utils.h
similarity index 100%
rename from system/utest/crypto/utils.h
rename to zircon/system/utest/crypto/utils.h
diff --git a/system/utest/ctor/ctor.cpp b/zircon/system/utest/ctor/ctor.cpp
similarity index 100%
rename from system/utest/ctor/ctor.cpp
rename to zircon/system/utest/ctor/ctor.cpp
diff --git a/system/utest/ctor/dso-ctor/dso-ctor.cpp b/zircon/system/utest/ctor/dso-ctor/dso-ctor.cpp
similarity index 100%
rename from system/utest/ctor/dso-ctor/dso-ctor.cpp
rename to zircon/system/utest/ctor/dso-ctor/dso-ctor.cpp
diff --git a/system/utest/ctor/dso-ctor/dso-ctor.h b/zircon/system/utest/ctor/dso-ctor/dso-ctor.h
similarity index 100%
rename from system/utest/ctor/dso-ctor/dso-ctor.h
rename to zircon/system/utest/ctor/dso-ctor/dso-ctor.h
diff --git a/system/utest/ctor/dso-ctor/rules.mk b/zircon/system/utest/ctor/dso-ctor/rules.mk
similarity index 100%
rename from system/utest/ctor/dso-ctor/rules.mk
rename to zircon/system/utest/ctor/dso-ctor/rules.mk
diff --git a/system/utest/ctor/rules.mk b/zircon/system/utest/ctor/rules.mk
similarity index 100%
rename from system/utest/ctor/rules.mk
rename to zircon/system/utest/ctor/rules.mk
diff --git a/system/utest/debugger/debugger.cpp b/zircon/system/utest/debugger/debugger.cpp
similarity index 100%
rename from system/utest/debugger/debugger.cpp
rename to zircon/system/utest/debugger/debugger.cpp
diff --git a/system/utest/debugger/rules.mk b/zircon/system/utest/debugger/rules.mk
similarity index 100%
rename from system/utest/debugger/rules.mk
rename to zircon/system/utest/debugger/rules.mk
diff --git a/system/utest/debugger/utils.cpp b/zircon/system/utest/debugger/utils.cpp
similarity index 100%
rename from system/utest/debugger/utils.cpp
rename to zircon/system/utest/debugger/utils.cpp
diff --git a/system/utest/debugger/utils.h b/zircon/system/utest/debugger/utils.h
similarity index 100%
rename from system/utest/debugger/utils.h
rename to zircon/system/utest/debugger/utils.h
diff --git a/system/utest/devfs/fdio-tests.cpp b/zircon/system/utest/devfs/fdio-tests.cpp
similarity index 100%
rename from system/utest/devfs/fdio-tests.cpp
rename to zircon/system/utest/devfs/fdio-tests.cpp
diff --git a/system/utest/devfs/fidl-tests.cpp b/zircon/system/utest/devfs/fidl-tests.cpp
similarity index 100%
rename from system/utest/devfs/fidl-tests.cpp
rename to zircon/system/utest/devfs/fidl-tests.cpp
diff --git a/system/utest/devfs/main.c b/zircon/system/utest/devfs/main.c
similarity index 100%
rename from system/utest/devfs/main.c
rename to zircon/system/utest/devfs/main.c
diff --git a/system/utest/devfs/rules.mk b/zircon/system/utest/devfs/rules.mk
similarity index 100%
rename from system/utest/devfs/rules.mk
rename to zircon/system/utest/devfs/rules.mk
diff --git a/system/utest/device-enumeration/main.cpp b/zircon/system/utest/device-enumeration/main.cpp
similarity index 100%
rename from system/utest/device-enumeration/main.cpp
rename to zircon/system/utest/device-enumeration/main.cpp
diff --git a/system/utest/device-enumeration/rules.mk b/zircon/system/utest/device-enumeration/rules.mk
similarity index 100%
rename from system/utest/device-enumeration/rules.mk
rename to zircon/system/utest/device-enumeration/rules.mk
diff --git a/system/utest/digest/digest.cpp b/zircon/system/utest/digest/digest.cpp
similarity index 100%
rename from system/utest/digest/digest.cpp
rename to zircon/system/utest/digest/digest.cpp
diff --git a/system/utest/digest/main.c b/zircon/system/utest/digest/main.c
similarity index 100%
rename from system/utest/digest/main.c
rename to zircon/system/utest/digest/main.c
diff --git a/system/utest/digest/merkle-tree.cpp b/zircon/system/utest/digest/merkle-tree.cpp
similarity index 100%
rename from system/utest/digest/merkle-tree.cpp
rename to zircon/system/utest/digest/merkle-tree.cpp
diff --git a/system/utest/digest/rules.mk b/zircon/system/utest/digest/rules.mk
similarity index 100%
rename from system/utest/digest/rules.mk
rename to zircon/system/utest/digest/rules.mk
diff --git a/system/utest/dlfcn/dlfcn.c b/zircon/system/utest/dlfcn/dlfcn.c
similarity index 100%
rename from system/utest/dlfcn/dlfcn.c
rename to zircon/system/utest/dlfcn/dlfcn.c
diff --git a/system/utest/dlfcn/rules.mk b/zircon/system/utest/dlfcn/rules.mk
similarity index 100%
rename from system/utest/dlfcn/rules.mk
rename to zircon/system/utest/dlfcn/rules.mk
diff --git a/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/libb.c b/zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/libb.c
similarity index 100%
rename from system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/libb.c
rename to zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/libb.c
diff --git a/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/rules.mk b/zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/rules.mk
similarity index 100%
rename from system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/rules.mk
rename to zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/dlopen-indirect-deps-test-libb/rules.mk
diff --git a/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/liba.c b/zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/liba.c
similarity index 100%
rename from system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/liba.c
rename to zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/liba.c
diff --git a/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/rules.mk b/zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/rules.mk
similarity index 100%
rename from system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/rules.mk
rename to zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/dlopen-indirect-deps-test-liba/rules.mk
diff --git a/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/rules.mk b/zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/rules.mk
similarity index 100%
rename from system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/rules.mk
rename to zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/rules.mk
diff --git a/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/test-module.c b/zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/test-module.c
similarity index 100%
rename from system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/test-module.c
rename to zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps-test-module/test-module.c
diff --git a/system/utest/dlopen-indirect-deps/dlopen-indirect-deps.c b/zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps.c
similarity index 100%
rename from system/utest/dlopen-indirect-deps/dlopen-indirect-deps.c
rename to zircon/system/utest/dlopen-indirect-deps/dlopen-indirect-deps.c
diff --git a/system/utest/dlopen-indirect-deps/rules.mk b/zircon/system/utest/dlopen-indirect-deps/rules.mk
similarity index 100%
rename from system/utest/dlopen-indirect-deps/rules.mk
rename to zircon/system/utest/dlopen-indirect-deps/rules.mk
diff --git a/system/utest/driver-test/main.cpp b/zircon/system/utest/driver-test/main.cpp
similarity index 100%
rename from system/utest/driver-test/main.cpp
rename to zircon/system/utest/driver-test/main.cpp
diff --git a/system/utest/driver-test/rules.mk b/zircon/system/utest/driver-test/rules.mk
similarity index 100%
rename from system/utest/driver-test/rules.mk
rename to zircon/system/utest/driver-test/rules.mk
diff --git a/system/utest/dump1/dump1.c b/zircon/system/utest/dump1/dump1.c
similarity index 100%
rename from system/utest/dump1/dump1.c
rename to zircon/system/utest/dump1/dump1.c
diff --git a/system/utest/dump1/rules.mk b/zircon/system/utest/dump1/rules.mk
similarity index 100%
rename from system/utest/dump1/rules.mk
rename to zircon/system/utest/dump1/rules.mk
diff --git a/system/utest/edid/edid-fuzztest.cpp b/zircon/system/utest/edid/edid-fuzztest.cpp
similarity index 100%
rename from system/utest/edid/edid-fuzztest.cpp
rename to zircon/system/utest/edid/edid-fuzztest.cpp
diff --git a/system/utest/edid/rules.mk b/zircon/system/utest/edid/rules.mk
similarity index 100%
rename from system/utest/edid/rules.mk
rename to zircon/system/utest/edid/rules.mk
diff --git a/system/utest/elf-search/elf-search-test.cpp b/zircon/system/utest/elf-search/elf-search-test.cpp
similarity index 100%
rename from system/utest/elf-search/elf-search-test.cpp
rename to zircon/system/utest/elf-search/elf-search-test.cpp
diff --git a/system/utest/elf-search/rules.mk b/zircon/system/utest/elf-search/rules.mk
similarity index 100%
rename from system/utest/elf-search/rules.mk
rename to zircon/system/utest/elf-search/rules.mk
diff --git a/system/utest/entropy/entropy.cpp b/zircon/system/utest/entropy/entropy.cpp
similarity index 100%
rename from system/utest/entropy/entropy.cpp
rename to zircon/system/utest/entropy/entropy.cpp
diff --git a/system/utest/entropy/rules.mk b/zircon/system/utest/entropy/rules.mk
similarity index 100%
rename from system/utest/entropy/rules.mk
rename to zircon/system/utest/entropy/rules.mk
diff --git a/system/utest/errno/errno.c b/zircon/system/utest/errno/errno.c
similarity index 100%
rename from system/utest/errno/errno.c
rename to zircon/system/utest/errno/errno.c
diff --git a/system/utest/errno/rules.mk b/zircon/system/utest/errno/rules.mk
similarity index 100%
rename from system/utest/errno/rules.mk
rename to zircon/system/utest/errno/rules.mk
diff --git a/system/utest/ethernet/ethernet.cpp b/zircon/system/utest/ethernet/ethernet.cpp
similarity index 100%
rename from system/utest/ethernet/ethernet.cpp
rename to zircon/system/utest/ethernet/ethernet.cpp
diff --git a/system/utest/ethernet/rules.mk b/zircon/system/utest/ethernet/rules.mk
similarity index 100%
rename from system/utest/ethernet/rules.mk
rename to zircon/system/utest/ethernet/rules.mk
diff --git a/system/utest/events/events.c b/zircon/system/utest/events/events.c
similarity index 100%
rename from system/utest/events/events.c
rename to zircon/system/utest/events/events.c
diff --git a/system/utest/events/rules.mk b/zircon/system/utest/events/rules.mk
similarity index 100%
rename from system/utest/events/rules.mk
rename to zircon/system/utest/events/rules.mk
diff --git a/system/utest/evil/evil.c b/zircon/system/utest/evil/evil.c
similarity index 100%
rename from system/utest/evil/evil.c
rename to zircon/system/utest/evil/evil.c
diff --git a/system/utest/evil/rules.mk b/zircon/system/utest/evil/rules.mk
similarity index 100%
rename from system/utest/evil/rules.mk
rename to zircon/system/utest/evil/rules.mk
diff --git a/system/utest/exception/exception.c b/zircon/system/utest/exception/exception.c
similarity index 100%
rename from system/utest/exception/exception.c
rename to zircon/system/utest/exception/exception.c
diff --git a/system/utest/exception/rules.mk b/zircon/system/utest/exception/rules.mk
similarity index 100%
rename from system/utest/exception/rules.mk
rename to zircon/system/utest/exception/rules.mk
diff --git a/system/utest/exit/exit.c b/zircon/system/utest/exit/exit.c
similarity index 100%
rename from system/utest/exit/exit.c
rename to zircon/system/utest/exit/exit.c
diff --git a/system/utest/exit/rules.mk b/zircon/system/utest/exit/rules.mk
similarity index 100%
rename from system/utest/exit/rules.mk
rename to zircon/system/utest/exit/rules.mk
diff --git a/system/utest/fbl/algorithm_tests.cpp b/zircon/system/utest/fbl/algorithm_tests.cpp
similarity index 100%
rename from system/utest/fbl/algorithm_tests.cpp
rename to zircon/system/utest/fbl/algorithm_tests.cpp
diff --git a/system/utest/fbl/array_tests.cpp b/zircon/system/utest/fbl/array_tests.cpp
similarity index 100%
rename from system/utest/fbl/array_tests.cpp
rename to zircon/system/utest/fbl/array_tests.cpp
diff --git a/system/utest/fbl/auto_call_tests.cpp b/zircon/system/utest/fbl/auto_call_tests.cpp
similarity index 100%
rename from system/utest/fbl/auto_call_tests.cpp
rename to zircon/system/utest/fbl/auto_call_tests.cpp
diff --git a/system/utest/fbl/condition_variable_tests.cpp b/zircon/system/utest/fbl/condition_variable_tests.cpp
similarity index 100%
rename from system/utest/fbl/condition_variable_tests.cpp
rename to zircon/system/utest/fbl/condition_variable_tests.cpp
diff --git a/system/utest/fbl/forward_tests.cpp b/zircon/system/utest/fbl/forward_tests.cpp
similarity index 100%
rename from system/utest/fbl/forward_tests.cpp
rename to zircon/system/utest/fbl/forward_tests.cpp
diff --git a/system/utest/fbl/function_tests.cpp b/zircon/system/utest/fbl/function_tests.cpp
similarity index 100%
rename from system/utest/fbl/function_tests.cpp
rename to zircon/system/utest/fbl/function_tests.cpp
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/associative_container_test_environment.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/associative_container_test_environment.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/associative_container_test_environment.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/associative_container_test_environment.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/base_test_environments.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/base_test_environments.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/base_test_environments.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/base_test_environments.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_doubly_linked_list_checker.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_doubly_linked_list_checker.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_doubly_linked_list_checker.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_doubly_linked_list_checker.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_hash_table_checker.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_hash_table_checker.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_hash_table_checker.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_hash_table_checker.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_singly_linked_list_checker.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_singly_linked_list_checker.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_singly_linked_list_checker.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_singly_linked_list_checker.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_wavl_tree_checker.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_wavl_tree_checker.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_wavl_tree_checker.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/intrusive_wavl_tree_checker.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/objects.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/objects.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/objects.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/objects.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/ordered_associative_container_test_environment.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/ordered_associative_container_test_environment.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/ordered_associative_container_test_environment.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/ordered_associative_container_test_environment.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/sequence_container_test_environment.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/sequence_container_test_environment.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/sequence_container_test_environment.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/sequence_container_test_environment.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/test_environment_utils.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/test_environment_utils.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/test_environment_utils.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/test_environment_utils.h
diff --git a/system/utest/fbl/include/fbl/tests/intrusive_containers/test_thunks.h b/zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/test_thunks.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/intrusive_containers/test_thunks.h
rename to zircon/system/utest/fbl/include/fbl/tests/intrusive_containers/test_thunks.h
diff --git a/system/utest/fbl/include/fbl/tests/lfsr.h b/zircon/system/utest/fbl/include/fbl/tests/lfsr.h
similarity index 100%
rename from system/utest/fbl/include/fbl/tests/lfsr.h
rename to zircon/system/utest/fbl/include/fbl/tests/lfsr.h
diff --git a/system/utest/fbl/intrusive_container_tests.cpp b/zircon/system/utest/fbl/intrusive_container_tests.cpp
similarity index 100%
rename from system/utest/fbl/intrusive_container_tests.cpp
rename to zircon/system/utest/fbl/intrusive_container_tests.cpp
diff --git a/system/utest/fbl/intrusive_doubly_linked_list_tests.cpp b/zircon/system/utest/fbl/intrusive_doubly_linked_list_tests.cpp
similarity index 100%
rename from system/utest/fbl/intrusive_doubly_linked_list_tests.cpp
rename to zircon/system/utest/fbl/intrusive_doubly_linked_list_tests.cpp
diff --git a/system/utest/fbl/intrusive_hash_table_dll_tests.cpp b/zircon/system/utest/fbl/intrusive_hash_table_dll_tests.cpp
similarity index 100%
rename from system/utest/fbl/intrusive_hash_table_dll_tests.cpp
rename to zircon/system/utest/fbl/intrusive_hash_table_dll_tests.cpp
diff --git a/system/utest/fbl/intrusive_hash_table_sll_tests.cpp b/zircon/system/utest/fbl/intrusive_hash_table_sll_tests.cpp
similarity index 100%
rename from system/utest/fbl/intrusive_hash_table_sll_tests.cpp
rename to zircon/system/utest/fbl/intrusive_hash_table_sll_tests.cpp
diff --git a/system/utest/fbl/intrusive_singly_linked_list_tests.cpp b/zircon/system/utest/fbl/intrusive_singly_linked_list_tests.cpp
similarity index 100%
rename from system/utest/fbl/intrusive_singly_linked_list_tests.cpp
rename to zircon/system/utest/fbl/intrusive_singly_linked_list_tests.cpp
diff --git a/system/utest/fbl/intrusive_wavl_tree_tests.cpp b/zircon/system/utest/fbl/intrusive_wavl_tree_tests.cpp
similarity index 100%
rename from system/utest/fbl/intrusive_wavl_tree_tests.cpp
rename to zircon/system/utest/fbl/intrusive_wavl_tree_tests.cpp
diff --git a/system/utest/fbl/main.c b/zircon/system/utest/fbl/main.c
similarity index 100%
rename from system/utest/fbl/main.c
rename to zircon/system/utest/fbl/main.c
diff --git a/system/utest/fbl/recycler_tests.cpp b/zircon/system/utest/fbl/recycler_tests.cpp
similarity index 100%
rename from system/utest/fbl/recycler_tests.cpp
rename to zircon/system/utest/fbl/recycler_tests.cpp
diff --git a/system/utest/fbl/ref_counted_tests.cpp b/zircon/system/utest/fbl/ref_counted_tests.cpp
similarity index 100%
rename from system/utest/fbl/ref_counted_tests.cpp
rename to zircon/system/utest/fbl/ref_counted_tests.cpp
diff --git a/system/utest/fbl/ref_counted_upgradeable_tests.cpp b/zircon/system/utest/fbl/ref_counted_upgradeable_tests.cpp
similarity index 100%
rename from system/utest/fbl/ref_counted_upgradeable_tests.cpp
rename to zircon/system/utest/fbl/ref_counted_upgradeable_tests.cpp
diff --git a/system/utest/fbl/ref_ptr_tests.cpp b/zircon/system/utest/fbl/ref_ptr_tests.cpp
similarity index 100%
rename from system/utest/fbl/ref_ptr_tests.cpp
rename to zircon/system/utest/fbl/ref_ptr_tests.cpp
diff --git a/system/utest/fbl/rules.mk b/zircon/system/utest/fbl/rules.mk
similarity index 100%
rename from system/utest/fbl/rules.mk
rename to zircon/system/utest/fbl/rules.mk
diff --git a/system/utest/fbl/slab_allocator_tests.cpp b/zircon/system/utest/fbl/slab_allocator_tests.cpp
similarity index 100%
rename from system/utest/fbl/slab_allocator_tests.cpp
rename to zircon/system/utest/fbl/slab_allocator_tests.cpp
diff --git a/system/utest/fbl/string_buffer_tests.cpp b/zircon/system/utest/fbl/string_buffer_tests.cpp
similarity index 100%
rename from system/utest/fbl/string_buffer_tests.cpp
rename to zircon/system/utest/fbl/string_buffer_tests.cpp
diff --git a/system/utest/fbl/string_piece_tests.cpp b/zircon/system/utest/fbl/string_piece_tests.cpp
similarity index 100%
rename from system/utest/fbl/string_piece_tests.cpp
rename to zircon/system/utest/fbl/string_piece_tests.cpp
diff --git a/system/utest/fbl/string_printf_tests.cpp b/zircon/system/utest/fbl/string_printf_tests.cpp
similarity index 100%
rename from system/utest/fbl/string_printf_tests.cpp
rename to zircon/system/utest/fbl/string_printf_tests.cpp
diff --git a/system/utest/fbl/string_tests.cpp b/zircon/system/utest/fbl/string_tests.cpp
similarity index 100%
rename from system/utest/fbl/string_tests.cpp
rename to zircon/system/utest/fbl/string_tests.cpp
diff --git a/system/utest/fbl/string_traits_tests.cpp b/zircon/system/utest/fbl/string_traits_tests.cpp
similarity index 100%
rename from system/utest/fbl/string_traits_tests.cpp
rename to zircon/system/utest/fbl/string_traits_tests.cpp
diff --git a/system/utest/fbl/type_info_tests.cpp b/zircon/system/utest/fbl/type_info_tests.cpp
similarity index 100%
rename from system/utest/fbl/type_info_tests.cpp
rename to zircon/system/utest/fbl/type_info_tests.cpp
diff --git a/system/utest/fbl/type_support_tests.cpp b/zircon/system/utest/fbl/type_support_tests.cpp
similarity index 100%
rename from system/utest/fbl/type_support_tests.cpp
rename to zircon/system/utest/fbl/type_support_tests.cpp
diff --git a/system/utest/fbl/unique_fd_tests.cpp b/zircon/system/utest/fbl/unique_fd_tests.cpp
similarity index 100%
rename from system/utest/fbl/unique_fd_tests.cpp
rename to zircon/system/utest/fbl/unique_fd_tests.cpp
diff --git a/system/utest/fbl/unique_free_ptr_tests.cpp b/zircon/system/utest/fbl/unique_free_ptr_tests.cpp
similarity index 100%
rename from system/utest/fbl/unique_free_ptr_tests.cpp
rename to zircon/system/utest/fbl/unique_free_ptr_tests.cpp
diff --git a/system/utest/fbl/unique_ptr_tests.cpp b/zircon/system/utest/fbl/unique_ptr_tests.cpp
similarity index 100%
rename from system/utest/fbl/unique_ptr_tests.cpp
rename to zircon/system/utest/fbl/unique_ptr_tests.cpp
diff --git a/system/utest/fbl/vector_tests.cpp b/zircon/system/utest/fbl/vector_tests.cpp
similarity index 100%
rename from system/utest/fbl/vector_tests.cpp
rename to zircon/system/utest/fbl/vector_tests.cpp
diff --git a/system/utest/fdio/fdio_handle_fd.c b/zircon/system/utest/fdio/fdio_handle_fd.c
similarity index 100%
rename from system/utest/fdio/fdio_handle_fd.c
rename to zircon/system/utest/fdio/fdio_handle_fd.c
diff --git a/system/utest/fdio/fdio_open_max.c b/zircon/system/utest/fdio/fdio_open_max.c
similarity index 100%
rename from system/utest/fdio/fdio_open_max.c
rename to zircon/system/utest/fdio/fdio_open_max.c
diff --git a/system/utest/fdio/fdio_path_canonicalize.c b/zircon/system/utest/fdio/fdio_path_canonicalize.c
similarity index 100%
rename from system/utest/fdio/fdio_path_canonicalize.c
rename to zircon/system/utest/fdio/fdio_path_canonicalize.c
diff --git a/system/utest/fdio/fdio_root.c b/zircon/system/utest/fdio/fdio_root.c
similarity index 100%
rename from system/utest/fdio/fdio_root.c
rename to zircon/system/utest/fdio/fdio_root.c
diff --git a/system/utest/fdio/fdio_socket.c b/zircon/system/utest/fdio/fdio_socket.c
similarity index 100%
rename from system/utest/fdio/fdio_socket.c
rename to zircon/system/utest/fdio/fdio_socket.c
diff --git a/system/utest/fdio/fdio_socketpair.c b/zircon/system/utest/fdio/fdio_socketpair.c
similarity index 100%
rename from system/utest/fdio/fdio_socketpair.c
rename to zircon/system/utest/fdio/fdio_socketpair.c
diff --git a/system/utest/fdio/main.c b/zircon/system/utest/fdio/main.c
similarity index 100%
rename from system/utest/fdio/main.c
rename to zircon/system/utest/fdio/main.c
diff --git a/system/utest/fdio/rules.mk b/zircon/system/utest/fdio/rules.mk
similarity index 100%
rename from system/utest/fdio/rules.mk
rename to zircon/system/utest/fdio/rules.mk
diff --git a/system/utest/fidl-compiler/attributes_tests.cpp b/zircon/system/utest/fidl-compiler/attributes_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/attributes_tests.cpp
rename to zircon/system/utest/fidl-compiler/attributes_tests.cpp
diff --git a/system/utest/fidl-compiler/coded_types_generator_tests.cpp b/zircon/system/utest/fidl-compiler/coded_types_generator_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/coded_types_generator_tests.cpp
rename to zircon/system/utest/fidl-compiler/coded_types_generator_tests.cpp
diff --git a/system/utest/fidl-compiler/consts_tests.cpp b/zircon/system/utest/fidl-compiler/consts_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/consts_tests.cpp
rename to zircon/system/utest/fidl-compiler/consts_tests.cpp
diff --git a/system/utest/fidl-compiler/declaration_order_tests.cpp b/zircon/system/utest/fidl-compiler/declaration_order_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/declaration_order_tests.cpp
rename to zircon/system/utest/fidl-compiler/declaration_order_tests.cpp
diff --git a/system/utest/fidl-compiler/enums_tests.cpp b/zircon/system/utest/fidl-compiler/enums_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/enums_tests.cpp
rename to zircon/system/utest/fidl-compiler/enums_tests.cpp
diff --git a/system/utest/fidl-compiler/errors_tests.cpp b/zircon/system/utest/fidl-compiler/errors_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/errors_tests.cpp
rename to zircon/system/utest/fidl-compiler/errors_tests.cpp
diff --git a/system/utest/fidl-compiler/examples.h b/zircon/system/utest/fidl-compiler/examples.h
similarity index 100%
rename from system/utest/fidl-compiler/examples.h
rename to zircon/system/utest/fidl-compiler/examples.h
diff --git a/system/utest/fidl-compiler/flat_ast_tests.cpp b/zircon/system/utest/fidl-compiler/flat_ast_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/flat_ast_tests.cpp
rename to zircon/system/utest/fidl-compiler/flat_ast_tests.cpp
diff --git a/system/utest/fidl-compiler/formatter_unittests.cpp b/zircon/system/utest/fidl-compiler/formatter_unittests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/formatter_unittests.cpp
rename to zircon/system/utest/fidl-compiler/formatter_unittests.cpp
diff --git a/system/utest/fidl-compiler/json_generator_tests.cpp b/zircon/system/utest/fidl-compiler/json_generator_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/json_generator_tests.cpp
rename to zircon/system/utest/fidl-compiler/json_generator_tests.cpp
diff --git a/system/utest/fidl-compiler/main.cpp b/zircon/system/utest/fidl-compiler/main.cpp
similarity index 100%
rename from system/utest/fidl-compiler/main.cpp
rename to zircon/system/utest/fidl-compiler/main.cpp
diff --git a/system/utest/fidl-compiler/max_bytes_multipass_tests.cpp b/zircon/system/utest/fidl-compiler/max_bytes_multipass_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/max_bytes_multipass_tests.cpp
rename to zircon/system/utest/fidl-compiler/max_bytes_multipass_tests.cpp
diff --git a/system/utest/fidl-compiler/max_bytes_tests.cpp b/zircon/system/utest/fidl-compiler/max_bytes_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/max_bytes_tests.cpp
rename to zircon/system/utest/fidl-compiler/max_bytes_tests.cpp
diff --git a/system/utest/fidl-compiler/max_handle_tests.cpp b/zircon/system/utest/fidl-compiler/max_handle_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/max_handle_tests.cpp
rename to zircon/system/utest/fidl-compiler/max_handle_tests.cpp
diff --git a/system/utest/fidl-compiler/optionals_tests.cpp b/zircon/system/utest/fidl-compiler/optionals_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/optionals_tests.cpp
rename to zircon/system/utest/fidl-compiler/optionals_tests.cpp
diff --git a/system/utest/fidl-compiler/ordinals_tests.cpp b/zircon/system/utest/fidl-compiler/ordinals_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/ordinals_tests.cpp
rename to zircon/system/utest/fidl-compiler/ordinals_tests.cpp
diff --git a/system/utest/fidl-compiler/parsing_tests.cpp b/zircon/system/utest/fidl-compiler/parsing_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/parsing_tests.cpp
rename to zircon/system/utest/fidl-compiler/parsing_tests.cpp
diff --git a/system/utest/fidl-compiler/rules.mk b/zircon/system/utest/fidl-compiler/rules.mk
similarity index 100%
rename from system/utest/fidl-compiler/rules.mk
rename to zircon/system/utest/fidl-compiler/rules.mk
diff --git a/system/utest/fidl-compiler/superinterface_tests.cpp b/zircon/system/utest/fidl-compiler/superinterface_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/superinterface_tests.cpp
rename to zircon/system/utest/fidl-compiler/superinterface_tests.cpp
diff --git a/system/utest/fidl-compiler/table_tests.cpp b/zircon/system/utest/fidl-compiler/table_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/table_tests.cpp
rename to zircon/system/utest/fidl-compiler/table_tests.cpp
diff --git a/system/utest/fidl-compiler/test_library.h b/zircon/system/utest/fidl-compiler/test_library.h
similarity index 100%
rename from system/utest/fidl-compiler/test_library.h
rename to zircon/system/utest/fidl-compiler/test_library.h
diff --git a/system/utest/fidl-compiler/testdata/badformat.fidl.noformat b/zircon/system/utest/fidl-compiler/testdata/badformat.fidl.noformat
similarity index 100%
rename from system/utest/fidl-compiler/testdata/badformat.fidl.noformat
rename to zircon/system/utest/fidl-compiler/testdata/badformat.fidl.noformat
diff --git a/system/utest/fidl-compiler/testdata/goodformat.fidl b/zircon/system/utest/fidl-compiler/testdata/goodformat.fidl
similarity index 100%
rename from system/utest/fidl-compiler/testdata/goodformat.fidl
rename to zircon/system/utest/fidl-compiler/testdata/goodformat.fidl
diff --git a/system/utest/fidl-compiler/types_tests.cpp b/zircon/system/utest/fidl-compiler/types_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/types_tests.cpp
rename to zircon/system/utest/fidl-compiler/types_tests.cpp
diff --git a/system/utest/fidl-compiler/using_tests.cpp b/zircon/system/utest/fidl-compiler/using_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/using_tests.cpp
rename to zircon/system/utest/fidl-compiler/using_tests.cpp
diff --git a/system/utest/fidl-compiler/virtual_source_tests.cpp b/zircon/system/utest/fidl-compiler/virtual_source_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/virtual_source_tests.cpp
rename to zircon/system/utest/fidl-compiler/virtual_source_tests.cpp
diff --git a/system/utest/fidl-compiler/visitor_unittests.cpp b/zircon/system/utest/fidl-compiler/visitor_unittests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/visitor_unittests.cpp
rename to zircon/system/utest/fidl-compiler/visitor_unittests.cpp
diff --git a/system/utest/fidl-compiler/xunion_tests.cpp b/zircon/system/utest/fidl-compiler/xunion_tests.cpp
similarity index 100%
rename from system/utest/fidl-compiler/xunion_tests.cpp
rename to zircon/system/utest/fidl-compiler/xunion_tests.cpp
diff --git a/system/utest/fidl-llcpp-interop/README.md b/zircon/system/utest/fidl-llcpp-interop/README.md
similarity index 100%
rename from system/utest/fidl-llcpp-interop/README.md
rename to zircon/system/utest/fidl-llcpp-interop/README.md
diff --git a/system/utest/fidl-llcpp-interop/basictypes.fidl b/zircon/system/utest/fidl-llcpp-interop/basictypes.fidl
similarity index 100%
rename from system/utest/fidl-llcpp-interop/basictypes.fidl
rename to zircon/system/utest/fidl-llcpp-interop/basictypes.fidl
diff --git a/system/utest/fidl-llcpp-interop/basictypes_tests.cpp b/zircon/system/utest/fidl-llcpp-interop/basictypes_tests.cpp
similarity index 100%
rename from system/utest/fidl-llcpp-interop/basictypes_tests.cpp
rename to zircon/system/utest/fidl-llcpp-interop/basictypes_tests.cpp
diff --git a/system/utest/fidl-llcpp-interop/dirent.fidl b/zircon/system/utest/fidl-llcpp-interop/dirent.fidl
similarity index 100%
rename from system/utest/fidl-llcpp-interop/dirent.fidl
rename to zircon/system/utest/fidl-llcpp-interop/dirent.fidl
diff --git a/system/utest/fidl-llcpp-interop/dirent_tests.cpp b/zircon/system/utest/fidl-llcpp-interop/dirent_tests.cpp
similarity index 100%
rename from system/utest/fidl-llcpp-interop/dirent_tests.cpp
rename to zircon/system/utest/fidl-llcpp-interop/dirent_tests.cpp
diff --git a/system/utest/fidl-llcpp-interop/gen_llcpp.sh b/zircon/system/utest/fidl-llcpp-interop/gen_llcpp.sh
similarity index 100%
rename from system/utest/fidl-llcpp-interop/gen_llcpp.sh
rename to zircon/system/utest/fidl-llcpp-interop/gen_llcpp.sh
diff --git a/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.cpp b/zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.cpp
similarity index 100%
rename from system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.cpp
rename to zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.cpp
diff --git a/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.h b/zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.h
similarity index 100%
rename from system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.h
rename to zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_basictypes.h
diff --git a/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.cpp b/zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.cpp
similarity index 100%
rename from system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.cpp
rename to zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.cpp
diff --git a/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.h b/zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.h
similarity index 100%
rename from system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.h
rename to zircon/system/utest/fidl-llcpp-interop/generated/fidl_llcpp_dirent.h
diff --git a/system/utest/fidl-llcpp-interop/main.cpp b/zircon/system/utest/fidl-llcpp-interop/main.cpp
similarity index 100%
rename from system/utest/fidl-llcpp-interop/main.cpp
rename to zircon/system/utest/fidl-llcpp-interop/main.cpp
diff --git a/system/utest/fidl-llcpp-interop/rules.mk b/zircon/system/utest/fidl-llcpp-interop/rules.mk
similarity index 100%
rename from system/utest/fidl-llcpp-interop/rules.mk
rename to zircon/system/utest/fidl-llcpp-interop/rules.mk
diff --git a/system/utest/fidl-simple/client_tests.c b/zircon/system/utest/fidl-simple/client_tests.c
similarity index 100%
rename from system/utest/fidl-simple/client_tests.c
rename to zircon/system/utest/fidl-simple/client_tests.c
diff --git a/system/utest/fidl-simple/fakesocket.fidl b/zircon/system/utest/fidl-simple/fakesocket.fidl
similarity index 100%
rename from system/utest/fidl-simple/fakesocket.fidl
rename to zircon/system/utest/fidl-simple/fakesocket.fidl
diff --git a/system/utest/fidl-simple/fakesocket_tests.cpp b/zircon/system/utest/fidl-simple/fakesocket_tests.cpp
similarity index 100%
rename from system/utest/fidl-simple/fakesocket_tests.cpp
rename to zircon/system/utest/fidl-simple/fakesocket_tests.cpp
diff --git a/system/utest/fidl-simple/ldsvc_tests.c b/zircon/system/utest/fidl-simple/ldsvc_tests.c
similarity index 100%
rename from system/utest/fidl-simple/ldsvc_tests.c
rename to zircon/system/utest/fidl-simple/ldsvc_tests.c
diff --git a/system/utest/fidl-simple/main.c b/zircon/system/utest/fidl-simple/main.c
similarity index 100%
rename from system/utest/fidl-simple/main.c
rename to zircon/system/utest/fidl-simple/main.c
diff --git a/system/utest/fidl-simple/rules.mk b/zircon/system/utest/fidl-simple/rules.mk
similarity index 100%
rename from system/utest/fidl-simple/rules.mk
rename to zircon/system/utest/fidl-simple/rules.mk
diff --git a/system/utest/fidl-simple/server_tests.c b/zircon/system/utest/fidl-simple/server_tests.c
similarity index 100%
rename from system/utest/fidl-simple/server_tests.c
rename to zircon/system/utest/fidl-simple/server_tests.c
diff --git a/system/utest/fidl-simple/spaceship.fidl b/zircon/system/utest/fidl-simple/spaceship.fidl
similarity index 100%
rename from system/utest/fidl-simple/spaceship.fidl
rename to zircon/system/utest/fidl-simple/spaceship.fidl
diff --git a/system/utest/fidl-simple/spaceship_tests.c b/zircon/system/utest/fidl-simple/spaceship_tests.c
similarity index 100%
rename from system/utest/fidl-simple/spaceship_tests.c
rename to zircon/system/utest/fidl-simple/spaceship_tests.c
diff --git a/system/utest/fidl-simple/spaceship_tests.cpp b/zircon/system/utest/fidl-simple/spaceship_tests.cpp
similarity index 100%
rename from system/utest/fidl-simple/spaceship_tests.cpp
rename to zircon/system/utest/fidl-simple/spaceship_tests.cpp
diff --git a/system/utest/fidl/abi_tests.cpp b/zircon/system/utest/fidl/abi_tests.cpp
similarity index 100%
rename from system/utest/fidl/abi_tests.cpp
rename to zircon/system/utest/fidl/abi_tests.cpp
diff --git a/system/utest/fidl/cpp_types_tests.cpp b/zircon/system/utest/fidl/cpp_types_tests.cpp
similarity index 100%
rename from system/utest/fidl/cpp_types_tests.cpp
rename to zircon/system/utest/fidl/cpp_types_tests.cpp
diff --git a/system/utest/fidl/decoding_tests.cpp b/zircon/system/utest/fidl/decoding_tests.cpp
similarity index 100%
rename from system/utest/fidl/decoding_tests.cpp
rename to zircon/system/utest/fidl/decoding_tests.cpp
diff --git a/system/utest/fidl/encoding_tests.cpp b/zircon/system/utest/fidl/encoding_tests.cpp
similarity index 100%
rename from system/utest/fidl/encoding_tests.cpp
rename to zircon/system/utest/fidl/encoding_tests.cpp
diff --git a/system/utest/fidl/fidl/README.md b/zircon/system/utest/fidl/fidl/README.md
similarity index 100%
rename from system/utest/fidl/fidl/README.md
rename to zircon/system/utest/fidl/fidl/README.md
diff --git a/system/utest/fidl/fidl/extra_messages.cpp b/zircon/system/utest/fidl/fidl/extra_messages.cpp
similarity index 100%
rename from system/utest/fidl/fidl/extra_messages.cpp
rename to zircon/system/utest/fidl/fidl/extra_messages.cpp
diff --git a/system/utest/fidl/fidl/extra_messages.fidl b/zircon/system/utest/fidl/fidl/extra_messages.fidl
similarity index 100%
rename from system/utest/fidl/fidl/extra_messages.fidl
rename to zircon/system/utest/fidl/fidl/extra_messages.fidl
diff --git a/system/utest/fidl/fidl/extra_messages.h b/zircon/system/utest/fidl/fidl/extra_messages.h
similarity index 100%
rename from system/utest/fidl/fidl/extra_messages.h
rename to zircon/system/utest/fidl/fidl/extra_messages.h
diff --git a/system/utest/fidl/fidl/messages.fidl b/zircon/system/utest/fidl/fidl/messages.fidl
similarity index 100%
rename from system/utest/fidl/fidl/messages.fidl
rename to zircon/system/utest/fidl/fidl/messages.fidl
diff --git a/system/utest/fidl/fidl_coded_types.cpp b/zircon/system/utest/fidl/fidl_coded_types.cpp
similarity index 100%
rename from system/utest/fidl/fidl_coded_types.cpp
rename to zircon/system/utest/fidl/fidl_coded_types.cpp
diff --git a/system/utest/fidl/fidl_coded_types.h b/zircon/system/utest/fidl/fidl_coded_types.h
similarity index 100%
rename from system/utest/fidl/fidl_coded_types.h
rename to zircon/system/utest/fidl/fidl_coded_types.h
diff --git a/system/utest/fidl/fidl_structs.h b/zircon/system/utest/fidl/fidl_structs.h
similarity index 100%
rename from system/utest/fidl/fidl_structs.h
rename to zircon/system/utest/fidl/fidl_structs.h
diff --git a/system/utest/fidl/formatting_tests.cpp b/zircon/system/utest/fidl/formatting_tests.cpp
similarity index 100%
rename from system/utest/fidl/formatting_tests.cpp
rename to zircon/system/utest/fidl/formatting_tests.cpp
diff --git a/system/utest/fidl/handle_closing_tests.cpp b/zircon/system/utest/fidl/handle_closing_tests.cpp
similarity index 100%
rename from system/utest/fidl/handle_closing_tests.cpp
rename to zircon/system/utest/fidl/handle_closing_tests.cpp
diff --git a/system/utest/fidl/linearizing_tests.cpp b/zircon/system/utest/fidl/linearizing_tests.cpp
similarity index 100%
rename from system/utest/fidl/linearizing_tests.cpp
rename to zircon/system/utest/fidl/linearizing_tests.cpp
diff --git a/system/utest/fidl/llcpp_types_tests.cpp b/zircon/system/utest/fidl/llcpp_types_tests.cpp
similarity index 100%
rename from system/utest/fidl/llcpp_types_tests.cpp
rename to zircon/system/utest/fidl/llcpp_types_tests.cpp
diff --git a/system/utest/fidl/main.c b/zircon/system/utest/fidl/main.c
similarity index 100%
rename from system/utest/fidl/main.c
rename to zircon/system/utest/fidl/main.c
diff --git a/system/utest/fidl/message_tests.cpp b/zircon/system/utest/fidl/message_tests.cpp
similarity index 100%
rename from system/utest/fidl/message_tests.cpp
rename to zircon/system/utest/fidl/message_tests.cpp
diff --git a/system/utest/fidl/rules.mk b/zircon/system/utest/fidl/rules.mk
similarity index 100%
rename from system/utest/fidl/rules.mk
rename to zircon/system/utest/fidl/rules.mk
diff --git a/system/utest/fidl/validating_tests.cpp b/zircon/system/utest/fidl/validating_tests.cpp
similarity index 100%
rename from system/utest/fidl/validating_tests.cpp
rename to zircon/system/utest/fidl/validating_tests.cpp
diff --git a/system/utest/fit/bridge_tests.cpp b/zircon/system/utest/fit/bridge_tests.cpp
similarity index 100%
rename from system/utest/fit/bridge_tests.cpp
rename to zircon/system/utest/fit/bridge_tests.cpp
diff --git a/system/utest/fit/defer_tests.cpp b/zircon/system/utest/fit/defer_tests.cpp
similarity index 100%
rename from system/utest/fit/defer_tests.cpp
rename to zircon/system/utest/fit/defer_tests.cpp
diff --git a/system/utest/fit/examples/function_example1.cpp b/zircon/system/utest/fit/examples/function_example1.cpp
similarity index 100%
rename from system/utest/fit/examples/function_example1.cpp
rename to zircon/system/utest/fit/examples/function_example1.cpp
diff --git a/system/utest/fit/examples/function_example1.h b/zircon/system/utest/fit/examples/function_example1.h
similarity index 100%
rename from system/utest/fit/examples/function_example1.h
rename to zircon/system/utest/fit/examples/function_example1.h
diff --git a/system/utest/fit/examples/function_example2.cpp b/zircon/system/utest/fit/examples/function_example2.cpp
similarity index 100%
rename from system/utest/fit/examples/function_example2.cpp
rename to zircon/system/utest/fit/examples/function_example2.cpp
diff --git a/system/utest/fit/examples/function_example2.h b/zircon/system/utest/fit/examples/function_example2.h
similarity index 100%
rename from system/utest/fit/examples/function_example2.h
rename to zircon/system/utest/fit/examples/function_example2.h
diff --git a/system/utest/fit/examples/promise_example1.cpp b/zircon/system/utest/fit/examples/promise_example1.cpp
similarity index 100%
rename from system/utest/fit/examples/promise_example1.cpp
rename to zircon/system/utest/fit/examples/promise_example1.cpp
diff --git a/system/utest/fit/examples/promise_example1.h b/zircon/system/utest/fit/examples/promise_example1.h
similarity index 100%
rename from system/utest/fit/examples/promise_example1.h
rename to zircon/system/utest/fit/examples/promise_example1.h
diff --git a/system/utest/fit/examples/promise_example2.cpp b/zircon/system/utest/fit/examples/promise_example2.cpp
similarity index 100%
rename from system/utest/fit/examples/promise_example2.cpp
rename to zircon/system/utest/fit/examples/promise_example2.cpp
diff --git a/system/utest/fit/examples/promise_example2.h b/zircon/system/utest/fit/examples/promise_example2.h
similarity index 100%
rename from system/utest/fit/examples/promise_example2.h
rename to zircon/system/utest/fit/examples/promise_example2.h
diff --git a/system/utest/fit/examples/utils.cpp b/zircon/system/utest/fit/examples/utils.cpp
similarity index 100%
rename from system/utest/fit/examples/utils.cpp
rename to zircon/system/utest/fit/examples/utils.cpp
diff --git a/system/utest/fit/examples/utils.h b/zircon/system/utest/fit/examples/utils.h
similarity index 100%
rename from system/utest/fit/examples/utils.h
rename to zircon/system/utest/fit/examples/utils.h
diff --git a/system/utest/fit/function_examples.cpp b/zircon/system/utest/fit/function_examples.cpp
similarity index 100%
rename from system/utest/fit/function_examples.cpp
rename to zircon/system/utest/fit/function_examples.cpp
diff --git a/system/utest/fit/function_tests.cpp b/zircon/system/utest/fit/function_tests.cpp
similarity index 100%
rename from system/utest/fit/function_tests.cpp
rename to zircon/system/utest/fit/function_tests.cpp
diff --git a/system/utest/fit/function_traits_tests.cpp b/zircon/system/utest/fit/function_traits_tests.cpp
similarity index 100%
rename from system/utest/fit/function_traits_tests.cpp
rename to zircon/system/utest/fit/function_traits_tests.cpp
diff --git a/system/utest/fit/future_tests.cpp b/zircon/system/utest/fit/future_tests.cpp
similarity index 100%
rename from system/utest/fit/future_tests.cpp
rename to zircon/system/utest/fit/future_tests.cpp
diff --git a/system/utest/fit/main.c b/zircon/system/utest/fit/main.c
similarity index 100%
rename from system/utest/fit/main.c
rename to zircon/system/utest/fit/main.c
diff --git a/system/utest/fit/nullable_tests.cpp b/zircon/system/utest/fit/nullable_tests.cpp
similarity index 100%
rename from system/utest/fit/nullable_tests.cpp
rename to zircon/system/utest/fit/nullable_tests.cpp
diff --git a/system/utest/fit/optional_tests.cpp b/zircon/system/utest/fit/optional_tests.cpp
similarity index 100%
rename from system/utest/fit/optional_tests.cpp
rename to zircon/system/utest/fit/optional_tests.cpp
diff --git a/system/utest/fit/pending_task_tests.cpp b/zircon/system/utest/fit/pending_task_tests.cpp
similarity index 100%
rename from system/utest/fit/pending_task_tests.cpp
rename to zircon/system/utest/fit/pending_task_tests.cpp
diff --git a/system/utest/fit/promise_examples.cpp b/zircon/system/utest/fit/promise_examples.cpp
similarity index 100%
rename from system/utest/fit/promise_examples.cpp
rename to zircon/system/utest/fit/promise_examples.cpp
diff --git a/system/utest/fit/promise_tests.cpp b/zircon/system/utest/fit/promise_tests.cpp
similarity index 100%
rename from system/utest/fit/promise_tests.cpp
rename to zircon/system/utest/fit/promise_tests.cpp
diff --git a/system/utest/fit/result_examples.cpp b/zircon/system/utest/fit/result_examples.cpp
similarity index 100%
rename from system/utest/fit/result_examples.cpp
rename to zircon/system/utest/fit/result_examples.cpp
diff --git a/system/utest/fit/result_tests.cpp b/zircon/system/utest/fit/result_tests.cpp
similarity index 100%
rename from system/utest/fit/result_tests.cpp
rename to zircon/system/utest/fit/result_tests.cpp
diff --git a/system/utest/fit/rules.mk b/zircon/system/utest/fit/rules.mk
similarity index 100%
rename from system/utest/fit/rules.mk
rename to zircon/system/utest/fit/rules.mk
diff --git a/system/utest/fit/scheduler_tests.cpp b/zircon/system/utest/fit/scheduler_tests.cpp
similarity index 100%
rename from system/utest/fit/scheduler_tests.cpp
rename to zircon/system/utest/fit/scheduler_tests.cpp
diff --git a/system/utest/fit/scope_tests.cpp b/zircon/system/utest/fit/scope_tests.cpp
similarity index 100%
rename from system/utest/fit/scope_tests.cpp
rename to zircon/system/utest/fit/scope_tests.cpp
diff --git a/system/utest/fit/sequencer_tests.cpp b/zircon/system/utest/fit/sequencer_tests.cpp
similarity index 100%
rename from system/utest/fit/sequencer_tests.cpp
rename to zircon/system/utest/fit/sequencer_tests.cpp
diff --git a/system/utest/fit/single_threaded_executor_tests.cpp b/zircon/system/utest/fit/single_threaded_executor_tests.cpp
similarity index 100%
rename from system/utest/fit/single_threaded_executor_tests.cpp
rename to zircon/system/utest/fit/single_threaded_executor_tests.cpp
diff --git a/system/utest/fit/suspended_task_tests.cpp b/zircon/system/utest/fit/suspended_task_tests.cpp
similarity index 100%
rename from system/utest/fit/suspended_task_tests.cpp
rename to zircon/system/utest/fit/suspended_task_tests.cpp
diff --git a/system/utest/fit/traits_tests.cpp b/zircon/system/utest/fit/traits_tests.cpp
similarity index 100%
rename from system/utest/fit/traits_tests.cpp
rename to zircon/system/utest/fit/traits_tests.cpp
diff --git a/system/utest/fit/unittest_utils.h b/zircon/system/utest/fit/unittest_utils.h
similarity index 100%
rename from system/utest/fit/unittest_utils.h
rename to zircon/system/utest/fit/unittest_utils.h
diff --git a/system/utest/fit/variant_tests.cpp b/zircon/system/utest/fit/variant_tests.cpp
similarity index 100%
rename from system/utest/fit/variant_tests.cpp
rename to zircon/system/utest/fit/variant_tests.cpp
diff --git a/system/utest/fpu/fputest.c b/zircon/system/utest/fpu/fputest.c
similarity index 100%
rename from system/utest/fpu/fputest.c
rename to zircon/system/utest/fpu/fputest.c
diff --git a/system/utest/fpu/rules.mk b/zircon/system/utest/fpu/rules.mk
similarity index 100%
rename from system/utest/fpu/rules.mk
rename to zircon/system/utest/fpu/rules.mk
diff --git a/system/utest/fs-bench/fs-bench.cpp b/zircon/system/utest/fs-bench/fs-bench.cpp
similarity index 100%
rename from system/utest/fs-bench/fs-bench.cpp
rename to zircon/system/utest/fs-bench/fs-bench.cpp
diff --git a/system/utest/fs-bench/rules.mk b/zircon/system/utest/fs-bench/rules.mk
similarity index 100%
rename from system/utest/fs-bench/rules.mk
rename to zircon/system/utest/fs-bench/rules.mk
diff --git a/system/utest/fs-host/main.cpp b/zircon/system/utest/fs-host/main.cpp
similarity index 100%
rename from system/utest/fs-host/main.cpp
rename to zircon/system/utest/fs-host/main.cpp
diff --git a/system/utest/fs-host/rules.mk b/zircon/system/utest/fs-host/rules.mk
similarity index 100%
rename from system/utest/fs-host/rules.mk
rename to zircon/system/utest/fs-host/rules.mk
diff --git a/system/utest/fs-host/test-basic.cpp b/zircon/system/utest/fs-host/test-basic.cpp
similarity index 100%
rename from system/utest/fs-host/test-basic.cpp
rename to zircon/system/utest/fs-host/test-basic.cpp
diff --git a/system/utest/fs-host/test-directory.cpp b/zircon/system/utest/fs-host/test-directory.cpp
similarity index 100%
rename from system/utest/fs-host/test-directory.cpp
rename to zircon/system/utest/fs-host/test-directory.cpp
diff --git a/system/utest/fs-host/test-maxfile.cpp b/zircon/system/utest/fs-host/test-maxfile.cpp
similarity index 100%
rename from system/utest/fs-host/test-maxfile.cpp
rename to zircon/system/utest/fs-host/test-maxfile.cpp
diff --git a/system/utest/fs-host/test-rw-workers.cpp b/zircon/system/utest/fs-host/test-rw-workers.cpp
similarity index 100%
rename from system/utest/fs-host/test-rw-workers.cpp
rename to zircon/system/utest/fs-host/test-rw-workers.cpp
diff --git a/system/utest/fs-host/test-sparse.cpp b/zircon/system/utest/fs-host/test-sparse.cpp
similarity index 100%
rename from system/utest/fs-host/test-sparse.cpp
rename to zircon/system/utest/fs-host/test-sparse.cpp
diff --git a/system/utest/fs-host/test-truncate.cpp b/zircon/system/utest/fs-host/test-truncate.cpp
similarity index 100%
rename from system/utest/fs-host/test-truncate.cpp
rename to zircon/system/utest/fs-host/test-truncate.cpp
diff --git a/system/utest/fs-host/util.cpp b/zircon/system/utest/fs-host/util.cpp
similarity index 100%
rename from system/utest/fs-host/util.cpp
rename to zircon/system/utest/fs-host/util.cpp
diff --git a/system/utest/fs-host/util.h b/zircon/system/utest/fs-host/util.h
similarity index 100%
rename from system/utest/fs-host/util.h
rename to zircon/system/utest/fs-host/util.h
diff --git a/system/utest/fs-management/fs-management.cpp b/zircon/system/utest/fs-management/fs-management.cpp
similarity index 100%
rename from system/utest/fs-management/fs-management.cpp
rename to zircon/system/utest/fs-management/fs-management.cpp
diff --git a/system/utest/fs-management/rules.mk b/zircon/system/utest/fs-management/rules.mk
similarity index 100%
rename from system/utest/fs-management/rules.mk
rename to zircon/system/utest/fs-management/rules.mk
diff --git a/system/utest/fs-test-utils/fixture_test.cpp b/zircon/system/utest/fs-test-utils/fixture_test.cpp
similarity index 100%
rename from system/utest/fs-test-utils/fixture_test.cpp
rename to zircon/system/utest/fs-test-utils/fixture_test.cpp
diff --git a/system/utest/fs-test-utils/main.cpp b/zircon/system/utest/fs-test-utils/main.cpp
similarity index 100%
rename from system/utest/fs-test-utils/main.cpp
rename to zircon/system/utest/fs-test-utils/main.cpp
diff --git a/system/utest/fs-test-utils/perftest_test.cpp b/zircon/system/utest/fs-test-utils/perftest_test.cpp
similarity index 100%
rename from system/utest/fs-test-utils/perftest_test.cpp
rename to zircon/system/utest/fs-test-utils/perftest_test.cpp
diff --git a/system/utest/fs-test-utils/rules.mk b/zircon/system/utest/fs-test-utils/rules.mk
similarity index 100%
rename from system/utest/fs-test-utils/rules.mk
rename to zircon/system/utest/fs-test-utils/rules.mk
diff --git a/system/utest/fs-test-utils/unittest_test.cpp b/zircon/system/utest/fs-test-utils/unittest_test.cpp
similarity index 100%
rename from system/utest/fs-test-utils/unittest_test.cpp
rename to zircon/system/utest/fs-test-utils/unittest_test.cpp
diff --git a/system/utest/fs-vnode/lazy-dir-tests.cpp b/zircon/system/utest/fs-vnode/lazy-dir-tests.cpp
similarity index 100%
rename from system/utest/fs-vnode/lazy-dir-tests.cpp
rename to zircon/system/utest/fs-vnode/lazy-dir-tests.cpp
diff --git a/system/utest/fs-vnode/main.c b/zircon/system/utest/fs-vnode/main.c
similarity index 100%
rename from system/utest/fs-vnode/main.c
rename to zircon/system/utest/fs-vnode/main.c
diff --git a/system/utest/fs-vnode/pseudo-dir-tests.cpp b/zircon/system/utest/fs-vnode/pseudo-dir-tests.cpp
similarity index 100%
rename from system/utest/fs-vnode/pseudo-dir-tests.cpp
rename to zircon/system/utest/fs-vnode/pseudo-dir-tests.cpp
diff --git a/system/utest/fs-vnode/pseudo-file-tests.cpp b/zircon/system/utest/fs-vnode/pseudo-file-tests.cpp
similarity index 100%
rename from system/utest/fs-vnode/pseudo-file-tests.cpp
rename to zircon/system/utest/fs-vnode/pseudo-file-tests.cpp
diff --git a/system/utest/fs-vnode/remote-dir-tests.cpp b/zircon/system/utest/fs-vnode/remote-dir-tests.cpp
similarity index 100%
rename from system/utest/fs-vnode/remote-dir-tests.cpp
rename to zircon/system/utest/fs-vnode/remote-dir-tests.cpp
diff --git a/system/utest/fs-vnode/rules.mk b/zircon/system/utest/fs-vnode/rules.mk
similarity index 100%
rename from system/utest/fs-vnode/rules.mk
rename to zircon/system/utest/fs-vnode/rules.mk
diff --git a/system/utest/fs-vnode/service-tests.cpp b/zircon/system/utest/fs-vnode/service-tests.cpp
similarity index 100%
rename from system/utest/fs-vnode/service-tests.cpp
rename to zircon/system/utest/fs-vnode/service-tests.cpp
diff --git a/system/utest/fs-vnode/teardown-tests.cpp b/zircon/system/utest/fs-vnode/teardown-tests.cpp
similarity index 100%
rename from system/utest/fs-vnode/teardown-tests.cpp
rename to zircon/system/utest/fs-vnode/teardown-tests.cpp
diff --git a/system/utest/fs-vnode/vmo-file-tests.cpp b/zircon/system/utest/fs-vnode/vmo-file-tests.cpp
similarity index 100%
rename from system/utest/fs-vnode/vmo-file-tests.cpp
rename to zircon/system/utest/fs-vnode/vmo-file-tests.cpp
diff --git a/system/utest/fs/filesystems.cpp b/zircon/system/utest/fs/filesystems.cpp
similarity index 100%
rename from system/utest/fs/filesystems.cpp
rename to zircon/system/utest/fs/filesystems.cpp
diff --git a/system/utest/fs/filesystems.h b/zircon/system/utest/fs/filesystems.h
similarity index 100%
rename from system/utest/fs/filesystems.h
rename to zircon/system/utest/fs/filesystems.h
diff --git a/system/utest/fs/main.cpp b/zircon/system/utest/fs/main.cpp
similarity index 100%
rename from system/utest/fs/main.cpp
rename to zircon/system/utest/fs/main.cpp
diff --git a/system/utest/fs/metrics_test.cpp b/zircon/system/utest/fs/metrics_test.cpp
similarity index 100%
rename from system/utest/fs/metrics_test.cpp
rename to zircon/system/utest/fs/metrics_test.cpp
diff --git a/system/utest/fs/misc.c b/zircon/system/utest/fs/misc.c
similarity index 100%
rename from system/utest/fs/misc.c
rename to zircon/system/utest/fs/misc.c
diff --git a/system/utest/fs/misc.h b/zircon/system/utest/fs/misc.h
similarity index 100%
rename from system/utest/fs/misc.h
rename to zircon/system/utest/fs/misc.h
diff --git a/system/utest/fs/rules.mk b/zircon/system/utest/fs/rules.mk
similarity index 100%
rename from system/utest/fs/rules.mk
rename to zircon/system/utest/fs/rules.mk
diff --git a/system/utest/fs/test-access.cpp b/zircon/system/utest/fs/test-access.cpp
similarity index 100%
rename from system/utest/fs/test-access.cpp
rename to zircon/system/utest/fs/test-access.cpp
diff --git a/system/utest/fs/test-append.cpp b/zircon/system/utest/fs/test-append.cpp
similarity index 100%
rename from system/utest/fs/test-append.cpp
rename to zircon/system/utest/fs/test-append.cpp
diff --git a/system/utest/fs/test-attr.c b/zircon/system/utest/fs/test-attr.c
similarity index 100%
rename from system/utest/fs/test-attr.c
rename to zircon/system/utest/fs/test-attr.c
diff --git a/system/utest/fs/test-basic.c b/zircon/system/utest/fs/test-basic.c
similarity index 100%
rename from system/utest/fs/test-basic.c
rename to zircon/system/utest/fs/test-basic.c
diff --git a/system/utest/fs/test-clone.cpp b/zircon/system/utest/fs/test-clone.cpp
similarity index 100%
rename from system/utest/fs/test-clone.cpp
rename to zircon/system/utest/fs/test-clone.cpp
diff --git a/system/utest/fs/test-directory.cpp b/zircon/system/utest/fs/test-directory.cpp
similarity index 100%
rename from system/utest/fs/test-directory.cpp
rename to zircon/system/utest/fs/test-directory.cpp
diff --git a/system/utest/fs/test-dot-dot.c b/zircon/system/utest/fs/test-dot-dot.c
similarity index 100%
rename from system/utest/fs/test-dot-dot.c
rename to zircon/system/utest/fs/test-dot-dot.c
diff --git a/system/utest/fs/test-fcntl.cpp b/zircon/system/utest/fs/test-fcntl.cpp
similarity index 100%
rename from system/utest/fs/test-fcntl.cpp
rename to zircon/system/utest/fs/test-fcntl.cpp
diff --git a/system/utest/fs/test-link.c b/zircon/system/utest/fs/test-link.c
similarity index 100%
rename from system/utest/fs/test-link.c
rename to zircon/system/utest/fs/test-link.c
diff --git a/system/utest/fs/test-lseek.cpp b/zircon/system/utest/fs/test-lseek.cpp
similarity index 100%
rename from system/utest/fs/test-lseek.cpp
rename to zircon/system/utest/fs/test-lseek.cpp
diff --git a/system/utest/fs/test-maxfile.cpp b/zircon/system/utest/fs/test-maxfile.cpp
similarity index 100%
rename from system/utest/fs/test-maxfile.cpp
rename to zircon/system/utest/fs/test-maxfile.cpp
diff --git a/system/utest/fs/test-minfs.cpp b/zircon/system/utest/fs/test-minfs.cpp
similarity index 100%
rename from system/utest/fs/test-minfs.cpp
rename to zircon/system/utest/fs/test-minfs.cpp
diff --git a/system/utest/fs/test-mmap.cpp b/zircon/system/utest/fs/test-mmap.cpp
similarity index 100%
rename from system/utest/fs/test-mmap.cpp
rename to zircon/system/utest/fs/test-mmap.cpp
diff --git a/system/utest/fs/test-overflow.c b/zircon/system/utest/fs/test-overflow.c
similarity index 100%
rename from system/utest/fs/test-overflow.c
rename to zircon/system/utest/fs/test-overflow.c
diff --git a/system/utest/fs/test-persist.cpp b/zircon/system/utest/fs/test-persist.cpp
similarity index 100%
rename from system/utest/fs/test-persist.cpp
rename to zircon/system/utest/fs/test-persist.cpp
diff --git a/system/utest/fs/test-random-op.c b/zircon/system/utest/fs/test-random-op.c
similarity index 100%
rename from system/utest/fs/test-random-op.c
rename to zircon/system/utest/fs/test-random-op.c
diff --git a/system/utest/fs/test-realpath.cpp b/zircon/system/utest/fs/test-realpath.cpp
similarity index 100%
rename from system/utest/fs/test-realpath.cpp
rename to zircon/system/utest/fs/test-realpath.cpp
diff --git a/system/utest/fs/test-rename.c b/zircon/system/utest/fs/test-rename.c
similarity index 100%
rename from system/utest/fs/test-rename.c
rename to zircon/system/utest/fs/test-rename.c
diff --git a/system/utest/fs/test-resize.cpp b/zircon/system/utest/fs/test-resize.cpp
similarity index 100%
rename from system/utest/fs/test-resize.cpp
rename to zircon/system/utest/fs/test-resize.cpp
diff --git a/system/utest/fs/test-rw-workers.c b/zircon/system/utest/fs/test-rw-workers.c
similarity index 100%
rename from system/utest/fs/test-rw-workers.c
rename to zircon/system/utest/fs/test-rw-workers.c
diff --git a/system/utest/fs/test-rw.cpp b/zircon/system/utest/fs/test-rw.cpp
similarity index 100%
rename from system/utest/fs/test-rw.cpp
rename to zircon/system/utest/fs/test-rw.cpp
diff --git a/system/utest/fs/test-sparse.cpp b/zircon/system/utest/fs/test-sparse.cpp
similarity index 100%
rename from system/utest/fs/test-sparse.cpp
rename to zircon/system/utest/fs/test-sparse.cpp
diff --git a/system/utest/fs/test-sync.c b/zircon/system/utest/fs/test-sync.c
similarity index 100%
rename from system/utest/fs/test-sync.c
rename to zircon/system/utest/fs/test-sync.c
diff --git a/system/utest/fs/test-threading.cpp b/zircon/system/utest/fs/test-threading.cpp
similarity index 100%
rename from system/utest/fs/test-threading.cpp
rename to zircon/system/utest/fs/test-threading.cpp
diff --git a/system/utest/fs/test-truncate.cpp b/zircon/system/utest/fs/test-truncate.cpp
similarity index 100%
rename from system/utest/fs/test-truncate.cpp
rename to zircon/system/utest/fs/test-truncate.cpp
diff --git a/system/utest/fs/test-unlink.cpp b/zircon/system/utest/fs/test-unlink.cpp
similarity index 100%
rename from system/utest/fs/test-unlink.cpp
rename to zircon/system/utest/fs/test-unlink.cpp
diff --git a/system/utest/fs/test-watcher.cpp b/zircon/system/utest/fs/test-watcher.cpp
similarity index 100%
rename from system/utest/fs/test-watcher.cpp
rename to zircon/system/utest/fs/test-watcher.cpp
diff --git a/system/utest/fs/wrap.c b/zircon/system/utest/fs/wrap.c
similarity index 100%
rename from system/utest/fs/wrap.c
rename to zircon/system/utest/fs/wrap.c
diff --git a/system/utest/fuzz-utils/fixture.cpp b/zircon/system/utest/fuzz-utils/fixture.cpp
similarity index 100%
rename from system/utest/fuzz-utils/fixture.cpp
rename to zircon/system/utest/fuzz-utils/fixture.cpp
diff --git a/system/utest/fuzz-utils/fixture.h b/zircon/system/utest/fuzz-utils/fixture.h
similarity index 100%
rename from system/utest/fuzz-utils/fixture.h
rename to zircon/system/utest/fuzz-utils/fixture.h
diff --git a/system/utest/fuzz-utils/fuzzer-fixture.cpp b/zircon/system/utest/fuzz-utils/fuzzer-fixture.cpp
similarity index 100%
rename from system/utest/fuzz-utils/fuzzer-fixture.cpp
rename to zircon/system/utest/fuzz-utils/fuzzer-fixture.cpp
diff --git a/system/utest/fuzz-utils/fuzzer-fixture.h b/zircon/system/utest/fuzz-utils/fuzzer-fixture.h
similarity index 100%
rename from system/utest/fuzz-utils/fuzzer-fixture.h
rename to zircon/system/utest/fuzz-utils/fuzzer-fixture.h
diff --git a/system/utest/fuzz-utils/fuzzer.cpp b/zircon/system/utest/fuzz-utils/fuzzer.cpp
similarity index 100%
rename from system/utest/fuzz-utils/fuzzer.cpp
rename to zircon/system/utest/fuzz-utils/fuzzer.cpp
diff --git a/system/utest/fuzz-utils/main.cpp b/zircon/system/utest/fuzz-utils/main.cpp
similarity index 100%
rename from system/utest/fuzz-utils/main.cpp
rename to zircon/system/utest/fuzz-utils/main.cpp
diff --git a/system/utest/fuzz-utils/path.cpp b/zircon/system/utest/fuzz-utils/path.cpp
similarity index 100%
rename from system/utest/fuzz-utils/path.cpp
rename to zircon/system/utest/fuzz-utils/path.cpp
diff --git a/system/utest/fuzz-utils/rules.mk b/zircon/system/utest/fuzz-utils/rules.mk
similarity index 100%
rename from system/utest/fuzz-utils/rules.mk
rename to zircon/system/utest/fuzz-utils/rules.mk
diff --git a/system/utest/fuzz-utils/string-list.cpp b/zircon/system/utest/fuzz-utils/string-list.cpp
similarity index 100%
rename from system/utest/fuzz-utils/string-list.cpp
rename to zircon/system/utest/fuzz-utils/string-list.cpp
diff --git a/system/utest/fuzz-utils/string-map.cpp b/zircon/system/utest/fuzz-utils/string-map.cpp
similarity index 100%
rename from system/utest/fuzz-utils/string-map.cpp
rename to zircon/system/utest/fuzz-utils/string-map.cpp
diff --git a/system/utest/fuzz-utils/test-fuzzer.cpp b/zircon/system/utest/fuzz-utils/test-fuzzer.cpp
similarity index 100%
rename from system/utest/fuzz-utils/test-fuzzer.cpp
rename to zircon/system/utest/fuzz-utils/test-fuzzer.cpp
diff --git a/system/utest/fuzz-utils/test-fuzzer.h b/zircon/system/utest/fuzz-utils/test-fuzzer.h
similarity index 100%
rename from system/utest/fuzz-utils/test-fuzzer.h
rename to zircon/system/utest/fuzz-utils/test-fuzzer.h
diff --git a/system/utest/fvm-host/main.cpp b/zircon/system/utest/fvm-host/main.cpp
similarity index 100%
rename from system/utest/fvm-host/main.cpp
rename to zircon/system/utest/fvm-host/main.cpp
diff --git a/system/utest/fvm-host/rules.mk b/zircon/system/utest/fvm-host/rules.mk
similarity index 100%
rename from system/utest/fvm-host/rules.mk
rename to zircon/system/utest/fvm-host/rules.mk
diff --git a/system/utest/fvm/fvm.cpp b/zircon/system/utest/fvm/fvm.cpp
similarity index 100%
rename from system/utest/fvm/fvm.cpp
rename to zircon/system/utest/fvm/fvm.cpp
diff --git a/system/utest/fvm/rules.mk b/zircon/system/utest/fvm/rules.mk
similarity index 100%
rename from system/utest/fvm/rules.mk
rename to zircon/system/utest/fvm/rules.mk
diff --git a/system/utest/fzl/fdio.cpp b/zircon/system/utest/fzl/fdio.cpp
similarity index 100%
rename from system/utest/fzl/fdio.cpp
rename to zircon/system/utest/fzl/fdio.cpp
diff --git a/system/utest/fzl/main.c b/zircon/system/utest/fzl/main.c
similarity index 100%
rename from system/utest/fzl/main.c
rename to zircon/system/utest/fzl/main.c
diff --git a/system/utest/fzl/memory_probe_tests.cpp b/zircon/system/utest/fzl/memory_probe_tests.cpp
similarity index 100%
rename from system/utest/fzl/memory_probe_tests.cpp
rename to zircon/system/utest/fzl/memory_probe_tests.cpp
diff --git a/system/utest/fzl/rules.mk b/zircon/system/utest/fzl/rules.mk
similarity index 100%
rename from system/utest/fzl/rules.mk
rename to zircon/system/utest/fzl/rules.mk
diff --git a/system/utest/getentropy/getentropy.cpp b/zircon/system/utest/getentropy/getentropy.cpp
similarity index 100%
rename from system/utest/getentropy/getentropy.cpp
rename to zircon/system/utest/getentropy/getentropy.cpp
diff --git a/system/utest/getentropy/rules.mk b/zircon/system/utest/getentropy/rules.mk
similarity index 100%
rename from system/utest/getentropy/rules.mk
rename to zircon/system/utest/getentropy/rules.mk
diff --git a/system/utest/handle-alias/handle-alias.c b/zircon/system/utest/handle-alias/handle-alias.c
similarity index 100%
rename from system/utest/handle-alias/handle-alias.c
rename to zircon/system/utest/handle-alias/handle-alias.c
diff --git a/system/utest/handle-alias/rules.mk b/zircon/system/utest/handle-alias/rules.mk
similarity index 100%
rename from system/utest/handle-alias/rules.mk
rename to zircon/system/utest/handle-alias/rules.mk
diff --git a/system/utest/hid-parser/hid-helper-test.cpp b/zircon/system/utest/hid-parser/hid-helper-test.cpp
similarity index 100%
rename from system/utest/hid-parser/hid-helper-test.cpp
rename to zircon/system/utest/hid-parser/hid-helper-test.cpp
diff --git a/system/utest/hid-parser/hid-parser-fuzztest.cpp b/zircon/system/utest/hid-parser/hid-parser-fuzztest.cpp
similarity index 100%
rename from system/utest/hid-parser/hid-parser-fuzztest.cpp
rename to zircon/system/utest/hid-parser/hid-parser-fuzztest.cpp
diff --git a/system/utest/hid-parser/hid-parser-test.cpp b/zircon/system/utest/hid-parser/hid-parser-test.cpp
similarity index 100%
rename from system/utest/hid-parser/hid-parser-test.cpp
rename to zircon/system/utest/hid-parser/hid-parser-test.cpp
diff --git a/system/utest/hid-parser/hid-report-data.cpp b/zircon/system/utest/hid-parser/hid-report-data.cpp
similarity index 100%
rename from system/utest/hid-parser/hid-report-data.cpp
rename to zircon/system/utest/hid-parser/hid-report-data.cpp
diff --git a/system/utest/hid-parser/hid-utest-data.cpp b/zircon/system/utest/hid-parser/hid-utest-data.cpp
similarity index 100%
rename from system/utest/hid-parser/hid-utest-data.cpp
rename to zircon/system/utest/hid-parser/hid-utest-data.cpp
diff --git a/system/utest/hid-parser/rules.mk b/zircon/system/utest/hid-parser/rules.mk
similarity index 100%
rename from system/utest/hid-parser/rules.mk
rename to zircon/system/utest/hid-parser/rules.mk
diff --git a/system/utest/hid/hid-test.cpp b/zircon/system/utest/hid/hid-test.cpp
similarity index 100%
rename from system/utest/hid/hid-test.cpp
rename to zircon/system/utest/hid/hid-test.cpp
diff --git a/system/utest/hid/rules.mk b/zircon/system/utest/hid/rules.mk
similarity index 100%
rename from system/utest/hid/rules.mk
rename to zircon/system/utest/hid/rules.mk
diff --git a/system/utest/hypervisor/MAINTAINERS b/zircon/system/utest/hypervisor/MAINTAINERS
similarity index 100%
rename from system/utest/hypervisor/MAINTAINERS
rename to zircon/system/utest/hypervisor/MAINTAINERS
diff --git a/system/utest/hypervisor/arm64.S b/zircon/system/utest/hypervisor/arm64.S
similarity index 100%
rename from system/utest/hypervisor/arm64.S
rename to zircon/system/utest/hypervisor/arm64.S
diff --git a/system/utest/hypervisor/constants_priv.h b/zircon/system/utest/hypervisor/constants_priv.h
similarity index 100%
rename from system/utest/hypervisor/constants_priv.h
rename to zircon/system/utest/hypervisor/constants_priv.h
diff --git a/system/utest/hypervisor/guest.cpp b/zircon/system/utest/hypervisor/guest.cpp
similarity index 100%
rename from system/utest/hypervisor/guest.cpp
rename to zircon/system/utest/hypervisor/guest.cpp
diff --git a/system/utest/hypervisor/main.cpp b/zircon/system/utest/hypervisor/main.cpp
similarity index 100%
rename from system/utest/hypervisor/main.cpp
rename to zircon/system/utest/hypervisor/main.cpp
diff --git a/system/utest/hypervisor/rules.mk b/zircon/system/utest/hypervisor/rules.mk
similarity index 100%
rename from system/utest/hypervisor/rules.mk
rename to zircon/system/utest/hypervisor/rules.mk
diff --git a/system/utest/hypervisor/x86.S b/zircon/system/utest/hypervisor/x86.S
similarity index 100%
rename from system/utest/hypervisor/x86.S
rename to zircon/system/utest/hypervisor/x86.S
diff --git a/system/utest/int-types/README.md b/zircon/system/utest/int-types/README.md
similarity index 100%
rename from system/utest/int-types/README.md
rename to zircon/system/utest/int-types/README.md
diff --git a/system/utest/int-types/int-types.c b/zircon/system/utest/int-types/int-types.c
similarity index 100%
rename from system/utest/int-types/int-types.c
rename to zircon/system/utest/int-types/int-types.c
diff --git a/system/utest/int-types/int-types.cpp b/zircon/system/utest/int-types/int-types.cpp
similarity index 100%
rename from system/utest/int-types/int-types.cpp
rename to zircon/system/utest/int-types/int-types.cpp
diff --git a/system/utest/int-types/rules.mk b/zircon/system/utest/int-types/rules.mk
similarity index 100%
rename from system/utest/int-types/rules.mk
rename to zircon/system/utest/int-types/rules.mk
diff --git a/system/utest/int-types/wchar-type.c b/zircon/system/utest/int-types/wchar-type.c
similarity index 100%
rename from system/utest/int-types/wchar-type.c
rename to zircon/system/utest/int-types/wchar-type.c
diff --git a/system/utest/int-types/wchar-type.cpp b/zircon/system/utest/int-types/wchar-type.cpp
similarity index 100%
rename from system/utest/int-types/wchar-type.cpp
rename to zircon/system/utest/int-types/wchar-type.cpp
diff --git a/system/utest/kcounter/kcounter-test.cpp b/zircon/system/utest/kcounter/kcounter-test.cpp
similarity index 100%
rename from system/utest/kcounter/kcounter-test.cpp
rename to zircon/system/utest/kcounter/kcounter-test.cpp
diff --git a/system/utest/kcounter/rules.mk b/zircon/system/utest/kcounter/rules.mk
similarity index 100%
rename from system/utest/kcounter/rules.mk
rename to zircon/system/utest/kcounter/rules.mk
diff --git a/system/utest/kernel-unittests/kernel-unittests.cpp b/zircon/system/utest/kernel-unittests/kernel-unittests.cpp
similarity index 100%
rename from system/utest/kernel-unittests/kernel-unittests.cpp
rename to zircon/system/utest/kernel-unittests/kernel-unittests.cpp
diff --git a/system/utest/kernel-unittests/rules.mk b/zircon/system/utest/kernel-unittests/rules.mk
similarity index 100%
rename from system/utest/kernel-unittests/rules.mk
rename to zircon/system/utest/kernel-unittests/rules.mk
diff --git a/system/utest/launchpad/launchpad.cpp b/zircon/system/utest/launchpad/launchpad.cpp
similarity index 100%
rename from system/utest/launchpad/launchpad.cpp
rename to zircon/system/utest/launchpad/launchpad.cpp
diff --git a/system/utest/launchpad/rules.mk b/zircon/system/utest/launchpad/rules.mk
similarity index 100%
rename from system/utest/launchpad/rules.mk
rename to zircon/system/utest/launchpad/rules.mk
diff --git a/system/utest/libfzl/fzl-test.cpp b/zircon/system/utest/libfzl/fzl-test.cpp
similarity index 100%
rename from system/utest/libfzl/fzl-test.cpp
rename to zircon/system/utest/libfzl/fzl-test.cpp
diff --git a/system/utest/libfzl/main.c b/zircon/system/utest/libfzl/main.c
similarity index 100%
rename from system/utest/libfzl/main.c
rename to zircon/system/utest/libfzl/main.c
diff --git a/system/utest/libfzl/owned-vmo-mapper-tests.cpp b/zircon/system/utest/libfzl/owned-vmo-mapper-tests.cpp
similarity index 100%
rename from system/utest/libfzl/owned-vmo-mapper-tests.cpp
rename to zircon/system/utest/libfzl/owned-vmo-mapper-tests.cpp
diff --git a/system/utest/libfzl/resizeable-vmo-mapper-tests.cpp b/zircon/system/utest/libfzl/resizeable-vmo-mapper-tests.cpp
similarity index 100%
rename from system/utest/libfzl/resizeable-vmo-mapper-tests.cpp
rename to zircon/system/utest/libfzl/resizeable-vmo-mapper-tests.cpp
diff --git a/system/utest/libfzl/rules.mk b/zircon/system/utest/libfzl/rules.mk
similarity index 100%
rename from system/utest/libfzl/rules.mk
rename to zircon/system/utest/libfzl/rules.mk
diff --git a/system/utest/libfzl/vmo-pool-tests.cpp b/zircon/system/utest/libfzl/vmo-pool-tests.cpp
similarity index 100%
rename from system/utest/libfzl/vmo-pool-tests.cpp
rename to zircon/system/utest/libfzl/vmo-pool-tests.cpp
diff --git a/system/utest/libfzl/vmo-probe.cpp b/zircon/system/utest/libfzl/vmo-probe.cpp
similarity index 100%
rename from system/utest/libfzl/vmo-probe.cpp
rename to zircon/system/utest/libfzl/vmo-probe.cpp
diff --git a/system/utest/libfzl/vmo-probe.h b/zircon/system/utest/libfzl/vmo-probe.h
similarity index 100%
rename from system/utest/libfzl/vmo-probe.h
rename to zircon/system/utest/libfzl/vmo-probe.h
diff --git a/system/utest/libfzl/vmo-vmar-tests.cpp b/zircon/system/utest/libfzl/vmo-vmar-tests.cpp
similarity index 100%
rename from system/utest/libfzl/vmo-vmar-tests.cpp
rename to zircon/system/utest/libfzl/vmo-vmar-tests.cpp
diff --git a/system/utest/libgpt/libgpt-tests.cpp b/zircon/system/utest/libgpt/libgpt-tests.cpp
similarity index 100%
rename from system/utest/libgpt/libgpt-tests.cpp
rename to zircon/system/utest/libgpt/libgpt-tests.cpp
diff --git a/system/utest/libgpt/libgpt-tests.h b/zircon/system/utest/libgpt/libgpt-tests.h
similarity index 100%
rename from system/utest/libgpt/libgpt-tests.h
rename to zircon/system/utest/libgpt/libgpt-tests.h
diff --git a/system/utest/libgpt/main.c b/zircon/system/utest/libgpt/main.c
similarity index 100%
rename from system/utest/libgpt/main.c
rename to zircon/system/utest/libgpt/main.c
diff --git a/system/utest/libgpt/rules.mk b/zircon/system/utest/libgpt/rules.mk
similarity index 100%
rename from system/utest/libgpt/rules.mk
rename to zircon/system/utest/libgpt/rules.mk
diff --git a/system/utest/libhwreg/bitfields-test.cpp b/zircon/system/utest/libhwreg/bitfields-test.cpp
similarity index 100%
rename from system/utest/libhwreg/bitfields-test.cpp
rename to zircon/system/utest/libhwreg/bitfields-test.cpp
diff --git a/system/utest/libhwreg/rules.mk b/zircon/system/utest/libhwreg/rules.mk
similarity index 100%
rename from system/utest/libhwreg/rules.mk
rename to zircon/system/utest/libhwreg/rules.mk
diff --git a/system/utest/libzx/rules.mk b/zircon/system/utest/libzx/rules.mk
similarity index 100%
rename from system/utest/libzx/rules.mk
rename to zircon/system/utest/libzx/rules.mk
diff --git a/system/utest/libzx/traits.cpp b/zircon/system/utest/libzx/traits.cpp
similarity index 100%
rename from system/utest/libzx/traits.cpp
rename to zircon/system/utest/libzx/traits.cpp
diff --git a/system/utest/libzx/zx-test.cpp b/zircon/system/utest/libzx/zx-test.cpp
similarity index 100%
rename from system/utest/libzx/zx-test.cpp
rename to zircon/system/utest/libzx/zx-test.cpp
diff --git a/system/utest/logger/rules.mk b/zircon/system/utest/logger/rules.mk
similarity index 100%
rename from system/utest/logger/rules.mk
rename to zircon/system/utest/logger/rules.mk
diff --git a/system/utest/logger/test.cpp b/zircon/system/utest/logger/test.cpp
similarity index 100%
rename from system/utest/logger/test.cpp
rename to zircon/system/utest/logger/test.cpp
diff --git a/system/utest/memfs/fidl-tests.cpp b/zircon/system/utest/memfs/fidl-tests.cpp
similarity index 100%
rename from system/utest/memfs/fidl-tests.cpp
rename to zircon/system/utest/memfs/fidl-tests.cpp
diff --git a/system/utest/memfs/main.c b/zircon/system/utest/memfs/main.c
similarity index 100%
rename from system/utest/memfs/main.c
rename to zircon/system/utest/memfs/main.c
diff --git a/system/utest/memfs/memfs-tests.cpp b/zircon/system/utest/memfs/memfs-tests.cpp
similarity index 100%
rename from system/utest/memfs/memfs-tests.cpp
rename to zircon/system/utest/memfs/memfs-tests.cpp
diff --git a/system/utest/memfs/rules.mk b/zircon/system/utest/memfs/rules.mk
similarity index 100%
rename from system/utest/memfs/rules.mk
rename to zircon/system/utest/memfs/rules.mk
diff --git a/system/utest/memfs/vmofile-tests.cpp b/zircon/system/utest/memfs/vmofile-tests.cpp
similarity index 100%
rename from system/utest/memfs/vmofile-tests.cpp
rename to zircon/system/utest/memfs/vmofile-tests.cpp
diff --git a/system/utest/msd/msd.c b/zircon/system/utest/msd/msd.c
similarity index 100%
rename from system/utest/msd/msd.c
rename to zircon/system/utest/msd/msd.c
diff --git a/system/utest/msd/rules.mk b/zircon/system/utest/msd/rules.mk
similarity index 100%
rename from system/utest/msd/rules.mk
rename to zircon/system/utest/msd/rules.mk
diff --git a/system/utest/namespace/namespace-test.c b/zircon/system/utest/namespace/namespace-test.c
similarity index 100%
rename from system/utest/namespace/namespace-test.c
rename to zircon/system/utest/namespace/namespace-test.c
diff --git a/system/utest/namespace/rules.mk b/zircon/system/utest/namespace/rules.mk
similarity index 100%
rename from system/utest/namespace/rules.mk
rename to zircon/system/utest/namespace/rules.mk
diff --git a/system/utest/perftest/README.md b/zircon/system/utest/perftest/README.md
similarity index 100%
rename from system/utest/perftest/README.md
rename to zircon/system/utest/perftest/README.md
diff --git a/system/utest/perftest/clock-test.cpp b/zircon/system/utest/perftest/clock-test.cpp
similarity index 100%
rename from system/utest/perftest/clock-test.cpp
rename to zircon/system/utest/perftest/clock-test.cpp
diff --git a/system/utest/perftest/handle-creation-test.cpp b/zircon/system/utest/perftest/handle-creation-test.cpp
similarity index 100%
rename from system/utest/perftest/handle-creation-test.cpp
rename to zircon/system/utest/perftest/handle-creation-test.cpp
diff --git a/system/utest/perftest/malloc-test.cpp b/zircon/system/utest/perftest/malloc-test.cpp
similarity index 100%
rename from system/utest/perftest/malloc-test.cpp
rename to zircon/system/utest/perftest/malloc-test.cpp
diff --git a/system/utest/perftest/memcpy-test.cpp b/zircon/system/utest/perftest/memcpy-test.cpp
similarity index 100%
rename from system/utest/perftest/memcpy-test.cpp
rename to zircon/system/utest/perftest/memcpy-test.cpp
diff --git a/system/utest/perftest/mutex-test.cpp b/zircon/system/utest/perftest/mutex-test.cpp
similarity index 100%
rename from system/utest/perftest/mutex-test.cpp
rename to zircon/system/utest/perftest/mutex-test.cpp
diff --git a/system/utest/perftest/null-test.cpp b/zircon/system/utest/perftest/null-test.cpp
similarity index 100%
rename from system/utest/perftest/null-test.cpp
rename to zircon/system/utest/perftest/null-test.cpp
diff --git a/system/utest/perftest/process-test.cpp b/zircon/system/utest/perftest/process-test.cpp
similarity index 100%
rename from system/utest/perftest/process-test.cpp
rename to zircon/system/utest/perftest/process-test.cpp
diff --git a/system/utest/perftest/results-test.cpp b/zircon/system/utest/perftest/results-test.cpp
similarity index 100%
rename from system/utest/perftest/results-test.cpp
rename to zircon/system/utest/perftest/results-test.cpp
diff --git a/system/utest/perftest/rules.mk b/zircon/system/utest/perftest/rules.mk
similarity index 100%
rename from system/utest/perftest/rules.mk
rename to zircon/system/utest/perftest/rules.mk
diff --git a/system/utest/perftest/runner-test.cpp b/zircon/system/utest/perftest/runner-test.cpp
similarity index 100%
rename from system/utest/perftest/runner-test.cpp
rename to zircon/system/utest/perftest/runner-test.cpp
diff --git a/system/utest/perftest/sleep-test.cpp b/zircon/system/utest/perftest/sleep-test.cpp
similarity index 100%
rename from system/utest/perftest/sleep-test.cpp
rename to zircon/system/utest/perftest/sleep-test.cpp
diff --git a/system/utest/perftest/syscalls-test.cpp b/zircon/system/utest/perftest/syscalls-test.cpp
similarity index 100%
rename from system/utest/perftest/syscalls-test.cpp
rename to zircon/system/utest/perftest/syscalls-test.cpp
diff --git a/system/utest/perftest/timer-test.cpp b/zircon/system/utest/perftest/timer-test.cpp
similarity index 100%
rename from system/utest/perftest/timer-test.cpp
rename to zircon/system/utest/perftest/timer-test.cpp
diff --git a/system/utest/platform-bus/main.cpp b/zircon/system/utest/platform-bus/main.cpp
similarity index 100%
rename from system/utest/platform-bus/main.cpp
rename to zircon/system/utest/platform-bus/main.cpp
diff --git a/system/utest/platform-bus/rules.mk b/zircon/system/utest/platform-bus/rules.mk
similarity index 100%
rename from system/utest/platform-bus/rules.mk
rename to zircon/system/utest/platform-bus/rules.mk
diff --git a/system/utest/policy/job-policy.cpp b/zircon/system/utest/policy/job-policy.cpp
similarity index 100%
rename from system/utest/policy/job-policy.cpp
rename to zircon/system/utest/policy/job-policy.cpp
diff --git a/system/utest/policy/rules.mk b/zircon/system/utest/policy/rules.mk
similarity index 100%
rename from system/utest/policy/rules.mk
rename to zircon/system/utest/policy/rules.mk
diff --git a/system/utest/posixio/README.md b/zircon/system/utest/posixio/README.md
similarity index 100%
rename from system/utest/posixio/README.md
rename to zircon/system/utest/posixio/README.md
diff --git a/system/utest/posixio/main.cpp b/zircon/system/utest/posixio/main.cpp
similarity index 100%
rename from system/utest/posixio/main.cpp
rename to zircon/system/utest/posixio/main.cpp
diff --git a/system/utest/posixio/rules.mk b/zircon/system/utest/posixio/rules.mk
similarity index 100%
rename from system/utest/posixio/rules.mk
rename to zircon/system/utest/posixio/rules.mk
diff --git a/system/utest/processor/processor.c b/zircon/system/utest/processor/processor.c
similarity index 100%
rename from system/utest/processor/processor.c
rename to zircon/system/utest/processor/processor.c
diff --git a/system/utest/processor/rules.mk b/zircon/system/utest/processor/rules.mk
similarity index 100%
rename from system/utest/processor/rules.mk
rename to zircon/system/utest/processor/rules.mk
diff --git a/system/utest/profile/profile.cpp b/zircon/system/utest/profile/profile.cpp
similarity index 100%
rename from system/utest/profile/profile.cpp
rename to zircon/system/utest/profile/profile.cpp
diff --git a/system/utest/profile/rules.mk b/zircon/system/utest/profile/rules.mk
similarity index 100%
rename from system/utest/profile/rules.mk
rename to zircon/system/utest/profile/rules.mk
diff --git a/system/utest/property/README.md b/zircon/system/utest/property/README.md
similarity index 100%
rename from system/utest/property/README.md
rename to zircon/system/utest/property/README.md
diff --git a/system/utest/property/property.c b/zircon/system/utest/property/property.c
similarity index 100%
rename from system/utest/property/property.c
rename to zircon/system/utest/property/property.c
diff --git a/system/utest/property/rules.mk b/zircon/system/utest/property/rules.mk
similarity index 100%
rename from system/utest/property/rules.mk
rename to zircon/system/utest/property/rules.mk
diff --git a/system/utest/pty/pty-test.c b/zircon/system/utest/pty/pty-test.c
similarity index 100%
rename from system/utest/pty/pty-test.c
rename to zircon/system/utest/pty/pty-test.c
diff --git a/system/utest/pty/rules.mk b/zircon/system/utest/pty/rules.mk
similarity index 100%
rename from system/utest/pty/rules.mk
rename to zircon/system/utest/pty/rules.mk
diff --git a/system/utest/qsort/qsort.c b/zircon/system/utest/qsort/qsort.c
similarity index 100%
rename from system/utest/qsort/qsort.c
rename to zircon/system/utest/qsort/qsort.c
diff --git a/system/utest/qsort/rules.mk b/zircon/system/utest/qsort/rules.mk
similarity index 100%
rename from system/utest/qsort/rules.mk
rename to zircon/system/utest/qsort/rules.mk
diff --git a/system/utest/race-tests/race-tests.cpp b/zircon/system/utest/race-tests/race-tests.cpp
similarity index 100%
rename from system/utest/race-tests/race-tests.cpp
rename to zircon/system/utest/race-tests/race-tests.cpp
diff --git a/system/utest/race-tests/rules.mk b/zircon/system/utest/race-tests/rules.mk
similarity index 100%
rename from system/utest/race-tests/rules.mk
rename to zircon/system/utest/race-tests/rules.mk
diff --git a/system/utest/ramdisk/main.c b/zircon/system/utest/ramdisk/main.c
similarity index 100%
rename from system/utest/ramdisk/main.c
rename to zircon/system/utest/ramdisk/main.c
diff --git a/system/utest/ramdisk/ramdisk.cpp b/zircon/system/utest/ramdisk/ramdisk.cpp
similarity index 100%
rename from system/utest/ramdisk/ramdisk.cpp
rename to zircon/system/utest/ramdisk/ramdisk.cpp
diff --git a/system/utest/ramdisk/rules.mk b/zircon/system/utest/ramdisk/rules.mk
similarity index 100%
rename from system/utest/ramdisk/rules.mk
rename to zircon/system/utest/ramdisk/rules.mk
diff --git a/system/utest/region-alloc/common.h b/zircon/system/utest/region-alloc/common.h
similarity index 100%
rename from system/utest/region-alloc/common.h
rename to zircon/system/utest/region-alloc/common.h
diff --git a/system/utest/region-alloc/main.c b/zircon/system/utest/region-alloc/main.c
similarity index 100%
rename from system/utest/region-alloc/main.c
rename to zircon/system/utest/region-alloc/main.c
diff --git a/system/utest/region-alloc/region-alloc-c-api.c b/zircon/system/utest/region-alloc/region-alloc-c-api.c
similarity index 100%
rename from system/utest/region-alloc/region-alloc-c-api.c
rename to zircon/system/utest/region-alloc/region-alloc-c-api.c
diff --git a/system/utest/region-alloc/region-alloc.cpp b/zircon/system/utest/region-alloc/region-alloc.cpp
similarity index 100%
rename from system/utest/region-alloc/region-alloc.cpp
rename to zircon/system/utest/region-alloc/region-alloc.cpp
diff --git a/system/utest/region-alloc/rules.mk b/zircon/system/utest/region-alloc/rules.mk
similarity index 100%
rename from system/utest/region-alloc/rules.mk
rename to zircon/system/utest/region-alloc/rules.mk
diff --git a/system/utest/register-state/register-state-test.cpp b/zircon/system/utest/register-state/register-state-test.cpp
similarity index 100%
rename from system/utest/register-state/register-state-test.cpp
rename to zircon/system/utest/register-state/register-state-test.cpp
diff --git a/system/utest/register-state/rules.mk b/zircon/system/utest/register-state/rules.mk
similarity index 100%
rename from system/utest/register-state/rules.mk
rename to zircon/system/utest/register-state/rules.mk
diff --git a/system/utest/rtc-lib/rtc.cpp b/zircon/system/utest/rtc-lib/rtc.cpp
similarity index 100%
rename from system/utest/rtc-lib/rtc.cpp
rename to zircon/system/utest/rtc-lib/rtc.cpp
diff --git a/system/utest/rtc-lib/rules.mk b/zircon/system/utest/rtc-lib/rules.mk
similarity index 100%
rename from system/utest/rtc-lib/rules.mk
rename to zircon/system/utest/rtc-lib/rules.mk
diff --git a/system/utest/runtests-utils/fuchsia-run-test.cpp b/zircon/system/utest/runtests-utils/fuchsia-run-test.cpp
similarity index 100%
rename from system/utest/runtests-utils/fuchsia-run-test.cpp
rename to zircon/system/utest/runtests-utils/fuchsia-run-test.cpp
diff --git a/system/utest/runtests-utils/fuchsia-test-main.cpp b/zircon/system/utest/runtests-utils/fuchsia-test-main.cpp
similarity index 100%
rename from system/utest/runtests-utils/fuchsia-test-main.cpp
rename to zircon/system/utest/runtests-utils/fuchsia-test-main.cpp
diff --git a/system/utest/runtests-utils/helper/publish-data-helper.c b/zircon/system/utest/runtests-utils/helper/publish-data-helper.c
similarity index 100%
rename from system/utest/runtests-utils/helper/publish-data-helper.c
rename to zircon/system/utest/runtests-utils/helper/publish-data-helper.c
diff --git a/system/utest/runtests-utils/helper/rules.mk b/zircon/system/utest/runtests-utils/helper/rules.mk
similarity index 100%
rename from system/utest/runtests-utils/helper/rules.mk
rename to zircon/system/utest/runtests-utils/helper/rules.mk
diff --git a/system/utest/runtests-utils/log-exporter-test.cpp b/zircon/system/utest/runtests-utils/log-exporter-test.cpp
similarity index 100%
rename from system/utest/runtests-utils/log-exporter-test.cpp
rename to zircon/system/utest/runtests-utils/log-exporter-test.cpp
diff --git a/system/utest/runtests-utils/posix-test-main.cpp b/zircon/system/utest/runtests-utils/posix-test-main.cpp
similarity index 100%
rename from system/utest/runtests-utils/posix-test-main.cpp
rename to zircon/system/utest/runtests-utils/posix-test-main.cpp
diff --git a/system/utest/runtests-utils/rules.mk b/zircon/system/utest/runtests-utils/rules.mk
similarity index 100%
rename from system/utest/runtests-utils/rules.mk
rename to zircon/system/utest/runtests-utils/rules.mk
diff --git a/system/utest/runtests-utils/runtests-utils-test-globals.h b/zircon/system/utest/runtests-utils/runtests-utils-test-globals.h
similarity index 100%
rename from system/utest/runtests-utils/runtests-utils-test-globals.h
rename to zircon/system/utest/runtests-utils/runtests-utils-test-globals.h
diff --git a/system/utest/runtests-utils/runtests-utils-test-utils.cpp b/zircon/system/utest/runtests-utils/runtests-utils-test-utils.cpp
similarity index 100%
rename from system/utest/runtests-utils/runtests-utils-test-utils.cpp
rename to zircon/system/utest/runtests-utils/runtests-utils-test-utils.cpp
diff --git a/system/utest/runtests-utils/runtests-utils-test-utils.h b/zircon/system/utest/runtests-utils/runtests-utils-test-utils.h
similarity index 100%
rename from system/utest/runtests-utils/runtests-utils-test-utils.h
rename to zircon/system/utest/runtests-utils/runtests-utils-test-utils.h
diff --git a/system/utest/runtests-utils/runtests-utils-test.cpp b/zircon/system/utest/runtests-utils/runtests-utils-test.cpp
similarity index 100%
rename from system/utest/runtests-utils/runtests-utils-test.cpp
rename to zircon/system/utest/runtests-utils/runtests-utils-test.cpp
diff --git a/system/utest/sanitizer/rules.mk b/zircon/system/utest/sanitizer/rules.mk
similarity index 100%
rename from system/utest/sanitizer/rules.mk
rename to zircon/system/utest/sanitizer/rules.mk
diff --git a/system/utest/sanitizer/sanitizer-utils.c b/zircon/system/utest/sanitizer/sanitizer-utils.c
similarity index 100%
rename from system/utest/sanitizer/sanitizer-utils.c
rename to zircon/system/utest/sanitizer/sanitizer-utils.c
diff --git a/system/utest/spawn/child.c b/zircon/system/utest/spawn/child.c
similarity index 100%
rename from system/utest/spawn/child.c
rename to zircon/system/utest/spawn/child.c
diff --git a/system/utest/spawn/launcher.c b/zircon/system/utest/spawn/launcher.c
similarity index 100%
rename from system/utest/spawn/launcher.c
rename to zircon/system/utest/spawn/launcher.c
diff --git a/system/utest/spawn/rules.mk b/zircon/system/utest/spawn/rules.mk
similarity index 100%
rename from system/utest/spawn/rules.mk
rename to zircon/system/utest/spawn/rules.mk
diff --git a/system/utest/spawn/spawn.cpp b/zircon/system/utest/spawn/spawn.cpp
similarity index 100%
rename from system/utest/spawn/spawn.cpp
rename to zircon/system/utest/spawn/spawn.cpp
diff --git a/system/utest/stdio/rules.mk b/zircon/system/utest/stdio/rules.mk
similarity index 100%
rename from system/utest/stdio/rules.mk
rename to zircon/system/utest/stdio/rules.mk
diff --git a/system/utest/stdio/stdio.c b/zircon/system/utest/stdio/stdio.c
similarity index 100%
rename from system/utest/stdio/stdio.c
rename to zircon/system/utest/stdio/stdio.c
diff --git a/system/utest/stdio/util.c b/zircon/system/utest/stdio/util.c
similarity index 100%
rename from system/utest/stdio/util.c
rename to zircon/system/utest/stdio/util.c
diff --git a/system/utest/stdio/util.h b/zircon/system/utest/stdio/util.h
similarity index 100%
rename from system/utest/stdio/util.h
rename to zircon/system/utest/stdio/util.h
diff --git a/system/utest/sysconf/rules.mk b/zircon/system/utest/sysconf/rules.mk
similarity index 100%
rename from system/utest/sysconf/rules.mk
rename to zircon/system/utest/sysconf/rules.mk
diff --git a/system/utest/sysconf/sysconf.c b/zircon/system/utest/sysconf/sysconf.c
similarity index 100%
rename from system/utest/sysconf/sysconf.c
rename to zircon/system/utest/sysconf/sysconf.c
diff --git a/system/utest/sysinfo/main.cpp b/zircon/system/utest/sysinfo/main.cpp
similarity index 100%
rename from system/utest/sysinfo/main.cpp
rename to zircon/system/utest/sysinfo/main.cpp
diff --git a/system/utest/sysinfo/rules.mk b/zircon/system/utest/sysinfo/rules.mk
similarity index 100%
rename from system/utest/sysinfo/rules.mk
rename to zircon/system/utest/sysinfo/rules.mk
diff --git a/system/utest/syslog/main.c b/zircon/system/utest/syslog/main.c
similarity index 100%
rename from system/utest/syslog/main.c
rename to zircon/system/utest/syslog/main.c
diff --git a/system/utest/syslog/rules.mk b/zircon/system/utest/syslog/rules.mk
similarity index 100%
rename from system/utest/syslog/rules.mk
rename to zircon/system/utest/syslog/rules.mk
diff --git a/system/utest/syslog/syslog_socket_tests.cpp b/zircon/system/utest/syslog/syslog_socket_tests.cpp
similarity index 100%
rename from system/utest/syslog/syslog_socket_tests.cpp
rename to zircon/system/utest/syslog/syslog_socket_tests.cpp
diff --git a/system/utest/syslog/syslog_tests.c b/zircon/system/utest/syslog/syslog_tests.c
similarity index 100%
rename from system/utest/syslog/syslog_tests.c
rename to zircon/system/utest/syslog/syslog_tests.c
diff --git a/system/utest/sysmem/main.c b/zircon/system/utest/sysmem/main.c
similarity index 100%
rename from system/utest/sysmem/main.c
rename to zircon/system/utest/sysmem/main.c
diff --git a/system/utest/sysmem/rules.mk b/zircon/system/utest/sysmem/rules.mk
similarity index 100%
rename from system/utest/sysmem/rules.mk
rename to zircon/system/utest/sysmem/rules.mk
diff --git a/system/utest/sysmem/sysmem_tests.cpp b/zircon/system/utest/sysmem/sysmem_tests.cpp
similarity index 100%
rename from system/utest/sysmem/sysmem_tests.cpp
rename to zircon/system/utest/sysmem/sysmem_tests.cpp
diff --git a/system/utest/task-utils/rules.mk b/zircon/system/utest/task-utils/rules.mk
similarity index 100%
rename from system/utest/task-utils/rules.mk
rename to zircon/system/utest/task-utils/rules.mk
diff --git a/system/utest/task-utils/walker.cpp b/zircon/system/utest/task-utils/walker.cpp
similarity index 100%
rename from system/utest/task-utils/walker.cpp
rename to zircon/system/utest/task-utils/walker.cpp
diff --git a/system/utest/thread-initial-state/arm64.S b/zircon/system/utest/thread-initial-state/arm64.S
similarity index 100%
rename from system/utest/thread-initial-state/arm64.S
rename to zircon/system/utest/thread-initial-state/arm64.S
diff --git a/system/utest/thread-initial-state/asm.h b/zircon/system/utest/thread-initial-state/asm.h
similarity index 100%
rename from system/utest/thread-initial-state/asm.h
rename to zircon/system/utest/thread-initial-state/asm.h
diff --git a/system/utest/thread-initial-state/init-state.c b/zircon/system/utest/thread-initial-state/init-state.c
similarity index 100%
rename from system/utest/thread-initial-state/init-state.c
rename to zircon/system/utest/thread-initial-state/init-state.c
diff --git a/system/utest/thread-initial-state/rules.mk b/zircon/system/utest/thread-initial-state/rules.mk
similarity index 100%
rename from system/utest/thread-initial-state/rules.mk
rename to zircon/system/utest/thread-initial-state/rules.mk
diff --git a/system/utest/thread-initial-state/x86-64.S b/zircon/system/utest/thread-initial-state/x86-64.S
similarity index 100%
rename from system/utest/thread-initial-state/x86-64.S
rename to zircon/system/utest/thread-initial-state/x86-64.S
diff --git a/system/utest/thread-state/rules.mk b/zircon/system/utest/thread-state/rules.mk
similarity index 100%
rename from system/utest/thread-state/rules.mk
rename to zircon/system/utest/thread-state/rules.mk
diff --git a/system/utest/thread-state/thread-state.cpp b/zircon/system/utest/thread-state/thread-state.cpp
similarity index 100%
rename from system/utest/thread-state/thread-state.cpp
rename to zircon/system/utest/thread-state/thread-state.cpp
diff --git a/system/utest/time/rules.mk b/zircon/system/utest/time/rules.mk
similarity index 100%
rename from system/utest/time/rules.mk
rename to zircon/system/utest/time/rules.mk
diff --git a/system/utest/time/time_test.cpp b/zircon/system/utest/time/time_test.cpp
similarity index 100%
rename from system/utest/time/time_test.cpp
rename to zircon/system/utest/time/time_test.cpp
diff --git a/system/utest/timers/rules.mk b/zircon/system/utest/timers/rules.mk
similarity index 100%
rename from system/utest/timers/rules.mk
rename to zircon/system/utest/timers/rules.mk
diff --git a/system/utest/timers/timers.cpp b/zircon/system/utest/timers/timers.cpp
similarity index 100%
rename from system/utest/timers/timers.cpp
rename to zircon/system/utest/timers/timers.cpp
diff --git a/system/utest/trace-reader/MAINTAINERS b/zircon/system/utest/trace-reader/MAINTAINERS
similarity index 100%
rename from system/utest/trace-reader/MAINTAINERS
rename to zircon/system/utest/trace-reader/MAINTAINERS
diff --git a/system/utest/trace-reader/main.c b/zircon/system/utest/trace-reader/main.c
similarity index 100%
rename from system/utest/trace-reader/main.c
rename to zircon/system/utest/trace-reader/main.c
diff --git a/system/utest/trace-reader/reader_tests.cpp b/zircon/system/utest/trace-reader/reader_tests.cpp
similarity index 100%
rename from system/utest/trace-reader/reader_tests.cpp
rename to zircon/system/utest/trace-reader/reader_tests.cpp
diff --git a/system/utest/trace-reader/records_tests.cpp b/zircon/system/utest/trace-reader/records_tests.cpp
similarity index 100%
rename from system/utest/trace-reader/records_tests.cpp
rename to zircon/system/utest/trace-reader/records_tests.cpp
diff --git a/system/utest/trace-reader/rules.mk b/zircon/system/utest/trace-reader/rules.mk
similarity index 100%
rename from system/utest/trace-reader/rules.mk
rename to zircon/system/utest/trace-reader/rules.mk
diff --git a/system/utest/trace/MAINTAINERS b/zircon/system/utest/trace/MAINTAINERS
similarity index 100%
rename from system/utest/trace/MAINTAINERS
rename to zircon/system/utest/trace/MAINTAINERS
diff --git a/system/utest/trace/engine_tests.cpp b/zircon/system/utest/trace/engine_tests.cpp
similarity index 100%
rename from system/utest/trace/engine_tests.cpp
rename to zircon/system/utest/trace/engine_tests.cpp
diff --git a/system/utest/trace/event_tests.c b/zircon/system/utest/trace/event_tests.c
similarity index 100%
rename from system/utest/trace/event_tests.c
rename to zircon/system/utest/trace/event_tests.c
diff --git a/system/utest/trace/event_tests.cpp b/zircon/system/utest/trace/event_tests.cpp
similarity index 100%
rename from system/utest/trace/event_tests.cpp
rename to zircon/system/utest/trace/event_tests.cpp
diff --git a/system/utest/trace/event_tests_common.h b/zircon/system/utest/trace/event_tests_common.h
similarity index 100%
rename from system/utest/trace/event_tests_common.h
rename to zircon/system/utest/trace/event_tests_common.h
diff --git a/system/utest/trace/event_tests_ntrace.c b/zircon/system/utest/trace/event_tests_ntrace.c
similarity index 100%
rename from system/utest/trace/event_tests_ntrace.c
rename to zircon/system/utest/trace/event_tests_ntrace.c
diff --git a/system/utest/trace/event_tests_ntrace.cpp b/zircon/system/utest/trace/event_tests_ntrace.cpp
similarity index 100%
rename from system/utest/trace/event_tests_ntrace.cpp
rename to zircon/system/utest/trace/event_tests_ntrace.cpp
diff --git a/system/utest/trace/fields_tests.cpp b/zircon/system/utest/trace/fields_tests.cpp
similarity index 100%
rename from system/utest/trace/fields_tests.cpp
rename to zircon/system/utest/trace/fields_tests.cpp
diff --git a/system/utest/trace/fixture.cpp b/zircon/system/utest/trace/fixture.cpp
similarity index 100%
rename from system/utest/trace/fixture.cpp
rename to zircon/system/utest/trace/fixture.cpp
diff --git a/system/utest/trace/fixture.h b/zircon/system/utest/trace/fixture.h
similarity index 100%
rename from system/utest/trace/fixture.h
rename to zircon/system/utest/trace/fixture.h
diff --git a/system/utest/trace/main.c b/zircon/system/utest/trace/main.c
similarity index 100%
rename from system/utest/trace/main.c
rename to zircon/system/utest/trace/main.c
diff --git a/system/utest/trace/no_optimization.c b/zircon/system/utest/trace/no_optimization.c
similarity index 100%
rename from system/utest/trace/no_optimization.c
rename to zircon/system/utest/trace/no_optimization.c
diff --git a/system/utest/trace/record_tests.cpp b/zircon/system/utest/trace/record_tests.cpp
similarity index 100%
rename from system/utest/trace/record_tests.cpp
rename to zircon/system/utest/trace/record_tests.cpp
diff --git a/system/utest/trace/rules.mk b/zircon/system/utest/trace/rules.mk
similarity index 100%
rename from system/utest/trace/rules.mk
rename to zircon/system/utest/trace/rules.mk
diff --git a/system/utest/usb/rules.mk b/zircon/system/utest/usb/rules.mk
similarity index 100%
rename from system/utest/usb/rules.mk
rename to zircon/system/utest/usb/rules.mk
diff --git a/system/utest/usb/usb-test.c b/zircon/system/utest/usb/usb-test.c
similarity index 100%
rename from system/utest/usb/usb-test.c
rename to zircon/system/utest/usb/usb-test.c
diff --git a/system/utest/utf_conversion/main.cpp b/zircon/system/utest/utf_conversion/main.cpp
similarity index 100%
rename from system/utest/utf_conversion/main.cpp
rename to zircon/system/utest/utf_conversion/main.cpp
diff --git a/system/utest/utf_conversion/rules.mk b/zircon/system/utest/utf_conversion/rules.mk
similarity index 100%
rename from system/utest/utf_conversion/rules.mk
rename to zircon/system/utest/utf_conversion/rules.mk
diff --git a/system/utest/util/listnode.cpp b/zircon/system/utest/util/listnode.cpp
similarity index 100%
rename from system/utest/util/listnode.cpp
rename to zircon/system/utest/util/listnode.cpp
diff --git a/system/utest/util/rules.mk b/zircon/system/utest/util/rules.mk
similarity index 100%
rename from system/utest/util/rules.mk
rename to zircon/system/utest/util/rules.mk
diff --git a/system/utest/vdso-base/rules.mk b/zircon/system/utest/vdso-base/rules.mk
similarity index 100%
rename from system/utest/vdso-base/rules.mk
rename to zircon/system/utest/vdso-base/rules.mk
diff --git a/system/utest/vdso-base/vdso-base.c b/zircon/system/utest/vdso-base/vdso-base.c
similarity index 100%
rename from system/utest/vdso-base/vdso-base.c
rename to zircon/system/utest/vdso-base/vdso-base.c
diff --git a/system/utest/vdso-variant/helper/rules.mk b/zircon/system/utest/vdso-variant/helper/rules.mk
similarity index 100%
rename from system/utest/vdso-variant/helper/rules.mk
rename to zircon/system/utest/vdso-variant/helper/rules.mk
diff --git a/system/utest/vdso-variant/helper/vdso-variant-helper.c b/zircon/system/utest/vdso-variant/helper/vdso-variant-helper.c
similarity index 100%
rename from system/utest/vdso-variant/helper/vdso-variant-helper.c
rename to zircon/system/utest/vdso-variant/helper/vdso-variant-helper.c
diff --git a/system/utest/vdso-variant/rules.mk b/zircon/system/utest/vdso-variant/rules.mk
similarity index 100%
rename from system/utest/vdso-variant/rules.mk
rename to zircon/system/utest/vdso-variant/rules.mk
diff --git a/system/utest/vdso-variant/vdso-variant.c b/zircon/system/utest/vdso-variant/vdso-variant.c
similarity index 100%
rename from system/utest/vdso-variant/vdso-variant.c
rename to zircon/system/utest/vdso-variant/vdso-variant.c
diff --git a/system/utest/vdso/rules.mk b/zircon/system/utest/vdso/rules.mk
similarity index 100%
rename from system/utest/vdso/rules.mk
rename to zircon/system/utest/vdso/rules.mk
diff --git a/system/utest/vdso/vdso.cpp b/zircon/system/utest/vdso/vdso.cpp
similarity index 100%
rename from system/utest/vdso/vdso.cpp
rename to zircon/system/utest/vdso/vdso.cpp
diff --git a/system/utest/vmo/bench.cpp b/zircon/system/utest/vmo/bench.cpp
similarity index 100%
rename from system/utest/vmo/bench.cpp
rename to zircon/system/utest/vmo/bench.cpp
diff --git a/system/utest/vmo/bench.h b/zircon/system/utest/vmo/bench.h
similarity index 100%
rename from system/utest/vmo/bench.h
rename to zircon/system/utest/vmo/bench.h
diff --git a/system/utest/vmo/rules.mk b/zircon/system/utest/vmo/rules.mk
similarity index 100%
rename from system/utest/vmo/rules.mk
rename to zircon/system/utest/vmo/rules.mk
diff --git a/system/utest/vmo/vmo.cpp b/zircon/system/utest/vmo/vmo.cpp
similarity index 100%
rename from system/utest/vmo/vmo.cpp
rename to zircon/system/utest/vmo/vmo.cpp
diff --git a/system/utest/x86-umip/main.cpp b/zircon/system/utest/x86-umip/main.cpp
similarity index 100%
rename from system/utest/x86-umip/main.cpp
rename to zircon/system/utest/x86-umip/main.cpp
diff --git a/system/utest/x86-umip/rules.mk b/zircon/system/utest/x86-umip/rules.mk
similarity index 100%
rename from system/utest/x86-umip/rules.mk
rename to zircon/system/utest/x86-umip/rules.mk
diff --git a/system/utest/zbi/rules.mk b/zircon/system/utest/zbi/rules.mk
similarity index 100%
rename from system/utest/zbi/rules.mk
rename to zircon/system/utest/zbi/rules.mk
diff --git a/system/utest/zbi/zbi.cpp b/zircon/system/utest/zbi/zbi.cpp
similarity index 100%
rename from system/utest/zbi/zbi.cpp
rename to zircon/system/utest/zbi/zbi.cpp
diff --git a/system/utest/zxcrypt/main.c b/zircon/system/utest/zxcrypt/main.c
similarity index 100%
rename from system/utest/zxcrypt/main.c
rename to zircon/system/utest/zxcrypt/main.c
diff --git a/system/utest/zxcrypt/rules.mk b/zircon/system/utest/zxcrypt/rules.mk
similarity index 100%
rename from system/utest/zxcrypt/rules.mk
rename to zircon/system/utest/zxcrypt/rules.mk
diff --git a/system/utest/zxcrypt/test-device.cpp b/zircon/system/utest/zxcrypt/test-device.cpp
similarity index 100%
rename from system/utest/zxcrypt/test-device.cpp
rename to zircon/system/utest/zxcrypt/test-device.cpp
diff --git a/system/utest/zxcrypt/test-device.h b/zircon/system/utest/zxcrypt/test-device.h
similarity index 100%
rename from system/utest/zxcrypt/test-device.h
rename to zircon/system/utest/zxcrypt/test-device.h
diff --git a/system/utest/zxcrypt/volume.cpp b/zircon/system/utest/zxcrypt/volume.cpp
similarity index 100%
rename from system/utest/zxcrypt/volume.cpp
rename to zircon/system/utest/zxcrypt/volume.cpp
diff --git a/system/utest/zxcrypt/zxcrypt.cpp b/zircon/system/utest/zxcrypt/zxcrypt.cpp
similarity index 100%
rename from system/utest/zxcrypt/zxcrypt.cpp
rename to zircon/system/utest/zxcrypt/zxcrypt.cpp
diff --git a/system/utest/zxio/main.c b/zircon/system/utest/zxio/main.c
similarity index 100%
rename from system/utest/zxio/main.c
rename to zircon/system/utest/zxio/main.c
diff --git a/system/utest/zxio/null-test.cpp b/zircon/system/utest/zxio/null-test.cpp
similarity index 100%
rename from system/utest/zxio/null-test.cpp
rename to zircon/system/utest/zxio/null-test.cpp
diff --git a/system/utest/zxio/rules.mk b/zircon/system/utest/zxio/rules.mk
similarity index 100%
rename from system/utest/zxio/rules.mk
rename to zircon/system/utest/zxio/rules.mk
diff --git a/system/utest/zxio/vmofile-test.cpp b/zircon/system/utest/zxio/vmofile-test.cpp
similarity index 100%
rename from system/utest/zxio/vmofile-test.cpp
rename to zircon/system/utest/zxio/vmofile-test.cpp
diff --git a/system/utest/zxio/zxio-test.cpp b/zircon/system/utest/zxio/zxio-test.cpp
similarity index 100%
rename from system/utest/zxio/zxio-test.cpp
rename to zircon/system/utest/zxio/zxio-test.cpp
diff --git a/third_party/MAINTAINERS b/zircon/third_party/MAINTAINERS
similarity index 100%
rename from third_party/MAINTAINERS
rename to zircon/third_party/MAINTAINERS
diff --git a/third_party/dev/ethernet/e1000/LICENSE b/zircon/third_party/dev/ethernet/e1000/LICENSE
similarity index 100%
rename from third_party/dev/ethernet/e1000/LICENSE
rename to zircon/third_party/dev/ethernet/e1000/LICENSE
diff --git a/third_party/dev/ethernet/e1000/README b/zircon/third_party/dev/ethernet/e1000/README
similarity index 100%
rename from third_party/dev/ethernet/e1000/README
rename to zircon/third_party/dev/ethernet/e1000/README
diff --git a/third_party/dev/ethernet/e1000/README.fuchsia b/zircon/third_party/dev/ethernet/e1000/README.fuchsia
similarity index 100%
rename from third_party/dev/ethernet/e1000/README.fuchsia
rename to zircon/third_party/dev/ethernet/e1000/README.fuchsia
diff --git a/third_party/dev/ethernet/e1000/e1000_80003es2lan.c b/zircon/third_party/dev/ethernet/e1000/e1000_80003es2lan.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_80003es2lan.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_80003es2lan.c
diff --git a/third_party/dev/ethernet/e1000/e1000_80003es2lan.h b/zircon/third_party/dev/ethernet/e1000/e1000_80003es2lan.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_80003es2lan.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_80003es2lan.h
diff --git a/third_party/dev/ethernet/e1000/e1000_82540.c b/zircon/third_party/dev/ethernet/e1000/e1000_82540.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82540.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_82540.c
diff --git a/third_party/dev/ethernet/e1000/e1000_82541.c b/zircon/third_party/dev/ethernet/e1000/e1000_82541.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82541.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_82541.c
diff --git a/third_party/dev/ethernet/e1000/e1000_82541.h b/zircon/third_party/dev/ethernet/e1000/e1000_82541.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82541.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_82541.h
diff --git a/third_party/dev/ethernet/e1000/e1000_82542.c b/zircon/third_party/dev/ethernet/e1000/e1000_82542.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82542.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_82542.c
diff --git a/third_party/dev/ethernet/e1000/e1000_82543.c b/zircon/third_party/dev/ethernet/e1000/e1000_82543.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82543.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_82543.c
diff --git a/third_party/dev/ethernet/e1000/e1000_82543.h b/zircon/third_party/dev/ethernet/e1000/e1000_82543.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82543.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_82543.h
diff --git a/third_party/dev/ethernet/e1000/e1000_82571.c b/zircon/third_party/dev/ethernet/e1000/e1000_82571.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82571.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_82571.c
diff --git a/third_party/dev/ethernet/e1000/e1000_82571.h b/zircon/third_party/dev/ethernet/e1000/e1000_82571.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82571.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_82571.h
diff --git a/third_party/dev/ethernet/e1000/e1000_82575.c b/zircon/third_party/dev/ethernet/e1000/e1000_82575.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82575.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_82575.c
diff --git a/third_party/dev/ethernet/e1000/e1000_82575.h b/zircon/third_party/dev/ethernet/e1000/e1000_82575.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_82575.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_82575.h
diff --git a/third_party/dev/ethernet/e1000/e1000_api.c b/zircon/third_party/dev/ethernet/e1000/e1000_api.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_api.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_api.c
diff --git a/third_party/dev/ethernet/e1000/e1000_api.h b/zircon/third_party/dev/ethernet/e1000/e1000_api.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_api.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_api.h
diff --git a/third_party/dev/ethernet/e1000/e1000_defines.h b/zircon/third_party/dev/ethernet/e1000/e1000_defines.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_defines.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_defines.h
diff --git a/third_party/dev/ethernet/e1000/e1000_hw.h b/zircon/third_party/dev/ethernet/e1000/e1000_hw.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_hw.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_hw.h
diff --git a/third_party/dev/ethernet/e1000/e1000_i210.c b/zircon/third_party/dev/ethernet/e1000/e1000_i210.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_i210.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_i210.c
diff --git a/third_party/dev/ethernet/e1000/e1000_i210.h b/zircon/third_party/dev/ethernet/e1000/e1000_i210.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_i210.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_i210.h
diff --git a/third_party/dev/ethernet/e1000/e1000_ich8lan.c b/zircon/third_party/dev/ethernet/e1000/e1000_ich8lan.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_ich8lan.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_ich8lan.c
diff --git a/third_party/dev/ethernet/e1000/e1000_ich8lan.h b/zircon/third_party/dev/ethernet/e1000/e1000_ich8lan.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_ich8lan.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_ich8lan.h
diff --git a/third_party/dev/ethernet/e1000/e1000_mac.c b/zircon/third_party/dev/ethernet/e1000/e1000_mac.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_mac.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_mac.c
diff --git a/third_party/dev/ethernet/e1000/e1000_mac.h b/zircon/third_party/dev/ethernet/e1000/e1000_mac.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_mac.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_mac.h
diff --git a/third_party/dev/ethernet/e1000/e1000_manage.c b/zircon/third_party/dev/ethernet/e1000/e1000_manage.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_manage.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_manage.c
diff --git a/third_party/dev/ethernet/e1000/e1000_manage.h b/zircon/third_party/dev/ethernet/e1000/e1000_manage.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_manage.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_manage.h
diff --git a/third_party/dev/ethernet/e1000/e1000_mbx.c b/zircon/third_party/dev/ethernet/e1000/e1000_mbx.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_mbx.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_mbx.c
diff --git a/third_party/dev/ethernet/e1000/e1000_mbx.h b/zircon/third_party/dev/ethernet/e1000/e1000_mbx.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_mbx.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_mbx.h
diff --git a/third_party/dev/ethernet/e1000/e1000_nvm.c b/zircon/third_party/dev/ethernet/e1000/e1000_nvm.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_nvm.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_nvm.c
diff --git a/third_party/dev/ethernet/e1000/e1000_nvm.h b/zircon/third_party/dev/ethernet/e1000/e1000_nvm.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_nvm.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_nvm.h
diff --git a/third_party/dev/ethernet/e1000/e1000_osdep.c b/zircon/third_party/dev/ethernet/e1000/e1000_osdep.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_osdep.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_osdep.c
diff --git a/third_party/dev/ethernet/e1000/e1000_osdep.h b/zircon/third_party/dev/ethernet/e1000/e1000_osdep.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_osdep.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_osdep.h
diff --git a/third_party/dev/ethernet/e1000/e1000_phy.c b/zircon/third_party/dev/ethernet/e1000/e1000_phy.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_phy.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_phy.c
diff --git a/third_party/dev/ethernet/e1000/e1000_phy.h b/zircon/third_party/dev/ethernet/e1000/e1000_phy.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_phy.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_phy.h
diff --git a/third_party/dev/ethernet/e1000/e1000_regs.h b/zircon/third_party/dev/ethernet/e1000/e1000_regs.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_regs.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_regs.h
diff --git a/third_party/dev/ethernet/e1000/e1000_vf.c b/zircon/third_party/dev/ethernet/e1000/e1000_vf.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_vf.c
rename to zircon/third_party/dev/ethernet/e1000/e1000_vf.c
diff --git a/third_party/dev/ethernet/e1000/e1000_vf.h b/zircon/third_party/dev/ethernet/e1000/e1000_vf.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/e1000_vf.h
rename to zircon/third_party/dev/ethernet/e1000/e1000_vf.h
diff --git a/third_party/dev/ethernet/e1000/em_txrx.c b/zircon/third_party/dev/ethernet/e1000/em_txrx.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/em_txrx.c
rename to zircon/third_party/dev/ethernet/e1000/em_txrx.c
diff --git a/third_party/dev/ethernet/e1000/fuchsia.c b/zircon/third_party/dev/ethernet/e1000/fuchsia.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/fuchsia.c
rename to zircon/third_party/dev/ethernet/e1000/fuchsia.c
diff --git a/third_party/dev/ethernet/e1000/if_em.c b/zircon/third_party/dev/ethernet/e1000/if_em.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/if_em.c
rename to zircon/third_party/dev/ethernet/e1000/if_em.c
diff --git a/third_party/dev/ethernet/e1000/if_em.h b/zircon/third_party/dev/ethernet/e1000/if_em.h
similarity index 100%
rename from third_party/dev/ethernet/e1000/if_em.h
rename to zircon/third_party/dev/ethernet/e1000/if_em.h
diff --git a/third_party/dev/ethernet/e1000/igb_txrx.c b/zircon/third_party/dev/ethernet/e1000/igb_txrx.c
similarity index 100%
rename from third_party/dev/ethernet/e1000/igb_txrx.c
rename to zircon/third_party/dev/ethernet/e1000/igb_txrx.c
diff --git a/third_party/dev/ethernet/e1000/rules.mk b/zircon/third_party/dev/ethernet/e1000/rules.mk
similarity index 100%
rename from third_party/dev/ethernet/e1000/rules.mk
rename to zircon/third_party/dev/ethernet/e1000/rules.mk
diff --git a/third_party/lib/acpica/.gitignore b/zircon/third_party/lib/acpica/.gitignore
similarity index 100%
rename from third_party/lib/acpica/.gitignore
rename to zircon/third_party/lib/acpica/.gitignore
diff --git a/third_party/lib/acpica/LICENSE b/zircon/third_party/lib/acpica/LICENSE
similarity index 100%
rename from third_party/lib/acpica/LICENSE
rename to zircon/third_party/lib/acpica/LICENSE
diff --git a/third_party/lib/acpica/MAINTAINERS b/zircon/third_party/lib/acpica/MAINTAINERS
similarity index 100%
rename from third_party/lib/acpica/MAINTAINERS
rename to zircon/third_party/lib/acpica/MAINTAINERS
diff --git a/third_party/lib/acpica/Makefile b/zircon/third_party/lib/acpica/Makefile
similarity index 100%
rename from third_party/lib/acpica/Makefile
rename to zircon/third_party/lib/acpica/Makefile
diff --git a/third_party/lib/acpica/README.fuchsia b/zircon/third_party/lib/acpica/README.fuchsia
similarity index 100%
rename from third_party/lib/acpica/README.fuchsia
rename to zircon/third_party/lib/acpica/README.fuchsia
diff --git a/third_party/lib/acpica/changes.txt b/zircon/third_party/lib/acpica/changes.txt
similarity index 100%
rename from third_party/lib/acpica/changes.txt
rename to zircon/third_party/lib/acpica/changes.txt
diff --git a/third_party/lib/acpica/generate/lint/files.lnt b/zircon/third_party/lib/acpica/generate/lint/files.lnt
similarity index 100%
rename from third_party/lib/acpica/generate/lint/files.lnt
rename to zircon/third_party/lib/acpica/generate/lint/files.lnt
diff --git a/third_party/lib/acpica/generate/lint/lint.bat b/zircon/third_party/lib/acpica/generate/lint/lint.bat
similarity index 100%
rename from third_party/lib/acpica/generate/lint/lint.bat
rename to zircon/third_party/lib/acpica/generate/lint/lint.bat
diff --git a/third_party/lib/acpica/generate/lint/lset.bat b/zircon/third_party/lib/acpica/generate/lint/lset.bat
similarity index 100%
rename from third_party/lib/acpica/generate/lint/lset.bat
rename to zircon/third_party/lib/acpica/generate/lint/lset.bat
diff --git a/third_party/lib/acpica/generate/lint/options.lnt b/zircon/third_party/lib/acpica/generate/lint/options.lnt
similarity index 100%
rename from third_party/lib/acpica/generate/lint/options.lnt
rename to zircon/third_party/lib/acpica/generate/lint/options.lnt
diff --git a/third_party/lib/acpica/generate/lint/readme.txt b/zircon/third_party/lib/acpica/generate/lint/readme.txt
similarity index 100%
rename from third_party/lib/acpica/generate/lint/readme.txt
rename to zircon/third_party/lib/acpica/generate/lint/readme.txt
diff --git a/third_party/lib/acpica/generate/lint/std16.lnt b/zircon/third_party/lib/acpica/generate/lint/std16.lnt
similarity index 100%
rename from third_party/lib/acpica/generate/lint/std16.lnt
rename to zircon/third_party/lib/acpica/generate/lint/std16.lnt
diff --git a/third_party/lib/acpica/generate/lint/std32.lnt b/zircon/third_party/lib/acpica/generate/lint/std32.lnt
similarity index 100%
rename from third_party/lib/acpica/generate/lint/std32.lnt
rename to zircon/third_party/lib/acpica/generate/lint/std32.lnt
diff --git a/third_party/lib/acpica/generate/lint/std64.lnt b/zircon/third_party/lib/acpica/generate/lint/std64.lnt
similarity index 100%
rename from third_party/lib/acpica/generate/lint/std64.lnt
rename to zircon/third_party/lib/acpica/generate/lint/std64.lnt
diff --git a/third_party/lib/acpica/generate/release/build.sh b/zircon/third_party/lib/acpica/generate/release/build.sh
similarity index 100%
rename from third_party/lib/acpica/generate/release/build.sh
rename to zircon/third_party/lib/acpica/generate/release/build.sh
diff --git a/third_party/lib/acpica/generate/release/release.sh b/zircon/third_party/lib/acpica/generate/release/release.sh
similarity index 100%
rename from third_party/lib/acpica/generate/release/release.sh
rename to zircon/third_party/lib/acpica/generate/release/release.sh
diff --git a/third_party/lib/acpica/generate/unix/Makefile b/zircon/third_party/lib/acpica/generate/unix/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/Makefile
diff --git a/third_party/lib/acpica/generate/unix/Makefile.common b/zircon/third_party/lib/acpica/generate/unix/Makefile.common
similarity index 100%
rename from third_party/lib/acpica/generate/unix/Makefile.common
rename to zircon/third_party/lib/acpica/generate/unix/Makefile.common
diff --git a/third_party/lib/acpica/generate/unix/Makefile.config b/zircon/third_party/lib/acpica/generate/unix/Makefile.config
similarity index 100%
rename from third_party/lib/acpica/generate/unix/Makefile.config
rename to zircon/third_party/lib/acpica/generate/unix/Makefile.config
diff --git a/third_party/lib/acpica/generate/unix/Makefile.rules b/zircon/third_party/lib/acpica/generate/unix/Makefile.rules
similarity index 100%
rename from third_party/lib/acpica/generate/unix/Makefile.rules
rename to zircon/third_party/lib/acpica/generate/unix/Makefile.rules
diff --git a/third_party/lib/acpica/generate/unix/acpibin/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpibin/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpibin/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpibin/Makefile
diff --git a/third_party/lib/acpica/generate/unix/acpidump/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpidump/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpidump/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpidump/Makefile
diff --git a/third_party/lib/acpica/generate/unix/acpiexamples/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpiexamples/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpiexamples/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpiexamples/Makefile
diff --git a/third_party/lib/acpica/generate/unix/acpiexec/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpiexec/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpiexec/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpiexec/Makefile
diff --git a/third_party/lib/acpica/generate/unix/acpihelp/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpihelp/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpihelp/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpihelp/Makefile
diff --git a/third_party/lib/acpica/generate/unix/acpinames/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpinames/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpinames/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpinames/Makefile
diff --git a/third_party/lib/acpica/generate/unix/acpisrc/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpisrc/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpisrc/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpisrc/Makefile
diff --git a/third_party/lib/acpica/generate/unix/acpixtract/Makefile b/zircon/third_party/lib/acpica/generate/unix/acpixtract/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/acpixtract/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/acpixtract/Makefile
diff --git a/third_party/lib/acpica/generate/unix/iasl/Makefile b/zircon/third_party/lib/acpica/generate/unix/iasl/Makefile
similarity index 100%
rename from third_party/lib/acpica/generate/unix/iasl/Makefile
rename to zircon/third_party/lib/acpica/generate/unix/iasl/Makefile
diff --git a/third_party/lib/acpica/generate/unix/readme.txt b/zircon/third_party/lib/acpica/generate/unix/readme.txt
similarity index 100%
rename from third_party/lib/acpica/generate/unix/readme.txt
rename to zircon/third_party/lib/acpica/generate/unix/readme.txt
diff --git a/third_party/lib/acpica/rules.mk b/zircon/third_party/lib/acpica/rules.mk
similarity index 100%
rename from third_party/lib/acpica/rules.mk
rename to zircon/third_party/lib/acpica/rules.mk
diff --git a/third_party/lib/acpica/source/common/acfileio.c b/zircon/third_party/lib/acpica/source/common/acfileio.c
similarity index 100%
rename from third_party/lib/acpica/source/common/acfileio.c
rename to zircon/third_party/lib/acpica/source/common/acfileio.c
diff --git a/third_party/lib/acpica/source/common/acgetline.c b/zircon/third_party/lib/acpica/source/common/acgetline.c
similarity index 100%
rename from third_party/lib/acpica/source/common/acgetline.c
rename to zircon/third_party/lib/acpica/source/common/acgetline.c
diff --git a/third_party/lib/acpica/source/common/adfile.c b/zircon/third_party/lib/acpica/source/common/adfile.c
similarity index 100%
rename from third_party/lib/acpica/source/common/adfile.c
rename to zircon/third_party/lib/acpica/source/common/adfile.c
diff --git a/third_party/lib/acpica/source/common/adisasm.c b/zircon/third_party/lib/acpica/source/common/adisasm.c
similarity index 100%
rename from third_party/lib/acpica/source/common/adisasm.c
rename to zircon/third_party/lib/acpica/source/common/adisasm.c
diff --git a/third_party/lib/acpica/source/common/adwalk.c b/zircon/third_party/lib/acpica/source/common/adwalk.c
similarity index 100%
rename from third_party/lib/acpica/source/common/adwalk.c
rename to zircon/third_party/lib/acpica/source/common/adwalk.c
diff --git a/third_party/lib/acpica/source/common/ahids.c b/zircon/third_party/lib/acpica/source/common/ahids.c
similarity index 100%
rename from third_party/lib/acpica/source/common/ahids.c
rename to zircon/third_party/lib/acpica/source/common/ahids.c
diff --git a/third_party/lib/acpica/source/common/ahpredef.c b/zircon/third_party/lib/acpica/source/common/ahpredef.c
similarity index 100%
rename from third_party/lib/acpica/source/common/ahpredef.c
rename to zircon/third_party/lib/acpica/source/common/ahpredef.c
diff --git a/third_party/lib/acpica/source/common/ahtable.c b/zircon/third_party/lib/acpica/source/common/ahtable.c
similarity index 100%
rename from third_party/lib/acpica/source/common/ahtable.c
rename to zircon/third_party/lib/acpica/source/common/ahtable.c
diff --git a/third_party/lib/acpica/source/common/ahuuids.c b/zircon/third_party/lib/acpica/source/common/ahuuids.c
similarity index 100%
rename from third_party/lib/acpica/source/common/ahuuids.c
rename to zircon/third_party/lib/acpica/source/common/ahuuids.c
diff --git a/third_party/lib/acpica/source/common/cmfsize.c b/zircon/third_party/lib/acpica/source/common/cmfsize.c
similarity index 100%
rename from third_party/lib/acpica/source/common/cmfsize.c
rename to zircon/third_party/lib/acpica/source/common/cmfsize.c
diff --git a/third_party/lib/acpica/source/common/dmextern.c b/zircon/third_party/lib/acpica/source/common/dmextern.c
similarity index 100%
rename from third_party/lib/acpica/source/common/dmextern.c
rename to zircon/third_party/lib/acpica/source/common/dmextern.c
diff --git a/third_party/lib/acpica/source/common/dmrestag.c b/zircon/third_party/lib/acpica/source/common/dmrestag.c
similarity index 100%
rename from third_party/lib/acpica/source/common/dmrestag.c
rename to zircon/third_party/lib/acpica/source/common/dmrestag.c
diff --git a/third_party/lib/acpica/source/common/dmtable.c b/zircon/third_party/lib/acpica/source/common/dmtable.c
similarity index 100%
rename from third_party/lib/acpica/source/common/dmtable.c
rename to zircon/third_party/lib/acpica/source/common/dmtable.c
diff --git a/third_party/lib/acpica/source/common/dmtables.c b/zircon/third_party/lib/acpica/source/common/dmtables.c
similarity index 100%
rename from third_party/lib/acpica/source/common/dmtables.c
rename to zircon/third_party/lib/acpica/source/common/dmtables.c
diff --git a/third_party/lib/acpica/source/common/dmtbdump.c b/zircon/third_party/lib/acpica/source/common/dmtbdump.c
similarity index 100%
rename from third_party/lib/acpica/source/common/dmtbdump.c
rename to zircon/third_party/lib/acpica/source/common/dmtbdump.c
diff --git a/third_party/lib/acpica/source/common/dmtbinfo.c b/zircon/third_party/lib/acpica/source/common/dmtbinfo.c
similarity index 100%
rename from third_party/lib/acpica/source/common/dmtbinfo.c
rename to zircon/third_party/lib/acpica/source/common/dmtbinfo.c
diff --git a/third_party/lib/acpica/source/common/getopt.c b/zircon/third_party/lib/acpica/source/common/getopt.c
similarity index 100%
rename from third_party/lib/acpica/source/common/getopt.c
rename to zircon/third_party/lib/acpica/source/common/getopt.c
diff --git a/third_party/lib/acpica/source/compiler/aslanalyze.c b/zircon/third_party/lib/acpica/source/compiler/aslanalyze.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslanalyze.c
rename to zircon/third_party/lib/acpica/source/compiler/aslanalyze.c
diff --git a/third_party/lib/acpica/source/compiler/aslascii.c b/zircon/third_party/lib/acpica/source/compiler/aslascii.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslascii.c
rename to zircon/third_party/lib/acpica/source/compiler/aslascii.c
diff --git a/third_party/lib/acpica/source/compiler/aslbtypes.c b/zircon/third_party/lib/acpica/source/compiler/aslbtypes.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslbtypes.c
rename to zircon/third_party/lib/acpica/source/compiler/aslbtypes.c
diff --git a/third_party/lib/acpica/source/compiler/aslcodegen.c b/zircon/third_party/lib/acpica/source/compiler/aslcodegen.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslcodegen.c
rename to zircon/third_party/lib/acpica/source/compiler/aslcodegen.c
diff --git a/third_party/lib/acpica/source/compiler/aslcompile.c b/zircon/third_party/lib/acpica/source/compiler/aslcompile.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslcompile.c
rename to zircon/third_party/lib/acpica/source/compiler/aslcompile.c
diff --git a/third_party/lib/acpica/source/compiler/aslcompiler.h b/zircon/third_party/lib/acpica/source/compiler/aslcompiler.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslcompiler.h
rename to zircon/third_party/lib/acpica/source/compiler/aslcompiler.h
diff --git a/third_party/lib/acpica/source/compiler/aslcompiler.l b/zircon/third_party/lib/acpica/source/compiler/aslcompiler.l
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslcompiler.l
rename to zircon/third_party/lib/acpica/source/compiler/aslcompiler.l
diff --git a/third_party/lib/acpica/source/compiler/aslcstyle.y b/zircon/third_party/lib/acpica/source/compiler/aslcstyle.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslcstyle.y
rename to zircon/third_party/lib/acpica/source/compiler/aslcstyle.y
diff --git a/third_party/lib/acpica/source/compiler/asldefine.h b/zircon/third_party/lib/acpica/source/compiler/asldefine.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asldefine.h
rename to zircon/third_party/lib/acpica/source/compiler/asldefine.h
diff --git a/third_party/lib/acpica/source/compiler/aslerror.c b/zircon/third_party/lib/acpica/source/compiler/aslerror.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslerror.c
rename to zircon/third_party/lib/acpica/source/compiler/aslerror.c
diff --git a/third_party/lib/acpica/source/compiler/aslfileio.c b/zircon/third_party/lib/acpica/source/compiler/aslfileio.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslfileio.c
rename to zircon/third_party/lib/acpica/source/compiler/aslfileio.c
diff --git a/third_party/lib/acpica/source/compiler/aslfiles.c b/zircon/third_party/lib/acpica/source/compiler/aslfiles.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslfiles.c
rename to zircon/third_party/lib/acpica/source/compiler/aslfiles.c
diff --git a/third_party/lib/acpica/source/compiler/aslfold.c b/zircon/third_party/lib/acpica/source/compiler/aslfold.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslfold.c
rename to zircon/third_party/lib/acpica/source/compiler/aslfold.c
diff --git a/third_party/lib/acpica/source/compiler/aslglobal.h b/zircon/third_party/lib/acpica/source/compiler/aslglobal.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslglobal.h
rename to zircon/third_party/lib/acpica/source/compiler/aslglobal.h
diff --git a/third_party/lib/acpica/source/compiler/aslhex.c b/zircon/third_party/lib/acpica/source/compiler/aslhex.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslhex.c
rename to zircon/third_party/lib/acpica/source/compiler/aslhex.c
diff --git a/third_party/lib/acpica/source/compiler/asllength.c b/zircon/third_party/lib/acpica/source/compiler/asllength.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asllength.c
rename to zircon/third_party/lib/acpica/source/compiler/asllength.c
diff --git a/third_party/lib/acpica/source/compiler/asllisting.c b/zircon/third_party/lib/acpica/source/compiler/asllisting.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asllisting.c
rename to zircon/third_party/lib/acpica/source/compiler/asllisting.c
diff --git a/third_party/lib/acpica/source/compiler/asllistsup.c b/zircon/third_party/lib/acpica/source/compiler/asllistsup.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asllistsup.c
rename to zircon/third_party/lib/acpica/source/compiler/asllistsup.c
diff --git a/third_party/lib/acpica/source/compiler/aslload.c b/zircon/third_party/lib/acpica/source/compiler/aslload.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslload.c
rename to zircon/third_party/lib/acpica/source/compiler/aslload.c
diff --git a/third_party/lib/acpica/source/compiler/asllookup.c b/zircon/third_party/lib/acpica/source/compiler/asllookup.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asllookup.c
rename to zircon/third_party/lib/acpica/source/compiler/asllookup.c
diff --git a/third_party/lib/acpica/source/compiler/aslmain.c b/zircon/third_party/lib/acpica/source/compiler/aslmain.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmain.c
rename to zircon/third_party/lib/acpica/source/compiler/aslmain.c
diff --git a/third_party/lib/acpica/source/compiler/aslmap.c b/zircon/third_party/lib/acpica/source/compiler/aslmap.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmap.c
rename to zircon/third_party/lib/acpica/source/compiler/aslmap.c
diff --git a/third_party/lib/acpica/source/compiler/aslmapenter.c b/zircon/third_party/lib/acpica/source/compiler/aslmapenter.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmapenter.c
rename to zircon/third_party/lib/acpica/source/compiler/aslmapenter.c
diff --git a/third_party/lib/acpica/source/compiler/aslmapoutput.c b/zircon/third_party/lib/acpica/source/compiler/aslmapoutput.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmapoutput.c
rename to zircon/third_party/lib/acpica/source/compiler/aslmapoutput.c
diff --git a/third_party/lib/acpica/source/compiler/aslmaputils.c b/zircon/third_party/lib/acpica/source/compiler/aslmaputils.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmaputils.c
rename to zircon/third_party/lib/acpica/source/compiler/aslmaputils.c
diff --git a/third_party/lib/acpica/source/compiler/aslmessages.c b/zircon/third_party/lib/acpica/source/compiler/aslmessages.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmessages.c
rename to zircon/third_party/lib/acpica/source/compiler/aslmessages.c
diff --git a/third_party/lib/acpica/source/compiler/aslmessages.h b/zircon/third_party/lib/acpica/source/compiler/aslmessages.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmessages.h
rename to zircon/third_party/lib/acpica/source/compiler/aslmessages.h
diff --git a/third_party/lib/acpica/source/compiler/aslmethod.c b/zircon/third_party/lib/acpica/source/compiler/aslmethod.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslmethod.c
rename to zircon/third_party/lib/acpica/source/compiler/aslmethod.c
diff --git a/third_party/lib/acpica/source/compiler/aslnamesp.c b/zircon/third_party/lib/acpica/source/compiler/aslnamesp.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslnamesp.c
rename to zircon/third_party/lib/acpica/source/compiler/aslnamesp.c
diff --git a/third_party/lib/acpica/source/compiler/asloffset.c b/zircon/third_party/lib/acpica/source/compiler/asloffset.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asloffset.c
rename to zircon/third_party/lib/acpica/source/compiler/asloffset.c
diff --git a/third_party/lib/acpica/source/compiler/aslopcodes.c b/zircon/third_party/lib/acpica/source/compiler/aslopcodes.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslopcodes.c
rename to zircon/third_party/lib/acpica/source/compiler/aslopcodes.c
diff --git a/third_party/lib/acpica/source/compiler/asloperands.c b/zircon/third_party/lib/acpica/source/compiler/asloperands.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asloperands.c
rename to zircon/third_party/lib/acpica/source/compiler/asloperands.c
diff --git a/third_party/lib/acpica/source/compiler/aslopt.c b/zircon/third_party/lib/acpica/source/compiler/aslopt.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslopt.c
rename to zircon/third_party/lib/acpica/source/compiler/aslopt.c
diff --git a/third_party/lib/acpica/source/compiler/asloptions.c b/zircon/third_party/lib/acpica/source/compiler/asloptions.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asloptions.c
rename to zircon/third_party/lib/acpica/source/compiler/asloptions.c
diff --git a/third_party/lib/acpica/source/compiler/aslparser.y b/zircon/third_party/lib/acpica/source/compiler/aslparser.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslparser.y
rename to zircon/third_party/lib/acpica/source/compiler/aslparser.y
diff --git a/third_party/lib/acpica/source/compiler/aslpredef.c b/zircon/third_party/lib/acpica/source/compiler/aslpredef.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslpredef.c
rename to zircon/third_party/lib/acpica/source/compiler/aslpredef.c
diff --git a/third_party/lib/acpica/source/compiler/aslprepkg.c b/zircon/third_party/lib/acpica/source/compiler/aslprepkg.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslprepkg.c
rename to zircon/third_party/lib/acpica/source/compiler/aslprepkg.c
diff --git a/third_party/lib/acpica/source/compiler/aslprintf.c b/zircon/third_party/lib/acpica/source/compiler/aslprintf.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslprintf.c
rename to zircon/third_party/lib/acpica/source/compiler/aslprintf.c
diff --git a/third_party/lib/acpica/source/compiler/aslprune.c b/zircon/third_party/lib/acpica/source/compiler/aslprune.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslprune.c
rename to zircon/third_party/lib/acpica/source/compiler/aslprune.c
diff --git a/third_party/lib/acpica/source/compiler/aslresource.c b/zircon/third_party/lib/acpica/source/compiler/aslresource.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslresource.c
rename to zircon/third_party/lib/acpica/source/compiler/aslresource.c
diff --git a/third_party/lib/acpica/source/compiler/aslresources.y b/zircon/third_party/lib/acpica/source/compiler/aslresources.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslresources.y
rename to zircon/third_party/lib/acpica/source/compiler/aslresources.y
diff --git a/third_party/lib/acpica/source/compiler/aslrestype1.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype1.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype1.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype1.c
diff --git a/third_party/lib/acpica/source/compiler/aslrestype1i.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype1i.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype1i.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype1i.c
diff --git a/third_party/lib/acpica/source/compiler/aslrestype2.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype2.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype2.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype2.c
diff --git a/third_party/lib/acpica/source/compiler/aslrestype2d.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype2d.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype2d.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype2d.c
diff --git a/third_party/lib/acpica/source/compiler/aslrestype2e.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype2e.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype2e.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype2e.c
diff --git a/third_party/lib/acpica/source/compiler/aslrestype2q.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype2q.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype2q.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype2q.c
diff --git a/third_party/lib/acpica/source/compiler/aslrestype2s.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype2s.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype2s.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype2s.c
diff --git a/third_party/lib/acpica/source/compiler/aslrestype2w.c b/zircon/third_party/lib/acpica/source/compiler/aslrestype2w.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrestype2w.c
rename to zircon/third_party/lib/acpica/source/compiler/aslrestype2w.c
diff --git a/third_party/lib/acpica/source/compiler/aslrules.y b/zircon/third_party/lib/acpica/source/compiler/aslrules.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslrules.y
rename to zircon/third_party/lib/acpica/source/compiler/aslrules.y
diff --git a/third_party/lib/acpica/source/compiler/aslstartup.c b/zircon/third_party/lib/acpica/source/compiler/aslstartup.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslstartup.c
rename to zircon/third_party/lib/acpica/source/compiler/aslstartup.c
diff --git a/third_party/lib/acpica/source/compiler/aslstubs.c b/zircon/third_party/lib/acpica/source/compiler/aslstubs.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslstubs.c
rename to zircon/third_party/lib/acpica/source/compiler/aslstubs.c
diff --git a/third_party/lib/acpica/source/compiler/aslsupport.l b/zircon/third_party/lib/acpica/source/compiler/aslsupport.l
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslsupport.l
rename to zircon/third_party/lib/acpica/source/compiler/aslsupport.l
diff --git a/third_party/lib/acpica/source/compiler/aslsupport.y b/zircon/third_party/lib/acpica/source/compiler/aslsupport.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslsupport.y
rename to zircon/third_party/lib/acpica/source/compiler/aslsupport.y
diff --git a/third_party/lib/acpica/source/compiler/asltokens.y b/zircon/third_party/lib/acpica/source/compiler/asltokens.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asltokens.y
rename to zircon/third_party/lib/acpica/source/compiler/asltokens.y
diff --git a/third_party/lib/acpica/source/compiler/asltransform.c b/zircon/third_party/lib/acpica/source/compiler/asltransform.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asltransform.c
rename to zircon/third_party/lib/acpica/source/compiler/asltransform.c
diff --git a/third_party/lib/acpica/source/compiler/asltree.c b/zircon/third_party/lib/acpica/source/compiler/asltree.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asltree.c
rename to zircon/third_party/lib/acpica/source/compiler/asltree.c
diff --git a/third_party/lib/acpica/source/compiler/asltypes.h b/zircon/third_party/lib/acpica/source/compiler/asltypes.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asltypes.h
rename to zircon/third_party/lib/acpica/source/compiler/asltypes.h
diff --git a/third_party/lib/acpica/source/compiler/asltypes.y b/zircon/third_party/lib/acpica/source/compiler/asltypes.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asltypes.y
rename to zircon/third_party/lib/acpica/source/compiler/asltypes.y
diff --git a/third_party/lib/acpica/source/compiler/aslutils.c b/zircon/third_party/lib/acpica/source/compiler/aslutils.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslutils.c
rename to zircon/third_party/lib/acpica/source/compiler/aslutils.c
diff --git a/third_party/lib/acpica/source/compiler/asluuid.c b/zircon/third_party/lib/acpica/source/compiler/asluuid.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/asluuid.c
rename to zircon/third_party/lib/acpica/source/compiler/asluuid.c
diff --git a/third_party/lib/acpica/source/compiler/aslwalks.c b/zircon/third_party/lib/acpica/source/compiler/aslwalks.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslwalks.c
rename to zircon/third_party/lib/acpica/source/compiler/aslwalks.c
diff --git a/third_party/lib/acpica/source/compiler/aslxref.c b/zircon/third_party/lib/acpica/source/compiler/aslxref.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/aslxref.c
rename to zircon/third_party/lib/acpica/source/compiler/aslxref.c
diff --git a/third_party/lib/acpica/source/compiler/dtcompile.c b/zircon/third_party/lib/acpica/source/compiler/dtcompile.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtcompile.c
rename to zircon/third_party/lib/acpica/source/compiler/dtcompile.c
diff --git a/third_party/lib/acpica/source/compiler/dtcompiler.h b/zircon/third_party/lib/acpica/source/compiler/dtcompiler.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtcompiler.h
rename to zircon/third_party/lib/acpica/source/compiler/dtcompiler.h
diff --git a/third_party/lib/acpica/source/compiler/dtexpress.c b/zircon/third_party/lib/acpica/source/compiler/dtexpress.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtexpress.c
rename to zircon/third_party/lib/acpica/source/compiler/dtexpress.c
diff --git a/third_party/lib/acpica/source/compiler/dtfield.c b/zircon/third_party/lib/acpica/source/compiler/dtfield.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtfield.c
rename to zircon/third_party/lib/acpica/source/compiler/dtfield.c
diff --git a/third_party/lib/acpica/source/compiler/dtio.c b/zircon/third_party/lib/acpica/source/compiler/dtio.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtio.c
rename to zircon/third_party/lib/acpica/source/compiler/dtio.c
diff --git a/third_party/lib/acpica/source/compiler/dtparser.l b/zircon/third_party/lib/acpica/source/compiler/dtparser.l
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtparser.l
rename to zircon/third_party/lib/acpica/source/compiler/dtparser.l
diff --git a/third_party/lib/acpica/source/compiler/dtparser.y b/zircon/third_party/lib/acpica/source/compiler/dtparser.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtparser.y
rename to zircon/third_party/lib/acpica/source/compiler/dtparser.y
diff --git a/third_party/lib/acpica/source/compiler/dtsubtable.c b/zircon/third_party/lib/acpica/source/compiler/dtsubtable.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtsubtable.c
rename to zircon/third_party/lib/acpica/source/compiler/dtsubtable.c
diff --git a/third_party/lib/acpica/source/compiler/dttable.c b/zircon/third_party/lib/acpica/source/compiler/dttable.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dttable.c
rename to zircon/third_party/lib/acpica/source/compiler/dttable.c
diff --git a/third_party/lib/acpica/source/compiler/dttable1.c b/zircon/third_party/lib/acpica/source/compiler/dttable1.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dttable1.c
rename to zircon/third_party/lib/acpica/source/compiler/dttable1.c
diff --git a/third_party/lib/acpica/source/compiler/dttable2.c b/zircon/third_party/lib/acpica/source/compiler/dttable2.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dttable2.c
rename to zircon/third_party/lib/acpica/source/compiler/dttable2.c
diff --git a/third_party/lib/acpica/source/compiler/dttemplate.c b/zircon/third_party/lib/acpica/source/compiler/dttemplate.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dttemplate.c
rename to zircon/third_party/lib/acpica/source/compiler/dttemplate.c
diff --git a/third_party/lib/acpica/source/compiler/dttemplate.h b/zircon/third_party/lib/acpica/source/compiler/dttemplate.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dttemplate.h
rename to zircon/third_party/lib/acpica/source/compiler/dttemplate.h
diff --git a/third_party/lib/acpica/source/compiler/dtutils.c b/zircon/third_party/lib/acpica/source/compiler/dtutils.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/dtutils.c
rename to zircon/third_party/lib/acpica/source/compiler/dtutils.c
diff --git a/third_party/lib/acpica/source/compiler/new_table.txt b/zircon/third_party/lib/acpica/source/compiler/new_table.txt
similarity index 100%
rename from third_party/lib/acpica/source/compiler/new_table.txt
rename to zircon/third_party/lib/acpica/source/compiler/new_table.txt
diff --git a/third_party/lib/acpica/source/compiler/preprocess.h b/zircon/third_party/lib/acpica/source/compiler/preprocess.h
similarity index 100%
rename from third_party/lib/acpica/source/compiler/preprocess.h
rename to zircon/third_party/lib/acpica/source/compiler/preprocess.h
diff --git a/third_party/lib/acpica/source/compiler/prexpress.c b/zircon/third_party/lib/acpica/source/compiler/prexpress.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/prexpress.c
rename to zircon/third_party/lib/acpica/source/compiler/prexpress.c
diff --git a/third_party/lib/acpica/source/compiler/prmacros.c b/zircon/third_party/lib/acpica/source/compiler/prmacros.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/prmacros.c
rename to zircon/third_party/lib/acpica/source/compiler/prmacros.c
diff --git a/third_party/lib/acpica/source/compiler/prparser.l b/zircon/third_party/lib/acpica/source/compiler/prparser.l
similarity index 100%
rename from third_party/lib/acpica/source/compiler/prparser.l
rename to zircon/third_party/lib/acpica/source/compiler/prparser.l
diff --git a/third_party/lib/acpica/source/compiler/prparser.y b/zircon/third_party/lib/acpica/source/compiler/prparser.y
similarity index 100%
rename from third_party/lib/acpica/source/compiler/prparser.y
rename to zircon/third_party/lib/acpica/source/compiler/prparser.y
diff --git a/third_party/lib/acpica/source/compiler/prscan.c b/zircon/third_party/lib/acpica/source/compiler/prscan.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/prscan.c
rename to zircon/third_party/lib/acpica/source/compiler/prscan.c
diff --git a/third_party/lib/acpica/source/compiler/prutils.c b/zircon/third_party/lib/acpica/source/compiler/prutils.c
similarity index 100%
rename from third_party/lib/acpica/source/compiler/prutils.c
rename to zircon/third_party/lib/acpica/source/compiler/prutils.c
diff --git a/third_party/lib/acpica/source/compiler/readme.txt b/zircon/third_party/lib/acpica/source/compiler/readme.txt
similarity index 100%
rename from third_party/lib/acpica/source/compiler/readme.txt
rename to zircon/third_party/lib/acpica/source/compiler/readme.txt
diff --git a/third_party/lib/acpica/source/components/debugger/dbcmds.c b/zircon/third_party/lib/acpica/source/components/debugger/dbcmds.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbcmds.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbcmds.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbconvert.c b/zircon/third_party/lib/acpica/source/components/debugger/dbconvert.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbconvert.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbconvert.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbdisply.c b/zircon/third_party/lib/acpica/source/components/debugger/dbdisply.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbdisply.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbdisply.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbexec.c b/zircon/third_party/lib/acpica/source/components/debugger/dbexec.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbexec.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbexec.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbfileio.c b/zircon/third_party/lib/acpica/source/components/debugger/dbfileio.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbfileio.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbfileio.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbhistry.c b/zircon/third_party/lib/acpica/source/components/debugger/dbhistry.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbhistry.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbhistry.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbinput.c b/zircon/third_party/lib/acpica/source/components/debugger/dbinput.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbinput.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbinput.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbmethod.c b/zircon/third_party/lib/acpica/source/components/debugger/dbmethod.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbmethod.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbmethod.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbnames.c b/zircon/third_party/lib/acpica/source/components/debugger/dbnames.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbnames.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbnames.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbobject.c b/zircon/third_party/lib/acpica/source/components/debugger/dbobject.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbobject.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbobject.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbstats.c b/zircon/third_party/lib/acpica/source/components/debugger/dbstats.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbstats.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbstats.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbtest.c b/zircon/third_party/lib/acpica/source/components/debugger/dbtest.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbtest.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbtest.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbutils.c b/zircon/third_party/lib/acpica/source/components/debugger/dbutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbutils.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbutils.c
diff --git a/third_party/lib/acpica/source/components/debugger/dbxface.c b/zircon/third_party/lib/acpica/source/components/debugger/dbxface.c
similarity index 100%
rename from third_party/lib/acpica/source/components/debugger/dbxface.c
rename to zircon/third_party/lib/acpica/source/components/debugger/dbxface.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmbuffer.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmbuffer.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmbuffer.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmbuffer.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmcstyle.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmcstyle.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmcstyle.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmcstyle.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmdeferred.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmdeferred.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmdeferred.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmdeferred.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmnames.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmnames.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmnames.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmnames.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmopcode.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmopcode.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmopcode.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmopcode.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmresrc.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmresrc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmresrc.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmresrc.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmresrcl.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmresrcl.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmresrcl.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmresrcl.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmresrcl2.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmresrcl2.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmresrcl2.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmresrcl2.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmresrcs.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmresrcs.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmresrcs.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmresrcs.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmutils.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmutils.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmutils.c
diff --git a/third_party/lib/acpica/source/components/disassembler/dmwalk.c b/zircon/third_party/lib/acpica/source/components/disassembler/dmwalk.c
similarity index 100%
rename from third_party/lib/acpica/source/components/disassembler/dmwalk.c
rename to zircon/third_party/lib/acpica/source/components/disassembler/dmwalk.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsargs.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsargs.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsargs.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsargs.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dscontrol.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dscontrol.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dscontrol.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dscontrol.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsdebug.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsdebug.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsdebug.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsdebug.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsfield.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsfield.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsfield.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsfield.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsinit.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsinit.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsinit.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsinit.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsmethod.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsmethod.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsmethod.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsmethod.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsmthdat.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsmthdat.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsmthdat.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsmthdat.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsobject.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsobject.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsobject.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsobject.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsopcode.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsopcode.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsopcode.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsopcode.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dsutils.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dsutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dsutils.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dsutils.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dswexec.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dswexec.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dswexec.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dswexec.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dswload.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dswload.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dswload.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dswload.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dswload2.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dswload2.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dswload2.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dswload2.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dswscope.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dswscope.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dswscope.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dswscope.c
diff --git a/third_party/lib/acpica/source/components/dispatcher/dswstate.c b/zircon/third_party/lib/acpica/source/components/dispatcher/dswstate.c
similarity index 100%
rename from third_party/lib/acpica/source/components/dispatcher/dswstate.c
rename to zircon/third_party/lib/acpica/source/components/dispatcher/dswstate.c
diff --git a/third_party/lib/acpica/source/components/events/evevent.c b/zircon/third_party/lib/acpica/source/components/events/evevent.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evevent.c
rename to zircon/third_party/lib/acpica/source/components/events/evevent.c
diff --git a/third_party/lib/acpica/source/components/events/evglock.c b/zircon/third_party/lib/acpica/source/components/events/evglock.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evglock.c
rename to zircon/third_party/lib/acpica/source/components/events/evglock.c
diff --git a/third_party/lib/acpica/source/components/events/evgpe.c b/zircon/third_party/lib/acpica/source/components/events/evgpe.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evgpe.c
rename to zircon/third_party/lib/acpica/source/components/events/evgpe.c
diff --git a/third_party/lib/acpica/source/components/events/evgpeblk.c b/zircon/third_party/lib/acpica/source/components/events/evgpeblk.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evgpeblk.c
rename to zircon/third_party/lib/acpica/source/components/events/evgpeblk.c
diff --git a/third_party/lib/acpica/source/components/events/evgpeinit.c b/zircon/third_party/lib/acpica/source/components/events/evgpeinit.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evgpeinit.c
rename to zircon/third_party/lib/acpica/source/components/events/evgpeinit.c
diff --git a/third_party/lib/acpica/source/components/events/evgpeutil.c b/zircon/third_party/lib/acpica/source/components/events/evgpeutil.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evgpeutil.c
rename to zircon/third_party/lib/acpica/source/components/events/evgpeutil.c
diff --git a/third_party/lib/acpica/source/components/events/evhandler.c b/zircon/third_party/lib/acpica/source/components/events/evhandler.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evhandler.c
rename to zircon/third_party/lib/acpica/source/components/events/evhandler.c
diff --git a/third_party/lib/acpica/source/components/events/evmisc.c b/zircon/third_party/lib/acpica/source/components/events/evmisc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evmisc.c
rename to zircon/third_party/lib/acpica/source/components/events/evmisc.c
diff --git a/third_party/lib/acpica/source/components/events/evregion.c b/zircon/third_party/lib/acpica/source/components/events/evregion.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evregion.c
rename to zircon/third_party/lib/acpica/source/components/events/evregion.c
diff --git a/third_party/lib/acpica/source/components/events/evrgnini.c b/zircon/third_party/lib/acpica/source/components/events/evrgnini.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evrgnini.c
rename to zircon/third_party/lib/acpica/source/components/events/evrgnini.c
diff --git a/third_party/lib/acpica/source/components/events/evsci.c b/zircon/third_party/lib/acpica/source/components/events/evsci.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evsci.c
rename to zircon/third_party/lib/acpica/source/components/events/evsci.c
diff --git a/third_party/lib/acpica/source/components/events/evxface.c b/zircon/third_party/lib/acpica/source/components/events/evxface.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evxface.c
rename to zircon/third_party/lib/acpica/source/components/events/evxface.c
diff --git a/third_party/lib/acpica/source/components/events/evxfevnt.c b/zircon/third_party/lib/acpica/source/components/events/evxfevnt.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evxfevnt.c
rename to zircon/third_party/lib/acpica/source/components/events/evxfevnt.c
diff --git a/third_party/lib/acpica/source/components/events/evxfgpe.c b/zircon/third_party/lib/acpica/source/components/events/evxfgpe.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evxfgpe.c
rename to zircon/third_party/lib/acpica/source/components/events/evxfgpe.c
diff --git a/third_party/lib/acpica/source/components/events/evxfregn.c b/zircon/third_party/lib/acpica/source/components/events/evxfregn.c
similarity index 100%
rename from third_party/lib/acpica/source/components/events/evxfregn.c
rename to zircon/third_party/lib/acpica/source/components/events/evxfregn.c
diff --git a/third_party/lib/acpica/source/components/executer/exconfig.c b/zircon/third_party/lib/acpica/source/components/executer/exconfig.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exconfig.c
rename to zircon/third_party/lib/acpica/source/components/executer/exconfig.c
diff --git a/third_party/lib/acpica/source/components/executer/exconvrt.c b/zircon/third_party/lib/acpica/source/components/executer/exconvrt.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exconvrt.c
rename to zircon/third_party/lib/acpica/source/components/executer/exconvrt.c
diff --git a/third_party/lib/acpica/source/components/executer/excreate.c b/zircon/third_party/lib/acpica/source/components/executer/excreate.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/excreate.c
rename to zircon/third_party/lib/acpica/source/components/executer/excreate.c
diff --git a/third_party/lib/acpica/source/components/executer/exdebug.c b/zircon/third_party/lib/acpica/source/components/executer/exdebug.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exdebug.c
rename to zircon/third_party/lib/acpica/source/components/executer/exdebug.c
diff --git a/third_party/lib/acpica/source/components/executer/exdump.c b/zircon/third_party/lib/acpica/source/components/executer/exdump.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exdump.c
rename to zircon/third_party/lib/acpica/source/components/executer/exdump.c
diff --git a/third_party/lib/acpica/source/components/executer/exfield.c b/zircon/third_party/lib/acpica/source/components/executer/exfield.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exfield.c
rename to zircon/third_party/lib/acpica/source/components/executer/exfield.c
diff --git a/third_party/lib/acpica/source/components/executer/exfldio.c b/zircon/third_party/lib/acpica/source/components/executer/exfldio.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exfldio.c
rename to zircon/third_party/lib/acpica/source/components/executer/exfldio.c
diff --git a/third_party/lib/acpica/source/components/executer/exmisc.c b/zircon/third_party/lib/acpica/source/components/executer/exmisc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exmisc.c
rename to zircon/third_party/lib/acpica/source/components/executer/exmisc.c
diff --git a/third_party/lib/acpica/source/components/executer/exmutex.c b/zircon/third_party/lib/acpica/source/components/executer/exmutex.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exmutex.c
rename to zircon/third_party/lib/acpica/source/components/executer/exmutex.c
diff --git a/third_party/lib/acpica/source/components/executer/exnames.c b/zircon/third_party/lib/acpica/source/components/executer/exnames.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exnames.c
rename to zircon/third_party/lib/acpica/source/components/executer/exnames.c
diff --git a/third_party/lib/acpica/source/components/executer/exoparg1.c b/zircon/third_party/lib/acpica/source/components/executer/exoparg1.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exoparg1.c
rename to zircon/third_party/lib/acpica/source/components/executer/exoparg1.c
diff --git a/third_party/lib/acpica/source/components/executer/exoparg2.c b/zircon/third_party/lib/acpica/source/components/executer/exoparg2.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exoparg2.c
rename to zircon/third_party/lib/acpica/source/components/executer/exoparg2.c
diff --git a/third_party/lib/acpica/source/components/executer/exoparg3.c b/zircon/third_party/lib/acpica/source/components/executer/exoparg3.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exoparg3.c
rename to zircon/third_party/lib/acpica/source/components/executer/exoparg3.c
diff --git a/third_party/lib/acpica/source/components/executer/exoparg6.c b/zircon/third_party/lib/acpica/source/components/executer/exoparg6.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exoparg6.c
rename to zircon/third_party/lib/acpica/source/components/executer/exoparg6.c
diff --git a/third_party/lib/acpica/source/components/executer/exprep.c b/zircon/third_party/lib/acpica/source/components/executer/exprep.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exprep.c
rename to zircon/third_party/lib/acpica/source/components/executer/exprep.c
diff --git a/third_party/lib/acpica/source/components/executer/exregion.c b/zircon/third_party/lib/acpica/source/components/executer/exregion.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exregion.c
rename to zircon/third_party/lib/acpica/source/components/executer/exregion.c
diff --git a/third_party/lib/acpica/source/components/executer/exresnte.c b/zircon/third_party/lib/acpica/source/components/executer/exresnte.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exresnte.c
rename to zircon/third_party/lib/acpica/source/components/executer/exresnte.c
diff --git a/third_party/lib/acpica/source/components/executer/exresolv.c b/zircon/third_party/lib/acpica/source/components/executer/exresolv.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exresolv.c
rename to zircon/third_party/lib/acpica/source/components/executer/exresolv.c
diff --git a/third_party/lib/acpica/source/components/executer/exresop.c b/zircon/third_party/lib/acpica/source/components/executer/exresop.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exresop.c
rename to zircon/third_party/lib/acpica/source/components/executer/exresop.c
diff --git a/third_party/lib/acpica/source/components/executer/exstore.c b/zircon/third_party/lib/acpica/source/components/executer/exstore.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exstore.c
rename to zircon/third_party/lib/acpica/source/components/executer/exstore.c
diff --git a/third_party/lib/acpica/source/components/executer/exstoren.c b/zircon/third_party/lib/acpica/source/components/executer/exstoren.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exstoren.c
rename to zircon/third_party/lib/acpica/source/components/executer/exstoren.c
diff --git a/third_party/lib/acpica/source/components/executer/exstorob.c b/zircon/third_party/lib/acpica/source/components/executer/exstorob.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exstorob.c
rename to zircon/third_party/lib/acpica/source/components/executer/exstorob.c
diff --git a/third_party/lib/acpica/source/components/executer/exsystem.c b/zircon/third_party/lib/acpica/source/components/executer/exsystem.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exsystem.c
rename to zircon/third_party/lib/acpica/source/components/executer/exsystem.c
diff --git a/third_party/lib/acpica/source/components/executer/extrace.c b/zircon/third_party/lib/acpica/source/components/executer/extrace.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/extrace.c
rename to zircon/third_party/lib/acpica/source/components/executer/extrace.c
diff --git a/third_party/lib/acpica/source/components/executer/exutils.c b/zircon/third_party/lib/acpica/source/components/executer/exutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/executer/exutils.c
rename to zircon/third_party/lib/acpica/source/components/executer/exutils.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwacpi.c b/zircon/third_party/lib/acpica/source/components/hardware/hwacpi.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwacpi.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwacpi.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwesleep.c b/zircon/third_party/lib/acpica/source/components/hardware/hwesleep.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwesleep.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwesleep.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwgpe.c b/zircon/third_party/lib/acpica/source/components/hardware/hwgpe.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwgpe.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwgpe.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwpci.c b/zircon/third_party/lib/acpica/source/components/hardware/hwpci.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwpci.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwpci.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwregs.c b/zircon/third_party/lib/acpica/source/components/hardware/hwregs.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwregs.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwregs.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwsleep.c b/zircon/third_party/lib/acpica/source/components/hardware/hwsleep.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwsleep.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwsleep.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwtimer.c b/zircon/third_party/lib/acpica/source/components/hardware/hwtimer.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwtimer.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwtimer.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwvalid.c b/zircon/third_party/lib/acpica/source/components/hardware/hwvalid.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwvalid.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwvalid.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwxface.c b/zircon/third_party/lib/acpica/source/components/hardware/hwxface.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwxface.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwxface.c
diff --git a/third_party/lib/acpica/source/components/hardware/hwxfsleep.c b/zircon/third_party/lib/acpica/source/components/hardware/hwxfsleep.c
similarity index 100%
rename from third_party/lib/acpica/source/components/hardware/hwxfsleep.c
rename to zircon/third_party/lib/acpica/source/components/hardware/hwxfsleep.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsaccess.c b/zircon/third_party/lib/acpica/source/components/namespace/nsaccess.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsaccess.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsaccess.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsalloc.c b/zircon/third_party/lib/acpica/source/components/namespace/nsalloc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsalloc.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsalloc.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsarguments.c b/zircon/third_party/lib/acpica/source/components/namespace/nsarguments.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsarguments.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsarguments.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsconvert.c b/zircon/third_party/lib/acpica/source/components/namespace/nsconvert.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsconvert.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsconvert.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsdump.c b/zircon/third_party/lib/acpica/source/components/namespace/nsdump.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsdump.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsdump.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsdumpdv.c b/zircon/third_party/lib/acpica/source/components/namespace/nsdumpdv.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsdumpdv.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsdumpdv.c
diff --git a/third_party/lib/acpica/source/components/namespace/nseval.c b/zircon/third_party/lib/acpica/source/components/namespace/nseval.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nseval.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nseval.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsinit.c b/zircon/third_party/lib/acpica/source/components/namespace/nsinit.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsinit.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsinit.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsload.c b/zircon/third_party/lib/acpica/source/components/namespace/nsload.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsload.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsload.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsnames.c b/zircon/third_party/lib/acpica/source/components/namespace/nsnames.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsnames.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsnames.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsobject.c b/zircon/third_party/lib/acpica/source/components/namespace/nsobject.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsobject.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsobject.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsparse.c b/zircon/third_party/lib/acpica/source/components/namespace/nsparse.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsparse.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsparse.c
diff --git a/third_party/lib/acpica/source/components/namespace/nspredef.c b/zircon/third_party/lib/acpica/source/components/namespace/nspredef.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nspredef.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nspredef.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsprepkg.c b/zircon/third_party/lib/acpica/source/components/namespace/nsprepkg.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsprepkg.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsprepkg.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsrepair.c b/zircon/third_party/lib/acpica/source/components/namespace/nsrepair.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsrepair.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsrepair.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsrepair2.c b/zircon/third_party/lib/acpica/source/components/namespace/nsrepair2.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsrepair2.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsrepair2.c
diff --git a/third_party/lib/acpica/source/components/namespace/nssearch.c b/zircon/third_party/lib/acpica/source/components/namespace/nssearch.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nssearch.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nssearch.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsutils.c b/zircon/third_party/lib/acpica/source/components/namespace/nsutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsutils.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsutils.c
diff --git a/third_party/lib/acpica/source/components/namespace/nswalk.c b/zircon/third_party/lib/acpica/source/components/namespace/nswalk.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nswalk.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nswalk.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsxfeval.c b/zircon/third_party/lib/acpica/source/components/namespace/nsxfeval.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsxfeval.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsxfeval.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsxfname.c b/zircon/third_party/lib/acpica/source/components/namespace/nsxfname.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsxfname.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsxfname.c
diff --git a/third_party/lib/acpica/source/components/namespace/nsxfobj.c b/zircon/third_party/lib/acpica/source/components/namespace/nsxfobj.c
similarity index 100%
rename from third_party/lib/acpica/source/components/namespace/nsxfobj.c
rename to zircon/third_party/lib/acpica/source/components/namespace/nsxfobj.c
diff --git a/third_party/lib/acpica/source/components/parser/psargs.c b/zircon/third_party/lib/acpica/source/components/parser/psargs.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psargs.c
rename to zircon/third_party/lib/acpica/source/components/parser/psargs.c
diff --git a/third_party/lib/acpica/source/components/parser/psloop.c b/zircon/third_party/lib/acpica/source/components/parser/psloop.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psloop.c
rename to zircon/third_party/lib/acpica/source/components/parser/psloop.c
diff --git a/third_party/lib/acpica/source/components/parser/psobject.c b/zircon/third_party/lib/acpica/source/components/parser/psobject.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psobject.c
rename to zircon/third_party/lib/acpica/source/components/parser/psobject.c
diff --git a/third_party/lib/acpica/source/components/parser/psopcode.c b/zircon/third_party/lib/acpica/source/components/parser/psopcode.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psopcode.c
rename to zircon/third_party/lib/acpica/source/components/parser/psopcode.c
diff --git a/third_party/lib/acpica/source/components/parser/psopinfo.c b/zircon/third_party/lib/acpica/source/components/parser/psopinfo.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psopinfo.c
rename to zircon/third_party/lib/acpica/source/components/parser/psopinfo.c
diff --git a/third_party/lib/acpica/source/components/parser/psparse.c b/zircon/third_party/lib/acpica/source/components/parser/psparse.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psparse.c
rename to zircon/third_party/lib/acpica/source/components/parser/psparse.c
diff --git a/third_party/lib/acpica/source/components/parser/psscope.c b/zircon/third_party/lib/acpica/source/components/parser/psscope.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psscope.c
rename to zircon/third_party/lib/acpica/source/components/parser/psscope.c
diff --git a/third_party/lib/acpica/source/components/parser/pstree.c b/zircon/third_party/lib/acpica/source/components/parser/pstree.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/pstree.c
rename to zircon/third_party/lib/acpica/source/components/parser/pstree.c
diff --git a/third_party/lib/acpica/source/components/parser/psutils.c b/zircon/third_party/lib/acpica/source/components/parser/psutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psutils.c
rename to zircon/third_party/lib/acpica/source/components/parser/psutils.c
diff --git a/third_party/lib/acpica/source/components/parser/pswalk.c b/zircon/third_party/lib/acpica/source/components/parser/pswalk.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/pswalk.c
rename to zircon/third_party/lib/acpica/source/components/parser/pswalk.c
diff --git a/third_party/lib/acpica/source/components/parser/psxface.c b/zircon/third_party/lib/acpica/source/components/parser/psxface.c
similarity index 100%
rename from third_party/lib/acpica/source/components/parser/psxface.c
rename to zircon/third_party/lib/acpica/source/components/parser/psxface.c
diff --git a/third_party/lib/acpica/source/components/resources/rsaddr.c b/zircon/third_party/lib/acpica/source/components/resources/rsaddr.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsaddr.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsaddr.c
diff --git a/third_party/lib/acpica/source/components/resources/rscalc.c b/zircon/third_party/lib/acpica/source/components/resources/rscalc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rscalc.c
rename to zircon/third_party/lib/acpica/source/components/resources/rscalc.c
diff --git a/third_party/lib/acpica/source/components/resources/rscreate.c b/zircon/third_party/lib/acpica/source/components/resources/rscreate.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rscreate.c
rename to zircon/third_party/lib/acpica/source/components/resources/rscreate.c
diff --git a/third_party/lib/acpica/source/components/resources/rsdump.c b/zircon/third_party/lib/acpica/source/components/resources/rsdump.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsdump.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsdump.c
diff --git a/third_party/lib/acpica/source/components/resources/rsdumpinfo.c b/zircon/third_party/lib/acpica/source/components/resources/rsdumpinfo.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsdumpinfo.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsdumpinfo.c
diff --git a/third_party/lib/acpica/source/components/resources/rsinfo.c b/zircon/third_party/lib/acpica/source/components/resources/rsinfo.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsinfo.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsinfo.c
diff --git a/third_party/lib/acpica/source/components/resources/rsio.c b/zircon/third_party/lib/acpica/source/components/resources/rsio.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsio.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsio.c
diff --git a/third_party/lib/acpica/source/components/resources/rsirq.c b/zircon/third_party/lib/acpica/source/components/resources/rsirq.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsirq.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsirq.c
diff --git a/third_party/lib/acpica/source/components/resources/rslist.c b/zircon/third_party/lib/acpica/source/components/resources/rslist.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rslist.c
rename to zircon/third_party/lib/acpica/source/components/resources/rslist.c
diff --git a/third_party/lib/acpica/source/components/resources/rsmemory.c b/zircon/third_party/lib/acpica/source/components/resources/rsmemory.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsmemory.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsmemory.c
diff --git a/third_party/lib/acpica/source/components/resources/rsmisc.c b/zircon/third_party/lib/acpica/source/components/resources/rsmisc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsmisc.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsmisc.c
diff --git a/third_party/lib/acpica/source/components/resources/rsserial.c b/zircon/third_party/lib/acpica/source/components/resources/rsserial.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsserial.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsserial.c
diff --git a/third_party/lib/acpica/source/components/resources/rsutils.c b/zircon/third_party/lib/acpica/source/components/resources/rsutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsutils.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsutils.c
diff --git a/third_party/lib/acpica/source/components/resources/rsxface.c b/zircon/third_party/lib/acpica/source/components/resources/rsxface.c
similarity index 100%
rename from third_party/lib/acpica/source/components/resources/rsxface.c
rename to zircon/third_party/lib/acpica/source/components/resources/rsxface.c
diff --git a/third_party/lib/acpica/source/components/tables/tbdata.c b/zircon/third_party/lib/acpica/source/components/tables/tbdata.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbdata.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbdata.c
diff --git a/third_party/lib/acpica/source/components/tables/tbfadt.c b/zircon/third_party/lib/acpica/source/components/tables/tbfadt.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbfadt.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbfadt.c
diff --git a/third_party/lib/acpica/source/components/tables/tbfind.c b/zircon/third_party/lib/acpica/source/components/tables/tbfind.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbfind.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbfind.c
diff --git a/third_party/lib/acpica/source/components/tables/tbinstal.c b/zircon/third_party/lib/acpica/source/components/tables/tbinstal.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbinstal.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbinstal.c
diff --git a/third_party/lib/acpica/source/components/tables/tbprint.c b/zircon/third_party/lib/acpica/source/components/tables/tbprint.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbprint.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbprint.c
diff --git a/third_party/lib/acpica/source/components/tables/tbutils.c b/zircon/third_party/lib/acpica/source/components/tables/tbutils.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbutils.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbutils.c
diff --git a/third_party/lib/acpica/source/components/tables/tbxface.c b/zircon/third_party/lib/acpica/source/components/tables/tbxface.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbxface.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbxface.c
diff --git a/third_party/lib/acpica/source/components/tables/tbxfload.c b/zircon/third_party/lib/acpica/source/components/tables/tbxfload.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbxfload.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbxfload.c
diff --git a/third_party/lib/acpica/source/components/tables/tbxfroot.c b/zircon/third_party/lib/acpica/source/components/tables/tbxfroot.c
similarity index 100%
rename from third_party/lib/acpica/source/components/tables/tbxfroot.c
rename to zircon/third_party/lib/acpica/source/components/tables/tbxfroot.c
diff --git a/third_party/lib/acpica/source/components/utilities/utaddress.c b/zircon/third_party/lib/acpica/source/components/utilities/utaddress.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utaddress.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utaddress.c
diff --git a/third_party/lib/acpica/source/components/utilities/utalloc.c b/zircon/third_party/lib/acpica/source/components/utilities/utalloc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utalloc.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utalloc.c
diff --git a/third_party/lib/acpica/source/components/utilities/utbuffer.c b/zircon/third_party/lib/acpica/source/components/utilities/utbuffer.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utbuffer.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utbuffer.c
diff --git a/third_party/lib/acpica/source/components/utilities/utcache.c b/zircon/third_party/lib/acpica/source/components/utilities/utcache.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utcache.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utcache.c
diff --git a/third_party/lib/acpica/source/components/utilities/utclib.c b/zircon/third_party/lib/acpica/source/components/utilities/utclib.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utclib.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utclib.c
diff --git a/third_party/lib/acpica/source/components/utilities/utcopy.c b/zircon/third_party/lib/acpica/source/components/utilities/utcopy.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utcopy.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utcopy.c
diff --git a/third_party/lib/acpica/source/components/utilities/utdebug.c b/zircon/third_party/lib/acpica/source/components/utilities/utdebug.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utdebug.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utdebug.c
diff --git a/third_party/lib/acpica/source/components/utilities/utdecode.c b/zircon/third_party/lib/acpica/source/components/utilities/utdecode.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utdecode.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utdecode.c
diff --git a/third_party/lib/acpica/source/components/utilities/utdelete.c b/zircon/third_party/lib/acpica/source/components/utilities/utdelete.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utdelete.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utdelete.c
diff --git a/third_party/lib/acpica/source/components/utilities/uterror.c b/zircon/third_party/lib/acpica/source/components/utilities/uterror.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/uterror.c
rename to zircon/third_party/lib/acpica/source/components/utilities/uterror.c
diff --git a/third_party/lib/acpica/source/components/utilities/uteval.c b/zircon/third_party/lib/acpica/source/components/utilities/uteval.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/uteval.c
rename to zircon/third_party/lib/acpica/source/components/utilities/uteval.c
diff --git a/third_party/lib/acpica/source/components/utilities/utexcep.c b/zircon/third_party/lib/acpica/source/components/utilities/utexcep.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utexcep.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utexcep.c
diff --git a/third_party/lib/acpica/source/components/utilities/utglobal.c b/zircon/third_party/lib/acpica/source/components/utilities/utglobal.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utglobal.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utglobal.c
diff --git a/third_party/lib/acpica/source/components/utilities/uthex.c b/zircon/third_party/lib/acpica/source/components/utilities/uthex.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/uthex.c
rename to zircon/third_party/lib/acpica/source/components/utilities/uthex.c
diff --git a/third_party/lib/acpica/source/components/utilities/utids.c b/zircon/third_party/lib/acpica/source/components/utilities/utids.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utids.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utids.c
diff --git a/third_party/lib/acpica/source/components/utilities/utinit.c b/zircon/third_party/lib/acpica/source/components/utilities/utinit.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utinit.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utinit.c
diff --git a/third_party/lib/acpica/source/components/utilities/utlock.c b/zircon/third_party/lib/acpica/source/components/utilities/utlock.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utlock.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utlock.c
diff --git a/third_party/lib/acpica/source/components/utilities/utmath.c b/zircon/third_party/lib/acpica/source/components/utilities/utmath.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utmath.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utmath.c
diff --git a/third_party/lib/acpica/source/components/utilities/utmisc.c b/zircon/third_party/lib/acpica/source/components/utilities/utmisc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utmisc.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utmisc.c
diff --git a/third_party/lib/acpica/source/components/utilities/utmutex.c b/zircon/third_party/lib/acpica/source/components/utilities/utmutex.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utmutex.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utmutex.c
diff --git a/third_party/lib/acpica/source/components/utilities/utnonansi.c b/zircon/third_party/lib/acpica/source/components/utilities/utnonansi.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utnonansi.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utnonansi.c
diff --git a/third_party/lib/acpica/source/components/utilities/utobject.c b/zircon/third_party/lib/acpica/source/components/utilities/utobject.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utobject.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utobject.c
diff --git a/third_party/lib/acpica/source/components/utilities/utosi.c b/zircon/third_party/lib/acpica/source/components/utilities/utosi.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utosi.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utosi.c
diff --git a/third_party/lib/acpica/source/components/utilities/utownerid.c b/zircon/third_party/lib/acpica/source/components/utilities/utownerid.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utownerid.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utownerid.c
diff --git a/third_party/lib/acpica/source/components/utilities/utpredef.c b/zircon/third_party/lib/acpica/source/components/utilities/utpredef.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utpredef.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utpredef.c
diff --git a/third_party/lib/acpica/source/components/utilities/utprint.c b/zircon/third_party/lib/acpica/source/components/utilities/utprint.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utprint.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utprint.c
diff --git a/third_party/lib/acpica/source/components/utilities/utresrc.c b/zircon/third_party/lib/acpica/source/components/utilities/utresrc.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utresrc.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utresrc.c
diff --git a/third_party/lib/acpica/source/components/utilities/utstate.c b/zircon/third_party/lib/acpica/source/components/utilities/utstate.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utstate.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utstate.c
diff --git a/third_party/lib/acpica/source/components/utilities/utstring.c b/zircon/third_party/lib/acpica/source/components/utilities/utstring.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utstring.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utstring.c
diff --git a/third_party/lib/acpica/source/components/utilities/uttrack.c b/zircon/third_party/lib/acpica/source/components/utilities/uttrack.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/uttrack.c
rename to zircon/third_party/lib/acpica/source/components/utilities/uttrack.c
diff --git a/third_party/lib/acpica/source/components/utilities/utuuid.c b/zircon/third_party/lib/acpica/source/components/utilities/utuuid.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utuuid.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utuuid.c
diff --git a/third_party/lib/acpica/source/components/utilities/utxface.c b/zircon/third_party/lib/acpica/source/components/utilities/utxface.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utxface.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utxface.c
diff --git a/third_party/lib/acpica/source/components/utilities/utxferror.c b/zircon/third_party/lib/acpica/source/components/utilities/utxferror.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utxferror.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utxferror.c
diff --git a/third_party/lib/acpica/source/components/utilities/utxfinit.c b/zircon/third_party/lib/acpica/source/components/utilities/utxfinit.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utxfinit.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utxfinit.c
diff --git a/third_party/lib/acpica/source/components/utilities/utxfmutex.c b/zircon/third_party/lib/acpica/source/components/utilities/utxfmutex.c
similarity index 100%
rename from third_party/lib/acpica/source/components/utilities/utxfmutex.c
rename to zircon/third_party/lib/acpica/source/components/utilities/utxfmutex.c
diff --git a/third_party/lib/acpica/source/include/acpica/acapps.h b/zircon/third_party/lib/acpica/source/include/acpica/acapps.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acapps.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acapps.h
diff --git a/third_party/lib/acpica/source/include/acpica/acbuffer.h b/zircon/third_party/lib/acpica/source/include/acpica/acbuffer.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acbuffer.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acbuffer.h
diff --git a/third_party/lib/acpica/source/include/acpica/acclib.h b/zircon/third_party/lib/acpica/source/include/acpica/acclib.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acclib.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acclib.h
diff --git a/third_party/lib/acpica/source/include/acpica/accommon.h b/zircon/third_party/lib/acpica/source/include/acpica/accommon.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/accommon.h
rename to zircon/third_party/lib/acpica/source/include/acpica/accommon.h
diff --git a/third_party/lib/acpica/source/include/acpica/acconfig.h b/zircon/third_party/lib/acpica/source/include/acpica/acconfig.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acconfig.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acconfig.h
diff --git a/third_party/lib/acpica/source/include/acpica/acdebug.h b/zircon/third_party/lib/acpica/source/include/acpica/acdebug.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acdebug.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acdebug.h
diff --git a/third_party/lib/acpica/source/include/acpica/acdisasm.h b/zircon/third_party/lib/acpica/source/include/acpica/acdisasm.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acdisasm.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acdisasm.h
diff --git a/third_party/lib/acpica/source/include/acpica/acdispat.h b/zircon/third_party/lib/acpica/source/include/acpica/acdispat.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acdispat.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acdispat.h
diff --git a/third_party/lib/acpica/source/include/acpica/acevents.h b/zircon/third_party/lib/acpica/source/include/acpica/acevents.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acevents.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acevents.h
diff --git a/third_party/lib/acpica/source/include/acpica/acexcep.h b/zircon/third_party/lib/acpica/source/include/acpica/acexcep.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acexcep.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acexcep.h
diff --git a/third_party/lib/acpica/source/include/acpica/acglobal.h b/zircon/third_party/lib/acpica/source/include/acpica/acglobal.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acglobal.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acglobal.h
diff --git a/third_party/lib/acpica/source/include/acpica/achware.h b/zircon/third_party/lib/acpica/source/include/acpica/achware.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/achware.h
rename to zircon/third_party/lib/acpica/source/include/acpica/achware.h
diff --git a/third_party/lib/acpica/source/include/acpica/acinterp.h b/zircon/third_party/lib/acpica/source/include/acpica/acinterp.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acinterp.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acinterp.h
diff --git a/third_party/lib/acpica/source/include/acpica/aclocal.h b/zircon/third_party/lib/acpica/source/include/acpica/aclocal.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/aclocal.h
rename to zircon/third_party/lib/acpica/source/include/acpica/aclocal.h
diff --git a/third_party/lib/acpica/source/include/acpica/acmacros.h b/zircon/third_party/lib/acpica/source/include/acpica/acmacros.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acmacros.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acmacros.h
diff --git a/third_party/lib/acpica/source/include/acpica/acnames.h b/zircon/third_party/lib/acpica/source/include/acpica/acnames.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acnames.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acnames.h
diff --git a/third_party/lib/acpica/source/include/acpica/acnamesp.h b/zircon/third_party/lib/acpica/source/include/acpica/acnamesp.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acnamesp.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acnamesp.h
diff --git a/third_party/lib/acpica/source/include/acpica/acobject.h b/zircon/third_party/lib/acpica/source/include/acpica/acobject.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acobject.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acobject.h
diff --git a/third_party/lib/acpica/source/include/acpica/acopcode.h b/zircon/third_party/lib/acpica/source/include/acpica/acopcode.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acopcode.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acopcode.h
diff --git a/third_party/lib/acpica/source/include/acpica/acoutput.h b/zircon/third_party/lib/acpica/source/include/acpica/acoutput.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acoutput.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acoutput.h
diff --git a/third_party/lib/acpica/source/include/acpica/acparser.h b/zircon/third_party/lib/acpica/source/include/acpica/acparser.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acparser.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acparser.h
diff --git a/third_party/lib/acpica/source/include/acpica/acpi.h b/zircon/third_party/lib/acpica/source/include/acpica/acpi.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acpi.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acpi.h
diff --git a/third_party/lib/acpica/source/include/acpica/acpiosxf.h b/zircon/third_party/lib/acpica/source/include/acpica/acpiosxf.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acpiosxf.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acpiosxf.h
diff --git a/third_party/lib/acpica/source/include/acpica/acpixf.h b/zircon/third_party/lib/acpica/source/include/acpica/acpixf.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acpixf.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acpixf.h
diff --git a/third_party/lib/acpica/source/include/acpica/acpredef.h b/zircon/third_party/lib/acpica/source/include/acpica/acpredef.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acpredef.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acpredef.h
diff --git a/third_party/lib/acpica/source/include/acpica/acresrc.h b/zircon/third_party/lib/acpica/source/include/acpica/acresrc.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acresrc.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acresrc.h
diff --git a/third_party/lib/acpica/source/include/acpica/acrestyp.h b/zircon/third_party/lib/acpica/source/include/acpica/acrestyp.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acrestyp.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acrestyp.h
diff --git a/third_party/lib/acpica/source/include/acpica/acstruct.h b/zircon/third_party/lib/acpica/source/include/acpica/acstruct.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acstruct.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acstruct.h
diff --git a/third_party/lib/acpica/source/include/acpica/actables.h b/zircon/third_party/lib/acpica/source/include/acpica/actables.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/actables.h
rename to zircon/third_party/lib/acpica/source/include/acpica/actables.h
diff --git a/third_party/lib/acpica/source/include/acpica/actbl.h b/zircon/third_party/lib/acpica/source/include/acpica/actbl.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/actbl.h
rename to zircon/third_party/lib/acpica/source/include/acpica/actbl.h
diff --git a/third_party/lib/acpica/source/include/acpica/actbl1.h b/zircon/third_party/lib/acpica/source/include/acpica/actbl1.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/actbl1.h
rename to zircon/third_party/lib/acpica/source/include/acpica/actbl1.h
diff --git a/third_party/lib/acpica/source/include/acpica/actbl2.h b/zircon/third_party/lib/acpica/source/include/acpica/actbl2.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/actbl2.h
rename to zircon/third_party/lib/acpica/source/include/acpica/actbl2.h
diff --git a/third_party/lib/acpica/source/include/acpica/actbl3.h b/zircon/third_party/lib/acpica/source/include/acpica/actbl3.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/actbl3.h
rename to zircon/third_party/lib/acpica/source/include/acpica/actbl3.h
diff --git a/third_party/lib/acpica/source/include/acpica/actypes.h b/zircon/third_party/lib/acpica/source/include/acpica/actypes.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/actypes.h
rename to zircon/third_party/lib/acpica/source/include/acpica/actypes.h
diff --git a/third_party/lib/acpica/source/include/acpica/acutils.h b/zircon/third_party/lib/acpica/source/include/acpica/acutils.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acutils.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acutils.h
diff --git a/third_party/lib/acpica/source/include/acpica/acuuid.h b/zircon/third_party/lib/acpica/source/include/acpica/acuuid.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/acuuid.h
rename to zircon/third_party/lib/acpica/source/include/acpica/acuuid.h
diff --git a/third_party/lib/acpica/source/include/acpica/amlcode.h b/zircon/third_party/lib/acpica/source/include/acpica/amlcode.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/amlcode.h
rename to zircon/third_party/lib/acpica/source/include/acpica/amlcode.h
diff --git a/third_party/lib/acpica/source/include/acpica/amlresrc.h b/zircon/third_party/lib/acpica/source/include/acpica/amlresrc.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/amlresrc.h
rename to zircon/third_party/lib/acpica/source/include/acpica/amlresrc.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/accygwin.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/accygwin.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/accygwin.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/accygwin.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acdragonfly.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acdragonfly.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acdragonfly.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acdragonfly.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acdragonflyex.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acdragonflyex.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acdragonflyex.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acdragonflyex.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acefi.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acefi.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acefi.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acefi.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acefiex.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acefiex.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acefiex.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acefiex.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acenv.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acenv.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acenv.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acenv.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acenvex.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acenvex.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acenvex.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acenvex.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acfreebsd.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acfreebsd.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acfreebsd.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acfreebsd.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acfuchsia.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acfuchsia.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acfuchsia.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acfuchsia.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acgcc.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acgcc.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acgcc.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acgcc.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/achaiku.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/achaiku.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/achaiku.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/achaiku.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acintel.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acintel.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acintel.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acintel.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/aclinux.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/aclinux.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/aclinux.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/aclinux.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/aclinuxex.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/aclinuxex.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/aclinuxex.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/aclinuxex.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acmacosx.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acmacosx.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acmacosx.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acmacosx.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acmsvc.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acmsvc.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acmsvc.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acmsvc.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acmsvcex.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acmsvcex.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acmsvcex.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acmsvcex.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acnetbsd.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acnetbsd.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acnetbsd.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acnetbsd.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acos2.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acos2.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acos2.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acos2.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acwin.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acwin.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acwin.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acwin.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acwin64.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acwin64.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acwin64.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acwin64.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/acwinex.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/acwinex.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/acwinex.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/acwinex.h
diff --git a/third_party/lib/acpica/source/include/acpica/platform/aczircon.h b/zircon/third_party/lib/acpica/source/include/acpica/platform/aczircon.h
similarity index 100%
rename from third_party/lib/acpica/source/include/acpica/platform/aczircon.h
rename to zircon/third_party/lib/acpica/source/include/acpica/platform/aczircon.h
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/osbsdtbl.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/osbsdtbl.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/osbsdtbl.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/osbsdtbl.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/osefitbl.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/osefitbl.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/osefitbl.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/osefitbl.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/osefixf.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/osefixf.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/osefixf.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/osefixf.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/osfuchsia.cpp b/zircon/third_party/lib/acpica/source/os_specific/service_layers/osfuchsia.cpp
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/osfuchsia.cpp
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/osfuchsia.cpp
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/oslibcfs.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/oslibcfs.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/oslibcfs.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/oslibcfs.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/oslinuxtbl.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/oslinuxtbl.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/oslinuxtbl.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/oslinuxtbl.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/osunixdir.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/osunixdir.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/osunixdir.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/osunixdir.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/osunixmap.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/osunixmap.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/osunixmap.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/osunixmap.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/osunixxf.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/osunixxf.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/osunixxf.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/osunixxf.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/oswindir.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/oswindir.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/oswindir.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/oswindir.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/oswintbl.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/oswintbl.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/oswintbl.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/oswintbl.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/oswinxf.c b/zircon/third_party/lib/acpica/source/os_specific/service_layers/oswinxf.c
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/oswinxf.c
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/oswinxf.c
diff --git a/third_party/lib/acpica/source/os_specific/service_layers/oszircon.cpp b/zircon/third_party/lib/acpica/source/os_specific/service_layers/oszircon.cpp
similarity index 100%
rename from third_party/lib/acpica/source/os_specific/service_layers/oszircon.cpp
rename to zircon/third_party/lib/acpica/source/os_specific/service_layers/oszircon.cpp
diff --git a/third_party/lib/acpica/source/tools/acpibin/abcompare.c b/zircon/third_party/lib/acpica/source/tools/acpibin/abcompare.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpibin/abcompare.c
rename to zircon/third_party/lib/acpica/source/tools/acpibin/abcompare.c
diff --git a/third_party/lib/acpica/source/tools/acpibin/abmain.c b/zircon/third_party/lib/acpica/source/tools/acpibin/abmain.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpibin/abmain.c
rename to zircon/third_party/lib/acpica/source/tools/acpibin/abmain.c
diff --git a/third_party/lib/acpica/source/tools/acpibin/acpibin.h b/zircon/third_party/lib/acpica/source/tools/acpibin/acpibin.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpibin/acpibin.h
rename to zircon/third_party/lib/acpica/source/tools/acpibin/acpibin.h
diff --git a/third_party/lib/acpica/source/tools/acpidump/acpidump.h b/zircon/third_party/lib/acpica/source/tools/acpidump/acpidump.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpidump/acpidump.h
rename to zircon/third_party/lib/acpica/source/tools/acpidump/acpidump.h
diff --git a/third_party/lib/acpica/source/tools/acpidump/apdump.c b/zircon/third_party/lib/acpica/source/tools/acpidump/apdump.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpidump/apdump.c
rename to zircon/third_party/lib/acpica/source/tools/acpidump/apdump.c
diff --git a/third_party/lib/acpica/source/tools/acpidump/apfiles.c b/zircon/third_party/lib/acpica/source/tools/acpidump/apfiles.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpidump/apfiles.c
rename to zircon/third_party/lib/acpica/source/tools/acpidump/apfiles.c
diff --git a/third_party/lib/acpica/source/tools/acpidump/apmain.c b/zircon/third_party/lib/acpica/source/tools/acpidump/apmain.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpidump/apmain.c
rename to zircon/third_party/lib/acpica/source/tools/acpidump/apmain.c
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aecommon.h b/zircon/third_party/lib/acpica/source/tools/acpiexec/aecommon.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aecommon.h
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aecommon.h
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aeexec.c b/zircon/third_party/lib/acpica/source/tools/acpiexec/aeexec.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aeexec.c
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aeexec.c
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aehandlers.c b/zircon/third_party/lib/acpica/source/tools/acpiexec/aehandlers.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aehandlers.c
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aehandlers.c
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aeinitfile.c b/zircon/third_party/lib/acpica/source/tools/acpiexec/aeinitfile.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aeinitfile.c
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aeinitfile.c
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aemain.c b/zircon/third_party/lib/acpica/source/tools/acpiexec/aemain.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aemain.c
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aemain.c
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aeregion.c b/zircon/third_party/lib/acpica/source/tools/acpiexec/aeregion.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aeregion.c
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aeregion.c
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aetables.c b/zircon/third_party/lib/acpica/source/tools/acpiexec/aetables.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aetables.c
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aetables.c
diff --git a/third_party/lib/acpica/source/tools/acpiexec/aetables.h b/zircon/third_party/lib/acpica/source/tools/acpiexec/aetables.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpiexec/aetables.h
rename to zircon/third_party/lib/acpica/source/tools/acpiexec/aetables.h
diff --git a/third_party/lib/acpica/source/tools/acpihelp/acpihelp.h b/zircon/third_party/lib/acpica/source/tools/acpihelp/acpihelp.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpihelp/acpihelp.h
rename to zircon/third_party/lib/acpica/source/tools/acpihelp/acpihelp.h
diff --git a/third_party/lib/acpica/source/tools/acpihelp/ahamlops.c b/zircon/third_party/lib/acpica/source/tools/acpihelp/ahamlops.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpihelp/ahamlops.c
rename to zircon/third_party/lib/acpica/source/tools/acpihelp/ahamlops.c
diff --git a/third_party/lib/acpica/source/tools/acpihelp/ahaslkey.c b/zircon/third_party/lib/acpica/source/tools/acpihelp/ahaslkey.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpihelp/ahaslkey.c
rename to zircon/third_party/lib/acpica/source/tools/acpihelp/ahaslkey.c
diff --git a/third_party/lib/acpica/source/tools/acpihelp/ahaslops.c b/zircon/third_party/lib/acpica/source/tools/acpihelp/ahaslops.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpihelp/ahaslops.c
rename to zircon/third_party/lib/acpica/source/tools/acpihelp/ahaslops.c
diff --git a/third_party/lib/acpica/source/tools/acpihelp/ahdecode.c b/zircon/third_party/lib/acpica/source/tools/acpihelp/ahdecode.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpihelp/ahdecode.c
rename to zircon/third_party/lib/acpica/source/tools/acpihelp/ahdecode.c
diff --git a/third_party/lib/acpica/source/tools/acpihelp/ahmain.c b/zircon/third_party/lib/acpica/source/tools/acpihelp/ahmain.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpihelp/ahmain.c
rename to zircon/third_party/lib/acpica/source/tools/acpihelp/ahmain.c
diff --git a/third_party/lib/acpica/source/tools/acpinames/acpinames.h b/zircon/third_party/lib/acpica/source/tools/acpinames/acpinames.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpinames/acpinames.h
rename to zircon/third_party/lib/acpica/source/tools/acpinames/acpinames.h
diff --git a/third_party/lib/acpica/source/tools/acpinames/anmain.c b/zircon/third_party/lib/acpica/source/tools/acpinames/anmain.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpinames/anmain.c
rename to zircon/third_party/lib/acpica/source/tools/acpinames/anmain.c
diff --git a/third_party/lib/acpica/source/tools/acpinames/anstubs.c b/zircon/third_party/lib/acpica/source/tools/acpinames/anstubs.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpinames/anstubs.c
rename to zircon/third_party/lib/acpica/source/tools/acpinames/anstubs.c
diff --git a/third_party/lib/acpica/source/tools/acpinames/antables.c b/zircon/third_party/lib/acpica/source/tools/acpinames/antables.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpinames/antables.c
rename to zircon/third_party/lib/acpica/source/tools/acpinames/antables.c
diff --git a/third_party/lib/acpica/source/tools/acpisrc/acpisrc.h b/zircon/third_party/lib/acpica/source/tools/acpisrc/acpisrc.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/acpisrc.h
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/acpisrc.h
diff --git a/third_party/lib/acpica/source/tools/acpisrc/ascase.c b/zircon/third_party/lib/acpica/source/tools/acpisrc/ascase.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/ascase.c
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/ascase.c
diff --git a/third_party/lib/acpica/source/tools/acpisrc/asconvrt.c b/zircon/third_party/lib/acpica/source/tools/acpisrc/asconvrt.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/asconvrt.c
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/asconvrt.c
diff --git a/third_party/lib/acpica/source/tools/acpisrc/asfile.c b/zircon/third_party/lib/acpica/source/tools/acpisrc/asfile.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/asfile.c
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/asfile.c
diff --git a/third_party/lib/acpica/source/tools/acpisrc/asmain.c b/zircon/third_party/lib/acpica/source/tools/acpisrc/asmain.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/asmain.c
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/asmain.c
diff --git a/third_party/lib/acpica/source/tools/acpisrc/asremove.c b/zircon/third_party/lib/acpica/source/tools/acpisrc/asremove.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/asremove.c
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/asremove.c
diff --git a/third_party/lib/acpica/source/tools/acpisrc/astable.c b/zircon/third_party/lib/acpica/source/tools/acpisrc/astable.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/astable.c
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/astable.c
diff --git a/third_party/lib/acpica/source/tools/acpisrc/asutils.c b/zircon/third_party/lib/acpica/source/tools/acpisrc/asutils.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpisrc/asutils.c
rename to zircon/third_party/lib/acpica/source/tools/acpisrc/asutils.c
diff --git a/third_party/lib/acpica/source/tools/acpixtract/acpixtract.c b/zircon/third_party/lib/acpica/source/tools/acpixtract/acpixtract.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpixtract/acpixtract.c
rename to zircon/third_party/lib/acpica/source/tools/acpixtract/acpixtract.c
diff --git a/third_party/lib/acpica/source/tools/acpixtract/acpixtract.h b/zircon/third_party/lib/acpica/source/tools/acpixtract/acpixtract.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpixtract/acpixtract.h
rename to zircon/third_party/lib/acpica/source/tools/acpixtract/acpixtract.h
diff --git a/third_party/lib/acpica/source/tools/acpixtract/axmain.c b/zircon/third_party/lib/acpica/source/tools/acpixtract/axmain.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpixtract/axmain.c
rename to zircon/third_party/lib/acpica/source/tools/acpixtract/axmain.c
diff --git a/third_party/lib/acpica/source/tools/acpixtract/axutils.c b/zircon/third_party/lib/acpica/source/tools/acpixtract/axutils.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/acpixtract/axutils.c
rename to zircon/third_party/lib/acpica/source/tools/acpixtract/axutils.c
diff --git a/third_party/lib/acpica/source/tools/examples/examples.c b/zircon/third_party/lib/acpica/source/tools/examples/examples.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/examples/examples.c
rename to zircon/third_party/lib/acpica/source/tools/examples/examples.c
diff --git a/third_party/lib/acpica/source/tools/examples/examples.h b/zircon/third_party/lib/acpica/source/tools/examples/examples.h
similarity index 100%
rename from third_party/lib/acpica/source/tools/examples/examples.h
rename to zircon/third_party/lib/acpica/source/tools/examples/examples.h
diff --git a/third_party/lib/acpica/source/tools/examples/exstubs.c b/zircon/third_party/lib/acpica/source/tools/examples/exstubs.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/examples/exstubs.c
rename to zircon/third_party/lib/acpica/source/tools/examples/exstubs.c
diff --git a/third_party/lib/acpica/source/tools/examples/extables.c b/zircon/third_party/lib/acpica/source/tools/examples/extables.c
similarity index 100%
rename from third_party/lib/acpica/source/tools/examples/extables.c
rename to zircon/third_party/lib/acpica/source/tools/examples/extables.c
diff --git a/third_party/lib/acpica/tests/misc/badcode.asl b/zircon/third_party/lib/acpica/tests/misc/badcode.asl
similarity index 100%
rename from third_party/lib/acpica/tests/misc/badcode.asl
rename to zircon/third_party/lib/acpica/tests/misc/badcode.asl
diff --git a/third_party/lib/acpica/tests/misc/grammar.asl b/zircon/third_party/lib/acpica/tests/misc/grammar.asl
similarity index 100%
rename from third_party/lib/acpica/tests/misc/grammar.asl
rename to zircon/third_party/lib/acpica/tests/misc/grammar.asl
diff --git a/third_party/lib/acpica/tests/templates/Makefile b/zircon/third_party/lib/acpica/tests/templates/Makefile
similarity index 100%
rename from third_party/lib/acpica/tests/templates/Makefile
rename to zircon/third_party/lib/acpica/tests/templates/Makefile
diff --git a/third_party/lib/acpica/tests/templates/templates.sh b/zircon/third_party/lib/acpica/tests/templates/templates.sh
similarity index 100%
rename from third_party/lib/acpica/tests/templates/templates.sh
rename to zircon/third_party/lib/acpica/tests/templates/templates.sh
diff --git a/third_party/lib/cksum/rules.mk b/zircon/third_party/lib/cksum/rules.mk
similarity index 100%
rename from third_party/lib/cksum/rules.mk
rename to zircon/third_party/lib/cksum/rules.mk
diff --git a/third_party/lib/cortex-strings/LICENSE b/zircon/third_party/lib/cortex-strings/LICENSE
similarity index 100%
rename from third_party/lib/cortex-strings/LICENSE
rename to zircon/third_party/lib/cortex-strings/LICENSE
diff --git a/third_party/lib/cortex-strings/README.fuchsia b/zircon/third_party/lib/cortex-strings/README.fuchsia
similarity index 100%
rename from third_party/lib/cortex-strings/README.fuchsia
rename to zircon/third_party/lib/cortex-strings/README.fuchsia
diff --git a/third_party/lib/cortex-strings/no-neon/src/aarch64/memset.S b/zircon/third_party/lib/cortex-strings/no-neon/src/aarch64/memset.S
similarity index 100%
rename from third_party/lib/cortex-strings/no-neon/src/aarch64/memset.S
rename to zircon/third_party/lib/cortex-strings/no-neon/src/aarch64/memset.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/memchr.S b/zircon/third_party/lib/cortex-strings/src/aarch64/memchr.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/memchr.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/memchr.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/memcmp.S b/zircon/third_party/lib/cortex-strings/src/aarch64/memcmp.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/memcmp.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/memcmp.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/memcpy.S b/zircon/third_party/lib/cortex-strings/src/aarch64/memcpy.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/memcpy.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/memcpy.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/memmove.S b/zircon/third_party/lib/cortex-strings/src/aarch64/memmove.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/memmove.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/memmove.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/memset.S b/zircon/third_party/lib/cortex-strings/src/aarch64/memset.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/memset.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/memset.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/strchr.S b/zircon/third_party/lib/cortex-strings/src/aarch64/strchr.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/strchr.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/strchr.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/strchrnul.S b/zircon/third_party/lib/cortex-strings/src/aarch64/strchrnul.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/strchrnul.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/strchrnul.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/strcmp.S b/zircon/third_party/lib/cortex-strings/src/aarch64/strcmp.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/strcmp.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/strcmp.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/strcpy.S b/zircon/third_party/lib/cortex-strings/src/aarch64/strcpy.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/strcpy.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/strcpy.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/strlen.S b/zircon/third_party/lib/cortex-strings/src/aarch64/strlen.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/strlen.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/strlen.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/strncmp.S b/zircon/third_party/lib/cortex-strings/src/aarch64/strncmp.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/strncmp.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/strncmp.S
diff --git a/third_party/lib/cortex-strings/src/aarch64/strnlen.S b/zircon/third_party/lib/cortex-strings/src/aarch64/strnlen.S
similarity index 100%
rename from third_party/lib/cortex-strings/src/aarch64/strnlen.S
rename to zircon/third_party/lib/cortex-strings/src/aarch64/strnlen.S
diff --git a/third_party/lib/cryptolib/rules.mk b/zircon/third_party/lib/cryptolib/rules.mk
similarity index 100%
rename from third_party/lib/cryptolib/rules.mk
rename to zircon/third_party/lib/cryptolib/rules.mk
diff --git a/third_party/lib/jitterentropy/CHANGES.md b/zircon/third_party/lib/jitterentropy/CHANGES.md
similarity index 100%
rename from third_party/lib/jitterentropy/CHANGES.md
rename to zircon/third_party/lib/jitterentropy/CHANGES.md
diff --git a/third_party/lib/jitterentropy/COPYING b/zircon/third_party/lib/jitterentropy/COPYING
similarity index 100%
rename from third_party/lib/jitterentropy/COPYING
rename to zircon/third_party/lib/jitterentropy/COPYING
diff --git a/third_party/lib/jitterentropy/COPYING.bsd b/zircon/third_party/lib/jitterentropy/COPYING.bsd
similarity index 100%
rename from third_party/lib/jitterentropy/COPYING.bsd
rename to zircon/third_party/lib/jitterentropy/COPYING.bsd
diff --git a/third_party/lib/jitterentropy/Makefile b/zircon/third_party/lib/jitterentropy/Makefile
similarity index 100%
rename from third_party/lib/jitterentropy/Makefile
rename to zircon/third_party/lib/jitterentropy/Makefile
diff --git a/third_party/lib/jitterentropy/README.fuchsia b/zircon/third_party/lib/jitterentropy/README.fuchsia
similarity index 100%
rename from third_party/lib/jitterentropy/README.fuchsia
rename to zircon/third_party/lib/jitterentropy/README.fuchsia
diff --git a/third_party/lib/jitterentropy/README.md b/zircon/third_party/lib/jitterentropy/README.md
similarity index 100%
rename from third_party/lib/jitterentropy/README.md
rename to zircon/third_party/lib/jitterentropy/README.md
diff --git a/third_party/lib/jitterentropy/arch/arm64/internal.h b/zircon/third_party/lib/jitterentropy/arch/arm64/internal.h
similarity index 100%
rename from third_party/lib/jitterentropy/arch/arm64/internal.h
rename to zircon/third_party/lib/jitterentropy/arch/arm64/internal.h
diff --git a/third_party/lib/jitterentropy/arch/x86/internal.h b/zircon/third_party/lib/jitterentropy/arch/x86/internal.h
similarity index 100%
rename from third_party/lib/jitterentropy/arch/x86/internal.h
rename to zircon/third_party/lib/jitterentropy/arch/x86/internal.h
diff --git a/third_party/lib/jitterentropy/doc/README b/zircon/third_party/lib/jitterentropy/doc/README
similarity index 100%
rename from third_party/lib/jitterentropy/doc/README
rename to zircon/third_party/lib/jitterentropy/doc/README
diff --git a/third_party/lib/jitterentropy/include/lib/jitterentropy/jitterentropy.h b/zircon/third_party/lib/jitterentropy/include/lib/jitterentropy/jitterentropy.h
similarity index 100%
rename from third_party/lib/jitterentropy/include/lib/jitterentropy/jitterentropy.h
rename to zircon/third_party/lib/jitterentropy/include/lib/jitterentropy/jitterentropy.h
diff --git a/third_party/lib/jitterentropy/jitterentropy-base.c b/zircon/third_party/lib/jitterentropy/jitterentropy-base.c
similarity index 100%
rename from third_party/lib/jitterentropy/jitterentropy-base.c
rename to zircon/third_party/lib/jitterentropy/jitterentropy-base.c
diff --git a/third_party/lib/jitterentropy/rules.mk b/zircon/third_party/lib/jitterentropy/rules.mk
similarity index 100%
rename from third_party/lib/jitterentropy/rules.mk
rename to zircon/third_party/lib/jitterentropy/rules.mk
diff --git a/third_party/lib/lz4/rules.mk b/zircon/third_party/lib/lz4/rules.mk
similarity index 100%
rename from third_party/lib/lz4/rules.mk
rename to zircon/third_party/lib/lz4/rules.mk
diff --git a/third_party/lib/uboringssl/rules.mk b/zircon/third_party/lib/uboringssl/rules.mk
similarity index 100%
rename from third_party/lib/uboringssl/rules.mk
rename to zircon/third_party/lib/uboringssl/rules.mk
diff --git a/third_party/tools/android/LICENSE b/zircon/third_party/tools/android/LICENSE
similarity index 100%
rename from third_party/tools/android/LICENSE
rename to zircon/third_party/tools/android/LICENSE
diff --git a/third_party/tools/android/avb/avbtool b/zircon/third_party/tools/android/avb/avbtool
similarity index 100%
rename from third_party/tools/android/avb/avbtool
rename to zircon/third_party/tools/android/avb/avbtool
diff --git a/third_party/tools/android/avb/test/data/atx_metadata.bin b/zircon/third_party/tools/android/avb/test/data/atx_metadata.bin
similarity index 100%
rename from third_party/tools/android/avb/test/data/atx_metadata.bin
rename to zircon/third_party/tools/android/avb/test/data/atx_metadata.bin
diff --git a/third_party/tools/android/avb/test/data/testkey_atx_psk.pem b/zircon/third_party/tools/android/avb/test/data/testkey_atx_psk.pem
similarity index 100%
rename from third_party/tools/android/avb/test/data/testkey_atx_psk.pem
rename to zircon/third_party/tools/android/avb/test/data/testkey_atx_psk.pem
diff --git a/third_party/tools/android/mkbootimg b/zircon/third_party/tools/android/mkbootimg
similarity index 100%
rename from third_party/tools/android/mkbootimg
rename to zircon/third_party/tools/android/mkbootimg
diff --git a/third_party/tools/android/mkdtimg b/zircon/third_party/tools/android/mkdtimg
similarity index 100%
rename from third_party/tools/android/mkdtimg
rename to zircon/third_party/tools/android/mkdtimg
diff --git a/third_party/uapp/dash/LICENSE b/zircon/third_party/uapp/dash/LICENSE
similarity index 100%
rename from third_party/uapp/dash/LICENSE
rename to zircon/third_party/uapp/dash/LICENSE
diff --git a/third_party/uapp/dash/MAINTAINERS b/zircon/third_party/uapp/dash/MAINTAINERS
similarity index 100%
rename from third_party/uapp/dash/MAINTAINERS
rename to zircon/third_party/uapp/dash/MAINTAINERS
diff --git a/third_party/uapp/dash/README.fuchsia b/zircon/third_party/uapp/dash/README.fuchsia
similarity index 100%
rename from third_party/uapp/dash/README.fuchsia
rename to zircon/third_party/uapp/dash/README.fuchsia
diff --git a/third_party/uapp/dash/config.h b/zircon/third_party/uapp/dash/config.h
similarity index 100%
rename from third_party/uapp/dash/config.h
rename to zircon/third_party/uapp/dash/config.h
diff --git a/third_party/uapp/dash/gen-sources.sh b/zircon/third_party/uapp/dash/gen-sources.sh
similarity index 100%
rename from third_party/uapp/dash/gen-sources.sh
rename to zircon/third_party/uapp/dash/gen-sources.sh
diff --git a/third_party/uapp/dash/rules.mk b/zircon/third_party/uapp/dash/rules.mk
similarity index 100%
rename from third_party/uapp/dash/rules.mk
rename to zircon/third_party/uapp/dash/rules.mk
diff --git a/third_party/uapp/dash/src/TOUR b/zircon/third_party/uapp/dash/src/TOUR
similarity index 100%
rename from third_party/uapp/dash/src/TOUR
rename to zircon/third_party/uapp/dash/src/TOUR
diff --git a/third_party/uapp/dash/src/alias.c b/zircon/third_party/uapp/dash/src/alias.c
similarity index 100%
rename from third_party/uapp/dash/src/alias.c
rename to zircon/third_party/uapp/dash/src/alias.c
diff --git a/third_party/uapp/dash/src/alias.h b/zircon/third_party/uapp/dash/src/alias.h
similarity index 100%
rename from third_party/uapp/dash/src/alias.h
rename to zircon/third_party/uapp/dash/src/alias.h
diff --git a/third_party/uapp/dash/src/arith_yacc.c b/zircon/third_party/uapp/dash/src/arith_yacc.c
similarity index 100%
rename from third_party/uapp/dash/src/arith_yacc.c
rename to zircon/third_party/uapp/dash/src/arith_yacc.c
diff --git a/third_party/uapp/dash/src/arith_yacc.h b/zircon/third_party/uapp/dash/src/arith_yacc.h
similarity index 100%
rename from third_party/uapp/dash/src/arith_yacc.h
rename to zircon/third_party/uapp/dash/src/arith_yacc.h
diff --git a/third_party/uapp/dash/src/arith_yylex.c b/zircon/third_party/uapp/dash/src/arith_yylex.c
similarity index 100%
rename from third_party/uapp/dash/src/arith_yylex.c
rename to zircon/third_party/uapp/dash/src/arith_yylex.c
diff --git a/third_party/uapp/dash/src/bltin/bltin.h b/zircon/third_party/uapp/dash/src/bltin/bltin.h
similarity index 100%
rename from third_party/uapp/dash/src/bltin/bltin.h
rename to zircon/third_party/uapp/dash/src/bltin/bltin.h
diff --git a/third_party/uapp/dash/src/bltin/echo.1 b/zircon/third_party/uapp/dash/src/bltin/echo.1
similarity index 100%
rename from third_party/uapp/dash/src/bltin/echo.1
rename to zircon/third_party/uapp/dash/src/bltin/echo.1
diff --git a/third_party/uapp/dash/src/bltin/printf.1 b/zircon/third_party/uapp/dash/src/bltin/printf.1
similarity index 100%
rename from third_party/uapp/dash/src/bltin/printf.1
rename to zircon/third_party/uapp/dash/src/bltin/printf.1
diff --git a/third_party/uapp/dash/src/bltin/printf.c b/zircon/third_party/uapp/dash/src/bltin/printf.c
similarity index 100%
rename from third_party/uapp/dash/src/bltin/printf.c
rename to zircon/third_party/uapp/dash/src/bltin/printf.c
diff --git a/third_party/uapp/dash/src/bltin/test.1 b/zircon/third_party/uapp/dash/src/bltin/test.1
similarity index 100%
rename from third_party/uapp/dash/src/bltin/test.1
rename to zircon/third_party/uapp/dash/src/bltin/test.1
diff --git a/third_party/uapp/dash/src/bltin/test.c b/zircon/third_party/uapp/dash/src/bltin/test.c
similarity index 100%
rename from third_party/uapp/dash/src/bltin/test.c
rename to zircon/third_party/uapp/dash/src/bltin/test.c
diff --git a/third_party/uapp/dash/src/bltin/times.c b/zircon/third_party/uapp/dash/src/bltin/times.c
similarity index 100%
rename from third_party/uapp/dash/src/bltin/times.c
rename to zircon/third_party/uapp/dash/src/bltin/times.c
diff --git a/third_party/uapp/dash/src/bltin/zircon.c b/zircon/third_party/uapp/dash/src/bltin/zircon.c
similarity index 100%
rename from third_party/uapp/dash/src/bltin/zircon.c
rename to zircon/third_party/uapp/dash/src/bltin/zircon.c
diff --git a/third_party/uapp/dash/src/builtins.c b/zircon/third_party/uapp/dash/src/builtins.c
similarity index 100%
rename from third_party/uapp/dash/src/builtins.c
rename to zircon/third_party/uapp/dash/src/builtins.c
diff --git a/third_party/uapp/dash/src/builtins.def b/zircon/third_party/uapp/dash/src/builtins.def
similarity index 100%
rename from third_party/uapp/dash/src/builtins.def
rename to zircon/third_party/uapp/dash/src/builtins.def
diff --git a/third_party/uapp/dash/src/builtins.def.in b/zircon/third_party/uapp/dash/src/builtins.def.in
similarity index 100%
rename from third_party/uapp/dash/src/builtins.def.in
rename to zircon/third_party/uapp/dash/src/builtins.def.in
diff --git a/third_party/uapp/dash/src/builtins.h b/zircon/third_party/uapp/dash/src/builtins.h
similarity index 100%
rename from third_party/uapp/dash/src/builtins.h
rename to zircon/third_party/uapp/dash/src/builtins.h
diff --git a/third_party/uapp/dash/src/cd.c b/zircon/third_party/uapp/dash/src/cd.c
similarity index 100%
rename from third_party/uapp/dash/src/cd.c
rename to zircon/third_party/uapp/dash/src/cd.c
diff --git a/third_party/uapp/dash/src/cd.h b/zircon/third_party/uapp/dash/src/cd.h
similarity index 100%
rename from third_party/uapp/dash/src/cd.h
rename to zircon/third_party/uapp/dash/src/cd.h
diff --git a/third_party/uapp/dash/src/dash.1 b/zircon/third_party/uapp/dash/src/dash.1
similarity index 100%
rename from third_party/uapp/dash/src/dash.1
rename to zircon/third_party/uapp/dash/src/dash.1
diff --git a/third_party/uapp/dash/src/error.c b/zircon/third_party/uapp/dash/src/error.c
similarity index 100%
rename from third_party/uapp/dash/src/error.c
rename to zircon/third_party/uapp/dash/src/error.c
diff --git a/third_party/uapp/dash/src/error.h b/zircon/third_party/uapp/dash/src/error.h
similarity index 100%
rename from third_party/uapp/dash/src/error.h
rename to zircon/third_party/uapp/dash/src/error.h
diff --git a/third_party/uapp/dash/src/eval.c b/zircon/third_party/uapp/dash/src/eval.c
similarity index 100%
rename from third_party/uapp/dash/src/eval.c
rename to zircon/third_party/uapp/dash/src/eval.c
diff --git a/third_party/uapp/dash/src/eval.h b/zircon/third_party/uapp/dash/src/eval.h
similarity index 100%
rename from third_party/uapp/dash/src/eval.h
rename to zircon/third_party/uapp/dash/src/eval.h
diff --git a/third_party/uapp/dash/src/exec.c b/zircon/third_party/uapp/dash/src/exec.c
similarity index 100%
rename from third_party/uapp/dash/src/exec.c
rename to zircon/third_party/uapp/dash/src/exec.c
diff --git a/third_party/uapp/dash/src/exec.h b/zircon/third_party/uapp/dash/src/exec.h
similarity index 100%
rename from third_party/uapp/dash/src/exec.h
rename to zircon/third_party/uapp/dash/src/exec.h
diff --git a/third_party/uapp/dash/src/expand.c b/zircon/third_party/uapp/dash/src/expand.c
similarity index 100%
rename from third_party/uapp/dash/src/expand.c
rename to zircon/third_party/uapp/dash/src/expand.c
diff --git a/third_party/uapp/dash/src/expand.h b/zircon/third_party/uapp/dash/src/expand.h
similarity index 100%
rename from third_party/uapp/dash/src/expand.h
rename to zircon/third_party/uapp/dash/src/expand.h
diff --git a/third_party/uapp/dash/src/funcs/cmv b/zircon/third_party/uapp/dash/src/funcs/cmv
similarity index 100%
rename from third_party/uapp/dash/src/funcs/cmv
rename to zircon/third_party/uapp/dash/src/funcs/cmv
diff --git a/third_party/uapp/dash/src/funcs/dirs b/zircon/third_party/uapp/dash/src/funcs/dirs
similarity index 100%
rename from third_party/uapp/dash/src/funcs/dirs
rename to zircon/third_party/uapp/dash/src/funcs/dirs
diff --git a/third_party/uapp/dash/src/funcs/kill b/zircon/third_party/uapp/dash/src/funcs/kill
similarity index 100%
rename from third_party/uapp/dash/src/funcs/kill
rename to zircon/third_party/uapp/dash/src/funcs/kill
diff --git a/third_party/uapp/dash/src/funcs/login b/zircon/third_party/uapp/dash/src/funcs/login
similarity index 100%
rename from third_party/uapp/dash/src/funcs/login
rename to zircon/third_party/uapp/dash/src/funcs/login
diff --git a/third_party/uapp/dash/src/funcs/newgrp b/zircon/third_party/uapp/dash/src/funcs/newgrp
similarity index 100%
rename from third_party/uapp/dash/src/funcs/newgrp
rename to zircon/third_party/uapp/dash/src/funcs/newgrp
diff --git a/third_party/uapp/dash/src/funcs/popd b/zircon/third_party/uapp/dash/src/funcs/popd
similarity index 100%
rename from third_party/uapp/dash/src/funcs/popd
rename to zircon/third_party/uapp/dash/src/funcs/popd
diff --git a/third_party/uapp/dash/src/funcs/pushd b/zircon/third_party/uapp/dash/src/funcs/pushd
similarity index 100%
rename from third_party/uapp/dash/src/funcs/pushd
rename to zircon/third_party/uapp/dash/src/funcs/pushd
diff --git a/third_party/uapp/dash/src/funcs/suspend b/zircon/third_party/uapp/dash/src/funcs/suspend
similarity index 100%
rename from third_party/uapp/dash/src/funcs/suspend
rename to zircon/third_party/uapp/dash/src/funcs/suspend
diff --git a/third_party/uapp/dash/src/init.c b/zircon/third_party/uapp/dash/src/init.c
similarity index 100%
rename from third_party/uapp/dash/src/init.c
rename to zircon/third_party/uapp/dash/src/init.c
diff --git a/third_party/uapp/dash/src/init.h b/zircon/third_party/uapp/dash/src/init.h
similarity index 100%
rename from third_party/uapp/dash/src/init.h
rename to zircon/third_party/uapp/dash/src/init.h
diff --git a/third_party/uapp/dash/src/input.c b/zircon/third_party/uapp/dash/src/input.c
similarity index 100%
rename from third_party/uapp/dash/src/input.c
rename to zircon/third_party/uapp/dash/src/input.c
diff --git a/third_party/uapp/dash/src/input.h b/zircon/third_party/uapp/dash/src/input.h
similarity index 100%
rename from third_party/uapp/dash/src/input.h
rename to zircon/third_party/uapp/dash/src/input.h
diff --git a/third_party/uapp/dash/src/jobs.c b/zircon/third_party/uapp/dash/src/jobs.c
similarity index 100%
rename from third_party/uapp/dash/src/jobs.c
rename to zircon/third_party/uapp/dash/src/jobs.c
diff --git a/third_party/uapp/dash/src/jobs.h b/zircon/third_party/uapp/dash/src/jobs.h
similarity index 100%
rename from third_party/uapp/dash/src/jobs.h
rename to zircon/third_party/uapp/dash/src/jobs.h
diff --git a/third_party/uapp/dash/src/machdep.h b/zircon/third_party/uapp/dash/src/machdep.h
similarity index 100%
rename from third_party/uapp/dash/src/machdep.h
rename to zircon/third_party/uapp/dash/src/machdep.h
diff --git a/third_party/uapp/dash/src/main.c b/zircon/third_party/uapp/dash/src/main.c
similarity index 100%
rename from third_party/uapp/dash/src/main.c
rename to zircon/third_party/uapp/dash/src/main.c
diff --git a/third_party/uapp/dash/src/main.h b/zircon/third_party/uapp/dash/src/main.h
similarity index 100%
rename from third_party/uapp/dash/src/main.h
rename to zircon/third_party/uapp/dash/src/main.h
diff --git a/third_party/uapp/dash/src/memalloc.c b/zircon/third_party/uapp/dash/src/memalloc.c
similarity index 100%
rename from third_party/uapp/dash/src/memalloc.c
rename to zircon/third_party/uapp/dash/src/memalloc.c
diff --git a/third_party/uapp/dash/src/memalloc.h b/zircon/third_party/uapp/dash/src/memalloc.h
similarity index 100%
rename from third_party/uapp/dash/src/memalloc.h
rename to zircon/third_party/uapp/dash/src/memalloc.h
diff --git a/third_party/uapp/dash/src/miscbltin.c b/zircon/third_party/uapp/dash/src/miscbltin.c
similarity index 100%
rename from third_party/uapp/dash/src/miscbltin.c
rename to zircon/third_party/uapp/dash/src/miscbltin.c
diff --git a/third_party/uapp/dash/src/miscbltin.h b/zircon/third_party/uapp/dash/src/miscbltin.h
similarity index 100%
rename from third_party/uapp/dash/src/miscbltin.h
rename to zircon/third_party/uapp/dash/src/miscbltin.h
diff --git a/third_party/uapp/dash/src/mkbuiltins b/zircon/third_party/uapp/dash/src/mkbuiltins
similarity index 100%
rename from third_party/uapp/dash/src/mkbuiltins
rename to zircon/third_party/uapp/dash/src/mkbuiltins
diff --git a/third_party/uapp/dash/src/mkinit.c b/zircon/third_party/uapp/dash/src/mkinit.c
similarity index 100%
rename from third_party/uapp/dash/src/mkinit.c
rename to zircon/third_party/uapp/dash/src/mkinit.c
diff --git a/third_party/uapp/dash/src/mknodes.c b/zircon/third_party/uapp/dash/src/mknodes.c
similarity index 100%
rename from third_party/uapp/dash/src/mknodes.c
rename to zircon/third_party/uapp/dash/src/mknodes.c
diff --git a/third_party/uapp/dash/src/mksyntax.c b/zircon/third_party/uapp/dash/src/mksyntax.c
similarity index 100%
rename from third_party/uapp/dash/src/mksyntax.c
rename to zircon/third_party/uapp/dash/src/mksyntax.c
diff --git a/third_party/uapp/dash/src/mktokens b/zircon/third_party/uapp/dash/src/mktokens
similarity index 100%
rename from third_party/uapp/dash/src/mktokens
rename to zircon/third_party/uapp/dash/src/mktokens
diff --git a/third_party/uapp/dash/src/mystring.c b/zircon/third_party/uapp/dash/src/mystring.c
similarity index 100%
rename from third_party/uapp/dash/src/mystring.c
rename to zircon/third_party/uapp/dash/src/mystring.c
diff --git a/third_party/uapp/dash/src/mystring.h b/zircon/third_party/uapp/dash/src/mystring.h
similarity index 100%
rename from third_party/uapp/dash/src/mystring.h
rename to zircon/third_party/uapp/dash/src/mystring.h
diff --git a/third_party/uapp/dash/src/nodes.c b/zircon/third_party/uapp/dash/src/nodes.c
similarity index 100%
rename from third_party/uapp/dash/src/nodes.c
rename to zircon/third_party/uapp/dash/src/nodes.c
diff --git a/third_party/uapp/dash/src/nodes.c.pat b/zircon/third_party/uapp/dash/src/nodes.c.pat
similarity index 100%
rename from third_party/uapp/dash/src/nodes.c.pat
rename to zircon/third_party/uapp/dash/src/nodes.c.pat
diff --git a/third_party/uapp/dash/src/nodes.h b/zircon/third_party/uapp/dash/src/nodes.h
similarity index 100%
rename from third_party/uapp/dash/src/nodes.h
rename to zircon/third_party/uapp/dash/src/nodes.h
diff --git a/third_party/uapp/dash/src/nodetypes b/zircon/third_party/uapp/dash/src/nodetypes
similarity index 100%
rename from third_party/uapp/dash/src/nodetypes
rename to zircon/third_party/uapp/dash/src/nodetypes
diff --git a/third_party/uapp/dash/src/options.c b/zircon/third_party/uapp/dash/src/options.c
similarity index 100%
rename from third_party/uapp/dash/src/options.c
rename to zircon/third_party/uapp/dash/src/options.c
diff --git a/third_party/uapp/dash/src/options.h b/zircon/third_party/uapp/dash/src/options.h
similarity index 100%
rename from third_party/uapp/dash/src/options.h
rename to zircon/third_party/uapp/dash/src/options.h
diff --git a/third_party/uapp/dash/src/output.c b/zircon/third_party/uapp/dash/src/output.c
similarity index 100%
rename from third_party/uapp/dash/src/output.c
rename to zircon/third_party/uapp/dash/src/output.c
diff --git a/third_party/uapp/dash/src/output.h b/zircon/third_party/uapp/dash/src/output.h
similarity index 100%
rename from third_party/uapp/dash/src/output.h
rename to zircon/third_party/uapp/dash/src/output.h
diff --git a/third_party/uapp/dash/src/parser.c b/zircon/third_party/uapp/dash/src/parser.c
similarity index 100%
rename from third_party/uapp/dash/src/parser.c
rename to zircon/third_party/uapp/dash/src/parser.c
diff --git a/third_party/uapp/dash/src/parser.h b/zircon/third_party/uapp/dash/src/parser.h
similarity index 100%
rename from third_party/uapp/dash/src/parser.h
rename to zircon/third_party/uapp/dash/src/parser.h
diff --git a/third_party/uapp/dash/src/process.c b/zircon/third_party/uapp/dash/src/process.c
similarity index 100%
rename from third_party/uapp/dash/src/process.c
rename to zircon/third_party/uapp/dash/src/process.c
diff --git a/third_party/uapp/dash/src/process.h b/zircon/third_party/uapp/dash/src/process.h
similarity index 100%
rename from third_party/uapp/dash/src/process.h
rename to zircon/third_party/uapp/dash/src/process.h
diff --git a/third_party/uapp/dash/src/redir.c b/zircon/third_party/uapp/dash/src/redir.c
similarity index 100%
rename from third_party/uapp/dash/src/redir.c
rename to zircon/third_party/uapp/dash/src/redir.c
diff --git a/third_party/uapp/dash/src/redir.h b/zircon/third_party/uapp/dash/src/redir.h
similarity index 100%
rename from third_party/uapp/dash/src/redir.h
rename to zircon/third_party/uapp/dash/src/redir.h
diff --git a/third_party/uapp/dash/src/shell.h b/zircon/third_party/uapp/dash/src/shell.h
similarity index 100%
rename from third_party/uapp/dash/src/shell.h
rename to zircon/third_party/uapp/dash/src/shell.h
diff --git a/third_party/uapp/dash/src/show.c b/zircon/third_party/uapp/dash/src/show.c
similarity index 100%
rename from third_party/uapp/dash/src/show.c
rename to zircon/third_party/uapp/dash/src/show.c
diff --git a/third_party/uapp/dash/src/show.h b/zircon/third_party/uapp/dash/src/show.h
similarity index 100%
rename from third_party/uapp/dash/src/show.h
rename to zircon/third_party/uapp/dash/src/show.h
diff --git a/third_party/uapp/dash/src/signames.c b/zircon/third_party/uapp/dash/src/signames.c
similarity index 100%
rename from third_party/uapp/dash/src/signames.c
rename to zircon/third_party/uapp/dash/src/signames.c
diff --git a/third_party/uapp/dash/src/syntax.c b/zircon/third_party/uapp/dash/src/syntax.c
similarity index 100%
rename from third_party/uapp/dash/src/syntax.c
rename to zircon/third_party/uapp/dash/src/syntax.c
diff --git a/third_party/uapp/dash/src/syntax.h b/zircon/third_party/uapp/dash/src/syntax.h
similarity index 100%
rename from third_party/uapp/dash/src/syntax.h
rename to zircon/third_party/uapp/dash/src/syntax.h
diff --git a/third_party/uapp/dash/src/system.c b/zircon/third_party/uapp/dash/src/system.c
similarity index 100%
rename from third_party/uapp/dash/src/system.c
rename to zircon/third_party/uapp/dash/src/system.c
diff --git a/third_party/uapp/dash/src/system.h b/zircon/third_party/uapp/dash/src/system.h
similarity index 100%
rename from third_party/uapp/dash/src/system.h
rename to zircon/third_party/uapp/dash/src/system.h
diff --git a/third_party/uapp/dash/src/tab.c b/zircon/third_party/uapp/dash/src/tab.c
similarity index 100%
rename from third_party/uapp/dash/src/tab.c
rename to zircon/third_party/uapp/dash/src/tab.c
diff --git a/third_party/uapp/dash/src/tab.h b/zircon/third_party/uapp/dash/src/tab.h
similarity index 100%
rename from third_party/uapp/dash/src/tab.h
rename to zircon/third_party/uapp/dash/src/tab.h
diff --git a/third_party/uapp/dash/src/token.h b/zircon/third_party/uapp/dash/src/token.h
similarity index 100%
rename from third_party/uapp/dash/src/token.h
rename to zircon/third_party/uapp/dash/src/token.h
diff --git a/third_party/uapp/dash/src/token_vars.h b/zircon/third_party/uapp/dash/src/token_vars.h
similarity index 100%
rename from third_party/uapp/dash/src/token_vars.h
rename to zircon/third_party/uapp/dash/src/token_vars.h
diff --git a/third_party/uapp/dash/src/trap.c b/zircon/third_party/uapp/dash/src/trap.c
similarity index 100%
rename from third_party/uapp/dash/src/trap.c
rename to zircon/third_party/uapp/dash/src/trap.c
diff --git a/third_party/uapp/dash/src/trap.h b/zircon/third_party/uapp/dash/src/trap.h
similarity index 100%
rename from third_party/uapp/dash/src/trap.h
rename to zircon/third_party/uapp/dash/src/trap.h
diff --git a/third_party/uapp/dash/src/var.c b/zircon/third_party/uapp/dash/src/var.c
similarity index 100%
rename from third_party/uapp/dash/src/var.c
rename to zircon/third_party/uapp/dash/src/var.c
diff --git a/third_party/uapp/dash/src/var.h b/zircon/third_party/uapp/dash/src/var.h
similarity index 100%
rename from third_party/uapp/dash/src/var.h
rename to zircon/third_party/uapp/dash/src/var.h
diff --git a/third_party/uapp/fsck-msdosfs/README.fuchsia b/zircon/third_party/uapp/fsck-msdosfs/README.fuchsia
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/README.fuchsia
rename to zircon/third_party/uapp/fsck-msdosfs/README.fuchsia
diff --git a/third_party/uapp/fsck-msdosfs/boot.c b/zircon/third_party/uapp/fsck-msdosfs/boot.c
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/boot.c
rename to zircon/third_party/uapp/fsck-msdosfs/boot.c
diff --git a/third_party/uapp/fsck-msdosfs/check.c b/zircon/third_party/uapp/fsck-msdosfs/check.c
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/check.c
rename to zircon/third_party/uapp/fsck-msdosfs/check.c
diff --git a/third_party/uapp/fsck-msdosfs/dir.c b/zircon/third_party/uapp/fsck-msdosfs/dir.c
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/dir.c
rename to zircon/third_party/uapp/fsck-msdosfs/dir.c
diff --git a/third_party/uapp/fsck-msdosfs/dosfs.h b/zircon/third_party/uapp/fsck-msdosfs/dosfs.h
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/dosfs.h
rename to zircon/third_party/uapp/fsck-msdosfs/dosfs.h
diff --git a/third_party/uapp/fsck-msdosfs/ext.h b/zircon/third_party/uapp/fsck-msdosfs/ext.h
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/ext.h
rename to zircon/third_party/uapp/fsck-msdosfs/ext.h
diff --git a/third_party/uapp/fsck-msdosfs/fat.c b/zircon/third_party/uapp/fsck-msdosfs/fat.c
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/fat.c
rename to zircon/third_party/uapp/fsck-msdosfs/fat.c
diff --git a/third_party/uapp/fsck-msdosfs/main.c b/zircon/third_party/uapp/fsck-msdosfs/main.c
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/main.c
rename to zircon/third_party/uapp/fsck-msdosfs/main.c
diff --git a/third_party/uapp/fsck-msdosfs/rules.mk b/zircon/third_party/uapp/fsck-msdosfs/rules.mk
similarity index 100%
rename from third_party/uapp/fsck-msdosfs/rules.mk
rename to zircon/third_party/uapp/fsck-msdosfs/rules.mk
diff --git a/third_party/uapp/kilo/LICENSE b/zircon/third_party/uapp/kilo/LICENSE
similarity index 100%
rename from third_party/uapp/kilo/LICENSE
rename to zircon/third_party/uapp/kilo/LICENSE
diff --git a/third_party/uapp/kilo/README.fuchsia b/zircon/third_party/uapp/kilo/README.fuchsia
similarity index 100%
rename from third_party/uapp/kilo/README.fuchsia
rename to zircon/third_party/uapp/kilo/README.fuchsia
diff --git a/third_party/uapp/kilo/kilo.c b/zircon/third_party/uapp/kilo/kilo.c
similarity index 100%
rename from third_party/uapp/kilo/kilo.c
rename to zircon/third_party/uapp/kilo/kilo.c
diff --git a/third_party/uapp/kilo/rules.mk b/zircon/third_party/uapp/kilo/rules.mk
similarity index 100%
rename from third_party/uapp/kilo/rules.mk
rename to zircon/third_party/uapp/kilo/rules.mk
diff --git a/third_party/uapp/mkfs-msdosfs/mkfs_msdos.c b/zircon/third_party/uapp/mkfs-msdosfs/mkfs_msdos.c
similarity index 100%
rename from third_party/uapp/mkfs-msdosfs/mkfs_msdos.c
rename to zircon/third_party/uapp/mkfs-msdosfs/mkfs_msdos.c
diff --git a/third_party/uapp/mkfs-msdosfs/mkfs_msdos.h b/zircon/third_party/uapp/mkfs-msdosfs/mkfs_msdos.h
similarity index 100%
rename from third_party/uapp/mkfs-msdosfs/mkfs_msdos.h
rename to zircon/third_party/uapp/mkfs-msdosfs/mkfs_msdos.h
diff --git a/third_party/uapp/mkfs-msdosfs/newfs_msdos.c b/zircon/third_party/uapp/mkfs-msdosfs/newfs_msdos.c
similarity index 100%
rename from third_party/uapp/mkfs-msdosfs/newfs_msdos.c
rename to zircon/third_party/uapp/mkfs-msdosfs/newfs_msdos.c
diff --git a/third_party/uapp/mkfs-msdosfs/rules.mk b/zircon/third_party/uapp/mkfs-msdosfs/rules.mk
similarity index 100%
rename from third_party/uapp/mkfs-msdosfs/rules.mk
rename to zircon/third_party/uapp/mkfs-msdosfs/rules.mk
diff --git a/third_party/ulib/acpica/empty.c b/zircon/third_party/ulib/acpica/empty.c
similarity index 100%
rename from third_party/ulib/acpica/empty.c
rename to zircon/third_party/ulib/acpica/empty.c
diff --git a/third_party/ulib/acpica/rules.mk b/zircon/third_party/ulib/acpica/rules.mk
similarity index 100%
rename from third_party/ulib/acpica/rules.mk
rename to zircon/third_party/ulib/acpica/rules.mk
diff --git a/third_party/ulib/backtrace/LICENSE b/zircon/third_party/ulib/backtrace/LICENSE
similarity index 100%
rename from third_party/ulib/backtrace/LICENSE
rename to zircon/third_party/ulib/backtrace/LICENSE
diff --git a/third_party/ulib/backtrace/Makefile.am b/zircon/third_party/ulib/backtrace/Makefile.am
similarity index 100%
rename from third_party/ulib/backtrace/Makefile.am
rename to zircon/third_party/ulib/backtrace/Makefile.am
diff --git a/third_party/ulib/backtrace/Makefile.in b/zircon/third_party/ulib/backtrace/Makefile.in
similarity index 100%
rename from third_party/ulib/backtrace/Makefile.in
rename to zircon/third_party/ulib/backtrace/Makefile.in
diff --git a/third_party/ulib/backtrace/README.md b/zircon/third_party/ulib/backtrace/README.md
similarity index 100%
rename from third_party/ulib/backtrace/README.md
rename to zircon/third_party/ulib/backtrace/README.md
diff --git a/third_party/ulib/backtrace/acinclude.m4 b/zircon/third_party/ulib/backtrace/acinclude.m4
similarity index 100%
rename from third_party/ulib/backtrace/acinclude.m4
rename to zircon/third_party/ulib/backtrace/acinclude.m4
diff --git a/third_party/ulib/backtrace/alloc.c b/zircon/third_party/ulib/backtrace/alloc.c
similarity index 100%
rename from third_party/ulib/backtrace/alloc.c
rename to zircon/third_party/ulib/backtrace/alloc.c
diff --git a/third_party/ulib/backtrace/atomic.c b/zircon/third_party/ulib/backtrace/atomic.c
similarity index 100%
rename from third_party/ulib/backtrace/atomic.c
rename to zircon/third_party/ulib/backtrace/atomic.c
diff --git a/third_party/ulib/backtrace/backtrace-supported.h.in b/zircon/third_party/ulib/backtrace/backtrace-supported.h.in
similarity index 100%
rename from third_party/ulib/backtrace/backtrace-supported.h.in
rename to zircon/third_party/ulib/backtrace/backtrace-supported.h.in
diff --git a/third_party/ulib/backtrace/backtrace.c b/zircon/third_party/ulib/backtrace/backtrace.c
similarity index 100%
rename from third_party/ulib/backtrace/backtrace.c
rename to zircon/third_party/ulib/backtrace/backtrace.c
diff --git a/third_party/ulib/backtrace/btest.c b/zircon/third_party/ulib/backtrace/btest.c
similarity index 100%
rename from third_party/ulib/backtrace/btest.c
rename to zircon/third_party/ulib/backtrace/btest.c
diff --git a/third_party/ulib/backtrace/config.h b/zircon/third_party/ulib/backtrace/config.h
similarity index 100%
rename from third_party/ulib/backtrace/config.h
rename to zircon/third_party/ulib/backtrace/config.h
diff --git a/third_party/ulib/backtrace/config.h.in b/zircon/third_party/ulib/backtrace/config.h.in
similarity index 100%
rename from third_party/ulib/backtrace/config.h.in
rename to zircon/third_party/ulib/backtrace/config.h.in
diff --git a/third_party/ulib/backtrace/configure.ac b/zircon/third_party/ulib/backtrace/configure.ac
similarity index 100%
rename from third_party/ulib/backtrace/configure.ac
rename to zircon/third_party/ulib/backtrace/configure.ac
diff --git a/third_party/ulib/backtrace/dwarf.c b/zircon/third_party/ulib/backtrace/dwarf.c
similarity index 100%
rename from third_party/ulib/backtrace/dwarf.c
rename to zircon/third_party/ulib/backtrace/dwarf.c
diff --git a/third_party/ulib/backtrace/elf.c b/zircon/third_party/ulib/backtrace/elf.c
similarity index 100%
rename from third_party/ulib/backtrace/elf.c
rename to zircon/third_party/ulib/backtrace/elf.c
diff --git a/third_party/ulib/backtrace/fileline.c b/zircon/third_party/ulib/backtrace/fileline.c
similarity index 100%
rename from third_party/ulib/backtrace/fileline.c
rename to zircon/third_party/ulib/backtrace/fileline.c
diff --git a/third_party/ulib/backtrace/filetype.awk b/zircon/third_party/ulib/backtrace/filetype.awk
similarity index 100%
rename from third_party/ulib/backtrace/filetype.awk
rename to zircon/third_party/ulib/backtrace/filetype.awk
diff --git a/third_party/ulib/backtrace/include/backtrace/backtrace-supported.h b/zircon/third_party/ulib/backtrace/include/backtrace/backtrace-supported.h
similarity index 100%
rename from third_party/ulib/backtrace/include/backtrace/backtrace-supported.h
rename to zircon/third_party/ulib/backtrace/include/backtrace/backtrace-supported.h
diff --git a/third_party/ulib/backtrace/include/backtrace/backtrace.h b/zircon/third_party/ulib/backtrace/include/backtrace/backtrace.h
similarity index 100%
rename from third_party/ulib/backtrace/include/backtrace/backtrace.h
rename to zircon/third_party/ulib/backtrace/include/backtrace/backtrace.h
diff --git a/third_party/ulib/backtrace/install-sh b/zircon/third_party/ulib/backtrace/install-sh
similarity index 100%
rename from third_party/ulib/backtrace/install-sh
rename to zircon/third_party/ulib/backtrace/install-sh
diff --git a/third_party/ulib/backtrace/internal.h b/zircon/third_party/ulib/backtrace/internal.h
similarity index 100%
rename from third_party/ulib/backtrace/internal.h
rename to zircon/third_party/ulib/backtrace/internal.h
diff --git a/third_party/ulib/backtrace/mmap.c b/zircon/third_party/ulib/backtrace/mmap.c
similarity index 100%
rename from third_party/ulib/backtrace/mmap.c
rename to zircon/third_party/ulib/backtrace/mmap.c
diff --git a/third_party/ulib/backtrace/mmapio.c b/zircon/third_party/ulib/backtrace/mmapio.c
similarity index 100%
rename from third_party/ulib/backtrace/mmapio.c
rename to zircon/third_party/ulib/backtrace/mmapio.c
diff --git a/third_party/ulib/backtrace/nounwind.c b/zircon/third_party/ulib/backtrace/nounwind.c
similarity index 100%
rename from third_party/ulib/backtrace/nounwind.c
rename to zircon/third_party/ulib/backtrace/nounwind.c
diff --git a/third_party/ulib/backtrace/pecoff.c b/zircon/third_party/ulib/backtrace/pecoff.c
similarity index 100%
rename from third_party/ulib/backtrace/pecoff.c
rename to zircon/third_party/ulib/backtrace/pecoff.c
diff --git a/third_party/ulib/backtrace/posix.c b/zircon/third_party/ulib/backtrace/posix.c
similarity index 100%
rename from third_party/ulib/backtrace/posix.c
rename to zircon/third_party/ulib/backtrace/posix.c
diff --git a/third_party/ulib/backtrace/print.c b/zircon/third_party/ulib/backtrace/print.c
similarity index 100%
rename from third_party/ulib/backtrace/print.c
rename to zircon/third_party/ulib/backtrace/print.c
diff --git a/third_party/ulib/backtrace/read.c b/zircon/third_party/ulib/backtrace/read.c
similarity index 100%
rename from third_party/ulib/backtrace/read.c
rename to zircon/third_party/ulib/backtrace/read.c
diff --git a/third_party/ulib/backtrace/rules.mk b/zircon/third_party/ulib/backtrace/rules.mk
similarity index 100%
rename from third_party/ulib/backtrace/rules.mk
rename to zircon/third_party/ulib/backtrace/rules.mk
diff --git a/third_party/ulib/backtrace/simple.c b/zircon/third_party/ulib/backtrace/simple.c
similarity index 100%
rename from third_party/ulib/backtrace/simple.c
rename to zircon/third_party/ulib/backtrace/simple.c
diff --git a/third_party/ulib/backtrace/sort.c b/zircon/third_party/ulib/backtrace/sort.c
similarity index 100%
rename from third_party/ulib/backtrace/sort.c
rename to zircon/third_party/ulib/backtrace/sort.c
diff --git a/third_party/ulib/backtrace/state.c b/zircon/third_party/ulib/backtrace/state.c
similarity index 100%
rename from third_party/ulib/backtrace/state.c
rename to zircon/third_party/ulib/backtrace/state.c
diff --git a/third_party/ulib/backtrace/stest.c b/zircon/third_party/ulib/backtrace/stest.c
similarity index 100%
rename from third_party/ulib/backtrace/stest.c
rename to zircon/third_party/ulib/backtrace/stest.c
diff --git a/third_party/ulib/backtrace/unknown.c b/zircon/third_party/ulib/backtrace/unknown.c
similarity index 100%
rename from third_party/ulib/backtrace/unknown.c
rename to zircon/third_party/ulib/backtrace/unknown.c
diff --git a/third_party/ulib/chromiumos-platform-ec/LICENSE b/zircon/third_party/ulib/chromiumos-platform-ec/LICENSE
similarity index 100%
rename from third_party/ulib/chromiumos-platform-ec/LICENSE
rename to zircon/third_party/ulib/chromiumos-platform-ec/LICENSE
diff --git a/third_party/ulib/chromiumos-platform-ec/README.fuchsia b/zircon/third_party/ulib/chromiumos-platform-ec/README.fuchsia
similarity index 100%
rename from third_party/ulib/chromiumos-platform-ec/README.fuchsia
rename to zircon/third_party/ulib/chromiumos-platform-ec/README.fuchsia
diff --git a/third_party/ulib/chromiumos-platform-ec/comm-lpc.cpp b/zircon/third_party/ulib/chromiumos-platform-ec/comm-lpc.cpp
similarity index 100%
rename from third_party/ulib/chromiumos-platform-ec/comm-lpc.cpp
rename to zircon/third_party/ulib/chromiumos-platform-ec/comm-lpc.cpp
diff --git a/third_party/ulib/chromiumos-platform-ec/include/chromiumos-platform-ec/ec_commands.h b/zircon/third_party/ulib/chromiumos-platform-ec/include/chromiumos-platform-ec/ec_commands.h
similarity index 100%
rename from third_party/ulib/chromiumos-platform-ec/include/chromiumos-platform-ec/ec_commands.h
rename to zircon/third_party/ulib/chromiumos-platform-ec/include/chromiumos-platform-ec/ec_commands.h
diff --git a/third_party/ulib/chromiumos-platform-ec/rules.mk b/zircon/third_party/ulib/chromiumos-platform-ec/rules.mk
similarity index 100%
rename from third_party/ulib/chromiumos-platform-ec/rules.mk
rename to zircon/third_party/ulib/chromiumos-platform-ec/rules.mk
diff --git a/third_party/ulib/cksum/LICENSE b/zircon/third_party/ulib/cksum/LICENSE
similarity index 100%
rename from third_party/ulib/cksum/LICENSE
rename to zircon/third_party/ulib/cksum/LICENSE
diff --git a/third_party/ulib/cksum/adler32.c b/zircon/third_party/ulib/cksum/adler32.c
similarity index 100%
rename from third_party/ulib/cksum/adler32.c
rename to zircon/third_party/ulib/cksum/adler32.c
diff --git a/third_party/ulib/cksum/crc16.c b/zircon/third_party/ulib/cksum/crc16.c
similarity index 100%
rename from third_party/ulib/cksum/crc16.c
rename to zircon/third_party/ulib/cksum/crc16.c
diff --git a/third_party/ulib/cksum/crc32.c b/zircon/third_party/ulib/cksum/crc32.c
similarity index 100%
rename from third_party/ulib/cksum/crc32.c
rename to zircon/third_party/ulib/cksum/crc32.c
diff --git a/third_party/ulib/cksum/crc32.h b/zircon/third_party/ulib/cksum/crc32.h
similarity index 100%
rename from third_party/ulib/cksum/crc32.h
rename to zircon/third_party/ulib/cksum/crc32.h
diff --git a/third_party/ulib/cksum/include/lib/cksum.h b/zircon/third_party/ulib/cksum/include/lib/cksum.h
similarity index 100%
rename from third_party/ulib/cksum/include/lib/cksum.h
rename to zircon/third_party/ulib/cksum/include/lib/cksum.h
diff --git a/third_party/ulib/cksum/rules.mk b/zircon/third_party/ulib/cksum/rules.mk
similarity index 100%
rename from third_party/ulib/cksum/rules.mk
rename to zircon/third_party/ulib/cksum/rules.mk
diff --git a/third_party/ulib/cksum/zutil.h b/zircon/third_party/ulib/cksum/zutil.h
similarity index 100%
rename from third_party/ulib/cksum/zutil.h
rename to zircon/third_party/ulib/cksum/zutil.h
diff --git a/third_party/ulib/cryptolib/README.fuchsia b/zircon/third_party/ulib/cryptolib/README.fuchsia
similarity index 100%
rename from third_party/ulib/cryptolib/README.fuchsia
rename to zircon/third_party/ulib/cryptolib/README.fuchsia
diff --git a/third_party/ulib/cryptolib/cryptolib.c b/zircon/third_party/ulib/cryptolib/cryptolib.c
similarity index 100%
rename from third_party/ulib/cryptolib/cryptolib.c
rename to zircon/third_party/ulib/cryptolib/cryptolib.c
diff --git a/third_party/ulib/cryptolib/include/lib/crypto/cryptolib.h b/zircon/third_party/ulib/cryptolib/include/lib/crypto/cryptolib.h
similarity index 100%
rename from third_party/ulib/cryptolib/include/lib/crypto/cryptolib.h
rename to zircon/third_party/ulib/cryptolib/include/lib/crypto/cryptolib.h
diff --git a/third_party/ulib/cryptolib/rules.mk b/zircon/third_party/ulib/cryptolib/rules.mk
similarity index 100%
rename from third_party/ulib/cryptolib/rules.mk
rename to zircon/third_party/ulib/cryptolib/rules.mk
diff --git a/third_party/ulib/jemalloc/.appveyor.yml b/zircon/third_party/ulib/jemalloc/.appveyor.yml
similarity index 100%
rename from third_party/ulib/jemalloc/.appveyor.yml
rename to zircon/third_party/ulib/jemalloc/.appveyor.yml
diff --git a/third_party/ulib/jemalloc/.autom4te.cfg b/zircon/third_party/ulib/jemalloc/.autom4te.cfg
similarity index 100%
rename from third_party/ulib/jemalloc/.autom4te.cfg
rename to zircon/third_party/ulib/jemalloc/.autom4te.cfg
diff --git a/third_party/ulib/jemalloc/.gitattributes b/zircon/third_party/ulib/jemalloc/.gitattributes
similarity index 100%
rename from third_party/ulib/jemalloc/.gitattributes
rename to zircon/third_party/ulib/jemalloc/.gitattributes
diff --git a/third_party/ulib/jemalloc/.gitignore b/zircon/third_party/ulib/jemalloc/.gitignore
similarity index 100%
rename from third_party/ulib/jemalloc/.gitignore
rename to zircon/third_party/ulib/jemalloc/.gitignore
diff --git a/third_party/ulib/jemalloc/.travis.yml b/zircon/third_party/ulib/jemalloc/.travis.yml
similarity index 100%
rename from third_party/ulib/jemalloc/.travis.yml
rename to zircon/third_party/ulib/jemalloc/.travis.yml
diff --git a/third_party/ulib/jemalloc/COPYING b/zircon/third_party/ulib/jemalloc/COPYING
similarity index 100%
rename from third_party/ulib/jemalloc/COPYING
rename to zircon/third_party/ulib/jemalloc/COPYING
diff --git a/third_party/ulib/jemalloc/ChangeLog b/zircon/third_party/ulib/jemalloc/ChangeLog
similarity index 100%
rename from third_party/ulib/jemalloc/ChangeLog
rename to zircon/third_party/ulib/jemalloc/ChangeLog
diff --git a/third_party/ulib/jemalloc/INSTALL b/zircon/third_party/ulib/jemalloc/INSTALL
similarity index 100%
rename from third_party/ulib/jemalloc/INSTALL
rename to zircon/third_party/ulib/jemalloc/INSTALL
diff --git a/third_party/ulib/jemalloc/Makefile.in b/zircon/third_party/ulib/jemalloc/Makefile.in
similarity index 100%
rename from third_party/ulib/jemalloc/Makefile.in
rename to zircon/third_party/ulib/jemalloc/Makefile.in
diff --git a/third_party/ulib/jemalloc/README b/zircon/third_party/ulib/jemalloc/README
similarity index 100%
rename from third_party/ulib/jemalloc/README
rename to zircon/third_party/ulib/jemalloc/README
diff --git a/third_party/ulib/jemalloc/README.fuchsia b/zircon/third_party/ulib/jemalloc/README.fuchsia
similarity index 100%
rename from third_party/ulib/jemalloc/README.fuchsia
rename to zircon/third_party/ulib/jemalloc/README.fuchsia
diff --git a/third_party/ulib/jemalloc/autogen.sh b/zircon/third_party/ulib/jemalloc/autogen.sh
similarity index 100%
rename from third_party/ulib/jemalloc/autogen.sh
rename to zircon/third_party/ulib/jemalloc/autogen.sh
diff --git a/third_party/ulib/jemalloc/bin/jemalloc-config.in b/zircon/third_party/ulib/jemalloc/bin/jemalloc-config.in
similarity index 100%
rename from third_party/ulib/jemalloc/bin/jemalloc-config.in
rename to zircon/third_party/ulib/jemalloc/bin/jemalloc-config.in
diff --git a/third_party/ulib/jemalloc/bin/jemalloc.sh.in b/zircon/third_party/ulib/jemalloc/bin/jemalloc.sh.in
similarity index 100%
rename from third_party/ulib/jemalloc/bin/jemalloc.sh.in
rename to zircon/third_party/ulib/jemalloc/bin/jemalloc.sh.in
diff --git a/third_party/ulib/jemalloc/bin/jeprof.in b/zircon/third_party/ulib/jemalloc/bin/jeprof.in
similarity index 100%
rename from third_party/ulib/jemalloc/bin/jeprof.in
rename to zircon/third_party/ulib/jemalloc/bin/jeprof.in
diff --git a/third_party/ulib/jemalloc/config.stamp.in b/zircon/third_party/ulib/jemalloc/config.stamp.in
similarity index 100%
rename from third_party/ulib/jemalloc/config.stamp.in
rename to zircon/third_party/ulib/jemalloc/config.stamp.in
diff --git a/third_party/ulib/jemalloc/configure.ac b/zircon/third_party/ulib/jemalloc/configure.ac
similarity index 100%
rename from third_party/ulib/jemalloc/configure.ac
rename to zircon/third_party/ulib/jemalloc/configure.ac
diff --git a/third_party/ulib/jemalloc/coverage.sh b/zircon/third_party/ulib/jemalloc/coverage.sh
similarity index 100%
rename from third_party/ulib/jemalloc/coverage.sh
rename to zircon/third_party/ulib/jemalloc/coverage.sh
diff --git a/third_party/ulib/jemalloc/doc/html.xsl.in b/zircon/third_party/ulib/jemalloc/doc/html.xsl.in
similarity index 100%
rename from third_party/ulib/jemalloc/doc/html.xsl.in
rename to zircon/third_party/ulib/jemalloc/doc/html.xsl.in
diff --git a/third_party/ulib/jemalloc/doc/jemalloc.xml.in b/zircon/third_party/ulib/jemalloc/doc/jemalloc.xml.in
similarity index 100%
rename from third_party/ulib/jemalloc/doc/jemalloc.xml.in
rename to zircon/third_party/ulib/jemalloc/doc/jemalloc.xml.in
diff --git a/third_party/ulib/jemalloc/doc/manpages.xsl.in b/zircon/third_party/ulib/jemalloc/doc/manpages.xsl.in
similarity index 100%
rename from third_party/ulib/jemalloc/doc/manpages.xsl.in
rename to zircon/third_party/ulib/jemalloc/doc/manpages.xsl.in
diff --git a/third_party/ulib/jemalloc/doc/stylesheet.xsl b/zircon/third_party/ulib/jemalloc/doc/stylesheet.xsl
similarity index 100%
rename from third_party/ulib/jemalloc/doc/stylesheet.xsl
rename to zircon/third_party/ulib/jemalloc/doc/stylesheet.xsl
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/arena_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/arena_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_a.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_a.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_a.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_a.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_b.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_b.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_b.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_inlines_b.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_a.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_a.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_a.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_a.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_b.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_b.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_b.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_structs_b.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/arena_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/arena_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/arena_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/assert.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/assert.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/assert.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/assert.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/atomic_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/atomic_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/atomic_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/atomic_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/atomic_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/atomic_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/atomic_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/atomic_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/base_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/base_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/base_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/base_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/base_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/base_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/base_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/base_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/base_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/bitmap_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ckh_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ckh_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ckh_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ckh_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ctl_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ctl_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ctl_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ctl_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_dss_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_mmap_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_mmap_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_mmap_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_mmap_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/extent_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/extent_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/extent_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/hash_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/hash_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/hash_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/hash_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/large_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/large_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/large_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/large_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/mutex_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/mutex_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/mutex_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/mutex_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/mutex_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/nstime_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/nstime_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/nstime_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/nstime_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/pages_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/pages_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/pages_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/pages_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/pages_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/pages_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/pages_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/pages_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ph.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ph.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ph.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ph.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_namespace.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/private_symbols.txt b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_symbols.txt
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/private_symbols.txt
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_symbols.txt
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/private_unnamespace.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/prng_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prng_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/prng_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prng_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/prng_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prng_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/prng_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prng_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/prof_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/prof_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/prof_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/prof_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/prof_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/prof_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/prof_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/prof_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/prof_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_namespace.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/public_symbols.txt b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_symbols.txt
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/public_symbols.txt
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_symbols.txt
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/public_unnamespace.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ql.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ql.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ql.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ql.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/qr.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/qr.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/qr.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/qr.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/rb.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rb.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/rb.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rb.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/rtree_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/rtree_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/rtree_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/rtree_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/rtree_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/size_classes.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/smoothstep.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/spin_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/spin_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/spin_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/spin_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/spin_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/spin_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/spin_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/spin_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/spin_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/spin_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/spin_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/spin_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/stats_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/stats_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/stats_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/stats_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/stats_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/stats_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/stats_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/stats_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/stats_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/stats_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/stats_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/stats_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tcache_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tcache_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tcache_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tcache_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tcache_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ticker_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ticker_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/ticker_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/ticker_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tsd_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tsd_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tsd_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/tsd_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/tsd_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/util_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/util_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/util_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/util_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/util_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/util_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/util_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/util_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/util_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/util_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/util_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/util_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/witness_externs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_externs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/witness_externs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_externs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/witness_inlines.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_inlines.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/witness_inlines.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_inlines.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/witness_structs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_structs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/witness_structs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_structs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/internal/witness_types.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_types.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/internal/witness_types.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/internal/witness_types.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h.in b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h.in
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_defs.h.in
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h.in b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h.in
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_macros.h.in
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle_jet.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle_jet.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle_jet.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_mangle_jet.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h.in b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h.in
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos.h.in
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos_jet.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos_jet.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos_jet.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_protos_jet.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.sh b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.sh
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.sh
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_rename.sh
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h
diff --git a/third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h.in b/zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h.in
rename to zircon/third_party/ulib/jemalloc/include/jemalloc/jemalloc_typedefs.h.in
diff --git a/third_party/ulib/jemalloc/include/msvc_compat/C99/stdbool.h b/zircon/third_party/ulib/jemalloc/include/msvc_compat/C99/stdbool.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/msvc_compat/C99/stdbool.h
rename to zircon/third_party/ulib/jemalloc/include/msvc_compat/C99/stdbool.h
diff --git a/third_party/ulib/jemalloc/include/msvc_compat/C99/stdint.h b/zircon/third_party/ulib/jemalloc/include/msvc_compat/C99/stdint.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/msvc_compat/C99/stdint.h
rename to zircon/third_party/ulib/jemalloc/include/msvc_compat/C99/stdint.h
diff --git a/third_party/ulib/jemalloc/include/msvc_compat/strings.h b/zircon/third_party/ulib/jemalloc/include/msvc_compat/strings.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/msvc_compat/strings.h
rename to zircon/third_party/ulib/jemalloc/include/msvc_compat/strings.h
diff --git a/third_party/ulib/jemalloc/include/msvc_compat/windows_extra.h b/zircon/third_party/ulib/jemalloc/include/msvc_compat/windows_extra.h
similarity index 100%
rename from third_party/ulib/jemalloc/include/msvc_compat/windows_extra.h
rename to zircon/third_party/ulib/jemalloc/include/msvc_compat/windows_extra.h
diff --git a/third_party/ulib/jemalloc/jemalloc.pc.in b/zircon/third_party/ulib/jemalloc/jemalloc.pc.in
similarity index 100%
rename from third_party/ulib/jemalloc/jemalloc.pc.in
rename to zircon/third_party/ulib/jemalloc/jemalloc.pc.in
diff --git a/third_party/ulib/jemalloc/m4/ax_cxx_compile_stdcxx.m4 b/zircon/third_party/ulib/jemalloc/m4/ax_cxx_compile_stdcxx.m4
similarity index 100%
rename from third_party/ulib/jemalloc/m4/ax_cxx_compile_stdcxx.m4
rename to zircon/third_party/ulib/jemalloc/m4/ax_cxx_compile_stdcxx.m4
diff --git a/third_party/ulib/jemalloc/msvc/ReadMe.txt b/zircon/third_party/ulib/jemalloc/msvc/ReadMe.txt
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/ReadMe.txt
rename to zircon/third_party/ulib/jemalloc/msvc/ReadMe.txt
diff --git a/third_party/ulib/jemalloc/msvc/jemalloc_vc2015.sln b/zircon/third_party/ulib/jemalloc/msvc/jemalloc_vc2015.sln
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/jemalloc_vc2015.sln
rename to zircon/third_party/ulib/jemalloc/msvc/jemalloc_vc2015.sln
diff --git a/third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
rename to zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
diff --git a/third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters b/zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
rename to zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
diff --git a/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.cpp b/zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.cpp
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.cpp
rename to zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.cpp
diff --git a/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.h b/zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.h
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.h
rename to zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.h
diff --git a/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj b/zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj
rename to zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj
diff --git a/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters b/zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters
rename to zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters
diff --git a/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads_main.cpp b/zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads_main.cpp
similarity index 100%
rename from third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads_main.cpp
rename to zircon/third_party/ulib/jemalloc/msvc/projects/vc2015/test_threads/test_threads_main.cpp
diff --git a/third_party/ulib/jemalloc/rules.mk b/zircon/third_party/ulib/jemalloc/rules.mk
similarity index 100%
rename from third_party/ulib/jemalloc/rules.mk
rename to zircon/third_party/ulib/jemalloc/rules.mk
diff --git a/third_party/ulib/jemalloc/src/arena.c b/zircon/third_party/ulib/jemalloc/src/arena.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/arena.c
rename to zircon/third_party/ulib/jemalloc/src/arena.c
diff --git a/third_party/ulib/jemalloc/src/atomic.c b/zircon/third_party/ulib/jemalloc/src/atomic.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/atomic.c
rename to zircon/third_party/ulib/jemalloc/src/atomic.c
diff --git a/third_party/ulib/jemalloc/src/base.c b/zircon/third_party/ulib/jemalloc/src/base.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/base.c
rename to zircon/third_party/ulib/jemalloc/src/base.c
diff --git a/third_party/ulib/jemalloc/src/bitmap.c b/zircon/third_party/ulib/jemalloc/src/bitmap.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/bitmap.c
rename to zircon/third_party/ulib/jemalloc/src/bitmap.c
diff --git a/third_party/ulib/jemalloc/src/ckh.c b/zircon/third_party/ulib/jemalloc/src/ckh.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/ckh.c
rename to zircon/third_party/ulib/jemalloc/src/ckh.c
diff --git a/third_party/ulib/jemalloc/src/ctl.c b/zircon/third_party/ulib/jemalloc/src/ctl.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/ctl.c
rename to zircon/third_party/ulib/jemalloc/src/ctl.c
diff --git a/third_party/ulib/jemalloc/src/extent.c b/zircon/third_party/ulib/jemalloc/src/extent.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/extent.c
rename to zircon/third_party/ulib/jemalloc/src/extent.c
diff --git a/third_party/ulib/jemalloc/src/extent_dss.c b/zircon/third_party/ulib/jemalloc/src/extent_dss.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/extent_dss.c
rename to zircon/third_party/ulib/jemalloc/src/extent_dss.c
diff --git a/third_party/ulib/jemalloc/src/extent_mmap.c b/zircon/third_party/ulib/jemalloc/src/extent_mmap.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/extent_mmap.c
rename to zircon/third_party/ulib/jemalloc/src/extent_mmap.c
diff --git a/third_party/ulib/jemalloc/src/hash.c b/zircon/third_party/ulib/jemalloc/src/hash.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/hash.c
rename to zircon/third_party/ulib/jemalloc/src/hash.c
diff --git a/third_party/ulib/jemalloc/src/jemalloc.c b/zircon/third_party/ulib/jemalloc/src/jemalloc.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/jemalloc.c
rename to zircon/third_party/ulib/jemalloc/src/jemalloc.c
diff --git a/third_party/ulib/jemalloc/src/jemalloc_cpp.cpp b/zircon/third_party/ulib/jemalloc/src/jemalloc_cpp.cpp
similarity index 100%
rename from third_party/ulib/jemalloc/src/jemalloc_cpp.cpp
rename to zircon/third_party/ulib/jemalloc/src/jemalloc_cpp.cpp
diff --git a/third_party/ulib/jemalloc/src/large.c b/zircon/third_party/ulib/jemalloc/src/large.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/large.c
rename to zircon/third_party/ulib/jemalloc/src/large.c
diff --git a/third_party/ulib/jemalloc/src/mb.c b/zircon/third_party/ulib/jemalloc/src/mb.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/mb.c
rename to zircon/third_party/ulib/jemalloc/src/mb.c
diff --git a/third_party/ulib/jemalloc/src/mutex.c b/zircon/third_party/ulib/jemalloc/src/mutex.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/mutex.c
rename to zircon/third_party/ulib/jemalloc/src/mutex.c
diff --git a/third_party/ulib/jemalloc/src/nstime.c b/zircon/third_party/ulib/jemalloc/src/nstime.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/nstime.c
rename to zircon/third_party/ulib/jemalloc/src/nstime.c
diff --git a/third_party/ulib/jemalloc/src/pages.c b/zircon/third_party/ulib/jemalloc/src/pages.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/pages.c
rename to zircon/third_party/ulib/jemalloc/src/pages.c
diff --git a/third_party/ulib/jemalloc/src/prng.c b/zircon/third_party/ulib/jemalloc/src/prng.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/prng.c
rename to zircon/third_party/ulib/jemalloc/src/prng.c
diff --git a/third_party/ulib/jemalloc/src/prof.c b/zircon/third_party/ulib/jemalloc/src/prof.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/prof.c
rename to zircon/third_party/ulib/jemalloc/src/prof.c
diff --git a/third_party/ulib/jemalloc/src/rtree.c b/zircon/third_party/ulib/jemalloc/src/rtree.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/rtree.c
rename to zircon/third_party/ulib/jemalloc/src/rtree.c
diff --git a/third_party/ulib/jemalloc/src/spin.c b/zircon/third_party/ulib/jemalloc/src/spin.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/spin.c
rename to zircon/third_party/ulib/jemalloc/src/spin.c
diff --git a/third_party/ulib/jemalloc/src/stats.c b/zircon/third_party/ulib/jemalloc/src/stats.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/stats.c
rename to zircon/third_party/ulib/jemalloc/src/stats.c
diff --git a/third_party/ulib/jemalloc/src/tcache.c b/zircon/third_party/ulib/jemalloc/src/tcache.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/tcache.c
rename to zircon/third_party/ulib/jemalloc/src/tcache.c
diff --git a/third_party/ulib/jemalloc/src/ticker.c b/zircon/third_party/ulib/jemalloc/src/ticker.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/ticker.c
rename to zircon/third_party/ulib/jemalloc/src/ticker.c
diff --git a/third_party/ulib/jemalloc/src/tsd.c b/zircon/third_party/ulib/jemalloc/src/tsd.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/tsd.c
rename to zircon/third_party/ulib/jemalloc/src/tsd.c
diff --git a/third_party/ulib/jemalloc/src/util.c b/zircon/third_party/ulib/jemalloc/src/util.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/util.c
rename to zircon/third_party/ulib/jemalloc/src/util.c
diff --git a/third_party/ulib/jemalloc/src/witness.c b/zircon/third_party/ulib/jemalloc/src/witness.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/witness.c
rename to zircon/third_party/ulib/jemalloc/src/witness.c
diff --git a/third_party/ulib/jemalloc/src/zone.c b/zircon/third_party/ulib/jemalloc/src/zone.c
similarity index 100%
rename from third_party/ulib/jemalloc/src/zone.c
rename to zircon/third_party/ulib/jemalloc/src/zone.c
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-alti.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-alti.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-alti.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-alti.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params11213.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params11213.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params11213.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params11213.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params1279.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params1279.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params1279.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params1279.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params132049.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params132049.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params132049.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params132049.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params19937.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params19937.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params19937.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params19937.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params216091.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params216091.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params216091.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params216091.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params2281.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params2281.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params2281.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params2281.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params4253.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params4253.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params4253.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params4253.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params44497.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params44497.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params44497.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params44497.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params607.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params607.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params607.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params607.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-params86243.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params86243.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-params86243.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-params86243.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT-sse2.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT-sse2.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT-sse2.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT-sse2.h
diff --git a/third_party/ulib/jemalloc/test/include/test/SFMT.h b/zircon/third_party/ulib/jemalloc/test/include/test/SFMT.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/SFMT.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/SFMT.h
diff --git a/third_party/ulib/jemalloc/test/include/test/btalloc.h b/zircon/third_party/ulib/jemalloc/test/include/test/btalloc.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/btalloc.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/btalloc.h
diff --git a/third_party/ulib/jemalloc/test/include/test/extent_hooks.h b/zircon/third_party/ulib/jemalloc/test/include/test/extent_hooks.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/extent_hooks.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/extent_hooks.h
diff --git a/third_party/ulib/jemalloc/test/include/test/jemalloc_test.h.in b/zircon/third_party/ulib/jemalloc/test/include/test/jemalloc_test.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/jemalloc_test.h.in
rename to zircon/third_party/ulib/jemalloc/test/include/test/jemalloc_test.h.in
diff --git a/third_party/ulib/jemalloc/test/include/test/jemalloc_test_defs.h.in b/zircon/third_party/ulib/jemalloc/test/include/test/jemalloc_test_defs.h.in
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/jemalloc_test_defs.h.in
rename to zircon/third_party/ulib/jemalloc/test/include/test/jemalloc_test_defs.h.in
diff --git a/third_party/ulib/jemalloc/test/include/test/math.h b/zircon/third_party/ulib/jemalloc/test/include/test/math.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/math.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/math.h
diff --git a/third_party/ulib/jemalloc/test/include/test/mq.h b/zircon/third_party/ulib/jemalloc/test/include/test/mq.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/mq.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/mq.h
diff --git a/third_party/ulib/jemalloc/test/include/test/mtx.h b/zircon/third_party/ulib/jemalloc/test/include/test/mtx.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/mtx.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/mtx.h
diff --git a/third_party/ulib/jemalloc/test/include/test/test.h b/zircon/third_party/ulib/jemalloc/test/include/test/test.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/test.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/test.h
diff --git a/third_party/ulib/jemalloc/test/include/test/thd.h b/zircon/third_party/ulib/jemalloc/test/include/test/thd.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/thd.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/thd.h
diff --git a/third_party/ulib/jemalloc/test/include/test/timer.h b/zircon/third_party/ulib/jemalloc/test/include/test/timer.h
similarity index 100%
rename from third_party/ulib/jemalloc/test/include/test/timer.h
rename to zircon/third_party/ulib/jemalloc/test/include/test/timer.h
diff --git a/third_party/ulib/jemalloc/test/integration/MALLOCX_ARENA.c b/zircon/third_party/ulib/jemalloc/test/integration/MALLOCX_ARENA.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/MALLOCX_ARENA.c
rename to zircon/third_party/ulib/jemalloc/test/integration/MALLOCX_ARENA.c
diff --git a/third_party/ulib/jemalloc/test/integration/aligned_alloc.c b/zircon/third_party/ulib/jemalloc/test/integration/aligned_alloc.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/aligned_alloc.c
rename to zircon/third_party/ulib/jemalloc/test/integration/aligned_alloc.c
diff --git a/third_party/ulib/jemalloc/test/integration/allocated.c b/zircon/third_party/ulib/jemalloc/test/integration/allocated.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/allocated.c
rename to zircon/third_party/ulib/jemalloc/test/integration/allocated.c
diff --git a/third_party/ulib/jemalloc/test/integration/extent.c b/zircon/third_party/ulib/jemalloc/test/integration/extent.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/extent.c
rename to zircon/third_party/ulib/jemalloc/test/integration/extent.c
diff --git a/third_party/ulib/jemalloc/test/integration/mallocx.c b/zircon/third_party/ulib/jemalloc/test/integration/mallocx.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/mallocx.c
rename to zircon/third_party/ulib/jemalloc/test/integration/mallocx.c
diff --git a/third_party/ulib/jemalloc/test/integration/overflow.c b/zircon/third_party/ulib/jemalloc/test/integration/overflow.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/overflow.c
rename to zircon/third_party/ulib/jemalloc/test/integration/overflow.c
diff --git a/third_party/ulib/jemalloc/test/integration/posix_memalign.c b/zircon/third_party/ulib/jemalloc/test/integration/posix_memalign.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/posix_memalign.c
rename to zircon/third_party/ulib/jemalloc/test/integration/posix_memalign.c
diff --git a/third_party/ulib/jemalloc/test/integration/rallocx.c b/zircon/third_party/ulib/jemalloc/test/integration/rallocx.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/rallocx.c
rename to zircon/third_party/ulib/jemalloc/test/integration/rallocx.c
diff --git a/third_party/ulib/jemalloc/test/integration/sdallocx.c b/zircon/third_party/ulib/jemalloc/test/integration/sdallocx.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/sdallocx.c
rename to zircon/third_party/ulib/jemalloc/test/integration/sdallocx.c
diff --git a/third_party/ulib/jemalloc/test/integration/thread_arena.c b/zircon/third_party/ulib/jemalloc/test/integration/thread_arena.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/thread_arena.c
rename to zircon/third_party/ulib/jemalloc/test/integration/thread_arena.c
diff --git a/third_party/ulib/jemalloc/test/integration/thread_tcache_enabled.c b/zircon/third_party/ulib/jemalloc/test/integration/thread_tcache_enabled.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/thread_tcache_enabled.c
rename to zircon/third_party/ulib/jemalloc/test/integration/thread_tcache_enabled.c
diff --git a/third_party/ulib/jemalloc/test/integration/xallocx.c b/zircon/third_party/ulib/jemalloc/test/integration/xallocx.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/integration/xallocx.c
rename to zircon/third_party/ulib/jemalloc/test/integration/xallocx.c
diff --git a/third_party/ulib/jemalloc/test/src/SFMT.c b/zircon/third_party/ulib/jemalloc/test/src/SFMT.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/SFMT.c
rename to zircon/third_party/ulib/jemalloc/test/src/SFMT.c
diff --git a/third_party/ulib/jemalloc/test/src/btalloc.c b/zircon/third_party/ulib/jemalloc/test/src/btalloc.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/btalloc.c
rename to zircon/third_party/ulib/jemalloc/test/src/btalloc.c
diff --git a/third_party/ulib/jemalloc/test/src/btalloc_0.c b/zircon/third_party/ulib/jemalloc/test/src/btalloc_0.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/btalloc_0.c
rename to zircon/third_party/ulib/jemalloc/test/src/btalloc_0.c
diff --git a/third_party/ulib/jemalloc/test/src/btalloc_1.c b/zircon/third_party/ulib/jemalloc/test/src/btalloc_1.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/btalloc_1.c
rename to zircon/third_party/ulib/jemalloc/test/src/btalloc_1.c
diff --git a/third_party/ulib/jemalloc/test/src/math.c b/zircon/third_party/ulib/jemalloc/test/src/math.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/math.c
rename to zircon/third_party/ulib/jemalloc/test/src/math.c
diff --git a/third_party/ulib/jemalloc/test/src/mq.c b/zircon/third_party/ulib/jemalloc/test/src/mq.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/mq.c
rename to zircon/third_party/ulib/jemalloc/test/src/mq.c
diff --git a/third_party/ulib/jemalloc/test/src/mtx.c b/zircon/third_party/ulib/jemalloc/test/src/mtx.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/mtx.c
rename to zircon/third_party/ulib/jemalloc/test/src/mtx.c
diff --git a/third_party/ulib/jemalloc/test/src/test.c b/zircon/third_party/ulib/jemalloc/test/src/test.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/test.c
rename to zircon/third_party/ulib/jemalloc/test/src/test.c
diff --git a/third_party/ulib/jemalloc/test/src/thd.c b/zircon/third_party/ulib/jemalloc/test/src/thd.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/thd.c
rename to zircon/third_party/ulib/jemalloc/test/src/thd.c
diff --git a/third_party/ulib/jemalloc/test/src/timer.c b/zircon/third_party/ulib/jemalloc/test/src/timer.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/src/timer.c
rename to zircon/third_party/ulib/jemalloc/test/src/timer.c
diff --git a/third_party/ulib/jemalloc/test/stress/microbench.c b/zircon/third_party/ulib/jemalloc/test/stress/microbench.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/stress/microbench.c
rename to zircon/third_party/ulib/jemalloc/test/stress/microbench.c
diff --git a/third_party/ulib/jemalloc/test/test.sh.in b/zircon/third_party/ulib/jemalloc/test/test.sh.in
similarity index 100%
rename from third_party/ulib/jemalloc/test/test.sh.in
rename to zircon/third_party/ulib/jemalloc/test/test.sh.in
diff --git a/third_party/ulib/jemalloc/test/unit/SFMT.c b/zircon/third_party/ulib/jemalloc/test/unit/SFMT.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/SFMT.c
rename to zircon/third_party/ulib/jemalloc/test/unit/SFMT.c
diff --git a/third_party/ulib/jemalloc/test/unit/a0.c b/zircon/third_party/ulib/jemalloc/test/unit/a0.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/a0.c
rename to zircon/third_party/ulib/jemalloc/test/unit/a0.c
diff --git a/third_party/ulib/jemalloc/test/unit/arena_reset.c b/zircon/third_party/ulib/jemalloc/test/unit/arena_reset.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/arena_reset.c
rename to zircon/third_party/ulib/jemalloc/test/unit/arena_reset.c
diff --git a/third_party/ulib/jemalloc/test/unit/arena_reset_prof.c b/zircon/third_party/ulib/jemalloc/test/unit/arena_reset_prof.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/arena_reset_prof.c
rename to zircon/third_party/ulib/jemalloc/test/unit/arena_reset_prof.c
diff --git a/third_party/ulib/jemalloc/test/unit/atomic.c b/zircon/third_party/ulib/jemalloc/test/unit/atomic.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/atomic.c
rename to zircon/third_party/ulib/jemalloc/test/unit/atomic.c
diff --git a/third_party/ulib/jemalloc/test/unit/base.c b/zircon/third_party/ulib/jemalloc/test/unit/base.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/base.c
rename to zircon/third_party/ulib/jemalloc/test/unit/base.c
diff --git a/third_party/ulib/jemalloc/test/unit/bitmap.c b/zircon/third_party/ulib/jemalloc/test/unit/bitmap.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/bitmap.c
rename to zircon/third_party/ulib/jemalloc/test/unit/bitmap.c
diff --git a/third_party/ulib/jemalloc/test/unit/ckh.c b/zircon/third_party/ulib/jemalloc/test/unit/ckh.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/ckh.c
rename to zircon/third_party/ulib/jemalloc/test/unit/ckh.c
diff --git a/third_party/ulib/jemalloc/test/unit/decay.c b/zircon/third_party/ulib/jemalloc/test/unit/decay.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/decay.c
rename to zircon/third_party/ulib/jemalloc/test/unit/decay.c
diff --git a/third_party/ulib/jemalloc/test/unit/extent_quantize.c b/zircon/third_party/ulib/jemalloc/test/unit/extent_quantize.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/extent_quantize.c
rename to zircon/third_party/ulib/jemalloc/test/unit/extent_quantize.c
diff --git a/third_party/ulib/jemalloc/test/unit/fork.c b/zircon/third_party/ulib/jemalloc/test/unit/fork.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/fork.c
rename to zircon/third_party/ulib/jemalloc/test/unit/fork.c
diff --git a/third_party/ulib/jemalloc/test/unit/hash.c b/zircon/third_party/ulib/jemalloc/test/unit/hash.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/hash.c
rename to zircon/third_party/ulib/jemalloc/test/unit/hash.c
diff --git a/third_party/ulib/jemalloc/test/unit/junk.c b/zircon/third_party/ulib/jemalloc/test/unit/junk.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/junk.c
rename to zircon/third_party/ulib/jemalloc/test/unit/junk.c
diff --git a/third_party/ulib/jemalloc/test/unit/junk_alloc.c b/zircon/third_party/ulib/jemalloc/test/unit/junk_alloc.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/junk_alloc.c
rename to zircon/third_party/ulib/jemalloc/test/unit/junk_alloc.c
diff --git a/third_party/ulib/jemalloc/test/unit/junk_free.c b/zircon/third_party/ulib/jemalloc/test/unit/junk_free.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/junk_free.c
rename to zircon/third_party/ulib/jemalloc/test/unit/junk_free.c
diff --git a/third_party/ulib/jemalloc/test/unit/mallctl.c b/zircon/third_party/ulib/jemalloc/test/unit/mallctl.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/mallctl.c
rename to zircon/third_party/ulib/jemalloc/test/unit/mallctl.c
diff --git a/third_party/ulib/jemalloc/test/unit/math.c b/zircon/third_party/ulib/jemalloc/test/unit/math.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/math.c
rename to zircon/third_party/ulib/jemalloc/test/unit/math.c
diff --git a/third_party/ulib/jemalloc/test/unit/mq.c b/zircon/third_party/ulib/jemalloc/test/unit/mq.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/mq.c
rename to zircon/third_party/ulib/jemalloc/test/unit/mq.c
diff --git a/third_party/ulib/jemalloc/test/unit/mtx.c b/zircon/third_party/ulib/jemalloc/test/unit/mtx.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/mtx.c
rename to zircon/third_party/ulib/jemalloc/test/unit/mtx.c
diff --git a/third_party/ulib/jemalloc/test/unit/nstime.c b/zircon/third_party/ulib/jemalloc/test/unit/nstime.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/nstime.c
rename to zircon/third_party/ulib/jemalloc/test/unit/nstime.c
diff --git a/third_party/ulib/jemalloc/test/unit/pack.c b/zircon/third_party/ulib/jemalloc/test/unit/pack.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/pack.c
rename to zircon/third_party/ulib/jemalloc/test/unit/pack.c
diff --git a/third_party/ulib/jemalloc/test/unit/pages.c b/zircon/third_party/ulib/jemalloc/test/unit/pages.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/pages.c
rename to zircon/third_party/ulib/jemalloc/test/unit/pages.c
diff --git a/third_party/ulib/jemalloc/test/unit/ph.c b/zircon/third_party/ulib/jemalloc/test/unit/ph.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/ph.c
rename to zircon/third_party/ulib/jemalloc/test/unit/ph.c
diff --git a/third_party/ulib/jemalloc/test/unit/prng.c b/zircon/third_party/ulib/jemalloc/test/unit/prng.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prng.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prng.c
diff --git a/third_party/ulib/jemalloc/test/unit/prof_accum.c b/zircon/third_party/ulib/jemalloc/test/unit/prof_accum.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prof_accum.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prof_accum.c
diff --git a/third_party/ulib/jemalloc/test/unit/prof_active.c b/zircon/third_party/ulib/jemalloc/test/unit/prof_active.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prof_active.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prof_active.c
diff --git a/third_party/ulib/jemalloc/test/unit/prof_gdump.c b/zircon/third_party/ulib/jemalloc/test/unit/prof_gdump.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prof_gdump.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prof_gdump.c
diff --git a/third_party/ulib/jemalloc/test/unit/prof_idump.c b/zircon/third_party/ulib/jemalloc/test/unit/prof_idump.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prof_idump.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prof_idump.c
diff --git a/third_party/ulib/jemalloc/test/unit/prof_reset.c b/zircon/third_party/ulib/jemalloc/test/unit/prof_reset.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prof_reset.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prof_reset.c
diff --git a/third_party/ulib/jemalloc/test/unit/prof_tctx.c b/zircon/third_party/ulib/jemalloc/test/unit/prof_tctx.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prof_tctx.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prof_tctx.c
diff --git a/third_party/ulib/jemalloc/test/unit/prof_thread_name.c b/zircon/third_party/ulib/jemalloc/test/unit/prof_thread_name.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/prof_thread_name.c
rename to zircon/third_party/ulib/jemalloc/test/unit/prof_thread_name.c
diff --git a/third_party/ulib/jemalloc/test/unit/ql.c b/zircon/third_party/ulib/jemalloc/test/unit/ql.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/ql.c
rename to zircon/third_party/ulib/jemalloc/test/unit/ql.c
diff --git a/third_party/ulib/jemalloc/test/unit/qr.c b/zircon/third_party/ulib/jemalloc/test/unit/qr.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/qr.c
rename to zircon/third_party/ulib/jemalloc/test/unit/qr.c
diff --git a/third_party/ulib/jemalloc/test/unit/rb.c b/zircon/third_party/ulib/jemalloc/test/unit/rb.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/rb.c
rename to zircon/third_party/ulib/jemalloc/test/unit/rb.c
diff --git a/third_party/ulib/jemalloc/test/unit/rtree.c b/zircon/third_party/ulib/jemalloc/test/unit/rtree.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/rtree.c
rename to zircon/third_party/ulib/jemalloc/test/unit/rtree.c
diff --git a/third_party/ulib/jemalloc/test/unit/size_classes.c b/zircon/third_party/ulib/jemalloc/test/unit/size_classes.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/size_classes.c
rename to zircon/third_party/ulib/jemalloc/test/unit/size_classes.c
diff --git a/third_party/ulib/jemalloc/test/unit/slab.c b/zircon/third_party/ulib/jemalloc/test/unit/slab.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/slab.c
rename to zircon/third_party/ulib/jemalloc/test/unit/slab.c
diff --git a/third_party/ulib/jemalloc/test/unit/smoothstep.c b/zircon/third_party/ulib/jemalloc/test/unit/smoothstep.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/smoothstep.c
rename to zircon/third_party/ulib/jemalloc/test/unit/smoothstep.c
diff --git a/third_party/ulib/jemalloc/test/unit/stats.c b/zircon/third_party/ulib/jemalloc/test/unit/stats.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/stats.c
rename to zircon/third_party/ulib/jemalloc/test/unit/stats.c
diff --git a/third_party/ulib/jemalloc/test/unit/stats_print.c b/zircon/third_party/ulib/jemalloc/test/unit/stats_print.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/stats_print.c
rename to zircon/third_party/ulib/jemalloc/test/unit/stats_print.c
diff --git a/third_party/ulib/jemalloc/test/unit/ticker.c b/zircon/third_party/ulib/jemalloc/test/unit/ticker.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/ticker.c
rename to zircon/third_party/ulib/jemalloc/test/unit/ticker.c
diff --git a/third_party/ulib/jemalloc/test/unit/tsd.c b/zircon/third_party/ulib/jemalloc/test/unit/tsd.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/tsd.c
rename to zircon/third_party/ulib/jemalloc/test/unit/tsd.c
diff --git a/third_party/ulib/jemalloc/test/unit/util.c b/zircon/third_party/ulib/jemalloc/test/unit/util.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/util.c
rename to zircon/third_party/ulib/jemalloc/test/unit/util.c
diff --git a/third_party/ulib/jemalloc/test/unit/witness.c b/zircon/third_party/ulib/jemalloc/test/unit/witness.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/witness.c
rename to zircon/third_party/ulib/jemalloc/test/unit/witness.c
diff --git a/third_party/ulib/jemalloc/test/unit/zero.c b/zircon/third_party/ulib/jemalloc/test/unit/zero.c
similarity index 100%
rename from third_party/ulib/jemalloc/test/unit/zero.c
rename to zircon/third_party/ulib/jemalloc/test/unit/zero.c
diff --git a/third_party/ulib/linenoise/LICENSE b/zircon/third_party/ulib/linenoise/LICENSE
similarity index 100%
rename from third_party/ulib/linenoise/LICENSE
rename to zircon/third_party/ulib/linenoise/LICENSE
diff --git a/third_party/ulib/linenoise/Makefile b/zircon/third_party/ulib/linenoise/Makefile
similarity index 100%
rename from third_party/ulib/linenoise/Makefile
rename to zircon/third_party/ulib/linenoise/Makefile
diff --git a/third_party/ulib/linenoise/README.fuchsia.md b/zircon/third_party/ulib/linenoise/README.fuchsia.md
similarity index 100%
rename from third_party/ulib/linenoise/README.fuchsia.md
rename to zircon/third_party/ulib/linenoise/README.fuchsia.md
diff --git a/third_party/ulib/linenoise/README.markdown b/zircon/third_party/ulib/linenoise/README.markdown
similarity index 100%
rename from third_party/ulib/linenoise/README.markdown
rename to zircon/third_party/ulib/linenoise/README.markdown
diff --git a/third_party/ulib/linenoise/example.c b/zircon/third_party/ulib/linenoise/example.c
similarity index 100%
rename from third_party/ulib/linenoise/example.c
rename to zircon/third_party/ulib/linenoise/example.c
diff --git a/third_party/ulib/linenoise/include/linenoise/linenoise.h b/zircon/third_party/ulib/linenoise/include/linenoise/linenoise.h
similarity index 100%
rename from third_party/ulib/linenoise/include/linenoise/linenoise.h
rename to zircon/third_party/ulib/linenoise/include/linenoise/linenoise.h
diff --git a/third_party/ulib/linenoise/linenoise.c b/zircon/third_party/ulib/linenoise/linenoise.c
similarity index 100%
rename from third_party/ulib/linenoise/linenoise.c
rename to zircon/third_party/ulib/linenoise/linenoise.c
diff --git a/third_party/ulib/linenoise/rules.mk b/zircon/third_party/ulib/linenoise/rules.mk
similarity index 100%
rename from third_party/ulib/linenoise/rules.mk
rename to zircon/third_party/ulib/linenoise/rules.mk
diff --git a/third_party/ulib/lz4/LICENSE b/zircon/third_party/ulib/lz4/LICENSE
similarity index 100%
rename from third_party/ulib/lz4/LICENSE
rename to zircon/third_party/ulib/lz4/LICENSE
diff --git a/third_party/ulib/lz4/Makefile.lz4 b/zircon/third_party/ulib/lz4/Makefile.lz4
similarity index 100%
rename from third_party/ulib/lz4/Makefile.lz4
rename to zircon/third_party/ulib/lz4/Makefile.lz4
diff --git a/third_party/ulib/lz4/README.md b/zircon/third_party/ulib/lz4/README.md
similarity index 100%
rename from third_party/ulib/lz4/README.md
rename to zircon/third_party/ulib/lz4/README.md
diff --git a/third_party/ulib/lz4/include/lz4/lz4.h b/zircon/third_party/ulib/lz4/include/lz4/lz4.h
similarity index 100%
rename from third_party/ulib/lz4/include/lz4/lz4.h
rename to zircon/third_party/ulib/lz4/include/lz4/lz4.h
diff --git a/third_party/ulib/lz4/include/lz4/lz4frame.h b/zircon/third_party/ulib/lz4/include/lz4/lz4frame.h
similarity index 100%
rename from third_party/ulib/lz4/include/lz4/lz4frame.h
rename to zircon/third_party/ulib/lz4/include/lz4/lz4frame.h
diff --git a/third_party/ulib/lz4/include/lz4/lz4frame_static.h b/zircon/third_party/ulib/lz4/include/lz4/lz4frame_static.h
similarity index 100%
rename from third_party/ulib/lz4/include/lz4/lz4frame_static.h
rename to zircon/third_party/ulib/lz4/include/lz4/lz4frame_static.h
diff --git a/third_party/ulib/lz4/include/lz4/lz4hc.h b/zircon/third_party/ulib/lz4/include/lz4/lz4hc.h
similarity index 100%
rename from third_party/ulib/lz4/include/lz4/lz4hc.h
rename to zircon/third_party/ulib/lz4/include/lz4/lz4hc.h
diff --git a/third_party/ulib/lz4/include/lz4/xxhash.h b/zircon/third_party/ulib/lz4/include/lz4/xxhash.h
similarity index 100%
rename from third_party/ulib/lz4/include/lz4/xxhash.h
rename to zircon/third_party/ulib/lz4/include/lz4/xxhash.h
diff --git a/third_party/ulib/lz4/liblz4.pc.in b/zircon/third_party/ulib/lz4/liblz4.pc.in
similarity index 100%
rename from third_party/ulib/lz4/liblz4.pc.in
rename to zircon/third_party/ulib/lz4/liblz4.pc.in
diff --git a/third_party/ulib/lz4/lz4-decompress-fuzztest.cpp b/zircon/third_party/ulib/lz4/lz4-decompress-fuzztest.cpp
similarity index 100%
rename from third_party/ulib/lz4/lz4-decompress-fuzztest.cpp
rename to zircon/third_party/ulib/lz4/lz4-decompress-fuzztest.cpp
diff --git a/third_party/ulib/lz4/lz4-fuzztest.cpp b/zircon/third_party/ulib/lz4/lz4-fuzztest.cpp
similarity index 100%
rename from third_party/ulib/lz4/lz4-fuzztest.cpp
rename to zircon/third_party/ulib/lz4/lz4-fuzztest.cpp
diff --git a/third_party/ulib/lz4/lz4.c b/zircon/third_party/ulib/lz4/lz4.c
similarity index 100%
rename from third_party/ulib/lz4/lz4.c
rename to zircon/third_party/ulib/lz4/lz4.c
diff --git a/third_party/ulib/lz4/lz4frame.c b/zircon/third_party/ulib/lz4/lz4frame.c
similarity index 100%
rename from third_party/ulib/lz4/lz4frame.c
rename to zircon/third_party/ulib/lz4/lz4frame.c
diff --git a/third_party/ulib/lz4/lz4hc.c b/zircon/third_party/ulib/lz4/lz4hc.c
similarity index 100%
rename from third_party/ulib/lz4/lz4hc.c
rename to zircon/third_party/ulib/lz4/lz4hc.c
diff --git a/third_party/ulib/lz4/rules.mk b/zircon/third_party/ulib/lz4/rules.mk
similarity index 100%
rename from third_party/ulib/lz4/rules.mk
rename to zircon/third_party/ulib/lz4/rules.mk
diff --git a/third_party/ulib/lz4/xxhash.c b/zircon/third_party/ulib/lz4/xxhash.c
similarity index 100%
rename from third_party/ulib/lz4/xxhash.c
rename to zircon/third_party/ulib/lz4/xxhash.c
diff --git a/third_party/ulib/musl/COPYRIGHT b/zircon/third_party/ulib/musl/COPYRIGHT
similarity index 100%
rename from third_party/ulib/musl/COPYRIGHT
rename to zircon/third_party/ulib/musl/COPYRIGHT
diff --git a/third_party/ulib/musl/INSTALL b/zircon/third_party/ulib/musl/INSTALL
similarity index 100%
rename from third_party/ulib/musl/INSTALL
rename to zircon/third_party/ulib/musl/INSTALL
diff --git a/third_party/ulib/musl/MAINTAINERS b/zircon/third_party/ulib/musl/MAINTAINERS
similarity index 100%
rename from third_party/ulib/musl/MAINTAINERS
rename to zircon/third_party/ulib/musl/MAINTAINERS
diff --git a/third_party/ulib/musl/README b/zircon/third_party/ulib/musl/README
similarity index 100%
rename from third_party/ulib/musl/README
rename to zircon/third_party/ulib/musl/README
diff --git a/third_party/ulib/musl/README.fuchsia.md b/zircon/third_party/ulib/musl/README.fuchsia.md
similarity index 100%
rename from third_party/ulib/musl/README.fuchsia.md
rename to zircon/third_party/ulib/musl/README.fuchsia.md
diff --git a/third_party/ulib/musl/WHATSNEW b/zircon/third_party/ulib/musl/WHATSNEW
similarity index 100%
rename from third_party/ulib/musl/WHATSNEW
rename to zircon/third_party/ulib/musl/WHATSNEW
diff --git a/third_party/ulib/musl/arch/aarch64/Scrt1.S b/zircon/third_party/ulib/musl/arch/aarch64/Scrt1.S
similarity index 100%
rename from third_party/ulib/musl/arch/aarch64/Scrt1.S
rename to zircon/third_party/ulib/musl/arch/aarch64/Scrt1.S
diff --git a/third_party/ulib/musl/arch/aarch64/dl-entry.S b/zircon/third_party/ulib/musl/arch/aarch64/dl-entry.S
similarity index 100%
rename from third_party/ulib/musl/arch/aarch64/dl-entry.S
rename to zircon/third_party/ulib/musl/arch/aarch64/dl-entry.S
diff --git a/third_party/ulib/musl/arch/aarch64/pthread_arch.h b/zircon/third_party/ulib/musl/arch/aarch64/pthread_arch.h
similarity index 100%
rename from third_party/ulib/musl/arch/aarch64/pthread_arch.h
rename to zircon/third_party/ulib/musl/arch/aarch64/pthread_arch.h
diff --git a/third_party/ulib/musl/arch/aarch64/reloc.h b/zircon/third_party/ulib/musl/arch/aarch64/reloc.h
similarity index 100%
rename from third_party/ulib/musl/arch/aarch64/reloc.h
rename to zircon/third_party/ulib/musl/arch/aarch64/reloc.h
diff --git a/third_party/ulib/musl/arch/x86_64/Scrt1.S b/zircon/third_party/ulib/musl/arch/x86_64/Scrt1.S
similarity index 100%
rename from third_party/ulib/musl/arch/x86_64/Scrt1.S
rename to zircon/third_party/ulib/musl/arch/x86_64/Scrt1.S
diff --git a/third_party/ulib/musl/arch/x86_64/dl-entry.S b/zircon/third_party/ulib/musl/arch/x86_64/dl-entry.S
similarity index 100%
rename from third_party/ulib/musl/arch/x86_64/dl-entry.S
rename to zircon/third_party/ulib/musl/arch/x86_64/dl-entry.S
diff --git a/third_party/ulib/musl/arch/x86_64/pthread_arch.h b/zircon/third_party/ulib/musl/arch/x86_64/pthread_arch.h
similarity index 100%
rename from third_party/ulib/musl/arch/x86_64/pthread_arch.h
rename to zircon/third_party/ulib/musl/arch/x86_64/pthread_arch.h
diff --git a/third_party/ulib/musl/arch/x86_64/reloc.h b/zircon/third_party/ulib/musl/arch/x86_64/reloc.h
similarity index 100%
rename from third_party/ulib/musl/arch/x86_64/reloc.h
rename to zircon/third_party/ulib/musl/arch/x86_64/reloc.h
diff --git a/third_party/ulib/musl/include/alloca.h b/zircon/third_party/ulib/musl/include/alloca.h
similarity index 100%
rename from third_party/ulib/musl/include/alloca.h
rename to zircon/third_party/ulib/musl/include/alloca.h
diff --git a/third_party/ulib/musl/include/ar.h b/zircon/third_party/ulib/musl/include/ar.h
similarity index 100%
rename from third_party/ulib/musl/include/ar.h
rename to zircon/third_party/ulib/musl/include/ar.h
diff --git a/third_party/ulib/musl/include/arpa/ftp.h b/zircon/third_party/ulib/musl/include/arpa/ftp.h
similarity index 100%
rename from third_party/ulib/musl/include/arpa/ftp.h
rename to zircon/third_party/ulib/musl/include/arpa/ftp.h
diff --git a/third_party/ulib/musl/include/arpa/inet.h b/zircon/third_party/ulib/musl/include/arpa/inet.h
similarity index 100%
rename from third_party/ulib/musl/include/arpa/inet.h
rename to zircon/third_party/ulib/musl/include/arpa/inet.h
diff --git a/third_party/ulib/musl/include/arpa/nameser.h b/zircon/third_party/ulib/musl/include/arpa/nameser.h
similarity index 100%
rename from third_party/ulib/musl/include/arpa/nameser.h
rename to zircon/third_party/ulib/musl/include/arpa/nameser.h
diff --git a/third_party/ulib/musl/include/arpa/nameser_compat.h b/zircon/third_party/ulib/musl/include/arpa/nameser_compat.h
similarity index 100%
rename from third_party/ulib/musl/include/arpa/nameser_compat.h
rename to zircon/third_party/ulib/musl/include/arpa/nameser_compat.h
diff --git a/third_party/ulib/musl/include/arpa/telnet.h b/zircon/third_party/ulib/musl/include/arpa/telnet.h
similarity index 100%
rename from third_party/ulib/musl/include/arpa/telnet.h
rename to zircon/third_party/ulib/musl/include/arpa/telnet.h
diff --git a/third_party/ulib/musl/include/arpa/tftp.h b/zircon/third_party/ulib/musl/include/arpa/tftp.h
similarity index 100%
rename from third_party/ulib/musl/include/arpa/tftp.h
rename to zircon/third_party/ulib/musl/include/arpa/tftp.h
diff --git a/third_party/ulib/musl/include/assert.h b/zircon/third_party/ulib/musl/include/assert.h
similarity index 100%
rename from third_party/ulib/musl/include/assert.h
rename to zircon/third_party/ulib/musl/include/assert.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/endian.h b/zircon/third_party/ulib/musl/include/bits/aarch64/endian.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/endian.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/endian.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/fenv.h b/zircon/third_party/ulib/musl/include/bits/aarch64/fenv.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/fenv.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/fenv.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/float.h b/zircon/third_party/ulib/musl/include/bits/aarch64/float.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/float.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/float.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/io.h b/zircon/third_party/ulib/musl/include/bits/aarch64/io.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/io.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/io.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/ioctl.h b/zircon/third_party/ulib/musl/include/bits/aarch64/ioctl.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/ioctl.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/ioctl.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/ipc.h b/zircon/third_party/ulib/musl/include/bits/aarch64/ipc.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/ipc.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/ipc.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/reg.h b/zircon/third_party/ulib/musl/include/bits/aarch64/reg.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/reg.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/reg.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/setjmp.h b/zircon/third_party/ulib/musl/include/bits/aarch64/setjmp.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/setjmp.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/setjmp.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/signal.h b/zircon/third_party/ulib/musl/include/bits/aarch64/signal.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/signal.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/signal.h
diff --git a/third_party/ulib/musl/include/bits/aarch64/stat.h b/zircon/third_party/ulib/musl/include/bits/aarch64/stat.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/aarch64/stat.h
rename to zircon/third_party/ulib/musl/include/bits/aarch64/stat.h
diff --git a/third_party/ulib/musl/include/bits/alltypes.h b/zircon/third_party/ulib/musl/include/bits/alltypes.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/alltypes.h
rename to zircon/third_party/ulib/musl/include/bits/alltypes.h
diff --git a/third_party/ulib/musl/include/bits/endian.h b/zircon/third_party/ulib/musl/include/bits/endian.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/endian.h
rename to zircon/third_party/ulib/musl/include/bits/endian.h
diff --git a/third_party/ulib/musl/include/bits/errno.h b/zircon/third_party/ulib/musl/include/bits/errno.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/errno.h
rename to zircon/third_party/ulib/musl/include/bits/errno.h
diff --git a/third_party/ulib/musl/include/bits/fcntl.h b/zircon/third_party/ulib/musl/include/bits/fcntl.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/fcntl.h
rename to zircon/third_party/ulib/musl/include/bits/fcntl.h
diff --git a/third_party/ulib/musl/include/bits/fenv.h b/zircon/third_party/ulib/musl/include/bits/fenv.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/fenv.h
rename to zircon/third_party/ulib/musl/include/bits/fenv.h
diff --git a/third_party/ulib/musl/include/bits/float.h b/zircon/third_party/ulib/musl/include/bits/float.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/float.h
rename to zircon/third_party/ulib/musl/include/bits/float.h
diff --git a/third_party/ulib/musl/include/bits/io.h b/zircon/third_party/ulib/musl/include/bits/io.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/io.h
rename to zircon/third_party/ulib/musl/include/bits/io.h
diff --git a/third_party/ulib/musl/include/bits/ioctl.h b/zircon/third_party/ulib/musl/include/bits/ioctl.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/ioctl.h
rename to zircon/third_party/ulib/musl/include/bits/ioctl.h
diff --git a/third_party/ulib/musl/include/bits/ipc.h b/zircon/third_party/ulib/musl/include/bits/ipc.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/ipc.h
rename to zircon/third_party/ulib/musl/include/bits/ipc.h
diff --git a/third_party/ulib/musl/include/bits/limits.h b/zircon/third_party/ulib/musl/include/bits/limits.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/limits.h
rename to zircon/third_party/ulib/musl/include/bits/limits.h
diff --git a/third_party/ulib/musl/include/bits/msg.h b/zircon/third_party/ulib/musl/include/bits/msg.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/msg.h
rename to zircon/third_party/ulib/musl/include/bits/msg.h
diff --git a/third_party/ulib/musl/include/bits/null.h b/zircon/third_party/ulib/musl/include/bits/null.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/null.h
rename to zircon/third_party/ulib/musl/include/bits/null.h
diff --git a/third_party/ulib/musl/include/bits/poll.h b/zircon/third_party/ulib/musl/include/bits/poll.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/poll.h
rename to zircon/third_party/ulib/musl/include/bits/poll.h
diff --git a/third_party/ulib/musl/include/bits/posix.h b/zircon/third_party/ulib/musl/include/bits/posix.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/posix.h
rename to zircon/third_party/ulib/musl/include/bits/posix.h
diff --git a/third_party/ulib/musl/include/bits/reg.h b/zircon/third_party/ulib/musl/include/bits/reg.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/reg.h
rename to zircon/third_party/ulib/musl/include/bits/reg.h
diff --git a/third_party/ulib/musl/include/bits/resource.h b/zircon/third_party/ulib/musl/include/bits/resource.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/resource.h
rename to zircon/third_party/ulib/musl/include/bits/resource.h
diff --git a/third_party/ulib/musl/include/bits/sem.h b/zircon/third_party/ulib/musl/include/bits/sem.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/sem.h
rename to zircon/third_party/ulib/musl/include/bits/sem.h
diff --git a/third_party/ulib/musl/include/bits/setjmp.h b/zircon/third_party/ulib/musl/include/bits/setjmp.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/setjmp.h
rename to zircon/third_party/ulib/musl/include/bits/setjmp.h
diff --git a/third_party/ulib/musl/include/bits/shm.h b/zircon/third_party/ulib/musl/include/bits/shm.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/shm.h
rename to zircon/third_party/ulib/musl/include/bits/shm.h
diff --git a/third_party/ulib/musl/include/bits/signal.h b/zircon/third_party/ulib/musl/include/bits/signal.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/signal.h
rename to zircon/third_party/ulib/musl/include/bits/signal.h
diff --git a/third_party/ulib/musl/include/bits/socket.h b/zircon/third_party/ulib/musl/include/bits/socket.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/socket.h
rename to zircon/third_party/ulib/musl/include/bits/socket.h
diff --git a/third_party/ulib/musl/include/bits/stat.h b/zircon/third_party/ulib/musl/include/bits/stat.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/stat.h
rename to zircon/third_party/ulib/musl/include/bits/stat.h
diff --git a/third_party/ulib/musl/include/bits/statfs.h b/zircon/third_party/ulib/musl/include/bits/statfs.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/statfs.h
rename to zircon/third_party/ulib/musl/include/bits/statfs.h
diff --git a/third_party/ulib/musl/include/bits/termios.h b/zircon/third_party/ulib/musl/include/bits/termios.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/termios.h
rename to zircon/third_party/ulib/musl/include/bits/termios.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/endian.h b/zircon/third_party/ulib/musl/include/bits/x86_64/endian.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/endian.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/endian.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/fenv.h b/zircon/third_party/ulib/musl/include/bits/x86_64/fenv.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/fenv.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/fenv.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/float.h b/zircon/third_party/ulib/musl/include/bits/x86_64/float.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/float.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/float.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/io.h b/zircon/third_party/ulib/musl/include/bits/x86_64/io.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/io.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/io.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/ioctl.h b/zircon/third_party/ulib/musl/include/bits/x86_64/ioctl.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/ioctl.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/ioctl.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/ipc.h b/zircon/third_party/ulib/musl/include/bits/x86_64/ipc.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/ipc.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/ipc.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/reg.h b/zircon/third_party/ulib/musl/include/bits/x86_64/reg.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/reg.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/reg.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/setjmp.h b/zircon/third_party/ulib/musl/include/bits/x86_64/setjmp.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/setjmp.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/setjmp.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/signal.h b/zircon/third_party/ulib/musl/include/bits/x86_64/signal.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/signal.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/signal.h
diff --git a/third_party/ulib/musl/include/bits/x86_64/stat.h b/zircon/third_party/ulib/musl/include/bits/x86_64/stat.h
similarity index 100%
rename from third_party/ulib/musl/include/bits/x86_64/stat.h
rename to zircon/third_party/ulib/musl/include/bits/x86_64/stat.h
diff --git a/third_party/ulib/musl/include/byteswap.h b/zircon/third_party/ulib/musl/include/byteswap.h
similarity index 100%
rename from third_party/ulib/musl/include/byteswap.h
rename to zircon/third_party/ulib/musl/include/byteswap.h
diff --git a/third_party/ulib/musl/include/complex.h b/zircon/third_party/ulib/musl/include/complex.h
similarity index 100%
rename from third_party/ulib/musl/include/complex.h
rename to zircon/third_party/ulib/musl/include/complex.h
diff --git a/third_party/ulib/musl/include/cpio.h b/zircon/third_party/ulib/musl/include/cpio.h
similarity index 100%
rename from third_party/ulib/musl/include/cpio.h
rename to zircon/third_party/ulib/musl/include/cpio.h
diff --git a/third_party/ulib/musl/include/crypt.h b/zircon/third_party/ulib/musl/include/crypt.h
similarity index 100%
rename from third_party/ulib/musl/include/crypt.h
rename to zircon/third_party/ulib/musl/include/crypt.h
diff --git a/third_party/ulib/musl/include/ctype.h b/zircon/third_party/ulib/musl/include/ctype.h
similarity index 100%
rename from third_party/ulib/musl/include/ctype.h
rename to zircon/third_party/ulib/musl/include/ctype.h
diff --git a/third_party/ulib/musl/include/dirent.h b/zircon/third_party/ulib/musl/include/dirent.h
similarity index 100%
rename from third_party/ulib/musl/include/dirent.h
rename to zircon/third_party/ulib/musl/include/dirent.h
diff --git a/third_party/ulib/musl/include/dlfcn.h b/zircon/third_party/ulib/musl/include/dlfcn.h
similarity index 100%
rename from third_party/ulib/musl/include/dlfcn.h
rename to zircon/third_party/ulib/musl/include/dlfcn.h
diff --git a/third_party/ulib/musl/include/elf.h b/zircon/third_party/ulib/musl/include/elf.h
similarity index 100%
rename from third_party/ulib/musl/include/elf.h
rename to zircon/third_party/ulib/musl/include/elf.h
diff --git a/third_party/ulib/musl/include/endian.h b/zircon/third_party/ulib/musl/include/endian.h
similarity index 100%
rename from third_party/ulib/musl/include/endian.h
rename to zircon/third_party/ulib/musl/include/endian.h
diff --git a/third_party/ulib/musl/include/err.h b/zircon/third_party/ulib/musl/include/err.h
similarity index 100%
rename from third_party/ulib/musl/include/err.h
rename to zircon/third_party/ulib/musl/include/err.h
diff --git a/third_party/ulib/musl/include/errno.h b/zircon/third_party/ulib/musl/include/errno.h
similarity index 100%
rename from third_party/ulib/musl/include/errno.h
rename to zircon/third_party/ulib/musl/include/errno.h
diff --git a/third_party/ulib/musl/include/fcntl.h b/zircon/third_party/ulib/musl/include/fcntl.h
similarity index 100%
rename from third_party/ulib/musl/include/fcntl.h
rename to zircon/third_party/ulib/musl/include/fcntl.h
diff --git a/third_party/ulib/musl/include/features.h b/zircon/third_party/ulib/musl/include/features.h
similarity index 100%
rename from third_party/ulib/musl/include/features.h
rename to zircon/third_party/ulib/musl/include/features.h
diff --git a/third_party/ulib/musl/include/fenv.h b/zircon/third_party/ulib/musl/include/fenv.h
similarity index 100%
rename from third_party/ulib/musl/include/fenv.h
rename to zircon/third_party/ulib/musl/include/fenv.h
diff --git a/third_party/ulib/musl/include/float.h b/zircon/third_party/ulib/musl/include/float.h
similarity index 100%
rename from third_party/ulib/musl/include/float.h
rename to zircon/third_party/ulib/musl/include/float.h
diff --git a/third_party/ulib/musl/include/fmtmsg.h b/zircon/third_party/ulib/musl/include/fmtmsg.h
similarity index 100%
rename from third_party/ulib/musl/include/fmtmsg.h
rename to zircon/third_party/ulib/musl/include/fmtmsg.h
diff --git a/third_party/ulib/musl/include/fnmatch.h b/zircon/third_party/ulib/musl/include/fnmatch.h
similarity index 100%
rename from third_party/ulib/musl/include/fnmatch.h
rename to zircon/third_party/ulib/musl/include/fnmatch.h
diff --git a/third_party/ulib/musl/include/ftw.h b/zircon/third_party/ulib/musl/include/ftw.h
similarity index 100%
rename from third_party/ulib/musl/include/ftw.h
rename to zircon/third_party/ulib/musl/include/ftw.h
diff --git a/third_party/ulib/musl/include/getopt.h b/zircon/third_party/ulib/musl/include/getopt.h
similarity index 100%
rename from third_party/ulib/musl/include/getopt.h
rename to zircon/third_party/ulib/musl/include/getopt.h
diff --git a/third_party/ulib/musl/include/glob.h b/zircon/third_party/ulib/musl/include/glob.h
similarity index 100%
rename from third_party/ulib/musl/include/glob.h
rename to zircon/third_party/ulib/musl/include/glob.h
diff --git a/third_party/ulib/musl/include/grp.h b/zircon/third_party/ulib/musl/include/grp.h
similarity index 100%
rename from third_party/ulib/musl/include/grp.h
rename to zircon/third_party/ulib/musl/include/grp.h
diff --git a/third_party/ulib/musl/include/iconv.h b/zircon/third_party/ulib/musl/include/iconv.h
similarity index 100%
rename from third_party/ulib/musl/include/iconv.h
rename to zircon/third_party/ulib/musl/include/iconv.h
diff --git a/third_party/ulib/musl/include/ifaddrs.h b/zircon/third_party/ulib/musl/include/ifaddrs.h
similarity index 100%
rename from third_party/ulib/musl/include/ifaddrs.h
rename to zircon/third_party/ulib/musl/include/ifaddrs.h
diff --git a/third_party/ulib/musl/include/inttypes.h b/zircon/third_party/ulib/musl/include/inttypes.h
similarity index 100%
rename from third_party/ulib/musl/include/inttypes.h
rename to zircon/third_party/ulib/musl/include/inttypes.h
diff --git a/third_party/ulib/musl/include/iso646.h b/zircon/third_party/ulib/musl/include/iso646.h
similarity index 100%
rename from third_party/ulib/musl/include/iso646.h
rename to zircon/third_party/ulib/musl/include/iso646.h
diff --git a/third_party/ulib/musl/include/langinfo.h b/zircon/third_party/ulib/musl/include/langinfo.h
similarity index 100%
rename from third_party/ulib/musl/include/langinfo.h
rename to zircon/third_party/ulib/musl/include/langinfo.h
diff --git a/third_party/ulib/musl/include/libgen.h b/zircon/third_party/ulib/musl/include/libgen.h
similarity index 100%
rename from third_party/ulib/musl/include/libgen.h
rename to zircon/third_party/ulib/musl/include/libgen.h
diff --git a/third_party/ulib/musl/include/limits.h b/zircon/third_party/ulib/musl/include/limits.h
similarity index 100%
rename from third_party/ulib/musl/include/limits.h
rename to zircon/third_party/ulib/musl/include/limits.h
diff --git a/third_party/ulib/musl/include/link.h b/zircon/third_party/ulib/musl/include/link.h
similarity index 100%
rename from third_party/ulib/musl/include/link.h
rename to zircon/third_party/ulib/musl/include/link.h
diff --git a/third_party/ulib/musl/include/locale.h b/zircon/third_party/ulib/musl/include/locale.h
similarity index 100%
rename from third_party/ulib/musl/include/locale.h
rename to zircon/third_party/ulib/musl/include/locale.h
diff --git a/third_party/ulib/musl/include/malloc.h b/zircon/third_party/ulib/musl/include/malloc.h
similarity index 100%
rename from third_party/ulib/musl/include/malloc.h
rename to zircon/third_party/ulib/musl/include/malloc.h
diff --git a/third_party/ulib/musl/include/math.h b/zircon/third_party/ulib/musl/include/math.h
similarity index 100%
rename from third_party/ulib/musl/include/math.h
rename to zircon/third_party/ulib/musl/include/math.h
diff --git a/third_party/ulib/musl/include/memory.h b/zircon/third_party/ulib/musl/include/memory.h
similarity index 100%
rename from third_party/ulib/musl/include/memory.h
rename to zircon/third_party/ulib/musl/include/memory.h
diff --git a/third_party/ulib/musl/include/monetary.h b/zircon/third_party/ulib/musl/include/monetary.h
similarity index 100%
rename from third_party/ulib/musl/include/monetary.h
rename to zircon/third_party/ulib/musl/include/monetary.h
diff --git a/third_party/ulib/musl/include/net/ethernet.h b/zircon/third_party/ulib/musl/include/net/ethernet.h
similarity index 100%
rename from third_party/ulib/musl/include/net/ethernet.h
rename to zircon/third_party/ulib/musl/include/net/ethernet.h
diff --git a/third_party/ulib/musl/include/net/if.h b/zircon/third_party/ulib/musl/include/net/if.h
similarity index 100%
rename from third_party/ulib/musl/include/net/if.h
rename to zircon/third_party/ulib/musl/include/net/if.h
diff --git a/third_party/ulib/musl/include/net/if_arp.h b/zircon/third_party/ulib/musl/include/net/if_arp.h
similarity index 100%
rename from third_party/ulib/musl/include/net/if_arp.h
rename to zircon/third_party/ulib/musl/include/net/if_arp.h
diff --git a/third_party/ulib/musl/include/net/route.h b/zircon/third_party/ulib/musl/include/net/route.h
similarity index 100%
rename from third_party/ulib/musl/include/net/route.h
rename to zircon/third_party/ulib/musl/include/net/route.h
diff --git a/third_party/ulib/musl/include/netdb.h b/zircon/third_party/ulib/musl/include/netdb.h
similarity index 100%
rename from third_party/ulib/musl/include/netdb.h
rename to zircon/third_party/ulib/musl/include/netdb.h
diff --git a/third_party/ulib/musl/include/netinet/ether.h b/zircon/third_party/ulib/musl/include/netinet/ether.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/ether.h
rename to zircon/third_party/ulib/musl/include/netinet/ether.h
diff --git a/third_party/ulib/musl/include/netinet/icmp6.h b/zircon/third_party/ulib/musl/include/netinet/icmp6.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/icmp6.h
rename to zircon/third_party/ulib/musl/include/netinet/icmp6.h
diff --git a/third_party/ulib/musl/include/netinet/if_ether.h b/zircon/third_party/ulib/musl/include/netinet/if_ether.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/if_ether.h
rename to zircon/third_party/ulib/musl/include/netinet/if_ether.h
diff --git a/third_party/ulib/musl/include/netinet/igmp.h b/zircon/third_party/ulib/musl/include/netinet/igmp.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/igmp.h
rename to zircon/third_party/ulib/musl/include/netinet/igmp.h
diff --git a/third_party/ulib/musl/include/netinet/in.h b/zircon/third_party/ulib/musl/include/netinet/in.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/in.h
rename to zircon/third_party/ulib/musl/include/netinet/in.h
diff --git a/third_party/ulib/musl/include/netinet/in_systm.h b/zircon/third_party/ulib/musl/include/netinet/in_systm.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/in_systm.h
rename to zircon/third_party/ulib/musl/include/netinet/in_systm.h
diff --git a/third_party/ulib/musl/include/netinet/ip.h b/zircon/third_party/ulib/musl/include/netinet/ip.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/ip.h
rename to zircon/third_party/ulib/musl/include/netinet/ip.h
diff --git a/third_party/ulib/musl/include/netinet/ip6.h b/zircon/third_party/ulib/musl/include/netinet/ip6.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/ip6.h
rename to zircon/third_party/ulib/musl/include/netinet/ip6.h
diff --git a/third_party/ulib/musl/include/netinet/ip_icmp.h b/zircon/third_party/ulib/musl/include/netinet/ip_icmp.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/ip_icmp.h
rename to zircon/third_party/ulib/musl/include/netinet/ip_icmp.h
diff --git a/third_party/ulib/musl/include/netinet/tcp.h b/zircon/third_party/ulib/musl/include/netinet/tcp.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/tcp.h
rename to zircon/third_party/ulib/musl/include/netinet/tcp.h
diff --git a/third_party/ulib/musl/include/netinet/udp.h b/zircon/third_party/ulib/musl/include/netinet/udp.h
similarity index 100%
rename from third_party/ulib/musl/include/netinet/udp.h
rename to zircon/third_party/ulib/musl/include/netinet/udp.h
diff --git a/third_party/ulib/musl/include/netpacket/packet.h b/zircon/third_party/ulib/musl/include/netpacket/packet.h
similarity index 100%
rename from third_party/ulib/musl/include/netpacket/packet.h
rename to zircon/third_party/ulib/musl/include/netpacket/packet.h
diff --git a/third_party/ulib/musl/include/nl_types.h b/zircon/third_party/ulib/musl/include/nl_types.h
similarity index 100%
rename from third_party/ulib/musl/include/nl_types.h
rename to zircon/third_party/ulib/musl/include/nl_types.h
diff --git a/third_party/ulib/musl/include/paths.h b/zircon/third_party/ulib/musl/include/paths.h
similarity index 100%
rename from third_party/ulib/musl/include/paths.h
rename to zircon/third_party/ulib/musl/include/paths.h
diff --git a/third_party/ulib/musl/include/poll.h b/zircon/third_party/ulib/musl/include/poll.h
similarity index 100%
rename from third_party/ulib/musl/include/poll.h
rename to zircon/third_party/ulib/musl/include/poll.h
diff --git a/third_party/ulib/musl/include/pthread.h b/zircon/third_party/ulib/musl/include/pthread.h
similarity index 100%
rename from third_party/ulib/musl/include/pthread.h
rename to zircon/third_party/ulib/musl/include/pthread.h
diff --git a/third_party/ulib/musl/include/pty.h b/zircon/third_party/ulib/musl/include/pty.h
similarity index 100%
rename from third_party/ulib/musl/include/pty.h
rename to zircon/third_party/ulib/musl/include/pty.h
diff --git a/third_party/ulib/musl/include/pwd.h b/zircon/third_party/ulib/musl/include/pwd.h
similarity index 100%
rename from third_party/ulib/musl/include/pwd.h
rename to zircon/third_party/ulib/musl/include/pwd.h
diff --git a/third_party/ulib/musl/include/regex.h b/zircon/third_party/ulib/musl/include/regex.h
similarity index 100%
rename from third_party/ulib/musl/include/regex.h
rename to zircon/third_party/ulib/musl/include/regex.h
diff --git a/third_party/ulib/musl/include/resolv.h b/zircon/third_party/ulib/musl/include/resolv.h
similarity index 100%
rename from third_party/ulib/musl/include/resolv.h
rename to zircon/third_party/ulib/musl/include/resolv.h
diff --git a/third_party/ulib/musl/include/sched.h b/zircon/third_party/ulib/musl/include/sched.h
similarity index 100%
rename from third_party/ulib/musl/include/sched.h
rename to zircon/third_party/ulib/musl/include/sched.h
diff --git a/third_party/ulib/musl/include/search.h b/zircon/third_party/ulib/musl/include/search.h
similarity index 100%
rename from third_party/ulib/musl/include/search.h
rename to zircon/third_party/ulib/musl/include/search.h
diff --git a/third_party/ulib/musl/include/semaphore.h b/zircon/third_party/ulib/musl/include/semaphore.h
similarity index 100%
rename from third_party/ulib/musl/include/semaphore.h
rename to zircon/third_party/ulib/musl/include/semaphore.h
diff --git a/third_party/ulib/musl/include/setjmp.h b/zircon/third_party/ulib/musl/include/setjmp.h
similarity index 100%
rename from third_party/ulib/musl/include/setjmp.h
rename to zircon/third_party/ulib/musl/include/setjmp.h
diff --git a/third_party/ulib/musl/include/signal.h b/zircon/third_party/ulib/musl/include/signal.h
similarity index 100%
rename from third_party/ulib/musl/include/signal.h
rename to zircon/third_party/ulib/musl/include/signal.h
diff --git a/third_party/ulib/musl/include/spawn.h b/zircon/third_party/ulib/musl/include/spawn.h
similarity index 100%
rename from third_party/ulib/musl/include/spawn.h
rename to zircon/third_party/ulib/musl/include/spawn.h
diff --git a/third_party/ulib/musl/include/stdio.h b/zircon/third_party/ulib/musl/include/stdio.h
similarity index 100%
rename from third_party/ulib/musl/include/stdio.h
rename to zircon/third_party/ulib/musl/include/stdio.h
diff --git a/third_party/ulib/musl/include/stdlib.h b/zircon/third_party/ulib/musl/include/stdlib.h
similarity index 100%
rename from third_party/ulib/musl/include/stdlib.h
rename to zircon/third_party/ulib/musl/include/stdlib.h
diff --git a/third_party/ulib/musl/include/stdnoreturn.h b/zircon/third_party/ulib/musl/include/stdnoreturn.h
similarity index 100%
rename from third_party/ulib/musl/include/stdnoreturn.h
rename to zircon/third_party/ulib/musl/include/stdnoreturn.h
diff --git a/third_party/ulib/musl/include/string.h b/zircon/third_party/ulib/musl/include/string.h
similarity index 100%
rename from third_party/ulib/musl/include/string.h
rename to zircon/third_party/ulib/musl/include/string.h
diff --git a/third_party/ulib/musl/include/strings.h b/zircon/third_party/ulib/musl/include/strings.h
similarity index 100%
rename from third_party/ulib/musl/include/strings.h
rename to zircon/third_party/ulib/musl/include/strings.h
diff --git a/third_party/ulib/musl/include/stropts.h b/zircon/third_party/ulib/musl/include/stropts.h
similarity index 100%
rename from third_party/ulib/musl/include/stropts.h
rename to zircon/third_party/ulib/musl/include/stropts.h
diff --git a/third_party/ulib/musl/include/sys/acct.h b/zircon/third_party/ulib/musl/include/sys/acct.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/acct.h
rename to zircon/third_party/ulib/musl/include/sys/acct.h
diff --git a/third_party/ulib/musl/include/sys/auxv.h b/zircon/third_party/ulib/musl/include/sys/auxv.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/auxv.h
rename to zircon/third_party/ulib/musl/include/sys/auxv.h
diff --git a/third_party/ulib/musl/include/sys/dir.h b/zircon/third_party/ulib/musl/include/sys/dir.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/dir.h
rename to zircon/third_party/ulib/musl/include/sys/dir.h
diff --git a/third_party/ulib/musl/include/sys/errno.h b/zircon/third_party/ulib/musl/include/sys/errno.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/errno.h
rename to zircon/third_party/ulib/musl/include/sys/errno.h
diff --git a/third_party/ulib/musl/include/sys/eventfd.h b/zircon/third_party/ulib/musl/include/sys/eventfd.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/eventfd.h
rename to zircon/third_party/ulib/musl/include/sys/eventfd.h
diff --git a/third_party/ulib/musl/include/sys/fcntl.h b/zircon/third_party/ulib/musl/include/sys/fcntl.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/fcntl.h
rename to zircon/third_party/ulib/musl/include/sys/fcntl.h
diff --git a/third_party/ulib/musl/include/sys/file.h b/zircon/third_party/ulib/musl/include/sys/file.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/file.h
rename to zircon/third_party/ulib/musl/include/sys/file.h
diff --git a/third_party/ulib/musl/include/sys/fsuid.h b/zircon/third_party/ulib/musl/include/sys/fsuid.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/fsuid.h
rename to zircon/third_party/ulib/musl/include/sys/fsuid.h
diff --git a/third_party/ulib/musl/include/sys/io.h b/zircon/third_party/ulib/musl/include/sys/io.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/io.h
rename to zircon/third_party/ulib/musl/include/sys/io.h
diff --git a/third_party/ulib/musl/include/sys/ioctl.h b/zircon/third_party/ulib/musl/include/sys/ioctl.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/ioctl.h
rename to zircon/third_party/ulib/musl/include/sys/ioctl.h
diff --git a/third_party/ulib/musl/include/sys/ipc.h b/zircon/third_party/ulib/musl/include/sys/ipc.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/ipc.h
rename to zircon/third_party/ulib/musl/include/sys/ipc.h
diff --git a/third_party/ulib/musl/include/sys/klog.h b/zircon/third_party/ulib/musl/include/sys/klog.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/klog.h
rename to zircon/third_party/ulib/musl/include/sys/klog.h
diff --git a/third_party/ulib/musl/include/sys/mman.h b/zircon/third_party/ulib/musl/include/sys/mman.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/mman.h
rename to zircon/third_party/ulib/musl/include/sys/mman.h
diff --git a/third_party/ulib/musl/include/sys/mount.h b/zircon/third_party/ulib/musl/include/sys/mount.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/mount.h
rename to zircon/third_party/ulib/musl/include/sys/mount.h
diff --git a/third_party/ulib/musl/include/sys/msg.h b/zircon/third_party/ulib/musl/include/sys/msg.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/msg.h
rename to zircon/third_party/ulib/musl/include/sys/msg.h
diff --git a/third_party/ulib/musl/include/sys/mtio.h b/zircon/third_party/ulib/musl/include/sys/mtio.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/mtio.h
rename to zircon/third_party/ulib/musl/include/sys/mtio.h
diff --git a/third_party/ulib/musl/include/sys/param.h b/zircon/third_party/ulib/musl/include/sys/param.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/param.h
rename to zircon/third_party/ulib/musl/include/sys/param.h
diff --git a/third_party/ulib/musl/include/sys/personality.h b/zircon/third_party/ulib/musl/include/sys/personality.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/personality.h
rename to zircon/third_party/ulib/musl/include/sys/personality.h
diff --git a/third_party/ulib/musl/include/sys/poll.h b/zircon/third_party/ulib/musl/include/sys/poll.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/poll.h
rename to zircon/third_party/ulib/musl/include/sys/poll.h
diff --git a/third_party/ulib/musl/include/sys/quota.h b/zircon/third_party/ulib/musl/include/sys/quota.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/quota.h
rename to zircon/third_party/ulib/musl/include/sys/quota.h
diff --git a/third_party/ulib/musl/include/sys/random.h b/zircon/third_party/ulib/musl/include/sys/random.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/random.h
rename to zircon/third_party/ulib/musl/include/sys/random.h
diff --git a/third_party/ulib/musl/include/sys/reboot.h b/zircon/third_party/ulib/musl/include/sys/reboot.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/reboot.h
rename to zircon/third_party/ulib/musl/include/sys/reboot.h
diff --git a/third_party/ulib/musl/include/sys/reg.h b/zircon/third_party/ulib/musl/include/sys/reg.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/reg.h
rename to zircon/third_party/ulib/musl/include/sys/reg.h
diff --git a/third_party/ulib/musl/include/sys/select.h b/zircon/third_party/ulib/musl/include/sys/select.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/select.h
rename to zircon/third_party/ulib/musl/include/sys/select.h
diff --git a/third_party/ulib/musl/include/sys/sem.h b/zircon/third_party/ulib/musl/include/sys/sem.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/sem.h
rename to zircon/third_party/ulib/musl/include/sys/sem.h
diff --git a/third_party/ulib/musl/include/sys/sendfile.h b/zircon/third_party/ulib/musl/include/sys/sendfile.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/sendfile.h
rename to zircon/third_party/ulib/musl/include/sys/sendfile.h
diff --git a/third_party/ulib/musl/include/sys/shm.h b/zircon/third_party/ulib/musl/include/sys/shm.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/shm.h
rename to zircon/third_party/ulib/musl/include/sys/shm.h
diff --git a/third_party/ulib/musl/include/sys/signal.h b/zircon/third_party/ulib/musl/include/sys/signal.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/signal.h
rename to zircon/third_party/ulib/musl/include/sys/signal.h
diff --git a/third_party/ulib/musl/include/sys/signalfd.h b/zircon/third_party/ulib/musl/include/sys/signalfd.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/signalfd.h
rename to zircon/third_party/ulib/musl/include/sys/signalfd.h
diff --git a/third_party/ulib/musl/include/sys/socket.h b/zircon/third_party/ulib/musl/include/sys/socket.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/socket.h
rename to zircon/third_party/ulib/musl/include/sys/socket.h
diff --git a/third_party/ulib/musl/include/sys/stat.h b/zircon/third_party/ulib/musl/include/sys/stat.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/stat.h
rename to zircon/third_party/ulib/musl/include/sys/stat.h
diff --git a/third_party/ulib/musl/include/sys/statfs.h b/zircon/third_party/ulib/musl/include/sys/statfs.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/statfs.h
rename to zircon/third_party/ulib/musl/include/sys/statfs.h
diff --git a/third_party/ulib/musl/include/sys/statvfs.h b/zircon/third_party/ulib/musl/include/sys/statvfs.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/statvfs.h
rename to zircon/third_party/ulib/musl/include/sys/statvfs.h
diff --git a/third_party/ulib/musl/include/sys/stropts.h b/zircon/third_party/ulib/musl/include/sys/stropts.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/stropts.h
rename to zircon/third_party/ulib/musl/include/sys/stropts.h
diff --git a/third_party/ulib/musl/include/sys/swap.h b/zircon/third_party/ulib/musl/include/sys/swap.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/swap.h
rename to zircon/third_party/ulib/musl/include/sys/swap.h
diff --git a/third_party/ulib/musl/include/sys/syslog.h b/zircon/third_party/ulib/musl/include/sys/syslog.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/syslog.h
rename to zircon/third_party/ulib/musl/include/sys/syslog.h
diff --git a/third_party/ulib/musl/include/sys/termios.h b/zircon/third_party/ulib/musl/include/sys/termios.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/termios.h
rename to zircon/third_party/ulib/musl/include/sys/termios.h
diff --git a/third_party/ulib/musl/include/sys/time.h b/zircon/third_party/ulib/musl/include/sys/time.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/time.h
rename to zircon/third_party/ulib/musl/include/sys/time.h
diff --git a/third_party/ulib/musl/include/sys/timeb.h b/zircon/third_party/ulib/musl/include/sys/timeb.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/timeb.h
rename to zircon/third_party/ulib/musl/include/sys/timeb.h
diff --git a/third_party/ulib/musl/include/sys/timerfd.h b/zircon/third_party/ulib/musl/include/sys/timerfd.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/timerfd.h
rename to zircon/third_party/ulib/musl/include/sys/timerfd.h
diff --git a/third_party/ulib/musl/include/sys/times.h b/zircon/third_party/ulib/musl/include/sys/times.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/times.h
rename to zircon/third_party/ulib/musl/include/sys/times.h
diff --git a/third_party/ulib/musl/include/sys/timex.h b/zircon/third_party/ulib/musl/include/sys/timex.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/timex.h
rename to zircon/third_party/ulib/musl/include/sys/timex.h
diff --git a/third_party/ulib/musl/include/sys/ttydefaults.h b/zircon/third_party/ulib/musl/include/sys/ttydefaults.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/ttydefaults.h
rename to zircon/third_party/ulib/musl/include/sys/ttydefaults.h
diff --git a/third_party/ulib/musl/include/sys/types.h b/zircon/third_party/ulib/musl/include/sys/types.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/types.h
rename to zircon/third_party/ulib/musl/include/sys/types.h
diff --git a/third_party/ulib/musl/include/sys/ucontext.h b/zircon/third_party/ulib/musl/include/sys/ucontext.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/ucontext.h
rename to zircon/third_party/ulib/musl/include/sys/ucontext.h
diff --git a/third_party/ulib/musl/include/sys/uio.h b/zircon/third_party/ulib/musl/include/sys/uio.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/uio.h
rename to zircon/third_party/ulib/musl/include/sys/uio.h
diff --git a/third_party/ulib/musl/include/sys/un.h b/zircon/third_party/ulib/musl/include/sys/un.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/un.h
rename to zircon/third_party/ulib/musl/include/sys/un.h
diff --git a/third_party/ulib/musl/include/sys/utsname.h b/zircon/third_party/ulib/musl/include/sys/utsname.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/utsname.h
rename to zircon/third_party/ulib/musl/include/sys/utsname.h
diff --git a/third_party/ulib/musl/include/sys/vfs.h b/zircon/third_party/ulib/musl/include/sys/vfs.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/vfs.h
rename to zircon/third_party/ulib/musl/include/sys/vfs.h
diff --git a/third_party/ulib/musl/include/sys/wait.h b/zircon/third_party/ulib/musl/include/sys/wait.h
similarity index 100%
rename from third_party/ulib/musl/include/sys/wait.h
rename to zircon/third_party/ulib/musl/include/sys/wait.h
diff --git a/third_party/ulib/musl/include/sysexits.h b/zircon/third_party/ulib/musl/include/sysexits.h
similarity index 100%
rename from third_party/ulib/musl/include/sysexits.h
rename to zircon/third_party/ulib/musl/include/sysexits.h
diff --git a/third_party/ulib/musl/include/syslog.h b/zircon/third_party/ulib/musl/include/syslog.h
similarity index 100%
rename from third_party/ulib/musl/include/syslog.h
rename to zircon/third_party/ulib/musl/include/syslog.h
diff --git a/third_party/ulib/musl/include/tar.h b/zircon/third_party/ulib/musl/include/tar.h
similarity index 100%
rename from third_party/ulib/musl/include/tar.h
rename to zircon/third_party/ulib/musl/include/tar.h
diff --git a/third_party/ulib/musl/include/termios.h b/zircon/third_party/ulib/musl/include/termios.h
similarity index 100%
rename from third_party/ulib/musl/include/termios.h
rename to zircon/third_party/ulib/musl/include/termios.h
diff --git a/third_party/ulib/musl/include/threads.h b/zircon/third_party/ulib/musl/include/threads.h
similarity index 100%
rename from third_party/ulib/musl/include/threads.h
rename to zircon/third_party/ulib/musl/include/threads.h
diff --git a/third_party/ulib/musl/include/time.h b/zircon/third_party/ulib/musl/include/time.h
similarity index 100%
rename from third_party/ulib/musl/include/time.h
rename to zircon/third_party/ulib/musl/include/time.h
diff --git a/third_party/ulib/musl/include/uchar.h b/zircon/third_party/ulib/musl/include/uchar.h
similarity index 100%
rename from third_party/ulib/musl/include/uchar.h
rename to zircon/third_party/ulib/musl/include/uchar.h
diff --git a/third_party/ulib/musl/include/ucontext.h b/zircon/third_party/ulib/musl/include/ucontext.h
similarity index 100%
rename from third_party/ulib/musl/include/ucontext.h
rename to zircon/third_party/ulib/musl/include/ucontext.h
diff --git a/third_party/ulib/musl/include/unistd.h b/zircon/third_party/ulib/musl/include/unistd.h
similarity index 100%
rename from third_party/ulib/musl/include/unistd.h
rename to zircon/third_party/ulib/musl/include/unistd.h
diff --git a/third_party/ulib/musl/include/utime.h b/zircon/third_party/ulib/musl/include/utime.h
similarity index 100%
rename from third_party/ulib/musl/include/utime.h
rename to zircon/third_party/ulib/musl/include/utime.h
diff --git a/third_party/ulib/musl/include/values.h b/zircon/third_party/ulib/musl/include/values.h
similarity index 100%
rename from third_party/ulib/musl/include/values.h
rename to zircon/third_party/ulib/musl/include/values.h
diff --git a/third_party/ulib/musl/include/wait.h b/zircon/third_party/ulib/musl/include/wait.h
similarity index 100%
rename from third_party/ulib/musl/include/wait.h
rename to zircon/third_party/ulib/musl/include/wait.h
diff --git a/third_party/ulib/musl/include/wchar.h b/zircon/third_party/ulib/musl/include/wchar.h
similarity index 100%
rename from third_party/ulib/musl/include/wchar.h
rename to zircon/third_party/ulib/musl/include/wchar.h
diff --git a/third_party/ulib/musl/include/wctype.h b/zircon/third_party/ulib/musl/include/wctype.h
similarity index 100%
rename from third_party/ulib/musl/include/wctype.h
rename to zircon/third_party/ulib/musl/include/wctype.h
diff --git a/third_party/ulib/musl/include/wordexp.h b/zircon/third_party/ulib/musl/include/wordexp.h
similarity index 100%
rename from third_party/ulib/musl/include/wordexp.h
rename to zircon/third_party/ulib/musl/include/wordexp.h
diff --git a/third_party/ulib/musl/include/zircon/dlfcn.h b/zircon/third_party/ulib/musl/include/zircon/dlfcn.h
similarity index 100%
rename from third_party/ulib/musl/include/zircon/dlfcn.h
rename to zircon/third_party/ulib/musl/include/zircon/dlfcn.h
diff --git a/third_party/ulib/musl/include/zircon/sanitizer.h b/zircon/third_party/ulib/musl/include/zircon/sanitizer.h
similarity index 100%
rename from third_party/ulib/musl/include/zircon/sanitizer.h
rename to zircon/third_party/ulib/musl/include/zircon/sanitizer.h
diff --git a/third_party/ulib/musl/include/zircon/threads.h b/zircon/third_party/ulib/musl/include/zircon/threads.h
similarity index 100%
rename from third_party/ulib/musl/include/zircon/threads.h
rename to zircon/third_party/ulib/musl/include/zircon/threads.h
diff --git a/third_party/ulib/musl/ldso/dlstart.c b/zircon/third_party/ulib/musl/ldso/dlstart.c
similarity index 100%
rename from third_party/ulib/musl/ldso/dlstart.c
rename to zircon/third_party/ulib/musl/ldso/dlstart.c
diff --git a/third_party/ulib/musl/ldso/dynlink-sancov.S b/zircon/third_party/ulib/musl/ldso/dynlink-sancov.S
similarity index 100%
rename from third_party/ulib/musl/ldso/dynlink-sancov.S
rename to zircon/third_party/ulib/musl/ldso/dynlink-sancov.S
diff --git a/third_party/ulib/musl/ldso/dynlink.c b/zircon/third_party/ulib/musl/ldso/dynlink.c
similarity index 100%
rename from third_party/ulib/musl/ldso/dynlink.c
rename to zircon/third_party/ulib/musl/ldso/dynlink.c
diff --git a/third_party/ulib/musl/ldso/relr.h b/zircon/third_party/ulib/musl/ldso/relr.h
similarity index 100%
rename from third_party/ulib/musl/ldso/relr.h
rename to zircon/third_party/ulib/musl/ldso/relr.h
diff --git a/third_party/ulib/musl/lib.ld b/zircon/third_party/ulib/musl/lib.ld
similarity index 100%
rename from third_party/ulib/musl/lib.ld
rename to zircon/third_party/ulib/musl/lib.ld
diff --git a/third_party/ulib/musl/musl-rules.mk b/zircon/third_party/ulib/musl/musl-rules.mk
similarity index 100%
rename from third_party/ulib/musl/musl-rules.mk
rename to zircon/third_party/ulib/musl/musl-rules.mk
diff --git a/third_party/ulib/musl/pthread/pthread_atfork.c b/zircon/third_party/ulib/musl/pthread/pthread_atfork.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_atfork.c
rename to zircon/third_party/ulib/musl/pthread/pthread_atfork.c
diff --git a/third_party/ulib/musl/pthread/pthread_attr_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_attr_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_attr_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_attr_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_attr_get.c b/zircon/third_party/ulib/musl/pthread/pthread_attr_get.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_attr_get.c
rename to zircon/third_party/ulib/musl/pthread/pthread_attr_get.c
diff --git a/third_party/ulib/musl/pthread/pthread_attr_init.c b/zircon/third_party/ulib/musl/pthread/pthread_attr_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_attr_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_attr_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_attr_setdetachstate.c b/zircon/third_party/ulib/musl/pthread/pthread_attr_setdetachstate.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_attr_setdetachstate.c
rename to zircon/third_party/ulib/musl/pthread/pthread_attr_setdetachstate.c
diff --git a/third_party/ulib/musl/pthread/pthread_attr_setguardsize.c b/zircon/third_party/ulib/musl/pthread/pthread_attr_setguardsize.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_attr_setguardsize.c
rename to zircon/third_party/ulib/musl/pthread/pthread_attr_setguardsize.c
diff --git a/third_party/ulib/musl/pthread/pthread_attr_setschedparam.c b/zircon/third_party/ulib/musl/pthread/pthread_attr_setschedparam.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_attr_setschedparam.c
rename to zircon/third_party/ulib/musl/pthread/pthread_attr_setschedparam.c
diff --git a/third_party/ulib/musl/pthread/pthread_attr_setstacksize.c b/zircon/third_party/ulib/musl/pthread/pthread_attr_setstacksize.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_attr_setstacksize.c
rename to zircon/third_party/ulib/musl/pthread/pthread_attr_setstacksize.c
diff --git a/third_party/ulib/musl/pthread/pthread_barrier_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_barrier_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_barrier_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_barrier_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_barrier_init.c b/zircon/third_party/ulib/musl/pthread/pthread_barrier_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_barrier_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_barrier_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_barrier_wait.c b/zircon/third_party/ulib/musl/pthread/pthread_barrier_wait.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_barrier_wait.c
rename to zircon/third_party/ulib/musl/pthread/pthread_barrier_wait.c
diff --git a/third_party/ulib/musl/pthread/pthread_barrierattr_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_barrierattr_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_barrierattr_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_barrierattr_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_barrierattr_init.c b/zircon/third_party/ulib/musl/pthread/pthread_barrierattr_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_barrierattr_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_barrierattr_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_cancel.c b/zircon/third_party/ulib/musl/pthread/pthread_cancel.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_cancel.c
rename to zircon/third_party/ulib/musl/pthread/pthread_cancel.c
diff --git a/third_party/ulib/musl/pthread/pthread_cond_broadcast.c b/zircon/third_party/ulib/musl/pthread/pthread_cond_broadcast.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_cond_broadcast.c
rename to zircon/third_party/ulib/musl/pthread/pthread_cond_broadcast.c
diff --git a/third_party/ulib/musl/pthread/pthread_cond_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_cond_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_cond_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_cond_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_cond_init.c b/zircon/third_party/ulib/musl/pthread/pthread_cond_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_cond_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_cond_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_cond_signal.c b/zircon/third_party/ulib/musl/pthread/pthread_cond_signal.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_cond_signal.c
rename to zircon/third_party/ulib/musl/pthread/pthread_cond_signal.c
diff --git a/third_party/ulib/musl/pthread/pthread_cond_timedwait.c b/zircon/third_party/ulib/musl/pthread/pthread_cond_timedwait.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_cond_timedwait.c
rename to zircon/third_party/ulib/musl/pthread/pthread_cond_timedwait.c
diff --git a/third_party/ulib/musl/pthread/pthread_cond_wait.c b/zircon/third_party/ulib/musl/pthread/pthread_cond_wait.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_cond_wait.c
rename to zircon/third_party/ulib/musl/pthread/pthread_cond_wait.c
diff --git a/third_party/ulib/musl/pthread/pthread_condattr_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_condattr_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_condattr_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_condattr_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_condattr_init.c b/zircon/third_party/ulib/musl/pthread/pthread_condattr_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_condattr_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_condattr_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_condattr_setclock.c b/zircon/third_party/ulib/musl/pthread/pthread_condattr_setclock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_condattr_setclock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_condattr_setclock.c
diff --git a/third_party/ulib/musl/pthread/pthread_create.c b/zircon/third_party/ulib/musl/pthread/pthread_create.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_create.c
rename to zircon/third_party/ulib/musl/pthread/pthread_create.c
diff --git a/third_party/ulib/musl/pthread/pthread_detach.c b/zircon/third_party/ulib/musl/pthread/pthread_detach.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_detach.c
rename to zircon/third_party/ulib/musl/pthread/pthread_detach.c
diff --git a/third_party/ulib/musl/pthread/pthread_equal.c b/zircon/third_party/ulib/musl/pthread/pthread_equal.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_equal.c
rename to zircon/third_party/ulib/musl/pthread/pthread_equal.c
diff --git a/third_party/ulib/musl/pthread/pthread_getattr_np.c b/zircon/third_party/ulib/musl/pthread/pthread_getattr_np.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_getattr_np.c
rename to zircon/third_party/ulib/musl/pthread/pthread_getattr_np.c
diff --git a/third_party/ulib/musl/pthread/pthread_getconcurrency.c b/zircon/third_party/ulib/musl/pthread/pthread_getconcurrency.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_getconcurrency.c
rename to zircon/third_party/ulib/musl/pthread/pthread_getconcurrency.c
diff --git a/third_party/ulib/musl/pthread/pthread_getcpuclockid.c b/zircon/third_party/ulib/musl/pthread/pthread_getcpuclockid.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_getcpuclockid.c
rename to zircon/third_party/ulib/musl/pthread/pthread_getcpuclockid.c
diff --git a/third_party/ulib/musl/pthread/pthread_getspecific.c b/zircon/third_party/ulib/musl/pthread/pthread_getspecific.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_getspecific.c
rename to zircon/third_party/ulib/musl/pthread/pthread_getspecific.c
diff --git a/third_party/ulib/musl/pthread/pthread_join.c b/zircon/third_party/ulib/musl/pthread/pthread_join.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_join.c
rename to zircon/third_party/ulib/musl/pthread/pthread_join.c
diff --git a/third_party/ulib/musl/pthread/pthread_key.c b/zircon/third_party/ulib/musl/pthread/pthread_key.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_key.c
rename to zircon/third_party/ulib/musl/pthread/pthread_key.c
diff --git a/third_party/ulib/musl/pthread/pthread_kill.c b/zircon/third_party/ulib/musl/pthread/pthread_kill.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_kill.c
rename to zircon/third_party/ulib/musl/pthread/pthread_kill.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_consistent.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_consistent.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_consistent.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_consistent.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_getprioceiling.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_getprioceiling.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_getprioceiling.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_getprioceiling.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_init.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_lock.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_lock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_lock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_lock.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_setprioceiling.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_setprioceiling.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_setprioceiling.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_setprioceiling.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_timedlock.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_timedlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_timedlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_timedlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_trylock.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_trylock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_trylock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_trylock.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutex_unlock.c b/zircon/third_party/ulib/musl/pthread/pthread_mutex_unlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutex_unlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutex_unlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutexattr_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_mutexattr_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutexattr_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutexattr_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutexattr_init.c b/zircon/third_party/ulib/musl/pthread/pthread_mutexattr_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutexattr_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutexattr_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutexattr_setprotocol.c b/zircon/third_party/ulib/musl/pthread/pthread_mutexattr_setprotocol.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutexattr_setprotocol.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutexattr_setprotocol.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutexattr_setrobust.c b/zircon/third_party/ulib/musl/pthread/pthread_mutexattr_setrobust.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutexattr_setrobust.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutexattr_setrobust.c
diff --git a/third_party/ulib/musl/pthread/pthread_mutexattr_settype.c b/zircon/third_party/ulib/musl/pthread/pthread_mutexattr_settype.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_mutexattr_settype.c
rename to zircon/third_party/ulib/musl/pthread/pthread_mutexattr_settype.c
diff --git a/third_party/ulib/musl/pthread/pthread_once.c b/zircon/third_party/ulib/musl/pthread/pthread_once.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_once.c
rename to zircon/third_party/ulib/musl/pthread/pthread_once.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_init.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_rdlock.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_rdlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_rdlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_rdlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_timedrdlock.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_timedrdlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_timedrdlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_timedrdlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_timedwrlock.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_timedwrlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_timedwrlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_timedwrlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_tryrdlock.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_tryrdlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_tryrdlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_tryrdlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_trywrlock.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_trywrlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_trywrlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_trywrlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_unlock.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_unlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_unlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_unlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlock_wrlock.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlock_wrlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlock_wrlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlock_wrlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlockattr_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlockattr_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlockattr_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlockattr_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_rwlockattr_init.c b/zircon/third_party/ulib/musl/pthread/pthread_rwlockattr_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_rwlockattr_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_rwlockattr_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_self.c b/zircon/third_party/ulib/musl/pthread/pthread_self.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_self.c
rename to zircon/third_party/ulib/musl/pthread/pthread_self.c
diff --git a/third_party/ulib/musl/pthread/pthread_setcancelstate.c b/zircon/third_party/ulib/musl/pthread/pthread_setcancelstate.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_setcancelstate.c
rename to zircon/third_party/ulib/musl/pthread/pthread_setcancelstate.c
diff --git a/third_party/ulib/musl/pthread/pthread_setcanceltype.c b/zircon/third_party/ulib/musl/pthread/pthread_setcanceltype.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_setcanceltype.c
rename to zircon/third_party/ulib/musl/pthread/pthread_setcanceltype.c
diff --git a/third_party/ulib/musl/pthread/pthread_setconcurrency.c b/zircon/third_party/ulib/musl/pthread/pthread_setconcurrency.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_setconcurrency.c
rename to zircon/third_party/ulib/musl/pthread/pthread_setconcurrency.c
diff --git a/third_party/ulib/musl/pthread/pthread_setspecific.c b/zircon/third_party/ulib/musl/pthread/pthread_setspecific.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_setspecific.c
rename to zircon/third_party/ulib/musl/pthread/pthread_setspecific.c
diff --git a/third_party/ulib/musl/pthread/pthread_sigmask.c b/zircon/third_party/ulib/musl/pthread/pthread_sigmask.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_sigmask.c
rename to zircon/third_party/ulib/musl/pthread/pthread_sigmask.c
diff --git a/third_party/ulib/musl/pthread/pthread_spin_destroy.c b/zircon/third_party/ulib/musl/pthread/pthread_spin_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_spin_destroy.c
rename to zircon/third_party/ulib/musl/pthread/pthread_spin_destroy.c
diff --git a/third_party/ulib/musl/pthread/pthread_spin_init.c b/zircon/third_party/ulib/musl/pthread/pthread_spin_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_spin_init.c
rename to zircon/third_party/ulib/musl/pthread/pthread_spin_init.c
diff --git a/third_party/ulib/musl/pthread/pthread_spin_lock.c b/zircon/third_party/ulib/musl/pthread/pthread_spin_lock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_spin_lock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_spin_lock.c
diff --git a/third_party/ulib/musl/pthread/pthread_spin_trylock.c b/zircon/third_party/ulib/musl/pthread/pthread_spin_trylock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_spin_trylock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_spin_trylock.c
diff --git a/third_party/ulib/musl/pthread/pthread_spin_unlock.c b/zircon/third_party/ulib/musl/pthread/pthread_spin_unlock.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_spin_unlock.c
rename to zircon/third_party/ulib/musl/pthread/pthread_spin_unlock.c
diff --git a/third_party/ulib/musl/pthread/pthread_testcancel.c b/zircon/third_party/ulib/musl/pthread/pthread_testcancel.c
similarity index 100%
rename from third_party/ulib/musl/pthread/pthread_testcancel.c
rename to zircon/third_party/ulib/musl/pthread/pthread_testcancel.c
diff --git a/third_party/ulib/musl/pthread/sem_destroy.c b/zircon/third_party/ulib/musl/pthread/sem_destroy.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_destroy.c
rename to zircon/third_party/ulib/musl/pthread/sem_destroy.c
diff --git a/third_party/ulib/musl/pthread/sem_getvalue.c b/zircon/third_party/ulib/musl/pthread/sem_getvalue.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_getvalue.c
rename to zircon/third_party/ulib/musl/pthread/sem_getvalue.c
diff --git a/third_party/ulib/musl/pthread/sem_init.c b/zircon/third_party/ulib/musl/pthread/sem_init.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_init.c
rename to zircon/third_party/ulib/musl/pthread/sem_init.c
diff --git a/third_party/ulib/musl/pthread/sem_open.c b/zircon/third_party/ulib/musl/pthread/sem_open.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_open.c
rename to zircon/third_party/ulib/musl/pthread/sem_open.c
diff --git a/third_party/ulib/musl/pthread/sem_post.c b/zircon/third_party/ulib/musl/pthread/sem_post.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_post.c
rename to zircon/third_party/ulib/musl/pthread/sem_post.c
diff --git a/third_party/ulib/musl/pthread/sem_timedwait.c b/zircon/third_party/ulib/musl/pthread/sem_timedwait.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_timedwait.c
rename to zircon/third_party/ulib/musl/pthread/sem_timedwait.c
diff --git a/third_party/ulib/musl/pthread/sem_trywait.c b/zircon/third_party/ulib/musl/pthread/sem_trywait.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_trywait.c
rename to zircon/third_party/ulib/musl/pthread/sem_trywait.c
diff --git a/third_party/ulib/musl/pthread/sem_unlink.c b/zircon/third_party/ulib/musl/pthread/sem_unlink.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_unlink.c
rename to zircon/third_party/ulib/musl/pthread/sem_unlink.c
diff --git a/third_party/ulib/musl/pthread/sem_wait.c b/zircon/third_party/ulib/musl/pthread/sem_wait.c
similarity index 100%
rename from third_party/ulib/musl/pthread/sem_wait.c
rename to zircon/third_party/ulib/musl/pthread/sem_wait.c
diff --git a/third_party/ulib/musl/sanitizers/__asan_early_init.c b/zircon/third_party/ulib/musl/sanitizers/__asan_early_init.c
similarity index 100%
rename from third_party/ulib/musl/sanitizers/__asan_early_init.c
rename to zircon/third_party/ulib/musl/sanitizers/__asan_early_init.c
diff --git a/third_party/ulib/musl/sanitizers/asan-stubs.c b/zircon/third_party/ulib/musl/sanitizers/asan-stubs.c
similarity index 100%
rename from third_party/ulib/musl/sanitizers/asan-stubs.c
rename to zircon/third_party/ulib/musl/sanitizers/asan-stubs.c
diff --git a/third_party/ulib/musl/sanitizers/hooks.c b/zircon/third_party/ulib/musl/sanitizers/hooks.c
similarity index 100%
rename from third_party/ulib/musl/sanitizers/hooks.c
rename to zircon/third_party/ulib/musl/sanitizers/hooks.c
diff --git a/third_party/ulib/musl/sanitizers/log.c b/zircon/third_party/ulib/musl/sanitizers/log.c
similarity index 100%
rename from third_party/ulib/musl/sanitizers/log.c
rename to zircon/third_party/ulib/musl/sanitizers/log.c
diff --git a/third_party/ulib/musl/sanitizers/sancov-stubs.S b/zircon/third_party/ulib/musl/sanitizers/sancov-stubs.S
similarity index 100%
rename from third_party/ulib/musl/sanitizers/sancov-stubs.S
rename to zircon/third_party/ulib/musl/sanitizers/sancov-stubs.S
diff --git a/third_party/ulib/musl/src/complex/cabs.c b/zircon/third_party/ulib/musl/src/complex/cabs.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cabs.c
rename to zircon/third_party/ulib/musl/src/complex/cabs.c
diff --git a/third_party/ulib/musl/src/complex/cabsf.c b/zircon/third_party/ulib/musl/src/complex/cabsf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cabsf.c
rename to zircon/third_party/ulib/musl/src/complex/cabsf.c
diff --git a/third_party/ulib/musl/src/complex/cabsl.c b/zircon/third_party/ulib/musl/src/complex/cabsl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cabsl.c
rename to zircon/third_party/ulib/musl/src/complex/cabsl.c
diff --git a/third_party/ulib/musl/src/complex/cacos.c b/zircon/third_party/ulib/musl/src/complex/cacos.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cacos.c
rename to zircon/third_party/ulib/musl/src/complex/cacos.c
diff --git a/third_party/ulib/musl/src/complex/cacosf.c b/zircon/third_party/ulib/musl/src/complex/cacosf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cacosf.c
rename to zircon/third_party/ulib/musl/src/complex/cacosf.c
diff --git a/third_party/ulib/musl/src/complex/cacosh.c b/zircon/third_party/ulib/musl/src/complex/cacosh.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cacosh.c
rename to zircon/third_party/ulib/musl/src/complex/cacosh.c
diff --git a/third_party/ulib/musl/src/complex/cacoshf.c b/zircon/third_party/ulib/musl/src/complex/cacoshf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cacoshf.c
rename to zircon/third_party/ulib/musl/src/complex/cacoshf.c
diff --git a/third_party/ulib/musl/src/complex/cacoshl.c b/zircon/third_party/ulib/musl/src/complex/cacoshl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cacoshl.c
rename to zircon/third_party/ulib/musl/src/complex/cacoshl.c
diff --git a/third_party/ulib/musl/src/complex/cacosl.c b/zircon/third_party/ulib/musl/src/complex/cacosl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cacosl.c
rename to zircon/third_party/ulib/musl/src/complex/cacosl.c
diff --git a/third_party/ulib/musl/src/complex/carg.c b/zircon/third_party/ulib/musl/src/complex/carg.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/carg.c
rename to zircon/third_party/ulib/musl/src/complex/carg.c
diff --git a/third_party/ulib/musl/src/complex/cargf.c b/zircon/third_party/ulib/musl/src/complex/cargf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cargf.c
rename to zircon/third_party/ulib/musl/src/complex/cargf.c
diff --git a/third_party/ulib/musl/src/complex/cargl.c b/zircon/third_party/ulib/musl/src/complex/cargl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cargl.c
rename to zircon/third_party/ulib/musl/src/complex/cargl.c
diff --git a/third_party/ulib/musl/src/complex/casin.c b/zircon/third_party/ulib/musl/src/complex/casin.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/casin.c
rename to zircon/third_party/ulib/musl/src/complex/casin.c
diff --git a/third_party/ulib/musl/src/complex/casinf.c b/zircon/third_party/ulib/musl/src/complex/casinf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/casinf.c
rename to zircon/third_party/ulib/musl/src/complex/casinf.c
diff --git a/third_party/ulib/musl/src/complex/casinh.c b/zircon/third_party/ulib/musl/src/complex/casinh.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/casinh.c
rename to zircon/third_party/ulib/musl/src/complex/casinh.c
diff --git a/third_party/ulib/musl/src/complex/casinhf.c b/zircon/third_party/ulib/musl/src/complex/casinhf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/casinhf.c
rename to zircon/third_party/ulib/musl/src/complex/casinhf.c
diff --git a/third_party/ulib/musl/src/complex/casinhl.c b/zircon/third_party/ulib/musl/src/complex/casinhl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/casinhl.c
rename to zircon/third_party/ulib/musl/src/complex/casinhl.c
diff --git a/third_party/ulib/musl/src/complex/casinl.c b/zircon/third_party/ulib/musl/src/complex/casinl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/casinl.c
rename to zircon/third_party/ulib/musl/src/complex/casinl.c
diff --git a/third_party/ulib/musl/src/complex/catanh.c b/zircon/third_party/ulib/musl/src/complex/catanh.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/catanh.c
rename to zircon/third_party/ulib/musl/src/complex/catanh.c
diff --git a/third_party/ulib/musl/src/complex/catanhf.c b/zircon/third_party/ulib/musl/src/complex/catanhf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/catanhf.c
rename to zircon/third_party/ulib/musl/src/complex/catanhf.c
diff --git a/third_party/ulib/musl/src/complex/catanhl.c b/zircon/third_party/ulib/musl/src/complex/catanhl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/catanhl.c
rename to zircon/third_party/ulib/musl/src/complex/catanhl.c
diff --git a/third_party/ulib/musl/src/complex/ccos.c b/zircon/third_party/ulib/musl/src/complex/ccos.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ccos.c
rename to zircon/third_party/ulib/musl/src/complex/ccos.c
diff --git a/third_party/ulib/musl/src/complex/ccosf.c b/zircon/third_party/ulib/musl/src/complex/ccosf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ccosf.c
rename to zircon/third_party/ulib/musl/src/complex/ccosf.c
diff --git a/third_party/ulib/musl/src/complex/ccoshl.c b/zircon/third_party/ulib/musl/src/complex/ccoshl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ccoshl.c
rename to zircon/third_party/ulib/musl/src/complex/ccoshl.c
diff --git a/third_party/ulib/musl/src/complex/ccosl.c b/zircon/third_party/ulib/musl/src/complex/ccosl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ccosl.c
rename to zircon/third_party/ulib/musl/src/complex/ccosl.c
diff --git a/third_party/ulib/musl/src/complex/cexpl.c b/zircon/third_party/ulib/musl/src/complex/cexpl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cexpl.c
rename to zircon/third_party/ulib/musl/src/complex/cexpl.c
diff --git a/third_party/ulib/musl/src/complex/cimag.c b/zircon/third_party/ulib/musl/src/complex/cimag.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cimag.c
rename to zircon/third_party/ulib/musl/src/complex/cimag.c
diff --git a/third_party/ulib/musl/src/complex/cimagf.c b/zircon/third_party/ulib/musl/src/complex/cimagf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cimagf.c
rename to zircon/third_party/ulib/musl/src/complex/cimagf.c
diff --git a/third_party/ulib/musl/src/complex/cimagl.c b/zircon/third_party/ulib/musl/src/complex/cimagl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cimagl.c
rename to zircon/third_party/ulib/musl/src/complex/cimagl.c
diff --git a/third_party/ulib/musl/src/complex/clog.c b/zircon/third_party/ulib/musl/src/complex/clog.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/clog.c
rename to zircon/third_party/ulib/musl/src/complex/clog.c
diff --git a/third_party/ulib/musl/src/complex/clogf.c b/zircon/third_party/ulib/musl/src/complex/clogf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/clogf.c
rename to zircon/third_party/ulib/musl/src/complex/clogf.c
diff --git a/third_party/ulib/musl/src/complex/clogl.c b/zircon/third_party/ulib/musl/src/complex/clogl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/clogl.c
rename to zircon/third_party/ulib/musl/src/complex/clogl.c
diff --git a/third_party/ulib/musl/src/complex/conj.c b/zircon/third_party/ulib/musl/src/complex/conj.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/conj.c
rename to zircon/third_party/ulib/musl/src/complex/conj.c
diff --git a/third_party/ulib/musl/src/complex/conjf.c b/zircon/third_party/ulib/musl/src/complex/conjf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/conjf.c
rename to zircon/third_party/ulib/musl/src/complex/conjf.c
diff --git a/third_party/ulib/musl/src/complex/conjl.c b/zircon/third_party/ulib/musl/src/complex/conjl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/conjl.c
rename to zircon/third_party/ulib/musl/src/complex/conjl.c
diff --git a/third_party/ulib/musl/src/complex/cpow.c b/zircon/third_party/ulib/musl/src/complex/cpow.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cpow.c
rename to zircon/third_party/ulib/musl/src/complex/cpow.c
diff --git a/third_party/ulib/musl/src/complex/cpowf.c b/zircon/third_party/ulib/musl/src/complex/cpowf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cpowf.c
rename to zircon/third_party/ulib/musl/src/complex/cpowf.c
diff --git a/third_party/ulib/musl/src/complex/cpowl.c b/zircon/third_party/ulib/musl/src/complex/cpowl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cpowl.c
rename to zircon/third_party/ulib/musl/src/complex/cpowl.c
diff --git a/third_party/ulib/musl/src/complex/cproj.c b/zircon/third_party/ulib/musl/src/complex/cproj.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cproj.c
rename to zircon/third_party/ulib/musl/src/complex/cproj.c
diff --git a/third_party/ulib/musl/src/complex/cprojf.c b/zircon/third_party/ulib/musl/src/complex/cprojf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cprojf.c
rename to zircon/third_party/ulib/musl/src/complex/cprojf.c
diff --git a/third_party/ulib/musl/src/complex/cprojl.c b/zircon/third_party/ulib/musl/src/complex/cprojl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/cprojl.c
rename to zircon/third_party/ulib/musl/src/complex/cprojl.c
diff --git a/third_party/ulib/musl/src/complex/creal.c b/zircon/third_party/ulib/musl/src/complex/creal.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/creal.c
rename to zircon/third_party/ulib/musl/src/complex/creal.c
diff --git a/third_party/ulib/musl/src/complex/crealf.c b/zircon/third_party/ulib/musl/src/complex/crealf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/crealf.c
rename to zircon/third_party/ulib/musl/src/complex/crealf.c
diff --git a/third_party/ulib/musl/src/complex/creall.c b/zircon/third_party/ulib/musl/src/complex/creall.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/creall.c
rename to zircon/third_party/ulib/musl/src/complex/creall.c
diff --git a/third_party/ulib/musl/src/complex/csin.c b/zircon/third_party/ulib/musl/src/complex/csin.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/csin.c
rename to zircon/third_party/ulib/musl/src/complex/csin.c
diff --git a/third_party/ulib/musl/src/complex/csinf.c b/zircon/third_party/ulib/musl/src/complex/csinf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/csinf.c
rename to zircon/third_party/ulib/musl/src/complex/csinf.c
diff --git a/third_party/ulib/musl/src/complex/csinhl.c b/zircon/third_party/ulib/musl/src/complex/csinhl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/csinhl.c
rename to zircon/third_party/ulib/musl/src/complex/csinhl.c
diff --git a/third_party/ulib/musl/src/complex/csinl.c b/zircon/third_party/ulib/musl/src/complex/csinl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/csinl.c
rename to zircon/third_party/ulib/musl/src/complex/csinl.c
diff --git a/third_party/ulib/musl/src/complex/csqrtl.c b/zircon/third_party/ulib/musl/src/complex/csqrtl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/csqrtl.c
rename to zircon/third_party/ulib/musl/src/complex/csqrtl.c
diff --git a/third_party/ulib/musl/src/complex/ctan.c b/zircon/third_party/ulib/musl/src/complex/ctan.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ctan.c
rename to zircon/third_party/ulib/musl/src/complex/ctan.c
diff --git a/third_party/ulib/musl/src/complex/ctanf.c b/zircon/third_party/ulib/musl/src/complex/ctanf.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ctanf.c
rename to zircon/third_party/ulib/musl/src/complex/ctanf.c
diff --git a/third_party/ulib/musl/src/complex/ctanhl.c b/zircon/third_party/ulib/musl/src/complex/ctanhl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ctanhl.c
rename to zircon/third_party/ulib/musl/src/complex/ctanhl.c
diff --git a/third_party/ulib/musl/src/complex/ctanl.c b/zircon/third_party/ulib/musl/src/complex/ctanl.c
similarity index 100%
rename from third_party/ulib/musl/src/complex/ctanl.c
rename to zircon/third_party/ulib/musl/src/complex/ctanl.c
diff --git a/third_party/ulib/musl/src/conf/confstr.c b/zircon/third_party/ulib/musl/src/conf/confstr.c
similarity index 100%
rename from third_party/ulib/musl/src/conf/confstr.c
rename to zircon/third_party/ulib/musl/src/conf/confstr.c
diff --git a/third_party/ulib/musl/src/conf/fpathconf.c b/zircon/third_party/ulib/musl/src/conf/fpathconf.c
similarity index 100%
rename from third_party/ulib/musl/src/conf/fpathconf.c
rename to zircon/third_party/ulib/musl/src/conf/fpathconf.c
diff --git a/third_party/ulib/musl/src/conf/pathconf.c b/zircon/third_party/ulib/musl/src/conf/pathconf.c
similarity index 100%
rename from third_party/ulib/musl/src/conf/pathconf.c
rename to zircon/third_party/ulib/musl/src/conf/pathconf.c
diff --git a/third_party/ulib/musl/src/conf/sysconf.c b/zircon/third_party/ulib/musl/src/conf/sysconf.c
similarity index 100%
rename from third_party/ulib/musl/src/conf/sysconf.c
rename to zircon/third_party/ulib/musl/src/conf/sysconf.c
diff --git a/third_party/ulib/musl/src/crypt/crypt.c b/zircon/third_party/ulib/musl/src/crypt/crypt.c
similarity index 100%
rename from third_party/ulib/musl/src/crypt/crypt.c
rename to zircon/third_party/ulib/musl/src/crypt/crypt.c
diff --git a/third_party/ulib/musl/src/crypt/crypt_r.c b/zircon/third_party/ulib/musl/src/crypt/crypt_r.c
similarity index 100%
rename from third_party/ulib/musl/src/crypt/crypt_r.c
rename to zircon/third_party/ulib/musl/src/crypt/crypt_r.c
diff --git a/third_party/ulib/musl/src/crypt/encrypt.c b/zircon/third_party/ulib/musl/src/crypt/encrypt.c
similarity index 100%
rename from third_party/ulib/musl/src/crypt/encrypt.c
rename to zircon/third_party/ulib/musl/src/crypt/encrypt.c
diff --git a/third_party/ulib/musl/src/ctype/__ctype_b_loc.c b/zircon/third_party/ulib/musl/src/ctype/__ctype_b_loc.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/__ctype_b_loc.c
rename to zircon/third_party/ulib/musl/src/ctype/__ctype_b_loc.c
diff --git a/third_party/ulib/musl/src/ctype/__ctype_get_mb_cur_max.c b/zircon/third_party/ulib/musl/src/ctype/__ctype_get_mb_cur_max.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/__ctype_get_mb_cur_max.c
rename to zircon/third_party/ulib/musl/src/ctype/__ctype_get_mb_cur_max.c
diff --git a/third_party/ulib/musl/src/ctype/__ctype_tolower_loc.c b/zircon/third_party/ulib/musl/src/ctype/__ctype_tolower_loc.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/__ctype_tolower_loc.c
rename to zircon/third_party/ulib/musl/src/ctype/__ctype_tolower_loc.c
diff --git a/third_party/ulib/musl/src/ctype/__ctype_toupper_loc.c b/zircon/third_party/ulib/musl/src/ctype/__ctype_toupper_loc.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/__ctype_toupper_loc.c
rename to zircon/third_party/ulib/musl/src/ctype/__ctype_toupper_loc.c
diff --git a/third_party/ulib/musl/src/ctype/alpha.h b/zircon/third_party/ulib/musl/src/ctype/alpha.h
similarity index 100%
rename from third_party/ulib/musl/src/ctype/alpha.h
rename to zircon/third_party/ulib/musl/src/ctype/alpha.h
diff --git a/third_party/ulib/musl/src/ctype/isalnum.c b/zircon/third_party/ulib/musl/src/ctype/isalnum.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isalnum.c
rename to zircon/third_party/ulib/musl/src/ctype/isalnum.c
diff --git a/third_party/ulib/musl/src/ctype/isalpha.c b/zircon/third_party/ulib/musl/src/ctype/isalpha.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isalpha.c
rename to zircon/third_party/ulib/musl/src/ctype/isalpha.c
diff --git a/third_party/ulib/musl/src/ctype/isascii.c b/zircon/third_party/ulib/musl/src/ctype/isascii.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isascii.c
rename to zircon/third_party/ulib/musl/src/ctype/isascii.c
diff --git a/third_party/ulib/musl/src/ctype/isblank.c b/zircon/third_party/ulib/musl/src/ctype/isblank.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isblank.c
rename to zircon/third_party/ulib/musl/src/ctype/isblank.c
diff --git a/third_party/ulib/musl/src/ctype/iscntrl.c b/zircon/third_party/ulib/musl/src/ctype/iscntrl.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iscntrl.c
rename to zircon/third_party/ulib/musl/src/ctype/iscntrl.c
diff --git a/third_party/ulib/musl/src/ctype/isdigit.c b/zircon/third_party/ulib/musl/src/ctype/isdigit.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isdigit.c
rename to zircon/third_party/ulib/musl/src/ctype/isdigit.c
diff --git a/third_party/ulib/musl/src/ctype/isgraph.c b/zircon/third_party/ulib/musl/src/ctype/isgraph.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isgraph.c
rename to zircon/third_party/ulib/musl/src/ctype/isgraph.c
diff --git a/third_party/ulib/musl/src/ctype/islower.c b/zircon/third_party/ulib/musl/src/ctype/islower.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/islower.c
rename to zircon/third_party/ulib/musl/src/ctype/islower.c
diff --git a/third_party/ulib/musl/src/ctype/isprint.c b/zircon/third_party/ulib/musl/src/ctype/isprint.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isprint.c
rename to zircon/third_party/ulib/musl/src/ctype/isprint.c
diff --git a/third_party/ulib/musl/src/ctype/ispunct.c b/zircon/third_party/ulib/musl/src/ctype/ispunct.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/ispunct.c
rename to zircon/third_party/ulib/musl/src/ctype/ispunct.c
diff --git a/third_party/ulib/musl/src/ctype/isspace.c b/zircon/third_party/ulib/musl/src/ctype/isspace.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isspace.c
rename to zircon/third_party/ulib/musl/src/ctype/isspace.c
diff --git a/third_party/ulib/musl/src/ctype/isupper.c b/zircon/third_party/ulib/musl/src/ctype/isupper.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isupper.c
rename to zircon/third_party/ulib/musl/src/ctype/isupper.c
diff --git a/third_party/ulib/musl/src/ctype/iswalnum.c b/zircon/third_party/ulib/musl/src/ctype/iswalnum.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswalnum.c
rename to zircon/third_party/ulib/musl/src/ctype/iswalnum.c
diff --git a/third_party/ulib/musl/src/ctype/iswalpha.c b/zircon/third_party/ulib/musl/src/ctype/iswalpha.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswalpha.c
rename to zircon/third_party/ulib/musl/src/ctype/iswalpha.c
diff --git a/third_party/ulib/musl/src/ctype/iswblank.c b/zircon/third_party/ulib/musl/src/ctype/iswblank.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswblank.c
rename to zircon/third_party/ulib/musl/src/ctype/iswblank.c
diff --git a/third_party/ulib/musl/src/ctype/iswcntrl.c b/zircon/third_party/ulib/musl/src/ctype/iswcntrl.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswcntrl.c
rename to zircon/third_party/ulib/musl/src/ctype/iswcntrl.c
diff --git a/third_party/ulib/musl/src/ctype/iswctype.c b/zircon/third_party/ulib/musl/src/ctype/iswctype.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswctype.c
rename to zircon/third_party/ulib/musl/src/ctype/iswctype.c
diff --git a/third_party/ulib/musl/src/ctype/iswdigit.c b/zircon/third_party/ulib/musl/src/ctype/iswdigit.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswdigit.c
rename to zircon/third_party/ulib/musl/src/ctype/iswdigit.c
diff --git a/third_party/ulib/musl/src/ctype/iswgraph.c b/zircon/third_party/ulib/musl/src/ctype/iswgraph.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswgraph.c
rename to zircon/third_party/ulib/musl/src/ctype/iswgraph.c
diff --git a/third_party/ulib/musl/src/ctype/iswlower.c b/zircon/third_party/ulib/musl/src/ctype/iswlower.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswlower.c
rename to zircon/third_party/ulib/musl/src/ctype/iswlower.c
diff --git a/third_party/ulib/musl/src/ctype/iswprint.c b/zircon/third_party/ulib/musl/src/ctype/iswprint.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswprint.c
rename to zircon/third_party/ulib/musl/src/ctype/iswprint.c
diff --git a/third_party/ulib/musl/src/ctype/iswpunct.c b/zircon/third_party/ulib/musl/src/ctype/iswpunct.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswpunct.c
rename to zircon/third_party/ulib/musl/src/ctype/iswpunct.c
diff --git a/third_party/ulib/musl/src/ctype/iswspace.c b/zircon/third_party/ulib/musl/src/ctype/iswspace.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswspace.c
rename to zircon/third_party/ulib/musl/src/ctype/iswspace.c
diff --git a/third_party/ulib/musl/src/ctype/iswupper.c b/zircon/third_party/ulib/musl/src/ctype/iswupper.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswupper.c
rename to zircon/third_party/ulib/musl/src/ctype/iswupper.c
diff --git a/third_party/ulib/musl/src/ctype/iswxdigit.c b/zircon/third_party/ulib/musl/src/ctype/iswxdigit.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/iswxdigit.c
rename to zircon/third_party/ulib/musl/src/ctype/iswxdigit.c
diff --git a/third_party/ulib/musl/src/ctype/isxdigit.c b/zircon/third_party/ulib/musl/src/ctype/isxdigit.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/isxdigit.c
rename to zircon/third_party/ulib/musl/src/ctype/isxdigit.c
diff --git a/third_party/ulib/musl/src/ctype/nonspacing.h b/zircon/third_party/ulib/musl/src/ctype/nonspacing.h
similarity index 100%
rename from third_party/ulib/musl/src/ctype/nonspacing.h
rename to zircon/third_party/ulib/musl/src/ctype/nonspacing.h
diff --git a/third_party/ulib/musl/src/ctype/punct.h b/zircon/third_party/ulib/musl/src/ctype/punct.h
similarity index 100%
rename from third_party/ulib/musl/src/ctype/punct.h
rename to zircon/third_party/ulib/musl/src/ctype/punct.h
diff --git a/third_party/ulib/musl/src/ctype/toascii.c b/zircon/third_party/ulib/musl/src/ctype/toascii.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/toascii.c
rename to zircon/third_party/ulib/musl/src/ctype/toascii.c
diff --git a/third_party/ulib/musl/src/ctype/tolower.c b/zircon/third_party/ulib/musl/src/ctype/tolower.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/tolower.c
rename to zircon/third_party/ulib/musl/src/ctype/tolower.c
diff --git a/third_party/ulib/musl/src/ctype/toupper.c b/zircon/third_party/ulib/musl/src/ctype/toupper.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/toupper.c
rename to zircon/third_party/ulib/musl/src/ctype/toupper.c
diff --git a/third_party/ulib/musl/src/ctype/towctrans.c b/zircon/third_party/ulib/musl/src/ctype/towctrans.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/towctrans.c
rename to zircon/third_party/ulib/musl/src/ctype/towctrans.c
diff --git a/third_party/ulib/musl/src/ctype/wcswidth.c b/zircon/third_party/ulib/musl/src/ctype/wcswidth.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/wcswidth.c
rename to zircon/third_party/ulib/musl/src/ctype/wcswidth.c
diff --git a/third_party/ulib/musl/src/ctype/wctrans.c b/zircon/third_party/ulib/musl/src/ctype/wctrans.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/wctrans.c
rename to zircon/third_party/ulib/musl/src/ctype/wctrans.c
diff --git a/third_party/ulib/musl/src/ctype/wcwidth.c b/zircon/third_party/ulib/musl/src/ctype/wcwidth.c
similarity index 100%
rename from third_party/ulib/musl/src/ctype/wcwidth.c
rename to zircon/third_party/ulib/musl/src/ctype/wcwidth.c
diff --git a/third_party/ulib/musl/src/ctype/wide.h b/zircon/third_party/ulib/musl/src/ctype/wide.h
similarity index 100%
rename from third_party/ulib/musl/src/ctype/wide.h
rename to zircon/third_party/ulib/musl/src/ctype/wide.h
diff --git a/third_party/ulib/musl/src/dirent/alphasort.c b/zircon/third_party/ulib/musl/src/dirent/alphasort.c
similarity index 100%
rename from third_party/ulib/musl/src/dirent/alphasort.c
rename to zircon/third_party/ulib/musl/src/dirent/alphasort.c
diff --git a/third_party/ulib/musl/src/dirent/scandir.c b/zircon/third_party/ulib/musl/src/dirent/scandir.c
similarity index 100%
rename from third_party/ulib/musl/src/dirent/scandir.c
rename to zircon/third_party/ulib/musl/src/dirent/scandir.c
diff --git a/third_party/ulib/musl/src/dirent/versionsort.c b/zircon/third_party/ulib/musl/src/dirent/versionsort.c
similarity index 100%
rename from third_party/ulib/musl/src/dirent/versionsort.c
rename to zircon/third_party/ulib/musl/src/dirent/versionsort.c
diff --git a/third_party/ulib/musl/src/env/__environ.c b/zircon/third_party/ulib/musl/src/env/__environ.c
similarity index 100%
rename from third_party/ulib/musl/src/env/__environ.c
rename to zircon/third_party/ulib/musl/src/env/__environ.c
diff --git a/third_party/ulib/musl/src/env/__libc_start_main.c b/zircon/third_party/ulib/musl/src/env/__libc_start_main.c
similarity index 100%
rename from third_party/ulib/musl/src/env/__libc_start_main.c
rename to zircon/third_party/ulib/musl/src/env/__libc_start_main.c
diff --git a/third_party/ulib/musl/src/env/__stack_chk_fail.c b/zircon/third_party/ulib/musl/src/env/__stack_chk_fail.c
similarity index 100%
rename from third_party/ulib/musl/src/env/__stack_chk_fail.c
rename to zircon/third_party/ulib/musl/src/env/__stack_chk_fail.c
diff --git a/third_party/ulib/musl/src/env/clearenv.c b/zircon/third_party/ulib/musl/src/env/clearenv.c
similarity index 100%
rename from third_party/ulib/musl/src/env/clearenv.c
rename to zircon/third_party/ulib/musl/src/env/clearenv.c
diff --git a/third_party/ulib/musl/src/env/getenv.c b/zircon/third_party/ulib/musl/src/env/getenv.c
similarity index 100%
rename from third_party/ulib/musl/src/env/getenv.c
rename to zircon/third_party/ulib/musl/src/env/getenv.c
diff --git a/third_party/ulib/musl/src/env/putenv.c b/zircon/third_party/ulib/musl/src/env/putenv.c
similarity index 100%
rename from third_party/ulib/musl/src/env/putenv.c
rename to zircon/third_party/ulib/musl/src/env/putenv.c
diff --git a/third_party/ulib/musl/src/env/setenv.c b/zircon/third_party/ulib/musl/src/env/setenv.c
similarity index 100%
rename from third_party/ulib/musl/src/env/setenv.c
rename to zircon/third_party/ulib/musl/src/env/setenv.c
diff --git a/third_party/ulib/musl/src/env/unsetenv.c b/zircon/third_party/ulib/musl/src/env/unsetenv.c
similarity index 100%
rename from third_party/ulib/musl/src/env/unsetenv.c
rename to zircon/third_party/ulib/musl/src/env/unsetenv.c
diff --git a/third_party/ulib/musl/src/errno/__errno_location.c b/zircon/third_party/ulib/musl/src/errno/__errno_location.c
similarity index 100%
rename from third_party/ulib/musl/src/errno/__errno_location.c
rename to zircon/third_party/ulib/musl/src/errno/__errno_location.c
diff --git a/third_party/ulib/musl/src/errno/__strerror.h b/zircon/third_party/ulib/musl/src/errno/__strerror.h
similarity index 100%
rename from third_party/ulib/musl/src/errno/__strerror.h
rename to zircon/third_party/ulib/musl/src/errno/__strerror.h
diff --git a/third_party/ulib/musl/src/errno/strerror.c b/zircon/third_party/ulib/musl/src/errno/strerror.c
similarity index 100%
rename from third_party/ulib/musl/src/errno/strerror.c
rename to zircon/third_party/ulib/musl/src/errno/strerror.c
diff --git a/third_party/ulib/musl/src/exit/_Exit.c b/zircon/third_party/ulib/musl/src/exit/_Exit.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/_Exit.c
rename to zircon/third_party/ulib/musl/src/exit/_Exit.c
diff --git a/third_party/ulib/musl/src/exit/__cxa_thread_atexit.c b/zircon/third_party/ulib/musl/src/exit/__cxa_thread_atexit.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/__cxa_thread_atexit.c
rename to zircon/third_party/ulib/musl/src/exit/__cxa_thread_atexit.c
diff --git a/third_party/ulib/musl/src/exit/abort.c b/zircon/third_party/ulib/musl/src/exit/abort.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/abort.c
rename to zircon/third_party/ulib/musl/src/exit/abort.c
diff --git a/third_party/ulib/musl/src/exit/assert.c b/zircon/third_party/ulib/musl/src/exit/assert.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/assert.c
rename to zircon/third_party/ulib/musl/src/exit/assert.c
diff --git a/third_party/ulib/musl/src/exit/at_quick_exit.c b/zircon/third_party/ulib/musl/src/exit/at_quick_exit.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/at_quick_exit.c
rename to zircon/third_party/ulib/musl/src/exit/at_quick_exit.c
diff --git a/third_party/ulib/musl/src/exit/atexit.c b/zircon/third_party/ulib/musl/src/exit/atexit.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/atexit.c
rename to zircon/third_party/ulib/musl/src/exit/atexit.c
diff --git a/third_party/ulib/musl/src/exit/exit.c b/zircon/third_party/ulib/musl/src/exit/exit.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/exit.c
rename to zircon/third_party/ulib/musl/src/exit/exit.c
diff --git a/third_party/ulib/musl/src/exit/quick_exit.c b/zircon/third_party/ulib/musl/src/exit/quick_exit.c
similarity index 100%
rename from third_party/ulib/musl/src/exit/quick_exit.c
rename to zircon/third_party/ulib/musl/src/exit/quick_exit.c
diff --git a/third_party/ulib/musl/src/fcntl/creat.c b/zircon/third_party/ulib/musl/src/fcntl/creat.c
similarity index 100%
rename from third_party/ulib/musl/src/fcntl/creat.c
rename to zircon/third_party/ulib/musl/src/fcntl/creat.c
diff --git a/third_party/ulib/musl/src/fenv/__flt_rounds.c b/zircon/third_party/ulib/musl/src/fenv/__flt_rounds.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/__flt_rounds.c
rename to zircon/third_party/ulib/musl/src/fenv/__flt_rounds.c
diff --git a/third_party/ulib/musl/src/fenv/aarch64/fenv.c b/zircon/third_party/ulib/musl/src/fenv/aarch64/fenv.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/aarch64/fenv.c
rename to zircon/third_party/ulib/musl/src/fenv/aarch64/fenv.c
diff --git a/third_party/ulib/musl/src/fenv/fegetexceptflag.c b/zircon/third_party/ulib/musl/src/fenv/fegetexceptflag.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/fegetexceptflag.c
rename to zircon/third_party/ulib/musl/src/fenv/fegetexceptflag.c
diff --git a/third_party/ulib/musl/src/fenv/feholdexcept.c b/zircon/third_party/ulib/musl/src/fenv/feholdexcept.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/feholdexcept.c
rename to zircon/third_party/ulib/musl/src/fenv/feholdexcept.c
diff --git a/third_party/ulib/musl/src/fenv/fesetexceptflag.c b/zircon/third_party/ulib/musl/src/fenv/fesetexceptflag.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/fesetexceptflag.c
rename to zircon/third_party/ulib/musl/src/fenv/fesetexceptflag.c
diff --git a/third_party/ulib/musl/src/fenv/fesetround.c b/zircon/third_party/ulib/musl/src/fenv/fesetround.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/fesetround.c
rename to zircon/third_party/ulib/musl/src/fenv/fesetround.c
diff --git a/third_party/ulib/musl/src/fenv/feupdateenv.c b/zircon/third_party/ulib/musl/src/fenv/feupdateenv.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/feupdateenv.c
rename to zircon/third_party/ulib/musl/src/fenv/feupdateenv.c
diff --git a/third_party/ulib/musl/src/fenv/x86_64/fenv.c b/zircon/third_party/ulib/musl/src/fenv/x86_64/fenv.c
similarity index 100%
rename from third_party/ulib/musl/src/fenv/x86_64/fenv.c
rename to zircon/third_party/ulib/musl/src/fenv/x86_64/fenv.c
diff --git a/third_party/ulib/musl/src/internal/__invtrigl.h b/zircon/third_party/ulib/musl/src/internal/__invtrigl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/__invtrigl.h
rename to zircon/third_party/ulib/musl/src/internal/__invtrigl.h
diff --git a/third_party/ulib/musl/src/internal/asan_impl.h b/zircon/third_party/ulib/musl/src/internal/asan_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/asan_impl.h
rename to zircon/third_party/ulib/musl/src/internal/asan_impl.h
diff --git a/third_party/ulib/musl/src/internal/asm.h b/zircon/third_party/ulib/musl/src/internal/asm.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/asm.h
rename to zircon/third_party/ulib/musl/src/internal/asm.h
diff --git a/third_party/ulib/musl/src/internal/atomic.h b/zircon/third_party/ulib/musl/src/internal/atomic.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/atomic.h
rename to zircon/third_party/ulib/musl/src/internal/atomic.h
diff --git a/third_party/ulib/musl/src/internal/dynlink.h b/zircon/third_party/ulib/musl/src/internal/dynlink.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/dynlink.h
rename to zircon/third_party/ulib/musl/src/internal/dynlink.h
diff --git a/third_party/ulib/musl/src/internal/env_impl.h b/zircon/third_party/ulib/musl/src/internal/env_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/env_impl.h
rename to zircon/third_party/ulib/musl/src/internal/env_impl.h
diff --git a/third_party/ulib/musl/src/internal/fdpic_crt.h b/zircon/third_party/ulib/musl/src/internal/fdpic_crt.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/fdpic_crt.h
rename to zircon/third_party/ulib/musl/src/internal/fdpic_crt.h
diff --git a/third_party/ulib/musl/src/internal/floatscan.c b/zircon/third_party/ulib/musl/src/internal/floatscan.c
similarity index 100%
rename from third_party/ulib/musl/src/internal/floatscan.c
rename to zircon/third_party/ulib/musl/src/internal/floatscan.c
diff --git a/third_party/ulib/musl/src/internal/floatscan.h b/zircon/third_party/ulib/musl/src/internal/floatscan.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/floatscan.h
rename to zircon/third_party/ulib/musl/src/internal/floatscan.h
diff --git a/third_party/ulib/musl/src/internal/futex_impl.h b/zircon/third_party/ulib/musl/src/internal/futex_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/futex_impl.h
rename to zircon/third_party/ulib/musl/src/internal/futex_impl.h
diff --git a/third_party/ulib/musl/src/internal/gettext_impl.h b/zircon/third_party/ulib/musl/src/internal/gettext_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/gettext_impl.h
rename to zircon/third_party/ulib/musl/src/internal/gettext_impl.h
diff --git a/third_party/ulib/musl/src/internal/intscan.c b/zircon/third_party/ulib/musl/src/internal/intscan.c
similarity index 100%
rename from third_party/ulib/musl/src/internal/intscan.c
rename to zircon/third_party/ulib/musl/src/internal/intscan.c
diff --git a/third_party/ulib/musl/src/internal/intscan.h b/zircon/third_party/ulib/musl/src/internal/intscan.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/intscan.h
rename to zircon/third_party/ulib/musl/src/internal/intscan.h
diff --git a/third_party/ulib/musl/src/internal/libc.c b/zircon/third_party/ulib/musl/src/internal/libc.c
similarity index 100%
rename from third_party/ulib/musl/src/internal/libc.c
rename to zircon/third_party/ulib/musl/src/internal/libc.c
diff --git a/third_party/ulib/musl/src/internal/libc.h b/zircon/third_party/ulib/musl/src/internal/libc.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/libc.h
rename to zircon/third_party/ulib/musl/src/internal/libc.h
diff --git a/third_party/ulib/musl/src/internal/locale_impl.h b/zircon/third_party/ulib/musl/src/internal/locale_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/locale_impl.h
rename to zircon/third_party/ulib/musl/src/internal/locale_impl.h
diff --git a/third_party/ulib/musl/src/internal/setjmp_impl.h b/zircon/third_party/ulib/musl/src/internal/setjmp_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/setjmp_impl.h
rename to zircon/third_party/ulib/musl/src/internal/setjmp_impl.h
diff --git a/third_party/ulib/musl/src/internal/shgetc.c b/zircon/third_party/ulib/musl/src/internal/shgetc.c
similarity index 100%
rename from third_party/ulib/musl/src/internal/shgetc.c
rename to zircon/third_party/ulib/musl/src/internal/shgetc.c
diff --git a/third_party/ulib/musl/src/internal/shgetc.h b/zircon/third_party/ulib/musl/src/internal/shgetc.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/shgetc.h
rename to zircon/third_party/ulib/musl/src/internal/shgetc.h
diff --git a/third_party/ulib/musl/src/internal/stdio_impl.h b/zircon/third_party/ulib/musl/src/internal/stdio_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/stdio_impl.h
rename to zircon/third_party/ulib/musl/src/internal/stdio_impl.h
diff --git a/third_party/ulib/musl/src/internal/threads_impl.h b/zircon/third_party/ulib/musl/src/internal/threads_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/threads_impl.h
rename to zircon/third_party/ulib/musl/src/internal/threads_impl.h
diff --git a/third_party/ulib/musl/src/internal/time_conversion.h b/zircon/third_party/ulib/musl/src/internal/time_conversion.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/time_conversion.h
rename to zircon/third_party/ulib/musl/src/internal/time_conversion.h
diff --git a/third_party/ulib/musl/src/internal/zircon_impl.h b/zircon/third_party/ulib/musl/src/internal/zircon_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/internal/zircon_impl.h
rename to zircon/third_party/ulib/musl/src/internal/zircon_impl.h
diff --git a/third_party/ulib/musl/src/ipc/ftok.c b/zircon/third_party/ulib/musl/src/ipc/ftok.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/ftok.c
rename to zircon/third_party/ulib/musl/src/ipc/ftok.c
diff --git a/third_party/ulib/musl/src/ipc/ipc.h b/zircon/third_party/ulib/musl/src/ipc/ipc.h
similarity index 100%
rename from third_party/ulib/musl/src/ipc/ipc.h
rename to zircon/third_party/ulib/musl/src/ipc/ipc.h
diff --git a/third_party/ulib/musl/src/ipc/msgctl.c b/zircon/third_party/ulib/musl/src/ipc/msgctl.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/msgctl.c
rename to zircon/third_party/ulib/musl/src/ipc/msgctl.c
diff --git a/third_party/ulib/musl/src/ipc/msgget.c b/zircon/third_party/ulib/musl/src/ipc/msgget.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/msgget.c
rename to zircon/third_party/ulib/musl/src/ipc/msgget.c
diff --git a/third_party/ulib/musl/src/ipc/msgrcv.c b/zircon/third_party/ulib/musl/src/ipc/msgrcv.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/msgrcv.c
rename to zircon/third_party/ulib/musl/src/ipc/msgrcv.c
diff --git a/third_party/ulib/musl/src/ipc/msgsnd.c b/zircon/third_party/ulib/musl/src/ipc/msgsnd.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/msgsnd.c
rename to zircon/third_party/ulib/musl/src/ipc/msgsnd.c
diff --git a/third_party/ulib/musl/src/ipc/semctl.c b/zircon/third_party/ulib/musl/src/ipc/semctl.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/semctl.c
rename to zircon/third_party/ulib/musl/src/ipc/semctl.c
diff --git a/third_party/ulib/musl/src/ipc/semget.c b/zircon/third_party/ulib/musl/src/ipc/semget.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/semget.c
rename to zircon/third_party/ulib/musl/src/ipc/semget.c
diff --git a/third_party/ulib/musl/src/ipc/semop.c b/zircon/third_party/ulib/musl/src/ipc/semop.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/semop.c
rename to zircon/third_party/ulib/musl/src/ipc/semop.c
diff --git a/third_party/ulib/musl/src/ipc/semtimedop.c b/zircon/third_party/ulib/musl/src/ipc/semtimedop.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/semtimedop.c
rename to zircon/third_party/ulib/musl/src/ipc/semtimedop.c
diff --git a/third_party/ulib/musl/src/ipc/shmat.c b/zircon/third_party/ulib/musl/src/ipc/shmat.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/shmat.c
rename to zircon/third_party/ulib/musl/src/ipc/shmat.c
diff --git a/third_party/ulib/musl/src/ipc/shmctl.c b/zircon/third_party/ulib/musl/src/ipc/shmctl.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/shmctl.c
rename to zircon/third_party/ulib/musl/src/ipc/shmctl.c
diff --git a/third_party/ulib/musl/src/ipc/shmdt.c b/zircon/third_party/ulib/musl/src/ipc/shmdt.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/shmdt.c
rename to zircon/third_party/ulib/musl/src/ipc/shmdt.c
diff --git a/third_party/ulib/musl/src/ipc/shmget.c b/zircon/third_party/ulib/musl/src/ipc/shmget.c
similarity index 100%
rename from third_party/ulib/musl/src/ipc/shmget.c
rename to zircon/third_party/ulib/musl/src/ipc/shmget.c
diff --git a/third_party/ulib/musl/src/ldso/aarch64/tlsdesc.S b/zircon/third_party/ulib/musl/src/ldso/aarch64/tlsdesc.S
similarity index 100%
rename from third_party/ulib/musl/src/ldso/aarch64/tlsdesc.S
rename to zircon/third_party/ulib/musl/src/ldso/aarch64/tlsdesc.S
diff --git a/third_party/ulib/musl/src/ldso/dlclose.c b/zircon/third_party/ulib/musl/src/ldso/dlclose.c
similarity index 100%
rename from third_party/ulib/musl/src/ldso/dlclose.c
rename to zircon/third_party/ulib/musl/src/ldso/dlclose.c
diff --git a/third_party/ulib/musl/src/ldso/dlerror.c b/zircon/third_party/ulib/musl/src/ldso/dlerror.c
similarity index 100%
rename from third_party/ulib/musl/src/ldso/dlerror.c
rename to zircon/third_party/ulib/musl/src/ldso/dlerror.c
diff --git a/third_party/ulib/musl/src/ldso/dlinfo.c b/zircon/third_party/ulib/musl/src/ldso/dlinfo.c
similarity index 100%
rename from third_party/ulib/musl/src/ldso/dlinfo.c
rename to zircon/third_party/ulib/musl/src/ldso/dlinfo.c
diff --git a/third_party/ulib/musl/src/ldso/x86_64/tlsdesc.S b/zircon/third_party/ulib/musl/src/ldso/x86_64/tlsdesc.S
similarity index 100%
rename from third_party/ulib/musl/src/ldso/x86_64/tlsdesc.S
rename to zircon/third_party/ulib/musl/src/ldso/x86_64/tlsdesc.S
diff --git a/third_party/ulib/musl/src/legacy/cuserid.c b/zircon/third_party/ulib/musl/src/legacy/cuserid.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/cuserid.c
rename to zircon/third_party/ulib/musl/src/legacy/cuserid.c
diff --git a/third_party/ulib/musl/src/legacy/err.c b/zircon/third_party/ulib/musl/src/legacy/err.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/err.c
rename to zircon/third_party/ulib/musl/src/legacy/err.c
diff --git a/third_party/ulib/musl/src/legacy/euidaccess.c b/zircon/third_party/ulib/musl/src/legacy/euidaccess.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/euidaccess.c
rename to zircon/third_party/ulib/musl/src/legacy/euidaccess.c
diff --git a/third_party/ulib/musl/src/legacy/ftw.c b/zircon/third_party/ulib/musl/src/legacy/ftw.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/ftw.c
rename to zircon/third_party/ulib/musl/src/legacy/ftw.c
diff --git a/third_party/ulib/musl/src/legacy/futimes.c b/zircon/third_party/ulib/musl/src/legacy/futimes.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/futimes.c
rename to zircon/third_party/ulib/musl/src/legacy/futimes.c
diff --git a/third_party/ulib/musl/src/legacy/getdtablesize.c b/zircon/third_party/ulib/musl/src/legacy/getdtablesize.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/getdtablesize.c
rename to zircon/third_party/ulib/musl/src/legacy/getdtablesize.c
diff --git a/third_party/ulib/musl/src/legacy/getpagesize.c b/zircon/third_party/ulib/musl/src/legacy/getpagesize.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/getpagesize.c
rename to zircon/third_party/ulib/musl/src/legacy/getpagesize.c
diff --git a/third_party/ulib/musl/src/legacy/getpass.c b/zircon/third_party/ulib/musl/src/legacy/getpass.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/getpass.c
rename to zircon/third_party/ulib/musl/src/legacy/getpass.c
diff --git a/third_party/ulib/musl/src/legacy/isastream.c b/zircon/third_party/ulib/musl/src/legacy/isastream.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/isastream.c
rename to zircon/third_party/ulib/musl/src/legacy/isastream.c
diff --git a/third_party/ulib/musl/src/legacy/lutimes.c b/zircon/third_party/ulib/musl/src/legacy/lutimes.c
similarity index 100%
rename from third_party/ulib/musl/src/legacy/lutimes.c
rename to zircon/third_party/ulib/musl/src/legacy/lutimes.c
diff --git a/third_party/ulib/musl/src/linux/adjtime.c b/zircon/third_party/ulib/musl/src/linux/adjtime.c
similarity index 100%
rename from third_party/ulib/musl/src/linux/adjtime.c
rename to zircon/third_party/ulib/musl/src/linux/adjtime.c
diff --git a/third_party/ulib/musl/src/linux/flock.c b/zircon/third_party/ulib/musl/src/linux/flock.c
similarity index 100%
rename from third_party/ulib/musl/src/linux/flock.c
rename to zircon/third_party/ulib/musl/src/linux/flock.c
diff --git a/third_party/ulib/musl/src/linux/sethostname.c b/zircon/third_party/ulib/musl/src/linux/sethostname.c
similarity index 100%
rename from third_party/ulib/musl/src/linux/sethostname.c
rename to zircon/third_party/ulib/musl/src/linux/sethostname.c
diff --git a/third_party/ulib/musl/src/linux/settimeofday.c b/zircon/third_party/ulib/musl/src/linux/settimeofday.c
similarity index 100%
rename from third_party/ulib/musl/src/linux/settimeofday.c
rename to zircon/third_party/ulib/musl/src/linux/settimeofday.c
diff --git a/third_party/ulib/musl/src/linux/stime.c b/zircon/third_party/ulib/musl/src/linux/stime.c
similarity index 100%
rename from third_party/ulib/musl/src/linux/stime.c
rename to zircon/third_party/ulib/musl/src/linux/stime.c
diff --git a/third_party/ulib/musl/src/linux/utimes.c b/zircon/third_party/ulib/musl/src/linux/utimes.c
similarity index 100%
rename from third_party/ulib/musl/src/linux/utimes.c
rename to zircon/third_party/ulib/musl/src/linux/utimes.c
diff --git a/third_party/ulib/musl/src/locale/__lctrans.c b/zircon/third_party/ulib/musl/src/locale/__lctrans.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/__lctrans.c
rename to zircon/third_party/ulib/musl/src/locale/__lctrans.c
diff --git a/third_party/ulib/musl/src/locale/__mo_lookup.c b/zircon/third_party/ulib/musl/src/locale/__mo_lookup.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/__mo_lookup.c
rename to zircon/third_party/ulib/musl/src/locale/__mo_lookup.c
diff --git a/third_party/ulib/musl/src/locale/big5.inc b/zircon/third_party/ulib/musl/src/locale/big5.inc
similarity index 100%
rename from third_party/ulib/musl/src/locale/big5.inc
rename to zircon/third_party/ulib/musl/src/locale/big5.inc
diff --git a/third_party/ulib/musl/src/locale/c_locale.c b/zircon/third_party/ulib/musl/src/locale/c_locale.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/c_locale.c
rename to zircon/third_party/ulib/musl/src/locale/c_locale.c
diff --git a/third_party/ulib/musl/src/locale/catclose.c b/zircon/third_party/ulib/musl/src/locale/catclose.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/catclose.c
rename to zircon/third_party/ulib/musl/src/locale/catclose.c
diff --git a/third_party/ulib/musl/src/locale/catgets.c b/zircon/third_party/ulib/musl/src/locale/catgets.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/catgets.c
rename to zircon/third_party/ulib/musl/src/locale/catgets.c
diff --git a/third_party/ulib/musl/src/locale/catopen.c b/zircon/third_party/ulib/musl/src/locale/catopen.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/catopen.c
rename to zircon/third_party/ulib/musl/src/locale/catopen.c
diff --git a/third_party/ulib/musl/src/locale/codepages.inc b/zircon/third_party/ulib/musl/src/locale/codepages.inc
similarity index 100%
rename from third_party/ulib/musl/src/locale/codepages.inc
rename to zircon/third_party/ulib/musl/src/locale/codepages.inc
diff --git a/third_party/ulib/musl/src/locale/duplocale.c b/zircon/third_party/ulib/musl/src/locale/duplocale.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/duplocale.c
rename to zircon/third_party/ulib/musl/src/locale/duplocale.c
diff --git a/third_party/ulib/musl/src/locale/freelocale.c b/zircon/third_party/ulib/musl/src/locale/freelocale.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/freelocale.c
rename to zircon/third_party/ulib/musl/src/locale/freelocale.c
diff --git a/third_party/ulib/musl/src/locale/gb18030.inc b/zircon/third_party/ulib/musl/src/locale/gb18030.inc
similarity index 100%
rename from third_party/ulib/musl/src/locale/gb18030.inc
rename to zircon/third_party/ulib/musl/src/locale/gb18030.inc
diff --git a/third_party/ulib/musl/src/locale/hkscs.inc b/zircon/third_party/ulib/musl/src/locale/hkscs.inc
similarity index 100%
rename from third_party/ulib/musl/src/locale/hkscs.inc
rename to zircon/third_party/ulib/musl/src/locale/hkscs.inc
diff --git a/third_party/ulib/musl/src/locale/iconv.c b/zircon/third_party/ulib/musl/src/locale/iconv.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/iconv.c
rename to zircon/third_party/ulib/musl/src/locale/iconv.c
diff --git a/third_party/ulib/musl/src/locale/jis0208.inc b/zircon/third_party/ulib/musl/src/locale/jis0208.inc
similarity index 100%
rename from third_party/ulib/musl/src/locale/jis0208.inc
rename to zircon/third_party/ulib/musl/src/locale/jis0208.inc
diff --git a/third_party/ulib/musl/src/locale/ksc.inc b/zircon/third_party/ulib/musl/src/locale/ksc.inc
similarity index 100%
rename from third_party/ulib/musl/src/locale/ksc.inc
rename to zircon/third_party/ulib/musl/src/locale/ksc.inc
diff --git a/third_party/ulib/musl/src/locale/langinfo.c b/zircon/third_party/ulib/musl/src/locale/langinfo.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/langinfo.c
rename to zircon/third_party/ulib/musl/src/locale/langinfo.c
diff --git a/third_party/ulib/musl/src/locale/legacychars.inc b/zircon/third_party/ulib/musl/src/locale/legacychars.inc
similarity index 100%
rename from third_party/ulib/musl/src/locale/legacychars.inc
rename to zircon/third_party/ulib/musl/src/locale/legacychars.inc
diff --git a/third_party/ulib/musl/src/locale/locale_map.c b/zircon/third_party/ulib/musl/src/locale/locale_map.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/locale_map.c
rename to zircon/third_party/ulib/musl/src/locale/locale_map.c
diff --git a/third_party/ulib/musl/src/locale/localeconv.c b/zircon/third_party/ulib/musl/src/locale/localeconv.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/localeconv.c
rename to zircon/third_party/ulib/musl/src/locale/localeconv.c
diff --git a/third_party/ulib/musl/src/locale/newlocale.c b/zircon/third_party/ulib/musl/src/locale/newlocale.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/newlocale.c
rename to zircon/third_party/ulib/musl/src/locale/newlocale.c
diff --git a/third_party/ulib/musl/src/locale/pleval.c b/zircon/third_party/ulib/musl/src/locale/pleval.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/pleval.c
rename to zircon/third_party/ulib/musl/src/locale/pleval.c
diff --git a/third_party/ulib/musl/src/locale/setlocale.c b/zircon/third_party/ulib/musl/src/locale/setlocale.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/setlocale.c
rename to zircon/third_party/ulib/musl/src/locale/setlocale.c
diff --git a/third_party/ulib/musl/src/locale/strcoll.c b/zircon/third_party/ulib/musl/src/locale/strcoll.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/strcoll.c
rename to zircon/third_party/ulib/musl/src/locale/strcoll.c
diff --git a/third_party/ulib/musl/src/locale/strfmon.c b/zircon/third_party/ulib/musl/src/locale/strfmon.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/strfmon.c
rename to zircon/third_party/ulib/musl/src/locale/strfmon.c
diff --git a/third_party/ulib/musl/src/locale/strxfrm.c b/zircon/third_party/ulib/musl/src/locale/strxfrm.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/strxfrm.c
rename to zircon/third_party/ulib/musl/src/locale/strxfrm.c
diff --git a/third_party/ulib/musl/src/locale/uselocale.c b/zircon/third_party/ulib/musl/src/locale/uselocale.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/uselocale.c
rename to zircon/third_party/ulib/musl/src/locale/uselocale.c
diff --git a/third_party/ulib/musl/src/locale/wcscoll.c b/zircon/third_party/ulib/musl/src/locale/wcscoll.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/wcscoll.c
rename to zircon/third_party/ulib/musl/src/locale/wcscoll.c
diff --git a/third_party/ulib/musl/src/locale/wcsxfrm.c b/zircon/third_party/ulib/musl/src/locale/wcsxfrm.c
similarity index 100%
rename from third_party/ulib/musl/src/locale/wcsxfrm.c
rename to zircon/third_party/ulib/musl/src/locale/wcsxfrm.c
diff --git a/third_party/ulib/musl/src/math/__expo2.c b/zircon/third_party/ulib/musl/src/math/__expo2.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__expo2.c
rename to zircon/third_party/ulib/musl/src/math/__expo2.c
diff --git a/third_party/ulib/musl/src/math/__expo2f.c b/zircon/third_party/ulib/musl/src/math/__expo2f.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__expo2f.c
rename to zircon/third_party/ulib/musl/src/math/__expo2f.c
diff --git a/third_party/ulib/musl/src/math/__fpclassify.c b/zircon/third_party/ulib/musl/src/math/__fpclassify.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__fpclassify.c
rename to zircon/third_party/ulib/musl/src/math/__fpclassify.c
diff --git a/third_party/ulib/musl/src/math/__fpclassifyf.c b/zircon/third_party/ulib/musl/src/math/__fpclassifyf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__fpclassifyf.c
rename to zircon/third_party/ulib/musl/src/math/__fpclassifyf.c
diff --git a/third_party/ulib/musl/src/math/__fpclassifyl.c b/zircon/third_party/ulib/musl/src/math/__fpclassifyl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__fpclassifyl.c
rename to zircon/third_party/ulib/musl/src/math/__fpclassifyl.c
diff --git a/third_party/ulib/musl/src/math/__invtrigl.c b/zircon/third_party/ulib/musl/src/math/__invtrigl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__invtrigl.c
rename to zircon/third_party/ulib/musl/src/math/__invtrigl.c
diff --git a/third_party/ulib/musl/src/math/__signbit.c b/zircon/third_party/ulib/musl/src/math/__signbit.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__signbit.c
rename to zircon/third_party/ulib/musl/src/math/__signbit.c
diff --git a/third_party/ulib/musl/src/math/__signbitf.c b/zircon/third_party/ulib/musl/src/math/__signbitf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__signbitf.c
rename to zircon/third_party/ulib/musl/src/math/__signbitf.c
diff --git a/third_party/ulib/musl/src/math/__signbitl.c b/zircon/third_party/ulib/musl/src/math/__signbitl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/__signbitl.c
rename to zircon/third_party/ulib/musl/src/math/__signbitl.c
diff --git a/third_party/ulib/musl/src/math/aarch64/fabs.S b/zircon/third_party/ulib/musl/src/math/aarch64/fabs.S
similarity index 100%
rename from third_party/ulib/musl/src/math/aarch64/fabs.S
rename to zircon/third_party/ulib/musl/src/math/aarch64/fabs.S
diff --git a/third_party/ulib/musl/src/math/aarch64/fabsf.S b/zircon/third_party/ulib/musl/src/math/aarch64/fabsf.S
similarity index 100%
rename from third_party/ulib/musl/src/math/aarch64/fabsf.S
rename to zircon/third_party/ulib/musl/src/math/aarch64/fabsf.S
diff --git a/third_party/ulib/musl/src/math/aarch64/sqrt.S b/zircon/third_party/ulib/musl/src/math/aarch64/sqrt.S
similarity index 100%
rename from third_party/ulib/musl/src/math/aarch64/sqrt.S
rename to zircon/third_party/ulib/musl/src/math/aarch64/sqrt.S
diff --git a/third_party/ulib/musl/src/math/aarch64/sqrtf.S b/zircon/third_party/ulib/musl/src/math/aarch64/sqrtf.S
similarity index 100%
rename from third_party/ulib/musl/src/math/aarch64/sqrtf.S
rename to zircon/third_party/ulib/musl/src/math/aarch64/sqrtf.S
diff --git a/third_party/ulib/musl/src/math/acosh.c b/zircon/third_party/ulib/musl/src/math/acosh.c
similarity index 100%
rename from third_party/ulib/musl/src/math/acosh.c
rename to zircon/third_party/ulib/musl/src/math/acosh.c
diff --git a/third_party/ulib/musl/src/math/acoshf.c b/zircon/third_party/ulib/musl/src/math/acoshf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/acoshf.c
rename to zircon/third_party/ulib/musl/src/math/acoshf.c
diff --git a/third_party/ulib/musl/src/math/acoshl.c b/zircon/third_party/ulib/musl/src/math/acoshl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/acoshl.c
rename to zircon/third_party/ulib/musl/src/math/acoshl.c
diff --git a/third_party/ulib/musl/src/math/asinh.c b/zircon/third_party/ulib/musl/src/math/asinh.c
similarity index 100%
rename from third_party/ulib/musl/src/math/asinh.c
rename to zircon/third_party/ulib/musl/src/math/asinh.c
diff --git a/third_party/ulib/musl/src/math/asinhf.c b/zircon/third_party/ulib/musl/src/math/asinhf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/asinhf.c
rename to zircon/third_party/ulib/musl/src/math/asinhf.c
diff --git a/third_party/ulib/musl/src/math/asinhl.c b/zircon/third_party/ulib/musl/src/math/asinhl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/asinhl.c
rename to zircon/third_party/ulib/musl/src/math/asinhl.c
diff --git a/third_party/ulib/musl/src/math/atanh.c b/zircon/third_party/ulib/musl/src/math/atanh.c
similarity index 100%
rename from third_party/ulib/musl/src/math/atanh.c
rename to zircon/third_party/ulib/musl/src/math/atanh.c
diff --git a/third_party/ulib/musl/src/math/atanhf.c b/zircon/third_party/ulib/musl/src/math/atanhf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/atanhf.c
rename to zircon/third_party/ulib/musl/src/math/atanhf.c
diff --git a/third_party/ulib/musl/src/math/atanhl.c b/zircon/third_party/ulib/musl/src/math/atanhl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/atanhl.c
rename to zircon/third_party/ulib/musl/src/math/atanhl.c
diff --git a/third_party/ulib/musl/src/math/ceil.c b/zircon/third_party/ulib/musl/src/math/ceil.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ceil.c
rename to zircon/third_party/ulib/musl/src/math/ceil.c
diff --git a/third_party/ulib/musl/src/math/ceilf.c b/zircon/third_party/ulib/musl/src/math/ceilf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ceilf.c
rename to zircon/third_party/ulib/musl/src/math/ceilf.c
diff --git a/third_party/ulib/musl/src/math/ceill.c b/zircon/third_party/ulib/musl/src/math/ceill.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ceill.c
rename to zircon/third_party/ulib/musl/src/math/ceill.c
diff --git a/third_party/ulib/musl/src/math/copysign.c b/zircon/third_party/ulib/musl/src/math/copysign.c
similarity index 100%
rename from third_party/ulib/musl/src/math/copysign.c
rename to zircon/third_party/ulib/musl/src/math/copysign.c
diff --git a/third_party/ulib/musl/src/math/copysignf.c b/zircon/third_party/ulib/musl/src/math/copysignf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/copysignf.c
rename to zircon/third_party/ulib/musl/src/math/copysignf.c
diff --git a/third_party/ulib/musl/src/math/copysignl.c b/zircon/third_party/ulib/musl/src/math/copysignl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/copysignl.c
rename to zircon/third_party/ulib/musl/src/math/copysignl.c
diff --git a/third_party/ulib/musl/src/math/cosh.c b/zircon/third_party/ulib/musl/src/math/cosh.c
similarity index 100%
rename from third_party/ulib/musl/src/math/cosh.c
rename to zircon/third_party/ulib/musl/src/math/cosh.c
diff --git a/third_party/ulib/musl/src/math/coshf.c b/zircon/third_party/ulib/musl/src/math/coshf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/coshf.c
rename to zircon/third_party/ulib/musl/src/math/coshf.c
diff --git a/third_party/ulib/musl/src/math/coshl.c b/zircon/third_party/ulib/musl/src/math/coshl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/coshl.c
rename to zircon/third_party/ulib/musl/src/math/coshl.c
diff --git a/third_party/ulib/musl/src/math/cosl.c b/zircon/third_party/ulib/musl/src/math/cosl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/cosl.c
rename to zircon/third_party/ulib/musl/src/math/cosl.c
diff --git a/third_party/ulib/musl/src/math/exp10.c b/zircon/third_party/ulib/musl/src/math/exp10.c
similarity index 100%
rename from third_party/ulib/musl/src/math/exp10.c
rename to zircon/third_party/ulib/musl/src/math/exp10.c
diff --git a/third_party/ulib/musl/src/math/exp10f.c b/zircon/third_party/ulib/musl/src/math/exp10f.c
similarity index 100%
rename from third_party/ulib/musl/src/math/exp10f.c
rename to zircon/third_party/ulib/musl/src/math/exp10f.c
diff --git a/third_party/ulib/musl/src/math/exp10l.c b/zircon/third_party/ulib/musl/src/math/exp10l.c
similarity index 100%
rename from third_party/ulib/musl/src/math/exp10l.c
rename to zircon/third_party/ulib/musl/src/math/exp10l.c
diff --git a/third_party/ulib/musl/src/math/fabsl.c b/zircon/third_party/ulib/musl/src/math/fabsl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fabsl.c
rename to zircon/third_party/ulib/musl/src/math/fabsl.c
diff --git a/third_party/ulib/musl/src/math/fdim.c b/zircon/third_party/ulib/musl/src/math/fdim.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fdim.c
rename to zircon/third_party/ulib/musl/src/math/fdim.c
diff --git a/third_party/ulib/musl/src/math/fdimf.c b/zircon/third_party/ulib/musl/src/math/fdimf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fdimf.c
rename to zircon/third_party/ulib/musl/src/math/fdimf.c
diff --git a/third_party/ulib/musl/src/math/fdiml.c b/zircon/third_party/ulib/musl/src/math/fdiml.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fdiml.c
rename to zircon/third_party/ulib/musl/src/math/fdiml.c
diff --git a/third_party/ulib/musl/src/math/finite.c b/zircon/third_party/ulib/musl/src/math/finite.c
similarity index 100%
rename from third_party/ulib/musl/src/math/finite.c
rename to zircon/third_party/ulib/musl/src/math/finite.c
diff --git a/third_party/ulib/musl/src/math/finitef.c b/zircon/third_party/ulib/musl/src/math/finitef.c
similarity index 100%
rename from third_party/ulib/musl/src/math/finitef.c
rename to zircon/third_party/ulib/musl/src/math/finitef.c
diff --git a/third_party/ulib/musl/src/math/floor.c b/zircon/third_party/ulib/musl/src/math/floor.c
similarity index 100%
rename from third_party/ulib/musl/src/math/floor.c
rename to zircon/third_party/ulib/musl/src/math/floor.c
diff --git a/third_party/ulib/musl/src/math/floorf.c b/zircon/third_party/ulib/musl/src/math/floorf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/floorf.c
rename to zircon/third_party/ulib/musl/src/math/floorf.c
diff --git a/third_party/ulib/musl/src/math/floorl.c b/zircon/third_party/ulib/musl/src/math/floorl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/floorl.c
rename to zircon/third_party/ulib/musl/src/math/floorl.c
diff --git a/third_party/ulib/musl/src/math/fmax.c b/zircon/third_party/ulib/musl/src/math/fmax.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fmax.c
rename to zircon/third_party/ulib/musl/src/math/fmax.c
diff --git a/third_party/ulib/musl/src/math/fmaxf.c b/zircon/third_party/ulib/musl/src/math/fmaxf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fmaxf.c
rename to zircon/third_party/ulib/musl/src/math/fmaxf.c
diff --git a/third_party/ulib/musl/src/math/fmaxl.c b/zircon/third_party/ulib/musl/src/math/fmaxl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fmaxl.c
rename to zircon/third_party/ulib/musl/src/math/fmaxl.c
diff --git a/third_party/ulib/musl/src/math/fmin.c b/zircon/third_party/ulib/musl/src/math/fmin.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fmin.c
rename to zircon/third_party/ulib/musl/src/math/fmin.c
diff --git a/third_party/ulib/musl/src/math/fminf.c b/zircon/third_party/ulib/musl/src/math/fminf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fminf.c
rename to zircon/third_party/ulib/musl/src/math/fminf.c
diff --git a/third_party/ulib/musl/src/math/fminl.c b/zircon/third_party/ulib/musl/src/math/fminl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fminl.c
rename to zircon/third_party/ulib/musl/src/math/fminl.c
diff --git a/third_party/ulib/musl/src/math/fmod.c b/zircon/third_party/ulib/musl/src/math/fmod.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fmod.c
rename to zircon/third_party/ulib/musl/src/math/fmod.c
diff --git a/third_party/ulib/musl/src/math/fmodf.c b/zircon/third_party/ulib/musl/src/math/fmodf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fmodf.c
rename to zircon/third_party/ulib/musl/src/math/fmodf.c
diff --git a/third_party/ulib/musl/src/math/fmodl.c b/zircon/third_party/ulib/musl/src/math/fmodl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/fmodl.c
rename to zircon/third_party/ulib/musl/src/math/fmodl.c
diff --git a/third_party/ulib/musl/src/math/frexp.c b/zircon/third_party/ulib/musl/src/math/frexp.c
similarity index 100%
rename from third_party/ulib/musl/src/math/frexp.c
rename to zircon/third_party/ulib/musl/src/math/frexp.c
diff --git a/third_party/ulib/musl/src/math/frexpf.c b/zircon/third_party/ulib/musl/src/math/frexpf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/frexpf.c
rename to zircon/third_party/ulib/musl/src/math/frexpf.c
diff --git a/third_party/ulib/musl/src/math/frexpl.c b/zircon/third_party/ulib/musl/src/math/frexpl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/frexpl.c
rename to zircon/third_party/ulib/musl/src/math/frexpl.c
diff --git a/third_party/ulib/musl/src/math/hypot.c b/zircon/third_party/ulib/musl/src/math/hypot.c
similarity index 100%
rename from third_party/ulib/musl/src/math/hypot.c
rename to zircon/third_party/ulib/musl/src/math/hypot.c
diff --git a/third_party/ulib/musl/src/math/hypotf.c b/zircon/third_party/ulib/musl/src/math/hypotf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/hypotf.c
rename to zircon/third_party/ulib/musl/src/math/hypotf.c
diff --git a/third_party/ulib/musl/src/math/hypotl.c b/zircon/third_party/ulib/musl/src/math/hypotl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/hypotl.c
rename to zircon/third_party/ulib/musl/src/math/hypotl.c
diff --git a/third_party/ulib/musl/src/math/ilogb.c b/zircon/third_party/ulib/musl/src/math/ilogb.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ilogb.c
rename to zircon/third_party/ulib/musl/src/math/ilogb.c
diff --git a/third_party/ulib/musl/src/math/ilogbf.c b/zircon/third_party/ulib/musl/src/math/ilogbf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ilogbf.c
rename to zircon/third_party/ulib/musl/src/math/ilogbf.c
diff --git a/third_party/ulib/musl/src/math/ilogbl.c b/zircon/third_party/ulib/musl/src/math/ilogbl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ilogbl.c
rename to zircon/third_party/ulib/musl/src/math/ilogbl.c
diff --git a/third_party/ulib/musl/src/math/ldexp.c b/zircon/third_party/ulib/musl/src/math/ldexp.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ldexp.c
rename to zircon/third_party/ulib/musl/src/math/ldexp.c
diff --git a/third_party/ulib/musl/src/math/ldexpf.c b/zircon/third_party/ulib/musl/src/math/ldexpf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ldexpf.c
rename to zircon/third_party/ulib/musl/src/math/ldexpf.c
diff --git a/third_party/ulib/musl/src/math/ldexpl.c b/zircon/third_party/ulib/musl/src/math/ldexpl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/ldexpl.c
rename to zircon/third_party/ulib/musl/src/math/ldexpl.c
diff --git a/third_party/ulib/musl/src/math/lgamma.c b/zircon/third_party/ulib/musl/src/math/lgamma.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lgamma.c
rename to zircon/third_party/ulib/musl/src/math/lgamma.c
diff --git a/third_party/ulib/musl/src/math/lgammaf.c b/zircon/third_party/ulib/musl/src/math/lgammaf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lgammaf.c
rename to zircon/third_party/ulib/musl/src/math/lgammaf.c
diff --git a/third_party/ulib/musl/src/math/llrint.c b/zircon/third_party/ulib/musl/src/math/llrint.c
similarity index 100%
rename from third_party/ulib/musl/src/math/llrint.c
rename to zircon/third_party/ulib/musl/src/math/llrint.c
diff --git a/third_party/ulib/musl/src/math/llrintf.c b/zircon/third_party/ulib/musl/src/math/llrintf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/llrintf.c
rename to zircon/third_party/ulib/musl/src/math/llrintf.c
diff --git a/third_party/ulib/musl/src/math/llrintl.c b/zircon/third_party/ulib/musl/src/math/llrintl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/llrintl.c
rename to zircon/third_party/ulib/musl/src/math/llrintl.c
diff --git a/third_party/ulib/musl/src/math/llround.c b/zircon/third_party/ulib/musl/src/math/llround.c
similarity index 100%
rename from third_party/ulib/musl/src/math/llround.c
rename to zircon/third_party/ulib/musl/src/math/llround.c
diff --git a/third_party/ulib/musl/src/math/llroundf.c b/zircon/third_party/ulib/musl/src/math/llroundf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/llroundf.c
rename to zircon/third_party/ulib/musl/src/math/llroundf.c
diff --git a/third_party/ulib/musl/src/math/llroundl.c b/zircon/third_party/ulib/musl/src/math/llroundl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/llroundl.c
rename to zircon/third_party/ulib/musl/src/math/llroundl.c
diff --git a/third_party/ulib/musl/src/math/logb.c b/zircon/third_party/ulib/musl/src/math/logb.c
similarity index 100%
rename from third_party/ulib/musl/src/math/logb.c
rename to zircon/third_party/ulib/musl/src/math/logb.c
diff --git a/third_party/ulib/musl/src/math/logbf.c b/zircon/third_party/ulib/musl/src/math/logbf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/logbf.c
rename to zircon/third_party/ulib/musl/src/math/logbf.c
diff --git a/third_party/ulib/musl/src/math/logbl.c b/zircon/third_party/ulib/musl/src/math/logbl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/logbl.c
rename to zircon/third_party/ulib/musl/src/math/logbl.c
diff --git a/third_party/ulib/musl/src/math/lrint.c b/zircon/third_party/ulib/musl/src/math/lrint.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lrint.c
rename to zircon/third_party/ulib/musl/src/math/lrint.c
diff --git a/third_party/ulib/musl/src/math/lrintf.c b/zircon/third_party/ulib/musl/src/math/lrintf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lrintf.c
rename to zircon/third_party/ulib/musl/src/math/lrintf.c
diff --git a/third_party/ulib/musl/src/math/lrintl.c b/zircon/third_party/ulib/musl/src/math/lrintl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lrintl.c
rename to zircon/third_party/ulib/musl/src/math/lrintl.c
diff --git a/third_party/ulib/musl/src/math/lround.c b/zircon/third_party/ulib/musl/src/math/lround.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lround.c
rename to zircon/third_party/ulib/musl/src/math/lround.c
diff --git a/third_party/ulib/musl/src/math/lroundf.c b/zircon/third_party/ulib/musl/src/math/lroundf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lroundf.c
rename to zircon/third_party/ulib/musl/src/math/lroundf.c
diff --git a/third_party/ulib/musl/src/math/lroundl.c b/zircon/third_party/ulib/musl/src/math/lroundl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/lroundl.c
rename to zircon/third_party/ulib/musl/src/math/lroundl.c
diff --git a/third_party/ulib/musl/src/math/modf.c b/zircon/third_party/ulib/musl/src/math/modf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/modf.c
rename to zircon/third_party/ulib/musl/src/math/modf.c
diff --git a/third_party/ulib/musl/src/math/modff.c b/zircon/third_party/ulib/musl/src/math/modff.c
similarity index 100%
rename from third_party/ulib/musl/src/math/modff.c
rename to zircon/third_party/ulib/musl/src/math/modff.c
diff --git a/third_party/ulib/musl/src/math/modfl.c b/zircon/third_party/ulib/musl/src/math/modfl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/modfl.c
rename to zircon/third_party/ulib/musl/src/math/modfl.c
diff --git a/third_party/ulib/musl/src/math/nan.c b/zircon/third_party/ulib/musl/src/math/nan.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nan.c
rename to zircon/third_party/ulib/musl/src/math/nan.c
diff --git a/third_party/ulib/musl/src/math/nanf.c b/zircon/third_party/ulib/musl/src/math/nanf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nanf.c
rename to zircon/third_party/ulib/musl/src/math/nanf.c
diff --git a/third_party/ulib/musl/src/math/nanl.c b/zircon/third_party/ulib/musl/src/math/nanl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nanl.c
rename to zircon/third_party/ulib/musl/src/math/nanl.c
diff --git a/third_party/ulib/musl/src/math/nearbyint.c b/zircon/third_party/ulib/musl/src/math/nearbyint.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nearbyint.c
rename to zircon/third_party/ulib/musl/src/math/nearbyint.c
diff --git a/third_party/ulib/musl/src/math/nearbyintf.c b/zircon/third_party/ulib/musl/src/math/nearbyintf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nearbyintf.c
rename to zircon/third_party/ulib/musl/src/math/nearbyintf.c
diff --git a/third_party/ulib/musl/src/math/nearbyintl.c b/zircon/third_party/ulib/musl/src/math/nearbyintl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nearbyintl.c
rename to zircon/third_party/ulib/musl/src/math/nearbyintl.c
diff --git a/third_party/ulib/musl/src/math/nextafter.c b/zircon/third_party/ulib/musl/src/math/nextafter.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nextafter.c
rename to zircon/third_party/ulib/musl/src/math/nextafter.c
diff --git a/third_party/ulib/musl/src/math/nextafterf.c b/zircon/third_party/ulib/musl/src/math/nextafterf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nextafterf.c
rename to zircon/third_party/ulib/musl/src/math/nextafterf.c
diff --git a/third_party/ulib/musl/src/math/nextafterl.c b/zircon/third_party/ulib/musl/src/math/nextafterl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nextafterl.c
rename to zircon/third_party/ulib/musl/src/math/nextafterl.c
diff --git a/third_party/ulib/musl/src/math/nexttoward.c b/zircon/third_party/ulib/musl/src/math/nexttoward.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nexttoward.c
rename to zircon/third_party/ulib/musl/src/math/nexttoward.c
diff --git a/third_party/ulib/musl/src/math/nexttowardf.c b/zircon/third_party/ulib/musl/src/math/nexttowardf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nexttowardf.c
rename to zircon/third_party/ulib/musl/src/math/nexttowardf.c
diff --git a/third_party/ulib/musl/src/math/nexttowardl.c b/zircon/third_party/ulib/musl/src/math/nexttowardl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/nexttowardl.c
rename to zircon/third_party/ulib/musl/src/math/nexttowardl.c
diff --git a/third_party/ulib/musl/src/math/remainder.c b/zircon/third_party/ulib/musl/src/math/remainder.c
similarity index 100%
rename from third_party/ulib/musl/src/math/remainder.c
rename to zircon/third_party/ulib/musl/src/math/remainder.c
diff --git a/third_party/ulib/musl/src/math/remainderf.c b/zircon/third_party/ulib/musl/src/math/remainderf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/remainderf.c
rename to zircon/third_party/ulib/musl/src/math/remainderf.c
diff --git a/third_party/ulib/musl/src/math/remainderl.c b/zircon/third_party/ulib/musl/src/math/remainderl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/remainderl.c
rename to zircon/third_party/ulib/musl/src/math/remainderl.c
diff --git a/third_party/ulib/musl/src/math/remquo.c b/zircon/third_party/ulib/musl/src/math/remquo.c
similarity index 100%
rename from third_party/ulib/musl/src/math/remquo.c
rename to zircon/third_party/ulib/musl/src/math/remquo.c
diff --git a/third_party/ulib/musl/src/math/remquof.c b/zircon/third_party/ulib/musl/src/math/remquof.c
similarity index 100%
rename from third_party/ulib/musl/src/math/remquof.c
rename to zircon/third_party/ulib/musl/src/math/remquof.c
diff --git a/third_party/ulib/musl/src/math/remquol.c b/zircon/third_party/ulib/musl/src/math/remquol.c
similarity index 100%
rename from third_party/ulib/musl/src/math/remquol.c
rename to zircon/third_party/ulib/musl/src/math/remquol.c
diff --git a/third_party/ulib/musl/src/math/rint.c b/zircon/third_party/ulib/musl/src/math/rint.c
similarity index 100%
rename from third_party/ulib/musl/src/math/rint.c
rename to zircon/third_party/ulib/musl/src/math/rint.c
diff --git a/third_party/ulib/musl/src/math/rintf.c b/zircon/third_party/ulib/musl/src/math/rintf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/rintf.c
rename to zircon/third_party/ulib/musl/src/math/rintf.c
diff --git a/third_party/ulib/musl/src/math/rintl.c b/zircon/third_party/ulib/musl/src/math/rintl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/rintl.c
rename to zircon/third_party/ulib/musl/src/math/rintl.c
diff --git a/third_party/ulib/musl/src/math/round.c b/zircon/third_party/ulib/musl/src/math/round.c
similarity index 100%
rename from third_party/ulib/musl/src/math/round.c
rename to zircon/third_party/ulib/musl/src/math/round.c
diff --git a/third_party/ulib/musl/src/math/roundf.c b/zircon/third_party/ulib/musl/src/math/roundf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/roundf.c
rename to zircon/third_party/ulib/musl/src/math/roundf.c
diff --git a/third_party/ulib/musl/src/math/roundl.c b/zircon/third_party/ulib/musl/src/math/roundl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/roundl.c
rename to zircon/third_party/ulib/musl/src/math/roundl.c
diff --git a/third_party/ulib/musl/src/math/scalbln.c b/zircon/third_party/ulib/musl/src/math/scalbln.c
similarity index 100%
rename from third_party/ulib/musl/src/math/scalbln.c
rename to zircon/third_party/ulib/musl/src/math/scalbln.c
diff --git a/third_party/ulib/musl/src/math/scalblnf.c b/zircon/third_party/ulib/musl/src/math/scalblnf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/scalblnf.c
rename to zircon/third_party/ulib/musl/src/math/scalblnf.c
diff --git a/third_party/ulib/musl/src/math/scalblnl.c b/zircon/third_party/ulib/musl/src/math/scalblnl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/scalblnl.c
rename to zircon/third_party/ulib/musl/src/math/scalblnl.c
diff --git a/third_party/ulib/musl/src/math/scalbn.c b/zircon/third_party/ulib/musl/src/math/scalbn.c
similarity index 100%
rename from third_party/ulib/musl/src/math/scalbn.c
rename to zircon/third_party/ulib/musl/src/math/scalbn.c
diff --git a/third_party/ulib/musl/src/math/scalbnf.c b/zircon/third_party/ulib/musl/src/math/scalbnf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/scalbnf.c
rename to zircon/third_party/ulib/musl/src/math/scalbnf.c
diff --git a/third_party/ulib/musl/src/math/scalbnl.c b/zircon/third_party/ulib/musl/src/math/scalbnl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/scalbnl.c
rename to zircon/third_party/ulib/musl/src/math/scalbnl.c
diff --git a/third_party/ulib/musl/src/math/signgam.c b/zircon/third_party/ulib/musl/src/math/signgam.c
similarity index 100%
rename from third_party/ulib/musl/src/math/signgam.c
rename to zircon/third_party/ulib/musl/src/math/signgam.c
diff --git a/third_party/ulib/musl/src/math/significand.c b/zircon/third_party/ulib/musl/src/math/significand.c
similarity index 100%
rename from third_party/ulib/musl/src/math/significand.c
rename to zircon/third_party/ulib/musl/src/math/significand.c
diff --git a/third_party/ulib/musl/src/math/significandf.c b/zircon/third_party/ulib/musl/src/math/significandf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/significandf.c
rename to zircon/third_party/ulib/musl/src/math/significandf.c
diff --git a/third_party/ulib/musl/src/math/sincosl.c b/zircon/third_party/ulib/musl/src/math/sincosl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/sincosl.c
rename to zircon/third_party/ulib/musl/src/math/sincosl.c
diff --git a/third_party/ulib/musl/src/math/sinh.c b/zircon/third_party/ulib/musl/src/math/sinh.c
similarity index 100%
rename from third_party/ulib/musl/src/math/sinh.c
rename to zircon/third_party/ulib/musl/src/math/sinh.c
diff --git a/third_party/ulib/musl/src/math/sinhf.c b/zircon/third_party/ulib/musl/src/math/sinhf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/sinhf.c
rename to zircon/third_party/ulib/musl/src/math/sinhf.c
diff --git a/third_party/ulib/musl/src/math/sinhl.c b/zircon/third_party/ulib/musl/src/math/sinhl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/sinhl.c
rename to zircon/third_party/ulib/musl/src/math/sinhl.c
diff --git a/third_party/ulib/musl/src/math/sinl.c b/zircon/third_party/ulib/musl/src/math/sinl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/sinl.c
rename to zircon/third_party/ulib/musl/src/math/sinl.c
diff --git a/third_party/ulib/musl/src/math/sqrtl.c b/zircon/third_party/ulib/musl/src/math/sqrtl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/sqrtl.c
rename to zircon/third_party/ulib/musl/src/math/sqrtl.c
diff --git a/third_party/ulib/musl/src/math/tanh.c b/zircon/third_party/ulib/musl/src/math/tanh.c
similarity index 100%
rename from third_party/ulib/musl/src/math/tanh.c
rename to zircon/third_party/ulib/musl/src/math/tanh.c
diff --git a/third_party/ulib/musl/src/math/tanhf.c b/zircon/third_party/ulib/musl/src/math/tanhf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/tanhf.c
rename to zircon/third_party/ulib/musl/src/math/tanhf.c
diff --git a/third_party/ulib/musl/src/math/tanhl.c b/zircon/third_party/ulib/musl/src/math/tanhl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/tanhl.c
rename to zircon/third_party/ulib/musl/src/math/tanhl.c
diff --git a/third_party/ulib/musl/src/math/tanl.c b/zircon/third_party/ulib/musl/src/math/tanl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/tanl.c
rename to zircon/third_party/ulib/musl/src/math/tanl.c
diff --git a/third_party/ulib/musl/src/math/tgamma.c b/zircon/third_party/ulib/musl/src/math/tgamma.c
similarity index 100%
rename from third_party/ulib/musl/src/math/tgamma.c
rename to zircon/third_party/ulib/musl/src/math/tgamma.c
diff --git a/third_party/ulib/musl/src/math/tgammaf.c b/zircon/third_party/ulib/musl/src/math/tgammaf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/tgammaf.c
rename to zircon/third_party/ulib/musl/src/math/tgammaf.c
diff --git a/third_party/ulib/musl/src/math/trunc.c b/zircon/third_party/ulib/musl/src/math/trunc.c
similarity index 100%
rename from third_party/ulib/musl/src/math/trunc.c
rename to zircon/third_party/ulib/musl/src/math/trunc.c
diff --git a/third_party/ulib/musl/src/math/truncf.c b/zircon/third_party/ulib/musl/src/math/truncf.c
similarity index 100%
rename from third_party/ulib/musl/src/math/truncf.c
rename to zircon/third_party/ulib/musl/src/math/truncf.c
diff --git a/third_party/ulib/musl/src/math/truncl.c b/zircon/third_party/ulib/musl/src/math/truncl.c
similarity index 100%
rename from third_party/ulib/musl/src/math/truncl.c
rename to zircon/third_party/ulib/musl/src/math/truncl.c
diff --git a/third_party/ulib/musl/src/math/x86_64/__invtrigl.S b/zircon/third_party/ulib/musl/src/math/x86_64/__invtrigl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/__invtrigl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/__invtrigl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/acosl.S b/zircon/third_party/ulib/musl/src/math/x86_64/acosl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/acosl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/acosl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/asinl.S b/zircon/third_party/ulib/musl/src/math/x86_64/asinl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/asinl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/asinl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/atan2l.S b/zircon/third_party/ulib/musl/src/math/x86_64/atan2l.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/atan2l.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/atan2l.S
diff --git a/third_party/ulib/musl/src/math/x86_64/atanl.S b/zircon/third_party/ulib/musl/src/math/x86_64/atanl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/atanl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/atanl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/ceill.S b/zircon/third_party/ulib/musl/src/math/x86_64/ceill.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/ceill.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/ceill.S
diff --git a/third_party/ulib/musl/src/math/x86_64/exp2l.S b/zircon/third_party/ulib/musl/src/math/x86_64/exp2l.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/exp2l.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/exp2l.S
diff --git a/third_party/ulib/musl/src/math/x86_64/expl.S b/zircon/third_party/ulib/musl/src/math/x86_64/expl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/expl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/expl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/expm1l.S b/zircon/third_party/ulib/musl/src/math/x86_64/expm1l.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/expm1l.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/expm1l.S
diff --git a/third_party/ulib/musl/src/math/x86_64/fabs.S b/zircon/third_party/ulib/musl/src/math/x86_64/fabs.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/fabs.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/fabs.S
diff --git a/third_party/ulib/musl/src/math/x86_64/fabsf.S b/zircon/third_party/ulib/musl/src/math/x86_64/fabsf.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/fabsf.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/fabsf.S
diff --git a/third_party/ulib/musl/src/math/x86_64/fabsl.S b/zircon/third_party/ulib/musl/src/math/x86_64/fabsl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/fabsl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/fabsl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/floorl.S b/zircon/third_party/ulib/musl/src/math/x86_64/floorl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/floorl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/floorl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/fmodl.S b/zircon/third_party/ulib/musl/src/math/x86_64/fmodl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/fmodl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/fmodl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/llrint.S b/zircon/third_party/ulib/musl/src/math/x86_64/llrint.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/llrint.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/llrint.S
diff --git a/third_party/ulib/musl/src/math/x86_64/llrintf.S b/zircon/third_party/ulib/musl/src/math/x86_64/llrintf.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/llrintf.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/llrintf.S
diff --git a/third_party/ulib/musl/src/math/x86_64/llrintl.S b/zircon/third_party/ulib/musl/src/math/x86_64/llrintl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/llrintl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/llrintl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/log10l.S b/zircon/third_party/ulib/musl/src/math/x86_64/log10l.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/log10l.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/log10l.S
diff --git a/third_party/ulib/musl/src/math/x86_64/log1pl.S b/zircon/third_party/ulib/musl/src/math/x86_64/log1pl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/log1pl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/log1pl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/log2l.S b/zircon/third_party/ulib/musl/src/math/x86_64/log2l.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/log2l.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/log2l.S
diff --git a/third_party/ulib/musl/src/math/x86_64/logl.S b/zircon/third_party/ulib/musl/src/math/x86_64/logl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/logl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/logl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/lrint.S b/zircon/third_party/ulib/musl/src/math/x86_64/lrint.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/lrint.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/lrint.S
diff --git a/third_party/ulib/musl/src/math/x86_64/lrintf.S b/zircon/third_party/ulib/musl/src/math/x86_64/lrintf.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/lrintf.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/lrintf.S
diff --git a/third_party/ulib/musl/src/math/x86_64/lrintl.S b/zircon/third_party/ulib/musl/src/math/x86_64/lrintl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/lrintl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/lrintl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/remainderl.S b/zircon/third_party/ulib/musl/src/math/x86_64/remainderl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/remainderl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/remainderl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/rintl.S b/zircon/third_party/ulib/musl/src/math/x86_64/rintl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/rintl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/rintl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/sqrt.S b/zircon/third_party/ulib/musl/src/math/x86_64/sqrt.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/sqrt.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/sqrt.S
diff --git a/third_party/ulib/musl/src/math/x86_64/sqrtf.S b/zircon/third_party/ulib/musl/src/math/x86_64/sqrtf.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/sqrtf.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/sqrtf.S
diff --git a/third_party/ulib/musl/src/math/x86_64/sqrtl.S b/zircon/third_party/ulib/musl/src/math/x86_64/sqrtl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/sqrtl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/sqrtl.S
diff --git a/third_party/ulib/musl/src/math/x86_64/truncl.S b/zircon/third_party/ulib/musl/src/math/x86_64/truncl.S
similarity index 100%
rename from third_party/ulib/musl/src/math/x86_64/truncl.S
rename to zircon/third_party/ulib/musl/src/math/x86_64/truncl.S
diff --git a/third_party/ulib/musl/src/misc/a64l.c b/zircon/third_party/ulib/musl/src/misc/a64l.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/a64l.c
rename to zircon/third_party/ulib/musl/src/misc/a64l.c
diff --git a/third_party/ulib/musl/src/misc/basename.c b/zircon/third_party/ulib/musl/src/misc/basename.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/basename.c
rename to zircon/third_party/ulib/musl/src/misc/basename.c
diff --git a/third_party/ulib/musl/src/misc/dirname.c b/zircon/third_party/ulib/musl/src/misc/dirname.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/dirname.c
rename to zircon/third_party/ulib/musl/src/misc/dirname.c
diff --git a/third_party/ulib/musl/src/misc/ffs.c b/zircon/third_party/ulib/musl/src/misc/ffs.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/ffs.c
rename to zircon/third_party/ulib/musl/src/misc/ffs.c
diff --git a/third_party/ulib/musl/src/misc/ffsl.c b/zircon/third_party/ulib/musl/src/misc/ffsl.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/ffsl.c
rename to zircon/third_party/ulib/musl/src/misc/ffsl.c
diff --git a/third_party/ulib/musl/src/misc/ffsll.c b/zircon/third_party/ulib/musl/src/misc/ffsll.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/ffsll.c
rename to zircon/third_party/ulib/musl/src/misc/ffsll.c
diff --git a/third_party/ulib/musl/src/misc/get_current_dir_name.c b/zircon/third_party/ulib/musl/src/misc/get_current_dir_name.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/get_current_dir_name.c
rename to zircon/third_party/ulib/musl/src/misc/get_current_dir_name.c
diff --git a/third_party/ulib/musl/src/misc/getauxval.c b/zircon/third_party/ulib/musl/src/misc/getauxval.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/getauxval.c
rename to zircon/third_party/ulib/musl/src/misc/getauxval.c
diff --git a/third_party/ulib/musl/src/misc/getdomainname.c b/zircon/third_party/ulib/musl/src/misc/getdomainname.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/getdomainname.c
rename to zircon/third_party/ulib/musl/src/misc/getdomainname.c
diff --git a/third_party/ulib/musl/src/misc/gethostid.c b/zircon/third_party/ulib/musl/src/misc/gethostid.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/gethostid.c
rename to zircon/third_party/ulib/musl/src/misc/gethostid.c
diff --git a/third_party/ulib/musl/src/misc/getopt.c b/zircon/third_party/ulib/musl/src/misc/getopt.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/getopt.c
rename to zircon/third_party/ulib/musl/src/misc/getopt.c
diff --git a/third_party/ulib/musl/src/misc/getopt_long.c b/zircon/third_party/ulib/musl/src/misc/getopt_long.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/getopt_long.c
rename to zircon/third_party/ulib/musl/src/misc/getopt_long.c
diff --git a/third_party/ulib/musl/src/misc/getsubopt.c b/zircon/third_party/ulib/musl/src/misc/getsubopt.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/getsubopt.c
rename to zircon/third_party/ulib/musl/src/misc/getsubopt.c
diff --git a/third_party/ulib/musl/src/misc/initgroups.c b/zircon/third_party/ulib/musl/src/misc/initgroups.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/initgroups.c
rename to zircon/third_party/ulib/musl/src/misc/initgroups.c
diff --git a/third_party/ulib/musl/src/misc/issetugid.c b/zircon/third_party/ulib/musl/src/misc/issetugid.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/issetugid.c
rename to zircon/third_party/ulib/musl/src/misc/issetugid.c
diff --git a/third_party/ulib/musl/src/misc/lockf.c b/zircon/third_party/ulib/musl/src/misc/lockf.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/lockf.c
rename to zircon/third_party/ulib/musl/src/misc/lockf.c
diff --git a/third_party/ulib/musl/src/misc/nftw.c b/zircon/third_party/ulib/musl/src/misc/nftw.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/nftw.c
rename to zircon/third_party/ulib/musl/src/misc/nftw.c
diff --git a/third_party/ulib/musl/src/misc/openpty.c b/zircon/third_party/ulib/musl/src/misc/openpty.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/openpty.c
rename to zircon/third_party/ulib/musl/src/misc/openpty.c
diff --git a/third_party/ulib/musl/src/misc/ptsname.c b/zircon/third_party/ulib/musl/src/misc/ptsname.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/ptsname.c
rename to zircon/third_party/ulib/musl/src/misc/ptsname.c
diff --git a/third_party/ulib/musl/src/misc/pty.c b/zircon/third_party/ulib/musl/src/misc/pty.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/pty.c
rename to zircon/third_party/ulib/musl/src/misc/pty.c
diff --git a/third_party/ulib/musl/src/misc/setdomainname.c b/zircon/third_party/ulib/musl/src/misc/setdomainname.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/setdomainname.c
rename to zircon/third_party/ulib/musl/src/misc/setdomainname.c
diff --git a/third_party/ulib/musl/src/misc/syslog.c b/zircon/third_party/ulib/musl/src/misc/syslog.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/syslog.c
rename to zircon/third_party/ulib/musl/src/misc/syslog.c
diff --git a/third_party/ulib/musl/src/misc/wordexp.c b/zircon/third_party/ulib/musl/src/misc/wordexp.c
similarity index 100%
rename from third_party/ulib/musl/src/misc/wordexp.c
rename to zircon/third_party/ulib/musl/src/misc/wordexp.c
diff --git a/third_party/ulib/musl/src/mman/madvise.c b/zircon/third_party/ulib/musl/src/mman/madvise.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/madvise.c
rename to zircon/third_party/ulib/musl/src/mman/madvise.c
diff --git a/third_party/ulib/musl/src/mman/mlock.c b/zircon/third_party/ulib/musl/src/mman/mlock.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/mlock.c
rename to zircon/third_party/ulib/musl/src/mman/mlock.c
diff --git a/third_party/ulib/musl/src/mman/mlockall.c b/zircon/third_party/ulib/musl/src/mman/mlockall.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/mlockall.c
rename to zircon/third_party/ulib/musl/src/mman/mlockall.c
diff --git a/third_party/ulib/musl/src/mman/mmap.c b/zircon/third_party/ulib/musl/src/mman/mmap.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/mmap.c
rename to zircon/third_party/ulib/musl/src/mman/mmap.c
diff --git a/third_party/ulib/musl/src/mman/mprotect.c b/zircon/third_party/ulib/musl/src/mman/mprotect.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/mprotect.c
rename to zircon/third_party/ulib/musl/src/mman/mprotect.c
diff --git a/third_party/ulib/musl/src/mman/msync.c b/zircon/third_party/ulib/musl/src/mman/msync.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/msync.c
rename to zircon/third_party/ulib/musl/src/mman/msync.c
diff --git a/third_party/ulib/musl/src/mman/munlock.c b/zircon/third_party/ulib/musl/src/mman/munlock.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/munlock.c
rename to zircon/third_party/ulib/musl/src/mman/munlock.c
diff --git a/third_party/ulib/musl/src/mman/munlockall.c b/zircon/third_party/ulib/musl/src/mman/munlockall.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/munlockall.c
rename to zircon/third_party/ulib/musl/src/mman/munlockall.c
diff --git a/third_party/ulib/musl/src/mman/munmap.c b/zircon/third_party/ulib/musl/src/mman/munmap.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/munmap.c
rename to zircon/third_party/ulib/musl/src/mman/munmap.c
diff --git a/third_party/ulib/musl/src/mman/posix_madvise.c b/zircon/third_party/ulib/musl/src/mman/posix_madvise.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/posix_madvise.c
rename to zircon/third_party/ulib/musl/src/mman/posix_madvise.c
diff --git a/third_party/ulib/musl/src/mman/shm_open.c b/zircon/third_party/ulib/musl/src/mman/shm_open.c
similarity index 100%
rename from third_party/ulib/musl/src/mman/shm_open.c
rename to zircon/third_party/ulib/musl/src/mman/shm_open.c
diff --git a/third_party/ulib/musl/src/multibyte/btowc.c b/zircon/third_party/ulib/musl/src/multibyte/btowc.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/btowc.c
rename to zircon/third_party/ulib/musl/src/multibyte/btowc.c
diff --git a/third_party/ulib/musl/src/multibyte/c16rtomb.c b/zircon/third_party/ulib/musl/src/multibyte/c16rtomb.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/c16rtomb.c
rename to zircon/third_party/ulib/musl/src/multibyte/c16rtomb.c
diff --git a/third_party/ulib/musl/src/multibyte/c32rtomb.c b/zircon/third_party/ulib/musl/src/multibyte/c32rtomb.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/c32rtomb.c
rename to zircon/third_party/ulib/musl/src/multibyte/c32rtomb.c
diff --git a/third_party/ulib/musl/src/multibyte/internal.c b/zircon/third_party/ulib/musl/src/multibyte/internal.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/internal.c
rename to zircon/third_party/ulib/musl/src/multibyte/internal.c
diff --git a/third_party/ulib/musl/src/multibyte/internal.h b/zircon/third_party/ulib/musl/src/multibyte/internal.h
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/internal.h
rename to zircon/third_party/ulib/musl/src/multibyte/internal.h
diff --git a/third_party/ulib/musl/src/multibyte/mblen.c b/zircon/third_party/ulib/musl/src/multibyte/mblen.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mblen.c
rename to zircon/third_party/ulib/musl/src/multibyte/mblen.c
diff --git a/third_party/ulib/musl/src/multibyte/mbrlen.c b/zircon/third_party/ulib/musl/src/multibyte/mbrlen.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbrlen.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbrlen.c
diff --git a/third_party/ulib/musl/src/multibyte/mbrtoc16.c b/zircon/third_party/ulib/musl/src/multibyte/mbrtoc16.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbrtoc16.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbrtoc16.c
diff --git a/third_party/ulib/musl/src/multibyte/mbrtoc32.c b/zircon/third_party/ulib/musl/src/multibyte/mbrtoc32.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbrtoc32.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbrtoc32.c
diff --git a/third_party/ulib/musl/src/multibyte/mbrtowc.c b/zircon/third_party/ulib/musl/src/multibyte/mbrtowc.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbrtowc.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbrtowc.c
diff --git a/third_party/ulib/musl/src/multibyte/mbsinit.c b/zircon/third_party/ulib/musl/src/multibyte/mbsinit.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbsinit.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbsinit.c
diff --git a/third_party/ulib/musl/src/multibyte/mbsnrtowcs.c b/zircon/third_party/ulib/musl/src/multibyte/mbsnrtowcs.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbsnrtowcs.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbsnrtowcs.c
diff --git a/third_party/ulib/musl/src/multibyte/mbsrtowcs.c b/zircon/third_party/ulib/musl/src/multibyte/mbsrtowcs.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbsrtowcs.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbsrtowcs.c
diff --git a/third_party/ulib/musl/src/multibyte/mbstowcs.c b/zircon/third_party/ulib/musl/src/multibyte/mbstowcs.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbstowcs.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbstowcs.c
diff --git a/third_party/ulib/musl/src/multibyte/mbtowc.c b/zircon/third_party/ulib/musl/src/multibyte/mbtowc.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/mbtowc.c
rename to zircon/third_party/ulib/musl/src/multibyte/mbtowc.c
diff --git a/third_party/ulib/musl/src/multibyte/wcrtomb.c b/zircon/third_party/ulib/musl/src/multibyte/wcrtomb.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/wcrtomb.c
rename to zircon/third_party/ulib/musl/src/multibyte/wcrtomb.c
diff --git a/third_party/ulib/musl/src/multibyte/wcsnrtombs.c b/zircon/third_party/ulib/musl/src/multibyte/wcsnrtombs.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/wcsnrtombs.c
rename to zircon/third_party/ulib/musl/src/multibyte/wcsnrtombs.c
diff --git a/third_party/ulib/musl/src/multibyte/wcsrtombs.c b/zircon/third_party/ulib/musl/src/multibyte/wcsrtombs.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/wcsrtombs.c
rename to zircon/third_party/ulib/musl/src/multibyte/wcsrtombs.c
diff --git a/third_party/ulib/musl/src/multibyte/wcstombs.c b/zircon/third_party/ulib/musl/src/multibyte/wcstombs.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/wcstombs.c
rename to zircon/third_party/ulib/musl/src/multibyte/wcstombs.c
diff --git a/third_party/ulib/musl/src/multibyte/wctob.c b/zircon/third_party/ulib/musl/src/multibyte/wctob.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/wctob.c
rename to zircon/third_party/ulib/musl/src/multibyte/wctob.c
diff --git a/third_party/ulib/musl/src/multibyte/wctomb.c b/zircon/third_party/ulib/musl/src/multibyte/wctomb.c
similarity index 100%
rename from third_party/ulib/musl/src/multibyte/wctomb.c
rename to zircon/third_party/ulib/musl/src/multibyte/wctomb.c
diff --git a/third_party/ulib/musl/src/network/accept.c b/zircon/third_party/ulib/musl/src/network/accept.c
similarity index 100%
rename from third_party/ulib/musl/src/network/accept.c
rename to zircon/third_party/ulib/musl/src/network/accept.c
diff --git a/third_party/ulib/musl/src/network/dn_comp.c b/zircon/third_party/ulib/musl/src/network/dn_comp.c
similarity index 100%
rename from third_party/ulib/musl/src/network/dn_comp.c
rename to zircon/third_party/ulib/musl/src/network/dn_comp.c
diff --git a/third_party/ulib/musl/src/network/dn_expand.c b/zircon/third_party/ulib/musl/src/network/dn_expand.c
similarity index 100%
rename from third_party/ulib/musl/src/network/dn_expand.c
rename to zircon/third_party/ulib/musl/src/network/dn_expand.c
diff --git a/third_party/ulib/musl/src/network/dn_skipname.c b/zircon/third_party/ulib/musl/src/network/dn_skipname.c
similarity index 100%
rename from third_party/ulib/musl/src/network/dn_skipname.c
rename to zircon/third_party/ulib/musl/src/network/dn_skipname.c
diff --git a/third_party/ulib/musl/src/network/dns_parse.c b/zircon/third_party/ulib/musl/src/network/dns_parse.c
similarity index 100%
rename from third_party/ulib/musl/src/network/dns_parse.c
rename to zircon/third_party/ulib/musl/src/network/dns_parse.c
diff --git a/third_party/ulib/musl/src/network/ent.c b/zircon/third_party/ulib/musl/src/network/ent.c
similarity index 100%
rename from third_party/ulib/musl/src/network/ent.c
rename to zircon/third_party/ulib/musl/src/network/ent.c
diff --git a/third_party/ulib/musl/src/network/ether.c b/zircon/third_party/ulib/musl/src/network/ether.c
similarity index 100%
rename from third_party/ulib/musl/src/network/ether.c
rename to zircon/third_party/ulib/musl/src/network/ether.c
diff --git a/third_party/ulib/musl/src/network/gai_strerror.c b/zircon/third_party/ulib/musl/src/network/gai_strerror.c
similarity index 100%
rename from third_party/ulib/musl/src/network/gai_strerror.c
rename to zircon/third_party/ulib/musl/src/network/gai_strerror.c
diff --git a/third_party/ulib/musl/src/network/gethostbyaddr.c b/zircon/third_party/ulib/musl/src/network/gethostbyaddr.c
similarity index 100%
rename from third_party/ulib/musl/src/network/gethostbyaddr.c
rename to zircon/third_party/ulib/musl/src/network/gethostbyaddr.c
diff --git a/third_party/ulib/musl/src/network/gethostbyaddr_r.c b/zircon/third_party/ulib/musl/src/network/gethostbyaddr_r.c
similarity index 100%
rename from third_party/ulib/musl/src/network/gethostbyaddr_r.c
rename to zircon/third_party/ulib/musl/src/network/gethostbyaddr_r.c
diff --git a/third_party/ulib/musl/src/network/gethostbyname.c b/zircon/third_party/ulib/musl/src/network/gethostbyname.c
similarity index 100%
rename from third_party/ulib/musl/src/network/gethostbyname.c
rename to zircon/third_party/ulib/musl/src/network/gethostbyname.c
diff --git a/third_party/ulib/musl/src/network/gethostbyname2.c b/zircon/third_party/ulib/musl/src/network/gethostbyname2.c
similarity index 100%
rename from third_party/ulib/musl/src/network/gethostbyname2.c
rename to zircon/third_party/ulib/musl/src/network/gethostbyname2.c
diff --git a/third_party/ulib/musl/src/network/gethostbyname2_r.c b/zircon/third_party/ulib/musl/src/network/gethostbyname2_r.c
similarity index 100%
rename from third_party/ulib/musl/src/network/gethostbyname2_r.c
rename to zircon/third_party/ulib/musl/src/network/gethostbyname2_r.c
diff --git a/third_party/ulib/musl/src/network/gethostbyname_r.c b/zircon/third_party/ulib/musl/src/network/gethostbyname_r.c
similarity index 100%
rename from third_party/ulib/musl/src/network/gethostbyname_r.c
rename to zircon/third_party/ulib/musl/src/network/gethostbyname_r.c
diff --git a/third_party/ulib/musl/src/network/getifaddrs.c b/zircon/third_party/ulib/musl/src/network/getifaddrs.c
similarity index 100%
rename from third_party/ulib/musl/src/network/getifaddrs.c
rename to zircon/third_party/ulib/musl/src/network/getifaddrs.c
diff --git a/third_party/ulib/musl/src/network/getnameinfo.c b/zircon/third_party/ulib/musl/src/network/getnameinfo.c
similarity index 100%
rename from third_party/ulib/musl/src/network/getnameinfo.c
rename to zircon/third_party/ulib/musl/src/network/getnameinfo.c
diff --git a/third_party/ulib/musl/src/network/getservbyname.c b/zircon/third_party/ulib/musl/src/network/getservbyname.c
similarity index 100%
rename from third_party/ulib/musl/src/network/getservbyname.c
rename to zircon/third_party/ulib/musl/src/network/getservbyname.c
diff --git a/third_party/ulib/musl/src/network/getservbyname_r.c b/zircon/third_party/ulib/musl/src/network/getservbyname_r.c
similarity index 100%
rename from third_party/ulib/musl/src/network/getservbyname_r.c
rename to zircon/third_party/ulib/musl/src/network/getservbyname_r.c
diff --git a/third_party/ulib/musl/src/network/getservbyport.c b/zircon/third_party/ulib/musl/src/network/getservbyport.c
similarity index 100%
rename from third_party/ulib/musl/src/network/getservbyport.c
rename to zircon/third_party/ulib/musl/src/network/getservbyport.c
diff --git a/third_party/ulib/musl/src/network/getservbyport_r.c b/zircon/third_party/ulib/musl/src/network/getservbyport_r.c
similarity index 100%
rename from third_party/ulib/musl/src/network/getservbyport_r.c
rename to zircon/third_party/ulib/musl/src/network/getservbyport_r.c
diff --git a/third_party/ulib/musl/src/network/h_errno.c b/zircon/third_party/ulib/musl/src/network/h_errno.c
similarity index 100%
rename from third_party/ulib/musl/src/network/h_errno.c
rename to zircon/third_party/ulib/musl/src/network/h_errno.c
diff --git a/third_party/ulib/musl/src/network/herror.c b/zircon/third_party/ulib/musl/src/network/herror.c
similarity index 100%
rename from third_party/ulib/musl/src/network/herror.c
rename to zircon/third_party/ulib/musl/src/network/herror.c
diff --git a/third_party/ulib/musl/src/network/hstrerror.c b/zircon/third_party/ulib/musl/src/network/hstrerror.c
similarity index 100%
rename from third_party/ulib/musl/src/network/hstrerror.c
rename to zircon/third_party/ulib/musl/src/network/hstrerror.c
diff --git a/third_party/ulib/musl/src/network/htonl.c b/zircon/third_party/ulib/musl/src/network/htonl.c
similarity index 100%
rename from third_party/ulib/musl/src/network/htonl.c
rename to zircon/third_party/ulib/musl/src/network/htonl.c
diff --git a/third_party/ulib/musl/src/network/htons.c b/zircon/third_party/ulib/musl/src/network/htons.c
similarity index 100%
rename from third_party/ulib/musl/src/network/htons.c
rename to zircon/third_party/ulib/musl/src/network/htons.c
diff --git a/third_party/ulib/musl/src/network/if_freenameindex.c b/zircon/third_party/ulib/musl/src/network/if_freenameindex.c
similarity index 100%
rename from third_party/ulib/musl/src/network/if_freenameindex.c
rename to zircon/third_party/ulib/musl/src/network/if_freenameindex.c
diff --git a/third_party/ulib/musl/src/network/if_indextoname.c b/zircon/third_party/ulib/musl/src/network/if_indextoname.c
similarity index 100%
rename from third_party/ulib/musl/src/network/if_indextoname.c
rename to zircon/third_party/ulib/musl/src/network/if_indextoname.c
diff --git a/third_party/ulib/musl/src/network/if_nameindex.c b/zircon/third_party/ulib/musl/src/network/if_nameindex.c
similarity index 100%
rename from third_party/ulib/musl/src/network/if_nameindex.c
rename to zircon/third_party/ulib/musl/src/network/if_nameindex.c
diff --git a/third_party/ulib/musl/src/network/if_nametoindex.c b/zircon/third_party/ulib/musl/src/network/if_nametoindex.c
similarity index 100%
rename from third_party/ulib/musl/src/network/if_nametoindex.c
rename to zircon/third_party/ulib/musl/src/network/if_nametoindex.c
diff --git a/third_party/ulib/musl/src/network/in6addr_any.c b/zircon/third_party/ulib/musl/src/network/in6addr_any.c
similarity index 100%
rename from third_party/ulib/musl/src/network/in6addr_any.c
rename to zircon/third_party/ulib/musl/src/network/in6addr_any.c
diff --git a/third_party/ulib/musl/src/network/in6addr_loopback.c b/zircon/third_party/ulib/musl/src/network/in6addr_loopback.c
similarity index 100%
rename from third_party/ulib/musl/src/network/in6addr_loopback.c
rename to zircon/third_party/ulib/musl/src/network/in6addr_loopback.c
diff --git a/third_party/ulib/musl/src/network/inet_addr.c b/zircon/third_party/ulib/musl/src/network/inet_addr.c
similarity index 100%
rename from third_party/ulib/musl/src/network/inet_addr.c
rename to zircon/third_party/ulib/musl/src/network/inet_addr.c
diff --git a/third_party/ulib/musl/src/network/inet_aton.c b/zircon/third_party/ulib/musl/src/network/inet_aton.c
similarity index 100%
rename from third_party/ulib/musl/src/network/inet_aton.c
rename to zircon/third_party/ulib/musl/src/network/inet_aton.c
diff --git a/third_party/ulib/musl/src/network/inet_legacy.c b/zircon/third_party/ulib/musl/src/network/inet_legacy.c
similarity index 100%
rename from third_party/ulib/musl/src/network/inet_legacy.c
rename to zircon/third_party/ulib/musl/src/network/inet_legacy.c
diff --git a/third_party/ulib/musl/src/network/inet_ntoa.c b/zircon/third_party/ulib/musl/src/network/inet_ntoa.c
similarity index 100%
rename from third_party/ulib/musl/src/network/inet_ntoa.c
rename to zircon/third_party/ulib/musl/src/network/inet_ntoa.c
diff --git a/third_party/ulib/musl/src/network/inet_ntop.c b/zircon/third_party/ulib/musl/src/network/inet_ntop.c
similarity index 100%
rename from third_party/ulib/musl/src/network/inet_ntop.c
rename to zircon/third_party/ulib/musl/src/network/inet_ntop.c
diff --git a/third_party/ulib/musl/src/network/inet_pton.c b/zircon/third_party/ulib/musl/src/network/inet_pton.c
similarity index 100%
rename from third_party/ulib/musl/src/network/inet_pton.c
rename to zircon/third_party/ulib/musl/src/network/inet_pton.c
diff --git a/third_party/ulib/musl/src/network/lookup.h b/zircon/third_party/ulib/musl/src/network/lookup.h
similarity index 100%
rename from third_party/ulib/musl/src/network/lookup.h
rename to zircon/third_party/ulib/musl/src/network/lookup.h
diff --git a/third_party/ulib/musl/src/network/lookup_ipliteral.c b/zircon/third_party/ulib/musl/src/network/lookup_ipliteral.c
similarity index 100%
rename from third_party/ulib/musl/src/network/lookup_ipliteral.c
rename to zircon/third_party/ulib/musl/src/network/lookup_ipliteral.c
diff --git a/third_party/ulib/musl/src/network/lookup_serv.c b/zircon/third_party/ulib/musl/src/network/lookup_serv.c
similarity index 100%
rename from third_party/ulib/musl/src/network/lookup_serv.c
rename to zircon/third_party/ulib/musl/src/network/lookup_serv.c
diff --git a/third_party/ulib/musl/src/network/netlink.c b/zircon/third_party/ulib/musl/src/network/netlink.c
similarity index 100%
rename from third_party/ulib/musl/src/network/netlink.c
rename to zircon/third_party/ulib/musl/src/network/netlink.c
diff --git a/third_party/ulib/musl/src/network/netlink.h b/zircon/third_party/ulib/musl/src/network/netlink.h
similarity index 100%
rename from third_party/ulib/musl/src/network/netlink.h
rename to zircon/third_party/ulib/musl/src/network/netlink.h
diff --git a/third_party/ulib/musl/src/network/netname.c b/zircon/third_party/ulib/musl/src/network/netname.c
similarity index 100%
rename from third_party/ulib/musl/src/network/netname.c
rename to zircon/third_party/ulib/musl/src/network/netname.c
diff --git a/third_party/ulib/musl/src/network/ns_parse.c b/zircon/third_party/ulib/musl/src/network/ns_parse.c
similarity index 100%
rename from third_party/ulib/musl/src/network/ns_parse.c
rename to zircon/third_party/ulib/musl/src/network/ns_parse.c
diff --git a/third_party/ulib/musl/src/network/ntohl.c b/zircon/third_party/ulib/musl/src/network/ntohl.c
similarity index 100%
rename from third_party/ulib/musl/src/network/ntohl.c
rename to zircon/third_party/ulib/musl/src/network/ntohl.c
diff --git a/third_party/ulib/musl/src/network/ntohs.c b/zircon/third_party/ulib/musl/src/network/ntohs.c
similarity index 100%
rename from third_party/ulib/musl/src/network/ntohs.c
rename to zircon/third_party/ulib/musl/src/network/ntohs.c
diff --git a/third_party/ulib/musl/src/network/proto.c b/zircon/third_party/ulib/musl/src/network/proto.c
similarity index 100%
rename from third_party/ulib/musl/src/network/proto.c
rename to zircon/third_party/ulib/musl/src/network/proto.c
diff --git a/third_party/ulib/musl/src/network/recv.c b/zircon/third_party/ulib/musl/src/network/recv.c
similarity index 100%
rename from third_party/ulib/musl/src/network/recv.c
rename to zircon/third_party/ulib/musl/src/network/recv.c
diff --git a/third_party/ulib/musl/src/network/res_init.c b/zircon/third_party/ulib/musl/src/network/res_init.c
similarity index 100%
rename from third_party/ulib/musl/src/network/res_init.c
rename to zircon/third_party/ulib/musl/src/network/res_init.c
diff --git a/third_party/ulib/musl/src/network/res_mkquery.c b/zircon/third_party/ulib/musl/src/network/res_mkquery.c
similarity index 100%
rename from third_party/ulib/musl/src/network/res_mkquery.c
rename to zircon/third_party/ulib/musl/src/network/res_mkquery.c
diff --git a/third_party/ulib/musl/src/network/res_msend.c b/zircon/third_party/ulib/musl/src/network/res_msend.c
similarity index 100%
rename from third_party/ulib/musl/src/network/res_msend.c
rename to zircon/third_party/ulib/musl/src/network/res_msend.c
diff --git a/third_party/ulib/musl/src/network/res_query.c b/zircon/third_party/ulib/musl/src/network/res_query.c
similarity index 100%
rename from third_party/ulib/musl/src/network/res_query.c
rename to zircon/third_party/ulib/musl/src/network/res_query.c
diff --git a/third_party/ulib/musl/src/network/res_querydomain.c b/zircon/third_party/ulib/musl/src/network/res_querydomain.c
similarity index 100%
rename from third_party/ulib/musl/src/network/res_querydomain.c
rename to zircon/third_party/ulib/musl/src/network/res_querydomain.c
diff --git a/third_party/ulib/musl/src/network/res_send.c b/zircon/third_party/ulib/musl/src/network/res_send.c
similarity index 100%
rename from third_party/ulib/musl/src/network/res_send.c
rename to zircon/third_party/ulib/musl/src/network/res_send.c
diff --git a/third_party/ulib/musl/src/network/res_state.c b/zircon/third_party/ulib/musl/src/network/res_state.c
similarity index 100%
rename from third_party/ulib/musl/src/network/res_state.c
rename to zircon/third_party/ulib/musl/src/network/res_state.c
diff --git a/third_party/ulib/musl/src/network/resolvconf.c b/zircon/third_party/ulib/musl/src/network/resolvconf.c
similarity index 100%
rename from third_party/ulib/musl/src/network/resolvconf.c
rename to zircon/third_party/ulib/musl/src/network/resolvconf.c
diff --git a/third_party/ulib/musl/src/network/send.c b/zircon/third_party/ulib/musl/src/network/send.c
similarity index 100%
rename from third_party/ulib/musl/src/network/send.c
rename to zircon/third_party/ulib/musl/src/network/send.c
diff --git a/third_party/ulib/musl/src/network/serv.c b/zircon/third_party/ulib/musl/src/network/serv.c
similarity index 100%
rename from third_party/ulib/musl/src/network/serv.c
rename to zircon/third_party/ulib/musl/src/network/serv.c
diff --git a/third_party/ulib/musl/src/passwd/fgetgrent.c b/zircon/third_party/ulib/musl/src/passwd/fgetgrent.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/fgetgrent.c
rename to zircon/third_party/ulib/musl/src/passwd/fgetgrent.c
diff --git a/third_party/ulib/musl/src/passwd/fgetpwent.c b/zircon/third_party/ulib/musl/src/passwd/fgetpwent.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/fgetpwent.c
rename to zircon/third_party/ulib/musl/src/passwd/fgetpwent.c
diff --git a/third_party/ulib/musl/src/passwd/getgr_a.c b/zircon/third_party/ulib/musl/src/passwd/getgr_a.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getgr_a.c
rename to zircon/third_party/ulib/musl/src/passwd/getgr_a.c
diff --git a/third_party/ulib/musl/src/passwd/getgr_r.c b/zircon/third_party/ulib/musl/src/passwd/getgr_r.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getgr_r.c
rename to zircon/third_party/ulib/musl/src/passwd/getgr_r.c
diff --git a/third_party/ulib/musl/src/passwd/getgrent.c b/zircon/third_party/ulib/musl/src/passwd/getgrent.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getgrent.c
rename to zircon/third_party/ulib/musl/src/passwd/getgrent.c
diff --git a/third_party/ulib/musl/src/passwd/getgrent_a.c b/zircon/third_party/ulib/musl/src/passwd/getgrent_a.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getgrent_a.c
rename to zircon/third_party/ulib/musl/src/passwd/getgrent_a.c
diff --git a/third_party/ulib/musl/src/passwd/getgrouplist.c b/zircon/third_party/ulib/musl/src/passwd/getgrouplist.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getgrouplist.c
rename to zircon/third_party/ulib/musl/src/passwd/getgrouplist.c
diff --git a/third_party/ulib/musl/src/passwd/getpw_a.c b/zircon/third_party/ulib/musl/src/passwd/getpw_a.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getpw_a.c
rename to zircon/third_party/ulib/musl/src/passwd/getpw_a.c
diff --git a/third_party/ulib/musl/src/passwd/getpw_r.c b/zircon/third_party/ulib/musl/src/passwd/getpw_r.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getpw_r.c
rename to zircon/third_party/ulib/musl/src/passwd/getpw_r.c
diff --git a/third_party/ulib/musl/src/passwd/getpwent.c b/zircon/third_party/ulib/musl/src/passwd/getpwent.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getpwent.c
rename to zircon/third_party/ulib/musl/src/passwd/getpwent.c
diff --git a/third_party/ulib/musl/src/passwd/getpwent_a.c b/zircon/third_party/ulib/musl/src/passwd/getpwent_a.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/getpwent_a.c
rename to zircon/third_party/ulib/musl/src/passwd/getpwent_a.c
diff --git a/third_party/ulib/musl/src/passwd/nscd.h b/zircon/third_party/ulib/musl/src/passwd/nscd.h
similarity index 100%
rename from third_party/ulib/musl/src/passwd/nscd.h
rename to zircon/third_party/ulib/musl/src/passwd/nscd.h
diff --git a/third_party/ulib/musl/src/passwd/nscd_query.c b/zircon/third_party/ulib/musl/src/passwd/nscd_query.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/nscd_query.c
rename to zircon/third_party/ulib/musl/src/passwd/nscd_query.c
diff --git a/third_party/ulib/musl/src/passwd/putgrent.c b/zircon/third_party/ulib/musl/src/passwd/putgrent.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/putgrent.c
rename to zircon/third_party/ulib/musl/src/passwd/putgrent.c
diff --git a/third_party/ulib/musl/src/passwd/putpwent.c b/zircon/third_party/ulib/musl/src/passwd/putpwent.c
similarity index 100%
rename from third_party/ulib/musl/src/passwd/putpwent.c
rename to zircon/third_party/ulib/musl/src/passwd/putpwent.c
diff --git a/third_party/ulib/musl/src/passwd/pwf.h b/zircon/third_party/ulib/musl/src/passwd/pwf.h
similarity index 100%
rename from third_party/ulib/musl/src/passwd/pwf.h
rename to zircon/third_party/ulib/musl/src/passwd/pwf.h
diff --git a/third_party/ulib/musl/src/prng/__rand48_step.c b/zircon/third_party/ulib/musl/src/prng/__rand48_step.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/__rand48_step.c
rename to zircon/third_party/ulib/musl/src/prng/__rand48_step.c
diff --git a/third_party/ulib/musl/src/prng/__seed48.c b/zircon/third_party/ulib/musl/src/prng/__seed48.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/__seed48.c
rename to zircon/third_party/ulib/musl/src/prng/__seed48.c
diff --git a/third_party/ulib/musl/src/prng/drand48.c b/zircon/third_party/ulib/musl/src/prng/drand48.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/drand48.c
rename to zircon/third_party/ulib/musl/src/prng/drand48.c
diff --git a/third_party/ulib/musl/src/prng/lcong48.c b/zircon/third_party/ulib/musl/src/prng/lcong48.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/lcong48.c
rename to zircon/third_party/ulib/musl/src/prng/lcong48.c
diff --git a/third_party/ulib/musl/src/prng/lrand48.c b/zircon/third_party/ulib/musl/src/prng/lrand48.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/lrand48.c
rename to zircon/third_party/ulib/musl/src/prng/lrand48.c
diff --git a/third_party/ulib/musl/src/prng/mrand48.c b/zircon/third_party/ulib/musl/src/prng/mrand48.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/mrand48.c
rename to zircon/third_party/ulib/musl/src/prng/mrand48.c
diff --git a/third_party/ulib/musl/src/prng/rand.c b/zircon/third_party/ulib/musl/src/prng/rand.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/rand.c
rename to zircon/third_party/ulib/musl/src/prng/rand.c
diff --git a/third_party/ulib/musl/src/prng/rand48_impl.h b/zircon/third_party/ulib/musl/src/prng/rand48_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/prng/rand48_impl.h
rename to zircon/third_party/ulib/musl/src/prng/rand48_impl.h
diff --git a/third_party/ulib/musl/src/prng/rand_r.c b/zircon/third_party/ulib/musl/src/prng/rand_r.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/rand_r.c
rename to zircon/third_party/ulib/musl/src/prng/rand_r.c
diff --git a/third_party/ulib/musl/src/prng/random.c b/zircon/third_party/ulib/musl/src/prng/random.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/random.c
rename to zircon/third_party/ulib/musl/src/prng/random.c
diff --git a/third_party/ulib/musl/src/prng/seed48.c b/zircon/third_party/ulib/musl/src/prng/seed48.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/seed48.c
rename to zircon/third_party/ulib/musl/src/prng/seed48.c
diff --git a/third_party/ulib/musl/src/prng/srand48.c b/zircon/third_party/ulib/musl/src/prng/srand48.c
similarity index 100%
rename from third_party/ulib/musl/src/prng/srand48.c
rename to zircon/third_party/ulib/musl/src/prng/srand48.c
diff --git a/third_party/ulib/musl/src/process/execl.c b/zircon/third_party/ulib/musl/src/process/execl.c
similarity index 100%
rename from third_party/ulib/musl/src/process/execl.c
rename to zircon/third_party/ulib/musl/src/process/execl.c
diff --git a/third_party/ulib/musl/src/process/execle.c b/zircon/third_party/ulib/musl/src/process/execle.c
similarity index 100%
rename from third_party/ulib/musl/src/process/execle.c
rename to zircon/third_party/ulib/musl/src/process/execle.c
diff --git a/third_party/ulib/musl/src/process/execlp.c b/zircon/third_party/ulib/musl/src/process/execlp.c
similarity index 100%
rename from third_party/ulib/musl/src/process/execlp.c
rename to zircon/third_party/ulib/musl/src/process/execlp.c
diff --git a/third_party/ulib/musl/src/process/execv.c b/zircon/third_party/ulib/musl/src/process/execv.c
similarity index 100%
rename from third_party/ulib/musl/src/process/execv.c
rename to zircon/third_party/ulib/musl/src/process/execv.c
diff --git a/third_party/ulib/musl/src/process/execve.c b/zircon/third_party/ulib/musl/src/process/execve.c
similarity index 100%
rename from third_party/ulib/musl/src/process/execve.c
rename to zircon/third_party/ulib/musl/src/process/execve.c
diff --git a/third_party/ulib/musl/src/process/execvp.c b/zircon/third_party/ulib/musl/src/process/execvp.c
similarity index 100%
rename from third_party/ulib/musl/src/process/execvp.c
rename to zircon/third_party/ulib/musl/src/process/execvp.c
diff --git a/third_party/ulib/musl/src/process/fdop.h b/zircon/third_party/ulib/musl/src/process/fdop.h
similarity index 100%
rename from third_party/ulib/musl/src/process/fdop.h
rename to zircon/third_party/ulib/musl/src/process/fdop.h
diff --git a/third_party/ulib/musl/src/process/fexecve.c b/zircon/third_party/ulib/musl/src/process/fexecve.c
similarity index 100%
rename from third_party/ulib/musl/src/process/fexecve.c
rename to zircon/third_party/ulib/musl/src/process/fexecve.c
diff --git a/third_party/ulib/musl/src/process/fork.c b/zircon/third_party/ulib/musl/src/process/fork.c
similarity index 100%
rename from third_party/ulib/musl/src/process/fork.c
rename to zircon/third_party/ulib/musl/src/process/fork.c
diff --git a/third_party/ulib/musl/src/process/posix_spawn.c b/zircon/third_party/ulib/musl/src/process/posix_spawn.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawn.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawn.c
diff --git a/third_party/ulib/musl/src/process/posix_spawn_file_actions_addclose.c b/zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_addclose.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawn_file_actions_addclose.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_addclose.c
diff --git a/third_party/ulib/musl/src/process/posix_spawn_file_actions_adddup2.c b/zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_adddup2.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawn_file_actions_adddup2.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_adddup2.c
diff --git a/third_party/ulib/musl/src/process/posix_spawn_file_actions_addopen.c b/zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_addopen.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawn_file_actions_addopen.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_addopen.c
diff --git a/third_party/ulib/musl/src/process/posix_spawn_file_actions_destroy.c b/zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_destroy.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawn_file_actions_destroy.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_destroy.c
diff --git a/third_party/ulib/musl/src/process/posix_spawn_file_actions_init.c b/zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_init.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawn_file_actions_init.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawn_file_actions_init.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_destroy.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_destroy.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_destroy.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_destroy.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_getflags.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_getflags.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_getflags.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_getflags.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_getpgroup.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_getpgroup.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_getpgroup.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_getpgroup.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_getsigdefault.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_getsigdefault.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_getsigdefault.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_getsigdefault.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_getsigmask.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_getsigmask.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_getsigmask.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_getsigmask.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_init.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_init.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_init.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_init.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_sched.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_sched.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_sched.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_sched.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_setflags.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_setflags.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_setflags.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_setflags.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_setpgroup.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_setpgroup.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_setpgroup.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_setpgroup.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_setsigdefault.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_setsigdefault.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_setsigdefault.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_setsigdefault.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnattr_setsigmask.c b/zircon/third_party/ulib/musl/src/process/posix_spawnattr_setsigmask.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnattr_setsigmask.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnattr_setsigmask.c
diff --git a/third_party/ulib/musl/src/process/posix_spawnp.c b/zircon/third_party/ulib/musl/src/process/posix_spawnp.c
similarity index 100%
rename from third_party/ulib/musl/src/process/posix_spawnp.c
rename to zircon/third_party/ulib/musl/src/process/posix_spawnp.c
diff --git a/third_party/ulib/musl/src/process/system.c b/zircon/third_party/ulib/musl/src/process/system.c
similarity index 100%
rename from third_party/ulib/musl/src/process/system.c
rename to zircon/third_party/ulib/musl/src/process/system.c
diff --git a/third_party/ulib/musl/src/process/wait.c b/zircon/third_party/ulib/musl/src/process/wait.c
similarity index 100%
rename from third_party/ulib/musl/src/process/wait.c
rename to zircon/third_party/ulib/musl/src/process/wait.c
diff --git a/third_party/ulib/musl/src/process/waitid.c b/zircon/third_party/ulib/musl/src/process/waitid.c
similarity index 100%
rename from third_party/ulib/musl/src/process/waitid.c
rename to zircon/third_party/ulib/musl/src/process/waitid.c
diff --git a/third_party/ulib/musl/src/process/waitpid.c b/zircon/third_party/ulib/musl/src/process/waitpid.c
similarity index 100%
rename from third_party/ulib/musl/src/process/waitpid.c
rename to zircon/third_party/ulib/musl/src/process/waitpid.c
diff --git a/third_party/ulib/musl/src/regex/fnmatch.c b/zircon/third_party/ulib/musl/src/regex/fnmatch.c
similarity index 100%
rename from third_party/ulib/musl/src/regex/fnmatch.c
rename to zircon/third_party/ulib/musl/src/regex/fnmatch.c
diff --git a/third_party/ulib/musl/src/regex/glob.c b/zircon/third_party/ulib/musl/src/regex/glob.c
similarity index 100%
rename from third_party/ulib/musl/src/regex/glob.c
rename to zircon/third_party/ulib/musl/src/regex/glob.c
diff --git a/third_party/ulib/musl/src/sched/affinity.c b/zircon/third_party/ulib/musl/src/sched/affinity.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/affinity.c
rename to zircon/third_party/ulib/musl/src/sched/affinity.c
diff --git a/third_party/ulib/musl/src/sched/sched_cpucount.c b/zircon/third_party/ulib/musl/src/sched/sched_cpucount.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_cpucount.c
rename to zircon/third_party/ulib/musl/src/sched/sched_cpucount.c
diff --git a/third_party/ulib/musl/src/sched/sched_get_priority_max.c b/zircon/third_party/ulib/musl/src/sched/sched_get_priority_max.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_get_priority_max.c
rename to zircon/third_party/ulib/musl/src/sched/sched_get_priority_max.c
diff --git a/third_party/ulib/musl/src/sched/sched_getcpu.c b/zircon/third_party/ulib/musl/src/sched/sched_getcpu.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_getcpu.c
rename to zircon/third_party/ulib/musl/src/sched/sched_getcpu.c
diff --git a/third_party/ulib/musl/src/sched/sched_getparam.c b/zircon/third_party/ulib/musl/src/sched/sched_getparam.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_getparam.c
rename to zircon/third_party/ulib/musl/src/sched/sched_getparam.c
diff --git a/third_party/ulib/musl/src/sched/sched_getscheduler.c b/zircon/third_party/ulib/musl/src/sched/sched_getscheduler.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_getscheduler.c
rename to zircon/third_party/ulib/musl/src/sched/sched_getscheduler.c
diff --git a/third_party/ulib/musl/src/sched/sched_rr_get_interval.c b/zircon/third_party/ulib/musl/src/sched/sched_rr_get_interval.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_rr_get_interval.c
rename to zircon/third_party/ulib/musl/src/sched/sched_rr_get_interval.c
diff --git a/third_party/ulib/musl/src/sched/sched_setparam.c b/zircon/third_party/ulib/musl/src/sched/sched_setparam.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_setparam.c
rename to zircon/third_party/ulib/musl/src/sched/sched_setparam.c
diff --git a/third_party/ulib/musl/src/sched/sched_setscheduler.c b/zircon/third_party/ulib/musl/src/sched/sched_setscheduler.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_setscheduler.c
rename to zircon/third_party/ulib/musl/src/sched/sched_setscheduler.c
diff --git a/third_party/ulib/musl/src/sched/sched_yield.c b/zircon/third_party/ulib/musl/src/sched/sched_yield.c
similarity index 100%
rename from third_party/ulib/musl/src/sched/sched_yield.c
rename to zircon/third_party/ulib/musl/src/sched/sched_yield.c
diff --git a/third_party/ulib/musl/src/setjmp/aarch64/longjmp.S b/zircon/third_party/ulib/musl/src/setjmp/aarch64/longjmp.S
similarity index 100%
rename from third_party/ulib/musl/src/setjmp/aarch64/longjmp.S
rename to zircon/third_party/ulib/musl/src/setjmp/aarch64/longjmp.S
diff --git a/third_party/ulib/musl/src/setjmp/aarch64/setjmp.S b/zircon/third_party/ulib/musl/src/setjmp/aarch64/setjmp.S
similarity index 100%
rename from third_party/ulib/musl/src/setjmp/aarch64/setjmp.S
rename to zircon/third_party/ulib/musl/src/setjmp/aarch64/setjmp.S
diff --git a/third_party/ulib/musl/src/setjmp/longjmp.c b/zircon/third_party/ulib/musl/src/setjmp/longjmp.c
similarity index 100%
rename from third_party/ulib/musl/src/setjmp/longjmp.c
rename to zircon/third_party/ulib/musl/src/setjmp/longjmp.c
diff --git a/third_party/ulib/musl/src/setjmp/setjmp.c b/zircon/third_party/ulib/musl/src/setjmp/setjmp.c
similarity index 100%
rename from third_party/ulib/musl/src/setjmp/setjmp.c
rename to zircon/third_party/ulib/musl/src/setjmp/setjmp.c
diff --git a/third_party/ulib/musl/src/setjmp/x86_64/longjmp.S b/zircon/third_party/ulib/musl/src/setjmp/x86_64/longjmp.S
similarity index 100%
rename from third_party/ulib/musl/src/setjmp/x86_64/longjmp.S
rename to zircon/third_party/ulib/musl/src/setjmp/x86_64/longjmp.S
diff --git a/third_party/ulib/musl/src/setjmp/x86_64/setjmp.S b/zircon/third_party/ulib/musl/src/setjmp/x86_64/setjmp.S
similarity index 100%
rename from third_party/ulib/musl/src/setjmp/x86_64/setjmp.S
rename to zircon/third_party/ulib/musl/src/setjmp/x86_64/setjmp.S
diff --git a/third_party/ulib/musl/src/signal/getitimer.c b/zircon/third_party/ulib/musl/src/signal/getitimer.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/getitimer.c
rename to zircon/third_party/ulib/musl/src/signal/getitimer.c
diff --git a/third_party/ulib/musl/src/signal/kill.c b/zircon/third_party/ulib/musl/src/signal/kill.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/kill.c
rename to zircon/third_party/ulib/musl/src/signal/kill.c
diff --git a/third_party/ulib/musl/src/signal/killpg.c b/zircon/third_party/ulib/musl/src/signal/killpg.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/killpg.c
rename to zircon/third_party/ulib/musl/src/signal/killpg.c
diff --git a/third_party/ulib/musl/src/signal/psiginfo.c b/zircon/third_party/ulib/musl/src/signal/psiginfo.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/psiginfo.c
rename to zircon/third_party/ulib/musl/src/signal/psiginfo.c
diff --git a/third_party/ulib/musl/src/signal/psignal.c b/zircon/third_party/ulib/musl/src/signal/psignal.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/psignal.c
rename to zircon/third_party/ulib/musl/src/signal/psignal.c
diff --git a/third_party/ulib/musl/src/signal/raise.c b/zircon/third_party/ulib/musl/src/signal/raise.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/raise.c
rename to zircon/third_party/ulib/musl/src/signal/raise.c
diff --git a/third_party/ulib/musl/src/signal/setitimer.c b/zircon/third_party/ulib/musl/src/signal/setitimer.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/setitimer.c
rename to zircon/third_party/ulib/musl/src/signal/setitimer.c
diff --git a/third_party/ulib/musl/src/signal/sigaction.c b/zircon/third_party/ulib/musl/src/signal/sigaction.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigaction.c
rename to zircon/third_party/ulib/musl/src/signal/sigaction.c
diff --git a/third_party/ulib/musl/src/signal/sigaddset.c b/zircon/third_party/ulib/musl/src/signal/sigaddset.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigaddset.c
rename to zircon/third_party/ulib/musl/src/signal/sigaddset.c
diff --git a/third_party/ulib/musl/src/signal/sigaltstack.c b/zircon/third_party/ulib/musl/src/signal/sigaltstack.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigaltstack.c
rename to zircon/third_party/ulib/musl/src/signal/sigaltstack.c
diff --git a/third_party/ulib/musl/src/signal/sigandset.c b/zircon/third_party/ulib/musl/src/signal/sigandset.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigandset.c
rename to zircon/third_party/ulib/musl/src/signal/sigandset.c
diff --git a/third_party/ulib/musl/src/signal/sigdelset.c b/zircon/third_party/ulib/musl/src/signal/sigdelset.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigdelset.c
rename to zircon/third_party/ulib/musl/src/signal/sigdelset.c
diff --git a/third_party/ulib/musl/src/signal/sigemptyset.c b/zircon/third_party/ulib/musl/src/signal/sigemptyset.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigemptyset.c
rename to zircon/third_party/ulib/musl/src/signal/sigemptyset.c
diff --git a/third_party/ulib/musl/src/signal/sigfillset.c b/zircon/third_party/ulib/musl/src/signal/sigfillset.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigfillset.c
rename to zircon/third_party/ulib/musl/src/signal/sigfillset.c
diff --git a/third_party/ulib/musl/src/signal/siginterrupt.c b/zircon/third_party/ulib/musl/src/signal/siginterrupt.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/siginterrupt.c
rename to zircon/third_party/ulib/musl/src/signal/siginterrupt.c
diff --git a/third_party/ulib/musl/src/signal/sigisemptyset.c b/zircon/third_party/ulib/musl/src/signal/sigisemptyset.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigisemptyset.c
rename to zircon/third_party/ulib/musl/src/signal/sigisemptyset.c
diff --git a/third_party/ulib/musl/src/signal/sigismember.c b/zircon/third_party/ulib/musl/src/signal/sigismember.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigismember.c
rename to zircon/third_party/ulib/musl/src/signal/sigismember.c
diff --git a/third_party/ulib/musl/src/signal/signal.c b/zircon/third_party/ulib/musl/src/signal/signal.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/signal.c
rename to zircon/third_party/ulib/musl/src/signal/signal.c
diff --git a/third_party/ulib/musl/src/signal/sigorset.c b/zircon/third_party/ulib/musl/src/signal/sigorset.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigorset.c
rename to zircon/third_party/ulib/musl/src/signal/sigorset.c
diff --git a/third_party/ulib/musl/src/signal/sigpause.c b/zircon/third_party/ulib/musl/src/signal/sigpause.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigpause.c
rename to zircon/third_party/ulib/musl/src/signal/sigpause.c
diff --git a/third_party/ulib/musl/src/signal/sigpending.c b/zircon/third_party/ulib/musl/src/signal/sigpending.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigpending.c
rename to zircon/third_party/ulib/musl/src/signal/sigpending.c
diff --git a/third_party/ulib/musl/src/signal/sigprocmask.c b/zircon/third_party/ulib/musl/src/signal/sigprocmask.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigprocmask.c
rename to zircon/third_party/ulib/musl/src/signal/sigprocmask.c
diff --git a/third_party/ulib/musl/src/signal/sigqueue.c b/zircon/third_party/ulib/musl/src/signal/sigqueue.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigqueue.c
rename to zircon/third_party/ulib/musl/src/signal/sigqueue.c
diff --git a/third_party/ulib/musl/src/signal/sigrtmax.c b/zircon/third_party/ulib/musl/src/signal/sigrtmax.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigrtmax.c
rename to zircon/third_party/ulib/musl/src/signal/sigrtmax.c
diff --git a/third_party/ulib/musl/src/signal/sigrtmin.c b/zircon/third_party/ulib/musl/src/signal/sigrtmin.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigrtmin.c
rename to zircon/third_party/ulib/musl/src/signal/sigrtmin.c
diff --git a/third_party/ulib/musl/src/signal/sigsuspend.c b/zircon/third_party/ulib/musl/src/signal/sigsuspend.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigsuspend.c
rename to zircon/third_party/ulib/musl/src/signal/sigsuspend.c
diff --git a/third_party/ulib/musl/src/signal/sigtimedwait.c b/zircon/third_party/ulib/musl/src/signal/sigtimedwait.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigtimedwait.c
rename to zircon/third_party/ulib/musl/src/signal/sigtimedwait.c
diff --git a/third_party/ulib/musl/src/signal/sigwait.c b/zircon/third_party/ulib/musl/src/signal/sigwait.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigwait.c
rename to zircon/third_party/ulib/musl/src/signal/sigwait.c
diff --git a/third_party/ulib/musl/src/signal/sigwaitinfo.c b/zircon/third_party/ulib/musl/src/signal/sigwaitinfo.c
similarity index 100%
rename from third_party/ulib/musl/src/signal/sigwaitinfo.c
rename to zircon/third_party/ulib/musl/src/signal/sigwaitinfo.c
diff --git a/third_party/ulib/musl/src/stat/futimesat.c b/zircon/third_party/ulib/musl/src/stat/futimesat.c
similarity index 100%
rename from third_party/ulib/musl/src/stat/futimesat.c
rename to zircon/third_party/ulib/musl/src/stat/futimesat.c
diff --git a/third_party/ulib/musl/src/stat/lchmod.c b/zircon/third_party/ulib/musl/src/stat/lchmod.c
similarity index 100%
rename from third_party/ulib/musl/src/stat/lchmod.c
rename to zircon/third_party/ulib/musl/src/stat/lchmod.c
diff --git a/third_party/ulib/musl/src/stat/mkfifoat.c b/zircon/third_party/ulib/musl/src/stat/mkfifoat.c
similarity index 100%
rename from third_party/ulib/musl/src/stat/mkfifoat.c
rename to zircon/third_party/ulib/musl/src/stat/mkfifoat.c
diff --git a/third_party/ulib/musl/src/stat/mknodat.c b/zircon/third_party/ulib/musl/src/stat/mknodat.c
similarity index 100%
rename from third_party/ulib/musl/src/stat/mknodat.c
rename to zircon/third_party/ulib/musl/src/stat/mknodat.c
diff --git a/third_party/ulib/musl/src/stat/statvfs.c b/zircon/third_party/ulib/musl/src/stat/statvfs.c
similarity index 100%
rename from third_party/ulib/musl/src/stat/statvfs.c
rename to zircon/third_party/ulib/musl/src/stat/statvfs.c
diff --git a/third_party/ulib/musl/src/stdio/__fclose_ca.c b/zircon/third_party/ulib/musl/src/stdio/__fclose_ca.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__fclose_ca.c
rename to zircon/third_party/ulib/musl/src/stdio/__fclose_ca.c
diff --git a/third_party/ulib/musl/src/stdio/__fdopen.c b/zircon/third_party/ulib/musl/src/stdio/__fdopen.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__fdopen.c
rename to zircon/third_party/ulib/musl/src/stdio/__fdopen.c
diff --git a/third_party/ulib/musl/src/stdio/__fmodeflags.c b/zircon/third_party/ulib/musl/src/stdio/__fmodeflags.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__fmodeflags.c
rename to zircon/third_party/ulib/musl/src/stdio/__fmodeflags.c
diff --git a/third_party/ulib/musl/src/stdio/__fopen_rb_ca.c b/zircon/third_party/ulib/musl/src/stdio/__fopen_rb_ca.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__fopen_rb_ca.c
rename to zircon/third_party/ulib/musl/src/stdio/__fopen_rb_ca.c
diff --git a/third_party/ulib/musl/src/stdio/__lockfile.c b/zircon/third_party/ulib/musl/src/stdio/__lockfile.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__lockfile.c
rename to zircon/third_party/ulib/musl/src/stdio/__lockfile.c
diff --git a/third_party/ulib/musl/src/stdio/__overflow.c b/zircon/third_party/ulib/musl/src/stdio/__overflow.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__overflow.c
rename to zircon/third_party/ulib/musl/src/stdio/__overflow.c
diff --git a/third_party/ulib/musl/src/stdio/__stdio_close.c b/zircon/third_party/ulib/musl/src/stdio/__stdio_close.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__stdio_close.c
rename to zircon/third_party/ulib/musl/src/stdio/__stdio_close.c
diff --git a/third_party/ulib/musl/src/stdio/__stdio_exit.c b/zircon/third_party/ulib/musl/src/stdio/__stdio_exit.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__stdio_exit.c
rename to zircon/third_party/ulib/musl/src/stdio/__stdio_exit.c
diff --git a/third_party/ulib/musl/src/stdio/__stdio_read.c b/zircon/third_party/ulib/musl/src/stdio/__stdio_read.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__stdio_read.c
rename to zircon/third_party/ulib/musl/src/stdio/__stdio_read.c
diff --git a/third_party/ulib/musl/src/stdio/__stdio_seek.c b/zircon/third_party/ulib/musl/src/stdio/__stdio_seek.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__stdio_seek.c
rename to zircon/third_party/ulib/musl/src/stdio/__stdio_seek.c
diff --git a/third_party/ulib/musl/src/stdio/__stdio_write.c b/zircon/third_party/ulib/musl/src/stdio/__stdio_write.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__stdio_write.c
rename to zircon/third_party/ulib/musl/src/stdio/__stdio_write.c
diff --git a/third_party/ulib/musl/src/stdio/__stdout_write.c b/zircon/third_party/ulib/musl/src/stdio/__stdout_write.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__stdout_write.c
rename to zircon/third_party/ulib/musl/src/stdio/__stdout_write.c
diff --git a/third_party/ulib/musl/src/stdio/__string_read.c b/zircon/third_party/ulib/musl/src/stdio/__string_read.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__string_read.c
rename to zircon/third_party/ulib/musl/src/stdio/__string_read.c
diff --git a/third_party/ulib/musl/src/stdio/__toread.c b/zircon/third_party/ulib/musl/src/stdio/__toread.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__toread.c
rename to zircon/third_party/ulib/musl/src/stdio/__toread.c
diff --git a/third_party/ulib/musl/src/stdio/__towrite.c b/zircon/third_party/ulib/musl/src/stdio/__towrite.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__towrite.c
rename to zircon/third_party/ulib/musl/src/stdio/__towrite.c
diff --git a/third_party/ulib/musl/src/stdio/__uflow.c b/zircon/third_party/ulib/musl/src/stdio/__uflow.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/__uflow.c
rename to zircon/third_party/ulib/musl/src/stdio/__uflow.c
diff --git a/third_party/ulib/musl/src/stdio/asprintf.c b/zircon/third_party/ulib/musl/src/stdio/asprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/asprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/asprintf.c
diff --git a/third_party/ulib/musl/src/stdio/clearerr.c b/zircon/third_party/ulib/musl/src/stdio/clearerr.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/clearerr.c
rename to zircon/third_party/ulib/musl/src/stdio/clearerr.c
diff --git a/third_party/ulib/musl/src/stdio/dprintf.c b/zircon/third_party/ulib/musl/src/stdio/dprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/dprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/dprintf.c
diff --git a/third_party/ulib/musl/src/stdio/fclose.c b/zircon/third_party/ulib/musl/src/stdio/fclose.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fclose.c
rename to zircon/third_party/ulib/musl/src/stdio/fclose.c
diff --git a/third_party/ulib/musl/src/stdio/feof.c b/zircon/third_party/ulib/musl/src/stdio/feof.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/feof.c
rename to zircon/third_party/ulib/musl/src/stdio/feof.c
diff --git a/third_party/ulib/musl/src/stdio/ferror.c b/zircon/third_party/ulib/musl/src/stdio/ferror.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/ferror.c
rename to zircon/third_party/ulib/musl/src/stdio/ferror.c
diff --git a/third_party/ulib/musl/src/stdio/fflush.c b/zircon/third_party/ulib/musl/src/stdio/fflush.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fflush.c
rename to zircon/third_party/ulib/musl/src/stdio/fflush.c
diff --git a/third_party/ulib/musl/src/stdio/fgetc.c b/zircon/third_party/ulib/musl/src/stdio/fgetc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fgetc.c
rename to zircon/third_party/ulib/musl/src/stdio/fgetc.c
diff --git a/third_party/ulib/musl/src/stdio/fgetln.c b/zircon/third_party/ulib/musl/src/stdio/fgetln.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fgetln.c
rename to zircon/third_party/ulib/musl/src/stdio/fgetln.c
diff --git a/third_party/ulib/musl/src/stdio/fgetpos.c b/zircon/third_party/ulib/musl/src/stdio/fgetpos.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fgetpos.c
rename to zircon/third_party/ulib/musl/src/stdio/fgetpos.c
diff --git a/third_party/ulib/musl/src/stdio/fgets.c b/zircon/third_party/ulib/musl/src/stdio/fgets.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fgets.c
rename to zircon/third_party/ulib/musl/src/stdio/fgets.c
diff --git a/third_party/ulib/musl/src/stdio/fgetwc.c b/zircon/third_party/ulib/musl/src/stdio/fgetwc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fgetwc.c
rename to zircon/third_party/ulib/musl/src/stdio/fgetwc.c
diff --git a/third_party/ulib/musl/src/stdio/fgetws.c b/zircon/third_party/ulib/musl/src/stdio/fgetws.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fgetws.c
rename to zircon/third_party/ulib/musl/src/stdio/fgetws.c
diff --git a/third_party/ulib/musl/src/stdio/fileno.c b/zircon/third_party/ulib/musl/src/stdio/fileno.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fileno.c
rename to zircon/third_party/ulib/musl/src/stdio/fileno.c
diff --git a/third_party/ulib/musl/src/stdio/flockfile.c b/zircon/third_party/ulib/musl/src/stdio/flockfile.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/flockfile.c
rename to zircon/third_party/ulib/musl/src/stdio/flockfile.c
diff --git a/third_party/ulib/musl/src/stdio/fmemopen.c b/zircon/third_party/ulib/musl/src/stdio/fmemopen.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fmemopen.c
rename to zircon/third_party/ulib/musl/src/stdio/fmemopen.c
diff --git a/third_party/ulib/musl/src/stdio/fopen.c b/zircon/third_party/ulib/musl/src/stdio/fopen.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fopen.c
rename to zircon/third_party/ulib/musl/src/stdio/fopen.c
diff --git a/third_party/ulib/musl/src/stdio/fprintf.c b/zircon/third_party/ulib/musl/src/stdio/fprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/fprintf.c
diff --git a/third_party/ulib/musl/src/stdio/fputc.c b/zircon/third_party/ulib/musl/src/stdio/fputc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fputc.c
rename to zircon/third_party/ulib/musl/src/stdio/fputc.c
diff --git a/third_party/ulib/musl/src/stdio/fputs.c b/zircon/third_party/ulib/musl/src/stdio/fputs.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fputs.c
rename to zircon/third_party/ulib/musl/src/stdio/fputs.c
diff --git a/third_party/ulib/musl/src/stdio/fputwc.c b/zircon/third_party/ulib/musl/src/stdio/fputwc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fputwc.c
rename to zircon/third_party/ulib/musl/src/stdio/fputwc.c
diff --git a/third_party/ulib/musl/src/stdio/fputws.c b/zircon/third_party/ulib/musl/src/stdio/fputws.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fputws.c
rename to zircon/third_party/ulib/musl/src/stdio/fputws.c
diff --git a/third_party/ulib/musl/src/stdio/fread.c b/zircon/third_party/ulib/musl/src/stdio/fread.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fread.c
rename to zircon/third_party/ulib/musl/src/stdio/fread.c
diff --git a/third_party/ulib/musl/src/stdio/freopen.c b/zircon/third_party/ulib/musl/src/stdio/freopen.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/freopen.c
rename to zircon/third_party/ulib/musl/src/stdio/freopen.c
diff --git a/third_party/ulib/musl/src/stdio/fscanf.c b/zircon/third_party/ulib/musl/src/stdio/fscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/fscanf.c
diff --git a/third_party/ulib/musl/src/stdio/fseek.c b/zircon/third_party/ulib/musl/src/stdio/fseek.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fseek.c
rename to zircon/third_party/ulib/musl/src/stdio/fseek.c
diff --git a/third_party/ulib/musl/src/stdio/fsetpos.c b/zircon/third_party/ulib/musl/src/stdio/fsetpos.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fsetpos.c
rename to zircon/third_party/ulib/musl/src/stdio/fsetpos.c
diff --git a/third_party/ulib/musl/src/stdio/ftell.c b/zircon/third_party/ulib/musl/src/stdio/ftell.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/ftell.c
rename to zircon/third_party/ulib/musl/src/stdio/ftell.c
diff --git a/third_party/ulib/musl/src/stdio/ftrylockfile.c b/zircon/third_party/ulib/musl/src/stdio/ftrylockfile.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/ftrylockfile.c
rename to zircon/third_party/ulib/musl/src/stdio/ftrylockfile.c
diff --git a/third_party/ulib/musl/src/stdio/funlockfile.c b/zircon/third_party/ulib/musl/src/stdio/funlockfile.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/funlockfile.c
rename to zircon/third_party/ulib/musl/src/stdio/funlockfile.c
diff --git a/third_party/ulib/musl/src/stdio/fwide.c b/zircon/third_party/ulib/musl/src/stdio/fwide.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fwide.c
rename to zircon/third_party/ulib/musl/src/stdio/fwide.c
diff --git a/third_party/ulib/musl/src/stdio/fwprintf.c b/zircon/third_party/ulib/musl/src/stdio/fwprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fwprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/fwprintf.c
diff --git a/third_party/ulib/musl/src/stdio/fwrite.c b/zircon/third_party/ulib/musl/src/stdio/fwrite.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fwrite.c
rename to zircon/third_party/ulib/musl/src/stdio/fwrite.c
diff --git a/third_party/ulib/musl/src/stdio/fwscanf.c b/zircon/third_party/ulib/musl/src/stdio/fwscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/fwscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/fwscanf.c
diff --git a/third_party/ulib/musl/src/stdio/getc.c b/zircon/third_party/ulib/musl/src/stdio/getc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getc.c
rename to zircon/third_party/ulib/musl/src/stdio/getc.c
diff --git a/third_party/ulib/musl/src/stdio/getc_unlocked.c b/zircon/third_party/ulib/musl/src/stdio/getc_unlocked.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getc_unlocked.c
rename to zircon/third_party/ulib/musl/src/stdio/getc_unlocked.c
diff --git a/third_party/ulib/musl/src/stdio/getchar.c b/zircon/third_party/ulib/musl/src/stdio/getchar.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getchar.c
rename to zircon/third_party/ulib/musl/src/stdio/getchar.c
diff --git a/third_party/ulib/musl/src/stdio/getchar_unlocked.c b/zircon/third_party/ulib/musl/src/stdio/getchar_unlocked.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getchar_unlocked.c
rename to zircon/third_party/ulib/musl/src/stdio/getchar_unlocked.c
diff --git a/third_party/ulib/musl/src/stdio/getdelim.c b/zircon/third_party/ulib/musl/src/stdio/getdelim.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getdelim.c
rename to zircon/third_party/ulib/musl/src/stdio/getdelim.c
diff --git a/third_party/ulib/musl/src/stdio/getline.c b/zircon/third_party/ulib/musl/src/stdio/getline.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getline.c
rename to zircon/third_party/ulib/musl/src/stdio/getline.c
diff --git a/third_party/ulib/musl/src/stdio/gets.c b/zircon/third_party/ulib/musl/src/stdio/gets.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/gets.c
rename to zircon/third_party/ulib/musl/src/stdio/gets.c
diff --git a/third_party/ulib/musl/src/stdio/getw.c b/zircon/third_party/ulib/musl/src/stdio/getw.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getw.c
rename to zircon/third_party/ulib/musl/src/stdio/getw.c
diff --git a/third_party/ulib/musl/src/stdio/getwc.c b/zircon/third_party/ulib/musl/src/stdio/getwc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getwc.c
rename to zircon/third_party/ulib/musl/src/stdio/getwc.c
diff --git a/third_party/ulib/musl/src/stdio/getwchar.c b/zircon/third_party/ulib/musl/src/stdio/getwchar.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/getwchar.c
rename to zircon/third_party/ulib/musl/src/stdio/getwchar.c
diff --git a/third_party/ulib/musl/src/stdio/ofl.c b/zircon/third_party/ulib/musl/src/stdio/ofl.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/ofl.c
rename to zircon/third_party/ulib/musl/src/stdio/ofl.c
diff --git a/third_party/ulib/musl/src/stdio/ofl_add.c b/zircon/third_party/ulib/musl/src/stdio/ofl_add.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/ofl_add.c
rename to zircon/third_party/ulib/musl/src/stdio/ofl_add.c
diff --git a/third_party/ulib/musl/src/stdio/open_memstream.c b/zircon/third_party/ulib/musl/src/stdio/open_memstream.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/open_memstream.c
rename to zircon/third_party/ulib/musl/src/stdio/open_memstream.c
diff --git a/third_party/ulib/musl/src/stdio/open_wmemstream.c b/zircon/third_party/ulib/musl/src/stdio/open_wmemstream.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/open_wmemstream.c
rename to zircon/third_party/ulib/musl/src/stdio/open_wmemstream.c
diff --git a/third_party/ulib/musl/src/stdio/pclose.c b/zircon/third_party/ulib/musl/src/stdio/pclose.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/pclose.c
rename to zircon/third_party/ulib/musl/src/stdio/pclose.c
diff --git a/third_party/ulib/musl/src/stdio/perror.c b/zircon/third_party/ulib/musl/src/stdio/perror.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/perror.c
rename to zircon/third_party/ulib/musl/src/stdio/perror.c
diff --git a/third_party/ulib/musl/src/stdio/popen.c b/zircon/third_party/ulib/musl/src/stdio/popen.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/popen.c
rename to zircon/third_party/ulib/musl/src/stdio/popen.c
diff --git a/third_party/ulib/musl/src/stdio/printf.c b/zircon/third_party/ulib/musl/src/stdio/printf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/printf.c
rename to zircon/third_party/ulib/musl/src/stdio/printf.c
diff --git a/third_party/ulib/musl/src/stdio/putc.c b/zircon/third_party/ulib/musl/src/stdio/putc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/putc.c
rename to zircon/third_party/ulib/musl/src/stdio/putc.c
diff --git a/third_party/ulib/musl/src/stdio/putc_unlocked.c b/zircon/third_party/ulib/musl/src/stdio/putc_unlocked.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/putc_unlocked.c
rename to zircon/third_party/ulib/musl/src/stdio/putc_unlocked.c
diff --git a/third_party/ulib/musl/src/stdio/putchar.c b/zircon/third_party/ulib/musl/src/stdio/putchar.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/putchar.c
rename to zircon/third_party/ulib/musl/src/stdio/putchar.c
diff --git a/third_party/ulib/musl/src/stdio/putchar_unlocked.c b/zircon/third_party/ulib/musl/src/stdio/putchar_unlocked.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/putchar_unlocked.c
rename to zircon/third_party/ulib/musl/src/stdio/putchar_unlocked.c
diff --git a/third_party/ulib/musl/src/stdio/puts.c b/zircon/third_party/ulib/musl/src/stdio/puts.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/puts.c
rename to zircon/third_party/ulib/musl/src/stdio/puts.c
diff --git a/third_party/ulib/musl/src/stdio/putw.c b/zircon/third_party/ulib/musl/src/stdio/putw.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/putw.c
rename to zircon/third_party/ulib/musl/src/stdio/putw.c
diff --git a/third_party/ulib/musl/src/stdio/putwc.c b/zircon/third_party/ulib/musl/src/stdio/putwc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/putwc.c
rename to zircon/third_party/ulib/musl/src/stdio/putwc.c
diff --git a/third_party/ulib/musl/src/stdio/putwchar.c b/zircon/third_party/ulib/musl/src/stdio/putwchar.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/putwchar.c
rename to zircon/third_party/ulib/musl/src/stdio/putwchar.c
diff --git a/third_party/ulib/musl/src/stdio/remove.c b/zircon/third_party/ulib/musl/src/stdio/remove.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/remove.c
rename to zircon/third_party/ulib/musl/src/stdio/remove.c
diff --git a/third_party/ulib/musl/src/stdio/rewind.c b/zircon/third_party/ulib/musl/src/stdio/rewind.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/rewind.c
rename to zircon/third_party/ulib/musl/src/stdio/rewind.c
diff --git a/third_party/ulib/musl/src/stdio/scanf.c b/zircon/third_party/ulib/musl/src/stdio/scanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/scanf.c
rename to zircon/third_party/ulib/musl/src/stdio/scanf.c
diff --git a/third_party/ulib/musl/src/stdio/setbuf.c b/zircon/third_party/ulib/musl/src/stdio/setbuf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/setbuf.c
rename to zircon/third_party/ulib/musl/src/stdio/setbuf.c
diff --git a/third_party/ulib/musl/src/stdio/setbuffer.c b/zircon/third_party/ulib/musl/src/stdio/setbuffer.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/setbuffer.c
rename to zircon/third_party/ulib/musl/src/stdio/setbuffer.c
diff --git a/third_party/ulib/musl/src/stdio/setlinebuf.c b/zircon/third_party/ulib/musl/src/stdio/setlinebuf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/setlinebuf.c
rename to zircon/third_party/ulib/musl/src/stdio/setlinebuf.c
diff --git a/third_party/ulib/musl/src/stdio/setvbuf.c b/zircon/third_party/ulib/musl/src/stdio/setvbuf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/setvbuf.c
rename to zircon/third_party/ulib/musl/src/stdio/setvbuf.c
diff --git a/third_party/ulib/musl/src/stdio/snprintf.c b/zircon/third_party/ulib/musl/src/stdio/snprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/snprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/snprintf.c
diff --git a/third_party/ulib/musl/src/stdio/sprintf.c b/zircon/third_party/ulib/musl/src/stdio/sprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/sprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/sprintf.c
diff --git a/third_party/ulib/musl/src/stdio/sscanf.c b/zircon/third_party/ulib/musl/src/stdio/sscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/sscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/sscanf.c
diff --git a/third_party/ulib/musl/src/stdio/stderr.c b/zircon/third_party/ulib/musl/src/stdio/stderr.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/stderr.c
rename to zircon/third_party/ulib/musl/src/stdio/stderr.c
diff --git a/third_party/ulib/musl/src/stdio/stdin.c b/zircon/third_party/ulib/musl/src/stdio/stdin.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/stdin.c
rename to zircon/third_party/ulib/musl/src/stdio/stdin.c
diff --git a/third_party/ulib/musl/src/stdio/stdout.c b/zircon/third_party/ulib/musl/src/stdio/stdout.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/stdout.c
rename to zircon/third_party/ulib/musl/src/stdio/stdout.c
diff --git a/third_party/ulib/musl/src/stdio/swprintf.c b/zircon/third_party/ulib/musl/src/stdio/swprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/swprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/swprintf.c
diff --git a/third_party/ulib/musl/src/stdio/swscanf.c b/zircon/third_party/ulib/musl/src/stdio/swscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/swscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/swscanf.c
diff --git a/third_party/ulib/musl/src/stdio/tempnam.c b/zircon/third_party/ulib/musl/src/stdio/tempnam.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/tempnam.c
rename to zircon/third_party/ulib/musl/src/stdio/tempnam.c
diff --git a/third_party/ulib/musl/src/stdio/tmpfile.c b/zircon/third_party/ulib/musl/src/stdio/tmpfile.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/tmpfile.c
rename to zircon/third_party/ulib/musl/src/stdio/tmpfile.c
diff --git a/third_party/ulib/musl/src/stdio/tmpnam.c b/zircon/third_party/ulib/musl/src/stdio/tmpnam.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/tmpnam.c
rename to zircon/third_party/ulib/musl/src/stdio/tmpnam.c
diff --git a/third_party/ulib/musl/src/stdio/ungetc.c b/zircon/third_party/ulib/musl/src/stdio/ungetc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/ungetc.c
rename to zircon/third_party/ulib/musl/src/stdio/ungetc.c
diff --git a/third_party/ulib/musl/src/stdio/ungetwc.c b/zircon/third_party/ulib/musl/src/stdio/ungetwc.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/ungetwc.c
rename to zircon/third_party/ulib/musl/src/stdio/ungetwc.c
diff --git a/third_party/ulib/musl/src/stdio/vasprintf.c b/zircon/third_party/ulib/musl/src/stdio/vasprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vasprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vasprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vdprintf.c b/zircon/third_party/ulib/musl/src/stdio/vdprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vdprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vdprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vfprintf.c b/zircon/third_party/ulib/musl/src/stdio/vfprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vfprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vfprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vfscanf.c b/zircon/third_party/ulib/musl/src/stdio/vfscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vfscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/vfscanf.c
diff --git a/third_party/ulib/musl/src/stdio/vfwprintf.c b/zircon/third_party/ulib/musl/src/stdio/vfwprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vfwprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vfwprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vfwscanf.c b/zircon/third_party/ulib/musl/src/stdio/vfwscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vfwscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/vfwscanf.c
diff --git a/third_party/ulib/musl/src/stdio/vprintf.c b/zircon/third_party/ulib/musl/src/stdio/vprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vscanf.c b/zircon/third_party/ulib/musl/src/stdio/vscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/vscanf.c
diff --git a/third_party/ulib/musl/src/stdio/vsnprintf.c b/zircon/third_party/ulib/musl/src/stdio/vsnprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vsnprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vsnprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vsprintf.c b/zircon/third_party/ulib/musl/src/stdio/vsprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vsprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vsprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vsscanf.c b/zircon/third_party/ulib/musl/src/stdio/vsscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vsscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/vsscanf.c
diff --git a/third_party/ulib/musl/src/stdio/vswprintf.c b/zircon/third_party/ulib/musl/src/stdio/vswprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vswprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vswprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vswscanf.c b/zircon/third_party/ulib/musl/src/stdio/vswscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vswscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/vswscanf.c
diff --git a/third_party/ulib/musl/src/stdio/vwprintf.c b/zircon/third_party/ulib/musl/src/stdio/vwprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vwprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/vwprintf.c
diff --git a/third_party/ulib/musl/src/stdio/vwscanf.c b/zircon/third_party/ulib/musl/src/stdio/vwscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/vwscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/vwscanf.c
diff --git a/third_party/ulib/musl/src/stdio/wprintf.c b/zircon/third_party/ulib/musl/src/stdio/wprintf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/wprintf.c
rename to zircon/third_party/ulib/musl/src/stdio/wprintf.c
diff --git a/third_party/ulib/musl/src/stdio/wscanf.c b/zircon/third_party/ulib/musl/src/stdio/wscanf.c
similarity index 100%
rename from third_party/ulib/musl/src/stdio/wscanf.c
rename to zircon/third_party/ulib/musl/src/stdio/wscanf.c
diff --git a/third_party/ulib/musl/src/stdlib/abs.c b/zircon/third_party/ulib/musl/src/stdlib/abs.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/abs.c
rename to zircon/third_party/ulib/musl/src/stdlib/abs.c
diff --git a/third_party/ulib/musl/src/stdlib/atof.c b/zircon/third_party/ulib/musl/src/stdlib/atof.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/atof.c
rename to zircon/third_party/ulib/musl/src/stdlib/atof.c
diff --git a/third_party/ulib/musl/src/stdlib/atoi.c b/zircon/third_party/ulib/musl/src/stdlib/atoi.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/atoi.c
rename to zircon/third_party/ulib/musl/src/stdlib/atoi.c
diff --git a/third_party/ulib/musl/src/stdlib/atol.c b/zircon/third_party/ulib/musl/src/stdlib/atol.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/atol.c
rename to zircon/third_party/ulib/musl/src/stdlib/atol.c
diff --git a/third_party/ulib/musl/src/stdlib/atoll.c b/zircon/third_party/ulib/musl/src/stdlib/atoll.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/atoll.c
rename to zircon/third_party/ulib/musl/src/stdlib/atoll.c
diff --git a/third_party/ulib/musl/src/stdlib/bsearch.c b/zircon/third_party/ulib/musl/src/stdlib/bsearch.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/bsearch.c
rename to zircon/third_party/ulib/musl/src/stdlib/bsearch.c
diff --git a/third_party/ulib/musl/src/stdlib/div.c b/zircon/third_party/ulib/musl/src/stdlib/div.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/div.c
rename to zircon/third_party/ulib/musl/src/stdlib/div.c
diff --git a/third_party/ulib/musl/src/stdlib/ecvt.c b/zircon/third_party/ulib/musl/src/stdlib/ecvt.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/ecvt.c
rename to zircon/third_party/ulib/musl/src/stdlib/ecvt.c
diff --git a/third_party/ulib/musl/src/stdlib/fcvt.c b/zircon/third_party/ulib/musl/src/stdlib/fcvt.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/fcvt.c
rename to zircon/third_party/ulib/musl/src/stdlib/fcvt.c
diff --git a/third_party/ulib/musl/src/stdlib/gcvt.c b/zircon/third_party/ulib/musl/src/stdlib/gcvt.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/gcvt.c
rename to zircon/third_party/ulib/musl/src/stdlib/gcvt.c
diff --git a/third_party/ulib/musl/src/stdlib/imaxabs.c b/zircon/third_party/ulib/musl/src/stdlib/imaxabs.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/imaxabs.c
rename to zircon/third_party/ulib/musl/src/stdlib/imaxabs.c
diff --git a/third_party/ulib/musl/src/stdlib/imaxdiv.c b/zircon/third_party/ulib/musl/src/stdlib/imaxdiv.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/imaxdiv.c
rename to zircon/third_party/ulib/musl/src/stdlib/imaxdiv.c
diff --git a/third_party/ulib/musl/src/stdlib/labs.c b/zircon/third_party/ulib/musl/src/stdlib/labs.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/labs.c
rename to zircon/third_party/ulib/musl/src/stdlib/labs.c
diff --git a/third_party/ulib/musl/src/stdlib/ldiv.c b/zircon/third_party/ulib/musl/src/stdlib/ldiv.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/ldiv.c
rename to zircon/third_party/ulib/musl/src/stdlib/ldiv.c
diff --git a/third_party/ulib/musl/src/stdlib/llabs.c b/zircon/third_party/ulib/musl/src/stdlib/llabs.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/llabs.c
rename to zircon/third_party/ulib/musl/src/stdlib/llabs.c
diff --git a/third_party/ulib/musl/src/stdlib/lldiv.c b/zircon/third_party/ulib/musl/src/stdlib/lldiv.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/lldiv.c
rename to zircon/third_party/ulib/musl/src/stdlib/lldiv.c
diff --git a/third_party/ulib/musl/src/stdlib/strtod.c b/zircon/third_party/ulib/musl/src/stdlib/strtod.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/strtod.c
rename to zircon/third_party/ulib/musl/src/stdlib/strtod.c
diff --git a/third_party/ulib/musl/src/stdlib/strtol.c b/zircon/third_party/ulib/musl/src/stdlib/strtol.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/strtol.c
rename to zircon/third_party/ulib/musl/src/stdlib/strtol.c
diff --git a/third_party/ulib/musl/src/stdlib/wcstod.c b/zircon/third_party/ulib/musl/src/stdlib/wcstod.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/wcstod.c
rename to zircon/third_party/ulib/musl/src/stdlib/wcstod.c
diff --git a/third_party/ulib/musl/src/stdlib/wcstol.c b/zircon/third_party/ulib/musl/src/stdlib/wcstol.c
similarity index 100%
rename from third_party/ulib/musl/src/stdlib/wcstol.c
rename to zircon/third_party/ulib/musl/src/stdlib/wcstol.c
diff --git a/third_party/ulib/musl/src/string/aarch64/memcpy.S b/zircon/third_party/ulib/musl/src/string/aarch64/memcpy.S
similarity index 100%
rename from third_party/ulib/musl/src/string/aarch64/memcpy.S
rename to zircon/third_party/ulib/musl/src/string/aarch64/memcpy.S
diff --git a/third_party/ulib/musl/src/string/aarch64/memmove.S b/zircon/third_party/ulib/musl/src/string/aarch64/memmove.S
similarity index 100%
rename from third_party/ulib/musl/src/string/aarch64/memmove.S
rename to zircon/third_party/ulib/musl/src/string/aarch64/memmove.S
diff --git a/third_party/ulib/musl/src/string/aarch64/memset.S b/zircon/third_party/ulib/musl/src/string/aarch64/memset.S
similarity index 100%
rename from third_party/ulib/musl/src/string/aarch64/memset.S
rename to zircon/third_party/ulib/musl/src/string/aarch64/memset.S
diff --git a/third_party/ulib/musl/src/string/aarch64/strchrnul.S b/zircon/third_party/ulib/musl/src/string/aarch64/strchrnul.S
similarity index 100%
rename from third_party/ulib/musl/src/string/aarch64/strchrnul.S
rename to zircon/third_party/ulib/musl/src/string/aarch64/strchrnul.S
diff --git a/third_party/ulib/musl/src/string/bcmp.c b/zircon/third_party/ulib/musl/src/string/bcmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/bcmp.c
rename to zircon/third_party/ulib/musl/src/string/bcmp.c
diff --git a/third_party/ulib/musl/src/string/bcopy.c b/zircon/third_party/ulib/musl/src/string/bcopy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/bcopy.c
rename to zircon/third_party/ulib/musl/src/string/bcopy.c
diff --git a/third_party/ulib/musl/src/string/bzero.c b/zircon/third_party/ulib/musl/src/string/bzero.c
similarity index 100%
rename from third_party/ulib/musl/src/string/bzero.c
rename to zircon/third_party/ulib/musl/src/string/bzero.c
diff --git a/third_party/ulib/musl/src/string/index.c b/zircon/third_party/ulib/musl/src/string/index.c
similarity index 100%
rename from third_party/ulib/musl/src/string/index.c
rename to zircon/third_party/ulib/musl/src/string/index.c
diff --git a/third_party/ulib/musl/src/string/memccpy.c b/zircon/third_party/ulib/musl/src/string/memccpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memccpy.c
rename to zircon/third_party/ulib/musl/src/string/memccpy.c
diff --git a/third_party/ulib/musl/src/string/memchr.c b/zircon/third_party/ulib/musl/src/string/memchr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memchr.c
rename to zircon/third_party/ulib/musl/src/string/memchr.c
diff --git a/third_party/ulib/musl/src/string/memcmp.c b/zircon/third_party/ulib/musl/src/string/memcmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memcmp.c
rename to zircon/third_party/ulib/musl/src/string/memcmp.c
diff --git a/third_party/ulib/musl/src/string/memcpy.c b/zircon/third_party/ulib/musl/src/string/memcpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memcpy.c
rename to zircon/third_party/ulib/musl/src/string/memcpy.c
diff --git a/third_party/ulib/musl/src/string/memmem.c b/zircon/third_party/ulib/musl/src/string/memmem.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memmem.c
rename to zircon/third_party/ulib/musl/src/string/memmem.c
diff --git a/third_party/ulib/musl/src/string/memmove.c b/zircon/third_party/ulib/musl/src/string/memmove.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memmove.c
rename to zircon/third_party/ulib/musl/src/string/memmove.c
diff --git a/third_party/ulib/musl/src/string/mempcpy.c b/zircon/third_party/ulib/musl/src/string/mempcpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/mempcpy.c
rename to zircon/third_party/ulib/musl/src/string/mempcpy.c
diff --git a/third_party/ulib/musl/src/string/memrchr.c b/zircon/third_party/ulib/musl/src/string/memrchr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memrchr.c
rename to zircon/third_party/ulib/musl/src/string/memrchr.c
diff --git a/third_party/ulib/musl/src/string/memset.c b/zircon/third_party/ulib/musl/src/string/memset.c
similarity index 100%
rename from third_party/ulib/musl/src/string/memset.c
rename to zircon/third_party/ulib/musl/src/string/memset.c
diff --git a/third_party/ulib/musl/src/string/rindex.c b/zircon/third_party/ulib/musl/src/string/rindex.c
similarity index 100%
rename from third_party/ulib/musl/src/string/rindex.c
rename to zircon/third_party/ulib/musl/src/string/rindex.c
diff --git a/third_party/ulib/musl/src/string/rules.mk b/zircon/third_party/ulib/musl/src/string/rules.mk
similarity index 100%
rename from third_party/ulib/musl/src/string/rules.mk
rename to zircon/third_party/ulib/musl/src/string/rules.mk
diff --git a/third_party/ulib/musl/src/string/stpcpy.c b/zircon/third_party/ulib/musl/src/string/stpcpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/stpcpy.c
rename to zircon/third_party/ulib/musl/src/string/stpcpy.c
diff --git a/third_party/ulib/musl/src/string/stpncpy.c b/zircon/third_party/ulib/musl/src/string/stpncpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/stpncpy.c
rename to zircon/third_party/ulib/musl/src/string/stpncpy.c
diff --git a/third_party/ulib/musl/src/string/strcasecmp.c b/zircon/third_party/ulib/musl/src/string/strcasecmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strcasecmp.c
rename to zircon/third_party/ulib/musl/src/string/strcasecmp.c
diff --git a/third_party/ulib/musl/src/string/strcasestr.c b/zircon/third_party/ulib/musl/src/string/strcasestr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strcasestr.c
rename to zircon/third_party/ulib/musl/src/string/strcasestr.c
diff --git a/third_party/ulib/musl/src/string/strcat.c b/zircon/third_party/ulib/musl/src/string/strcat.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strcat.c
rename to zircon/third_party/ulib/musl/src/string/strcat.c
diff --git a/third_party/ulib/musl/src/string/strchr.c b/zircon/third_party/ulib/musl/src/string/strchr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strchr.c
rename to zircon/third_party/ulib/musl/src/string/strchr.c
diff --git a/third_party/ulib/musl/src/string/strchrnul.c b/zircon/third_party/ulib/musl/src/string/strchrnul.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strchrnul.c
rename to zircon/third_party/ulib/musl/src/string/strchrnul.c
diff --git a/third_party/ulib/musl/src/string/strcmp.c b/zircon/third_party/ulib/musl/src/string/strcmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strcmp.c
rename to zircon/third_party/ulib/musl/src/string/strcmp.c
diff --git a/third_party/ulib/musl/src/string/strcpy.c b/zircon/third_party/ulib/musl/src/string/strcpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strcpy.c
rename to zircon/third_party/ulib/musl/src/string/strcpy.c
diff --git a/third_party/ulib/musl/src/string/strcspn.c b/zircon/third_party/ulib/musl/src/string/strcspn.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strcspn.c
rename to zircon/third_party/ulib/musl/src/string/strcspn.c
diff --git a/third_party/ulib/musl/src/string/strdup.c b/zircon/third_party/ulib/musl/src/string/strdup.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strdup.c
rename to zircon/third_party/ulib/musl/src/string/strdup.c
diff --git a/third_party/ulib/musl/src/string/strerror_r.c b/zircon/third_party/ulib/musl/src/string/strerror_r.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strerror_r.c
rename to zircon/third_party/ulib/musl/src/string/strerror_r.c
diff --git a/third_party/ulib/musl/src/string/strlcat.c b/zircon/third_party/ulib/musl/src/string/strlcat.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strlcat.c
rename to zircon/third_party/ulib/musl/src/string/strlcat.c
diff --git a/third_party/ulib/musl/src/string/strlcpy.c b/zircon/third_party/ulib/musl/src/string/strlcpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strlcpy.c
rename to zircon/third_party/ulib/musl/src/string/strlcpy.c
diff --git a/third_party/ulib/musl/src/string/strlen.c b/zircon/third_party/ulib/musl/src/string/strlen.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strlen.c
rename to zircon/third_party/ulib/musl/src/string/strlen.c
diff --git a/third_party/ulib/musl/src/string/strncasecmp.c b/zircon/third_party/ulib/musl/src/string/strncasecmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strncasecmp.c
rename to zircon/third_party/ulib/musl/src/string/strncasecmp.c
diff --git a/third_party/ulib/musl/src/string/strncat.c b/zircon/third_party/ulib/musl/src/string/strncat.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strncat.c
rename to zircon/third_party/ulib/musl/src/string/strncat.c
diff --git a/third_party/ulib/musl/src/string/strncmp.c b/zircon/third_party/ulib/musl/src/string/strncmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strncmp.c
rename to zircon/third_party/ulib/musl/src/string/strncmp.c
diff --git a/third_party/ulib/musl/src/string/strncpy.c b/zircon/third_party/ulib/musl/src/string/strncpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strncpy.c
rename to zircon/third_party/ulib/musl/src/string/strncpy.c
diff --git a/third_party/ulib/musl/src/string/strndup.c b/zircon/third_party/ulib/musl/src/string/strndup.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strndup.c
rename to zircon/third_party/ulib/musl/src/string/strndup.c
diff --git a/third_party/ulib/musl/src/string/strnlen.c b/zircon/third_party/ulib/musl/src/string/strnlen.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strnlen.c
rename to zircon/third_party/ulib/musl/src/string/strnlen.c
diff --git a/third_party/ulib/musl/src/string/strpbrk.c b/zircon/third_party/ulib/musl/src/string/strpbrk.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strpbrk.c
rename to zircon/third_party/ulib/musl/src/string/strpbrk.c
diff --git a/third_party/ulib/musl/src/string/strrchr.c b/zircon/third_party/ulib/musl/src/string/strrchr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strrchr.c
rename to zircon/third_party/ulib/musl/src/string/strrchr.c
diff --git a/third_party/ulib/musl/src/string/strsep.c b/zircon/third_party/ulib/musl/src/string/strsep.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strsep.c
rename to zircon/third_party/ulib/musl/src/string/strsep.c
diff --git a/third_party/ulib/musl/src/string/strsignal.c b/zircon/third_party/ulib/musl/src/string/strsignal.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strsignal.c
rename to zircon/third_party/ulib/musl/src/string/strsignal.c
diff --git a/third_party/ulib/musl/src/string/strspn.c b/zircon/third_party/ulib/musl/src/string/strspn.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strspn.c
rename to zircon/third_party/ulib/musl/src/string/strspn.c
diff --git a/third_party/ulib/musl/src/string/strstr.c b/zircon/third_party/ulib/musl/src/string/strstr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strstr.c
rename to zircon/third_party/ulib/musl/src/string/strstr.c
diff --git a/third_party/ulib/musl/src/string/strtok.c b/zircon/third_party/ulib/musl/src/string/strtok.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strtok.c
rename to zircon/third_party/ulib/musl/src/string/strtok.c
diff --git a/third_party/ulib/musl/src/string/strtok_r.c b/zircon/third_party/ulib/musl/src/string/strtok_r.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strtok_r.c
rename to zircon/third_party/ulib/musl/src/string/strtok_r.c
diff --git a/third_party/ulib/musl/src/string/strverscmp.c b/zircon/third_party/ulib/musl/src/string/strverscmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/strverscmp.c
rename to zircon/third_party/ulib/musl/src/string/strverscmp.c
diff --git a/third_party/ulib/musl/src/string/swab.c b/zircon/third_party/ulib/musl/src/string/swab.c
similarity index 100%
rename from third_party/ulib/musl/src/string/swab.c
rename to zircon/third_party/ulib/musl/src/string/swab.c
diff --git a/third_party/ulib/musl/src/string/wcpcpy.c b/zircon/third_party/ulib/musl/src/string/wcpcpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcpcpy.c
rename to zircon/third_party/ulib/musl/src/string/wcpcpy.c
diff --git a/third_party/ulib/musl/src/string/wcpncpy.c b/zircon/third_party/ulib/musl/src/string/wcpncpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcpncpy.c
rename to zircon/third_party/ulib/musl/src/string/wcpncpy.c
diff --git a/third_party/ulib/musl/src/string/wcscasecmp.c b/zircon/third_party/ulib/musl/src/string/wcscasecmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcscasecmp.c
rename to zircon/third_party/ulib/musl/src/string/wcscasecmp.c
diff --git a/third_party/ulib/musl/src/string/wcscat.c b/zircon/third_party/ulib/musl/src/string/wcscat.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcscat.c
rename to zircon/third_party/ulib/musl/src/string/wcscat.c
diff --git a/third_party/ulib/musl/src/string/wcschr.c b/zircon/third_party/ulib/musl/src/string/wcschr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcschr.c
rename to zircon/third_party/ulib/musl/src/string/wcschr.c
diff --git a/third_party/ulib/musl/src/string/wcscmp.c b/zircon/third_party/ulib/musl/src/string/wcscmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcscmp.c
rename to zircon/third_party/ulib/musl/src/string/wcscmp.c
diff --git a/third_party/ulib/musl/src/string/wcscpy.c b/zircon/third_party/ulib/musl/src/string/wcscpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcscpy.c
rename to zircon/third_party/ulib/musl/src/string/wcscpy.c
diff --git a/third_party/ulib/musl/src/string/wcscspn.c b/zircon/third_party/ulib/musl/src/string/wcscspn.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcscspn.c
rename to zircon/third_party/ulib/musl/src/string/wcscspn.c
diff --git a/third_party/ulib/musl/src/string/wcsdup.c b/zircon/third_party/ulib/musl/src/string/wcsdup.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsdup.c
rename to zircon/third_party/ulib/musl/src/string/wcsdup.c
diff --git a/third_party/ulib/musl/src/string/wcslen.c b/zircon/third_party/ulib/musl/src/string/wcslen.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcslen.c
rename to zircon/third_party/ulib/musl/src/string/wcslen.c
diff --git a/third_party/ulib/musl/src/string/wcsncasecmp.c b/zircon/third_party/ulib/musl/src/string/wcsncasecmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsncasecmp.c
rename to zircon/third_party/ulib/musl/src/string/wcsncasecmp.c
diff --git a/third_party/ulib/musl/src/string/wcsncat.c b/zircon/third_party/ulib/musl/src/string/wcsncat.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsncat.c
rename to zircon/third_party/ulib/musl/src/string/wcsncat.c
diff --git a/third_party/ulib/musl/src/string/wcsncmp.c b/zircon/third_party/ulib/musl/src/string/wcsncmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsncmp.c
rename to zircon/third_party/ulib/musl/src/string/wcsncmp.c
diff --git a/third_party/ulib/musl/src/string/wcsncpy.c b/zircon/third_party/ulib/musl/src/string/wcsncpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsncpy.c
rename to zircon/third_party/ulib/musl/src/string/wcsncpy.c
diff --git a/third_party/ulib/musl/src/string/wcsnlen.c b/zircon/third_party/ulib/musl/src/string/wcsnlen.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsnlen.c
rename to zircon/third_party/ulib/musl/src/string/wcsnlen.c
diff --git a/third_party/ulib/musl/src/string/wcspbrk.c b/zircon/third_party/ulib/musl/src/string/wcspbrk.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcspbrk.c
rename to zircon/third_party/ulib/musl/src/string/wcspbrk.c
diff --git a/third_party/ulib/musl/src/string/wcsrchr.c b/zircon/third_party/ulib/musl/src/string/wcsrchr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsrchr.c
rename to zircon/third_party/ulib/musl/src/string/wcsrchr.c
diff --git a/third_party/ulib/musl/src/string/wcsspn.c b/zircon/third_party/ulib/musl/src/string/wcsspn.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsspn.c
rename to zircon/third_party/ulib/musl/src/string/wcsspn.c
diff --git a/third_party/ulib/musl/src/string/wcsstr.c b/zircon/third_party/ulib/musl/src/string/wcsstr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcsstr.c
rename to zircon/third_party/ulib/musl/src/string/wcsstr.c
diff --git a/third_party/ulib/musl/src/string/wcstok.c b/zircon/third_party/ulib/musl/src/string/wcstok.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcstok.c
rename to zircon/third_party/ulib/musl/src/string/wcstok.c
diff --git a/third_party/ulib/musl/src/string/wcswcs.c b/zircon/third_party/ulib/musl/src/string/wcswcs.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wcswcs.c
rename to zircon/third_party/ulib/musl/src/string/wcswcs.c
diff --git a/third_party/ulib/musl/src/string/wmemchr.c b/zircon/third_party/ulib/musl/src/string/wmemchr.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wmemchr.c
rename to zircon/third_party/ulib/musl/src/string/wmemchr.c
diff --git a/third_party/ulib/musl/src/string/wmemcmp.c b/zircon/third_party/ulib/musl/src/string/wmemcmp.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wmemcmp.c
rename to zircon/third_party/ulib/musl/src/string/wmemcmp.c
diff --git a/third_party/ulib/musl/src/string/wmemcpy.c b/zircon/third_party/ulib/musl/src/string/wmemcpy.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wmemcpy.c
rename to zircon/third_party/ulib/musl/src/string/wmemcpy.c
diff --git a/third_party/ulib/musl/src/string/wmemmove.c b/zircon/third_party/ulib/musl/src/string/wmemmove.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wmemmove.c
rename to zircon/third_party/ulib/musl/src/string/wmemmove.c
diff --git a/third_party/ulib/musl/src/string/wmemset.c b/zircon/third_party/ulib/musl/src/string/wmemset.c
similarity index 100%
rename from third_party/ulib/musl/src/string/wmemset.c
rename to zircon/third_party/ulib/musl/src/string/wmemset.c
diff --git a/third_party/ulib/musl/src/string/x86_64/memcpy.S b/zircon/third_party/ulib/musl/src/string/x86_64/memcpy.S
similarity index 100%
rename from third_party/ulib/musl/src/string/x86_64/memcpy.S
rename to zircon/third_party/ulib/musl/src/string/x86_64/memcpy.S
diff --git a/third_party/ulib/musl/src/string/x86_64/memmove.S b/zircon/third_party/ulib/musl/src/string/x86_64/memmove.S
similarity index 100%
rename from third_party/ulib/musl/src/string/x86_64/memmove.S
rename to zircon/third_party/ulib/musl/src/string/x86_64/memmove.S
diff --git a/third_party/ulib/musl/src/string/x86_64/mempcpy.S b/zircon/third_party/ulib/musl/src/string/x86_64/mempcpy.S
similarity index 100%
rename from third_party/ulib/musl/src/string/x86_64/mempcpy.S
rename to zircon/third_party/ulib/musl/src/string/x86_64/mempcpy.S
diff --git a/third_party/ulib/musl/src/string/x86_64/memset.S b/zircon/third_party/ulib/musl/src/string/x86_64/memset.S
similarity index 100%
rename from third_party/ulib/musl/src/string/x86_64/memset.S
rename to zircon/third_party/ulib/musl/src/string/x86_64/memset.S
diff --git a/third_party/ulib/musl/src/temp/__randname.c b/zircon/third_party/ulib/musl/src/temp/__randname.c
similarity index 100%
rename from third_party/ulib/musl/src/temp/__randname.c
rename to zircon/third_party/ulib/musl/src/temp/__randname.c
diff --git a/third_party/ulib/musl/src/temp/mkdtemp.c b/zircon/third_party/ulib/musl/src/temp/mkdtemp.c
similarity index 100%
rename from third_party/ulib/musl/src/temp/mkdtemp.c
rename to zircon/third_party/ulib/musl/src/temp/mkdtemp.c
diff --git a/third_party/ulib/musl/src/temp/mkostemp.c b/zircon/third_party/ulib/musl/src/temp/mkostemp.c
similarity index 100%
rename from third_party/ulib/musl/src/temp/mkostemp.c
rename to zircon/third_party/ulib/musl/src/temp/mkostemp.c
diff --git a/third_party/ulib/musl/src/temp/mkostemps.c b/zircon/third_party/ulib/musl/src/temp/mkostemps.c
similarity index 100%
rename from third_party/ulib/musl/src/temp/mkostemps.c
rename to zircon/third_party/ulib/musl/src/temp/mkostemps.c
diff --git a/third_party/ulib/musl/src/temp/mkstemp.c b/zircon/third_party/ulib/musl/src/temp/mkstemp.c
similarity index 100%
rename from third_party/ulib/musl/src/temp/mkstemp.c
rename to zircon/third_party/ulib/musl/src/temp/mkstemp.c
diff --git a/third_party/ulib/musl/src/temp/mkstemps.c b/zircon/third_party/ulib/musl/src/temp/mkstemps.c
similarity index 100%
rename from third_party/ulib/musl/src/temp/mkstemps.c
rename to zircon/third_party/ulib/musl/src/temp/mkstemps.c
diff --git a/third_party/ulib/musl/src/temp/mktemp.c b/zircon/third_party/ulib/musl/src/temp/mktemp.c
similarity index 100%
rename from third_party/ulib/musl/src/temp/mktemp.c
rename to zircon/third_party/ulib/musl/src/temp/mktemp.c
diff --git a/third_party/ulib/musl/src/termios/cfgetospeed.c b/zircon/third_party/ulib/musl/src/termios/cfgetospeed.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/cfgetospeed.c
rename to zircon/third_party/ulib/musl/src/termios/cfgetospeed.c
diff --git a/third_party/ulib/musl/src/termios/cfmakeraw.c b/zircon/third_party/ulib/musl/src/termios/cfmakeraw.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/cfmakeraw.c
rename to zircon/third_party/ulib/musl/src/termios/cfmakeraw.c
diff --git a/third_party/ulib/musl/src/termios/cfsetospeed.c b/zircon/third_party/ulib/musl/src/termios/cfsetospeed.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/cfsetospeed.c
rename to zircon/third_party/ulib/musl/src/termios/cfsetospeed.c
diff --git a/third_party/ulib/musl/src/termios/tcdrain.c b/zircon/third_party/ulib/musl/src/termios/tcdrain.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/tcdrain.c
rename to zircon/third_party/ulib/musl/src/termios/tcdrain.c
diff --git a/third_party/ulib/musl/src/termios/tcflow.c b/zircon/third_party/ulib/musl/src/termios/tcflow.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/tcflow.c
rename to zircon/third_party/ulib/musl/src/termios/tcflow.c
diff --git a/third_party/ulib/musl/src/termios/tcflush.c b/zircon/third_party/ulib/musl/src/termios/tcflush.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/tcflush.c
rename to zircon/third_party/ulib/musl/src/termios/tcflush.c
diff --git a/third_party/ulib/musl/src/termios/tcgetattr.c b/zircon/third_party/ulib/musl/src/termios/tcgetattr.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/tcgetattr.c
rename to zircon/third_party/ulib/musl/src/termios/tcgetattr.c
diff --git a/third_party/ulib/musl/src/termios/tcgetsid.c b/zircon/third_party/ulib/musl/src/termios/tcgetsid.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/tcgetsid.c
rename to zircon/third_party/ulib/musl/src/termios/tcgetsid.c
diff --git a/third_party/ulib/musl/src/termios/tcsendbreak.c b/zircon/third_party/ulib/musl/src/termios/tcsendbreak.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/tcsendbreak.c
rename to zircon/third_party/ulib/musl/src/termios/tcsendbreak.c
diff --git a/third_party/ulib/musl/src/termios/tcsetattr.c b/zircon/third_party/ulib/musl/src/termios/tcsetattr.c
similarity index 100%
rename from third_party/ulib/musl/src/termios/tcsetattr.c
rename to zircon/third_party/ulib/musl/src/termios/tcsetattr.c
diff --git a/third_party/ulib/musl/src/thread/__timedwait.c b/zircon/third_party/ulib/musl/src/thread/__timedwait.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/__timedwait.c
rename to zircon/third_party/ulib/musl/src/thread/__timedwait.c
diff --git a/third_party/ulib/musl/src/thread/__tls_get_addr.c b/zircon/third_party/ulib/musl/src/thread/__tls_get_addr.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/__tls_get_addr.c
rename to zircon/third_party/ulib/musl/src/thread/__tls_get_addr.c
diff --git a/third_party/ulib/musl/src/thread/__wait.c b/zircon/third_party/ulib/musl/src/thread/__wait.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/__wait.c
rename to zircon/third_party/ulib/musl/src/thread/__wait.c
diff --git a/third_party/ulib/musl/src/thread/allocate.c b/zircon/third_party/ulib/musl/src/thread/allocate.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/allocate.c
rename to zircon/third_party/ulib/musl/src/thread/allocate.c
diff --git a/third_party/ulib/musl/src/thread/call_once.c b/zircon/third_party/ulib/musl/src/thread/call_once.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/call_once.c
rename to zircon/third_party/ulib/musl/src/thread/call_once.c
diff --git a/third_party/ulib/musl/src/thread/cnd_broadcast.c b/zircon/third_party/ulib/musl/src/thread/cnd_broadcast.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/cnd_broadcast.c
rename to zircon/third_party/ulib/musl/src/thread/cnd_broadcast.c
diff --git a/third_party/ulib/musl/src/thread/cnd_destroy.c b/zircon/third_party/ulib/musl/src/thread/cnd_destroy.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/cnd_destroy.c
rename to zircon/third_party/ulib/musl/src/thread/cnd_destroy.c
diff --git a/third_party/ulib/musl/src/thread/cnd_init.c b/zircon/third_party/ulib/musl/src/thread/cnd_init.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/cnd_init.c
rename to zircon/third_party/ulib/musl/src/thread/cnd_init.c
diff --git a/third_party/ulib/musl/src/thread/cnd_signal.c b/zircon/third_party/ulib/musl/src/thread/cnd_signal.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/cnd_signal.c
rename to zircon/third_party/ulib/musl/src/thread/cnd_signal.c
diff --git a/third_party/ulib/musl/src/thread/cnd_timedwait.c b/zircon/third_party/ulib/musl/src/thread/cnd_timedwait.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/cnd_timedwait.c
rename to zircon/third_party/ulib/musl/src/thread/cnd_timedwait.c
diff --git a/third_party/ulib/musl/src/thread/cnd_wait.c b/zircon/third_party/ulib/musl/src/thread/cnd_wait.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/cnd_wait.c
rename to zircon/third_party/ulib/musl/src/thread/cnd_wait.c
diff --git a/third_party/ulib/musl/src/thread/mtx_destroy.c b/zircon/third_party/ulib/musl/src/thread/mtx_destroy.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/mtx_destroy.c
rename to zircon/third_party/ulib/musl/src/thread/mtx_destroy.c
diff --git a/third_party/ulib/musl/src/thread/mtx_init.c b/zircon/third_party/ulib/musl/src/thread/mtx_init.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/mtx_init.c
rename to zircon/third_party/ulib/musl/src/thread/mtx_init.c
diff --git a/third_party/ulib/musl/src/thread/mtx_lock.c b/zircon/third_party/ulib/musl/src/thread/mtx_lock.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/mtx_lock.c
rename to zircon/third_party/ulib/musl/src/thread/mtx_lock.c
diff --git a/third_party/ulib/musl/src/thread/mtx_timedlock.c b/zircon/third_party/ulib/musl/src/thread/mtx_timedlock.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/mtx_timedlock.c
rename to zircon/third_party/ulib/musl/src/thread/mtx_timedlock.c
diff --git a/third_party/ulib/musl/src/thread/mtx_trylock.c b/zircon/third_party/ulib/musl/src/thread/mtx_trylock.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/mtx_trylock.c
rename to zircon/third_party/ulib/musl/src/thread/mtx_trylock.c
diff --git a/third_party/ulib/musl/src/thread/mtx_unlock.c b/zircon/third_party/ulib/musl/src/thread/mtx_unlock.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/mtx_unlock.c
rename to zircon/third_party/ulib/musl/src/thread/mtx_unlock.c
diff --git a/third_party/ulib/musl/src/thread/safestack.c b/zircon/third_party/ulib/musl/src/thread/safestack.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/safestack.c
rename to zircon/third_party/ulib/musl/src/thread/safestack.c
diff --git a/third_party/ulib/musl/src/thread/thrd_create.c b/zircon/third_party/ulib/musl/src/thread/thrd_create.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/thrd_create.c
rename to zircon/third_party/ulib/musl/src/thread/thrd_create.c
diff --git a/third_party/ulib/musl/src/thread/thrd_detach.c b/zircon/third_party/ulib/musl/src/thread/thrd_detach.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/thrd_detach.c
rename to zircon/third_party/ulib/musl/src/thread/thrd_detach.c
diff --git a/third_party/ulib/musl/src/thread/thrd_exit.c b/zircon/third_party/ulib/musl/src/thread/thrd_exit.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/thrd_exit.c
rename to zircon/third_party/ulib/musl/src/thread/thrd_exit.c
diff --git a/third_party/ulib/musl/src/thread/thrd_join.c b/zircon/third_party/ulib/musl/src/thread/thrd_join.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/thrd_join.c
rename to zircon/third_party/ulib/musl/src/thread/thrd_join.c
diff --git a/third_party/ulib/musl/src/thread/thrd_sleep.c b/zircon/third_party/ulib/musl/src/thread/thrd_sleep.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/thrd_sleep.c
rename to zircon/third_party/ulib/musl/src/thread/thrd_sleep.c
diff --git a/third_party/ulib/musl/src/thread/thrd_yield.c b/zircon/third_party/ulib/musl/src/thread/thrd_yield.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/thrd_yield.c
rename to zircon/third_party/ulib/musl/src/thread/thrd_yield.c
diff --git a/third_party/ulib/musl/src/thread/tss.c b/zircon/third_party/ulib/musl/src/thread/tss.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/tss.c
rename to zircon/third_party/ulib/musl/src/thread/tss.c
diff --git a/third_party/ulib/musl/src/thread/tss_set.c b/zircon/third_party/ulib/musl/src/thread/tss_set.c
similarity index 100%
rename from third_party/ulib/musl/src/thread/tss_set.c
rename to zircon/third_party/ulib/musl/src/thread/tss_set.c
diff --git a/third_party/ulib/musl/src/time/__asctime.c b/zircon/third_party/ulib/musl/src/time/__asctime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/__asctime.c
rename to zircon/third_party/ulib/musl/src/time/__asctime.c
diff --git a/third_party/ulib/musl/src/time/__map_file.c b/zircon/third_party/ulib/musl/src/time/__map_file.c
similarity index 100%
rename from third_party/ulib/musl/src/time/__map_file.c
rename to zircon/third_party/ulib/musl/src/time/__map_file.c
diff --git a/third_party/ulib/musl/src/time/__month_to_secs.c b/zircon/third_party/ulib/musl/src/time/__month_to_secs.c
similarity index 100%
rename from third_party/ulib/musl/src/time/__month_to_secs.c
rename to zircon/third_party/ulib/musl/src/time/__month_to_secs.c
diff --git a/third_party/ulib/musl/src/time/__secs_to_tm.c b/zircon/third_party/ulib/musl/src/time/__secs_to_tm.c
similarity index 100%
rename from third_party/ulib/musl/src/time/__secs_to_tm.c
rename to zircon/third_party/ulib/musl/src/time/__secs_to_tm.c
diff --git a/third_party/ulib/musl/src/time/__tm_to_secs.c b/zircon/third_party/ulib/musl/src/time/__tm_to_secs.c
similarity index 100%
rename from third_party/ulib/musl/src/time/__tm_to_secs.c
rename to zircon/third_party/ulib/musl/src/time/__tm_to_secs.c
diff --git a/third_party/ulib/musl/src/time/__tz.c b/zircon/third_party/ulib/musl/src/time/__tz.c
similarity index 100%
rename from third_party/ulib/musl/src/time/__tz.c
rename to zircon/third_party/ulib/musl/src/time/__tz.c
diff --git a/third_party/ulib/musl/src/time/__year_to_secs.c b/zircon/third_party/ulib/musl/src/time/__year_to_secs.c
similarity index 100%
rename from third_party/ulib/musl/src/time/__year_to_secs.c
rename to zircon/third_party/ulib/musl/src/time/__year_to_secs.c
diff --git a/third_party/ulib/musl/src/time/asctime.c b/zircon/third_party/ulib/musl/src/time/asctime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/asctime.c
rename to zircon/third_party/ulib/musl/src/time/asctime.c
diff --git a/third_party/ulib/musl/src/time/asctime_r.c b/zircon/third_party/ulib/musl/src/time/asctime_r.c
similarity index 100%
rename from third_party/ulib/musl/src/time/asctime_r.c
rename to zircon/third_party/ulib/musl/src/time/asctime_r.c
diff --git a/third_party/ulib/musl/src/time/clock.c b/zircon/third_party/ulib/musl/src/time/clock.c
similarity index 100%
rename from third_party/ulib/musl/src/time/clock.c
rename to zircon/third_party/ulib/musl/src/time/clock.c
diff --git a/third_party/ulib/musl/src/time/clock_getcpuclockid.c b/zircon/third_party/ulib/musl/src/time/clock_getcpuclockid.c
similarity index 100%
rename from third_party/ulib/musl/src/time/clock_getcpuclockid.c
rename to zircon/third_party/ulib/musl/src/time/clock_getcpuclockid.c
diff --git a/third_party/ulib/musl/src/time/clock_getres.c b/zircon/third_party/ulib/musl/src/time/clock_getres.c
similarity index 100%
rename from third_party/ulib/musl/src/time/clock_getres.c
rename to zircon/third_party/ulib/musl/src/time/clock_getres.c
diff --git a/third_party/ulib/musl/src/time/clock_gettime.c b/zircon/third_party/ulib/musl/src/time/clock_gettime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/clock_gettime.c
rename to zircon/third_party/ulib/musl/src/time/clock_gettime.c
diff --git a/third_party/ulib/musl/src/time/clock_nanosleep.c b/zircon/third_party/ulib/musl/src/time/clock_nanosleep.c
similarity index 100%
rename from third_party/ulib/musl/src/time/clock_nanosleep.c
rename to zircon/third_party/ulib/musl/src/time/clock_nanosleep.c
diff --git a/third_party/ulib/musl/src/time/clock_settime.c b/zircon/third_party/ulib/musl/src/time/clock_settime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/clock_settime.c
rename to zircon/third_party/ulib/musl/src/time/clock_settime.c
diff --git a/third_party/ulib/musl/src/time/ctime.c b/zircon/third_party/ulib/musl/src/time/ctime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/ctime.c
rename to zircon/third_party/ulib/musl/src/time/ctime.c
diff --git a/third_party/ulib/musl/src/time/ctime_r.c b/zircon/third_party/ulib/musl/src/time/ctime_r.c
similarity index 100%
rename from third_party/ulib/musl/src/time/ctime_r.c
rename to zircon/third_party/ulib/musl/src/time/ctime_r.c
diff --git a/third_party/ulib/musl/src/time/difftime.c b/zircon/third_party/ulib/musl/src/time/difftime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/difftime.c
rename to zircon/third_party/ulib/musl/src/time/difftime.c
diff --git a/third_party/ulib/musl/src/time/ftime.c b/zircon/third_party/ulib/musl/src/time/ftime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/ftime.c
rename to zircon/third_party/ulib/musl/src/time/ftime.c
diff --git a/third_party/ulib/musl/src/time/getdate.c b/zircon/third_party/ulib/musl/src/time/getdate.c
similarity index 100%
rename from third_party/ulib/musl/src/time/getdate.c
rename to zircon/third_party/ulib/musl/src/time/getdate.c
diff --git a/third_party/ulib/musl/src/time/gettimeofday.c b/zircon/third_party/ulib/musl/src/time/gettimeofday.c
similarity index 100%
rename from third_party/ulib/musl/src/time/gettimeofday.c
rename to zircon/third_party/ulib/musl/src/time/gettimeofday.c
diff --git a/third_party/ulib/musl/src/time/gmtime.c b/zircon/third_party/ulib/musl/src/time/gmtime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/gmtime.c
rename to zircon/third_party/ulib/musl/src/time/gmtime.c
diff --git a/third_party/ulib/musl/src/time/gmtime_r.c b/zircon/third_party/ulib/musl/src/time/gmtime_r.c
similarity index 100%
rename from third_party/ulib/musl/src/time/gmtime_r.c
rename to zircon/third_party/ulib/musl/src/time/gmtime_r.c
diff --git a/third_party/ulib/musl/src/time/localtime.c b/zircon/third_party/ulib/musl/src/time/localtime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/localtime.c
rename to zircon/third_party/ulib/musl/src/time/localtime.c
diff --git a/third_party/ulib/musl/src/time/localtime_r.c b/zircon/third_party/ulib/musl/src/time/localtime_r.c
similarity index 100%
rename from third_party/ulib/musl/src/time/localtime_r.c
rename to zircon/third_party/ulib/musl/src/time/localtime_r.c
diff --git a/third_party/ulib/musl/src/time/mktime.c b/zircon/third_party/ulib/musl/src/time/mktime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/mktime.c
rename to zircon/third_party/ulib/musl/src/time/mktime.c
diff --git a/third_party/ulib/musl/src/time/nanosleep.c b/zircon/third_party/ulib/musl/src/time/nanosleep.c
similarity index 100%
rename from third_party/ulib/musl/src/time/nanosleep.c
rename to zircon/third_party/ulib/musl/src/time/nanosleep.c
diff --git a/third_party/ulib/musl/src/time/strftime.c b/zircon/third_party/ulib/musl/src/time/strftime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/strftime.c
rename to zircon/third_party/ulib/musl/src/time/strftime.c
diff --git a/third_party/ulib/musl/src/time/strptime.c b/zircon/third_party/ulib/musl/src/time/strptime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/strptime.c
rename to zircon/third_party/ulib/musl/src/time/strptime.c
diff --git a/third_party/ulib/musl/src/time/time.c b/zircon/third_party/ulib/musl/src/time/time.c
similarity index 100%
rename from third_party/ulib/musl/src/time/time.c
rename to zircon/third_party/ulib/musl/src/time/time.c
diff --git a/third_party/ulib/musl/src/time/time_impl.h b/zircon/third_party/ulib/musl/src/time/time_impl.h
similarity index 100%
rename from third_party/ulib/musl/src/time/time_impl.h
rename to zircon/third_party/ulib/musl/src/time/time_impl.h
diff --git a/third_party/ulib/musl/src/time/timegm.c b/zircon/third_party/ulib/musl/src/time/timegm.c
similarity index 100%
rename from third_party/ulib/musl/src/time/timegm.c
rename to zircon/third_party/ulib/musl/src/time/timegm.c
diff --git a/third_party/ulib/musl/src/time/times.c b/zircon/third_party/ulib/musl/src/time/times.c
similarity index 100%
rename from third_party/ulib/musl/src/time/times.c
rename to zircon/third_party/ulib/musl/src/time/times.c
diff --git a/third_party/ulib/musl/src/time/timespec_get.c b/zircon/third_party/ulib/musl/src/time/timespec_get.c
similarity index 100%
rename from third_party/ulib/musl/src/time/timespec_get.c
rename to zircon/third_party/ulib/musl/src/time/timespec_get.c
diff --git a/third_party/ulib/musl/src/time/utime.c b/zircon/third_party/ulib/musl/src/time/utime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/utime.c
rename to zircon/third_party/ulib/musl/src/time/utime.c
diff --git a/third_party/ulib/musl/src/time/wcsftime.c b/zircon/third_party/ulib/musl/src/time/wcsftime.c
similarity index 100%
rename from third_party/ulib/musl/src/time/wcsftime.c
rename to zircon/third_party/ulib/musl/src/time/wcsftime.c
diff --git a/third_party/ulib/musl/src/unistd/_exit.c b/zircon/third_party/ulib/musl/src/unistd/_exit.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/_exit.c
rename to zircon/third_party/ulib/musl/src/unistd/_exit.c
diff --git a/third_party/ulib/musl/src/unistd/acct.c b/zircon/third_party/ulib/musl/src/unistd/acct.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/acct.c
rename to zircon/third_party/ulib/musl/src/unistd/acct.c
diff --git a/third_party/ulib/musl/src/unistd/alarm.c b/zircon/third_party/ulib/musl/src/unistd/alarm.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/alarm.c
rename to zircon/third_party/ulib/musl/src/unistd/alarm.c
diff --git a/third_party/ulib/musl/src/unistd/ctermid.c b/zircon/third_party/ulib/musl/src/unistd/ctermid.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/ctermid.c
rename to zircon/third_party/ulib/musl/src/unistd/ctermid.c
diff --git a/third_party/ulib/musl/src/unistd/gethostname.c b/zircon/third_party/ulib/musl/src/unistd/gethostname.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/gethostname.c
rename to zircon/third_party/ulib/musl/src/unistd/gethostname.c
diff --git a/third_party/ulib/musl/src/unistd/getlogin.c b/zircon/third_party/ulib/musl/src/unistd/getlogin.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/getlogin.c
rename to zircon/third_party/ulib/musl/src/unistd/getlogin.c
diff --git a/third_party/ulib/musl/src/unistd/getlogin_r.c b/zircon/third_party/ulib/musl/src/unistd/getlogin_r.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/getlogin_r.c
rename to zircon/third_party/ulib/musl/src/unistd/getlogin_r.c
diff --git a/third_party/ulib/musl/src/unistd/pause.c b/zircon/third_party/ulib/musl/src/unistd/pause.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/pause.c
rename to zircon/third_party/ulib/musl/src/unistd/pause.c
diff --git a/third_party/ulib/musl/src/unistd/posix_close.c b/zircon/third_party/ulib/musl/src/unistd/posix_close.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/posix_close.c
rename to zircon/third_party/ulib/musl/src/unistd/posix_close.c
diff --git a/third_party/ulib/musl/src/unistd/setpgrp.c b/zircon/third_party/ulib/musl/src/unistd/setpgrp.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/setpgrp.c
rename to zircon/third_party/ulib/musl/src/unistd/setpgrp.c
diff --git a/third_party/ulib/musl/src/unistd/sleep.c b/zircon/third_party/ulib/musl/src/unistd/sleep.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/sleep.c
rename to zircon/third_party/ulib/musl/src/unistd/sleep.c
diff --git a/third_party/ulib/musl/src/unistd/tcgetpgrp.c b/zircon/third_party/ulib/musl/src/unistd/tcgetpgrp.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/tcgetpgrp.c
rename to zircon/third_party/ulib/musl/src/unistd/tcgetpgrp.c
diff --git a/third_party/ulib/musl/src/unistd/tcsetpgrp.c b/zircon/third_party/ulib/musl/src/unistd/tcsetpgrp.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/tcsetpgrp.c
rename to zircon/third_party/ulib/musl/src/unistd/tcsetpgrp.c
diff --git a/third_party/ulib/musl/src/unistd/ttyname.c b/zircon/third_party/ulib/musl/src/unistd/ttyname.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/ttyname.c
rename to zircon/third_party/ulib/musl/src/unistd/ttyname.c
diff --git a/third_party/ulib/musl/src/unistd/ualarm.c b/zircon/third_party/ulib/musl/src/unistd/ualarm.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/ualarm.c
rename to zircon/third_party/ulib/musl/src/unistd/ualarm.c
diff --git a/third_party/ulib/musl/src/unistd/usleep.c b/zircon/third_party/ulib/musl/src/unistd/usleep.c
similarity index 100%
rename from third_party/ulib/musl/src/unistd/usleep.c
rename to zircon/third_party/ulib/musl/src/unistd/usleep.c
diff --git a/third_party/ulib/musl/stubs/idstubs.c b/zircon/third_party/ulib/musl/stubs/idstubs.c
similarity index 100%
rename from third_party/ulib/musl/stubs/idstubs.c
rename to zircon/third_party/ulib/musl/stubs/idstubs.c
diff --git a/third_party/ulib/musl/stubs/iostubs.c b/zircon/third_party/ulib/musl/stubs/iostubs.c
similarity index 100%
rename from third_party/ulib/musl/stubs/iostubs.c
rename to zircon/third_party/ulib/musl/stubs/iostubs.c
diff --git a/third_party/ulib/musl/stubs/socketstubs.c b/zircon/third_party/ulib/musl/stubs/socketstubs.c
similarity index 100%
rename from third_party/ulib/musl/stubs/socketstubs.c
rename to zircon/third_party/ulib/musl/stubs/socketstubs.c
diff --git a/third_party/ulib/musl/third_party/complex/__cexp.c b/zircon/third_party/ulib/musl/third_party/complex/__cexp.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/__cexp.c
rename to zircon/third_party/ulib/musl/third_party/complex/__cexp.c
diff --git a/third_party/ulib/musl/third_party/complex/__cexpf.c b/zircon/third_party/ulib/musl/third_party/complex/__cexpf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/__cexpf.c
rename to zircon/third_party/ulib/musl/third_party/complex/__cexpf.c
diff --git a/third_party/ulib/musl/third_party/complex/catan.c b/zircon/third_party/ulib/musl/third_party/complex/catan.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/catan.c
rename to zircon/third_party/ulib/musl/third_party/complex/catan.c
diff --git a/third_party/ulib/musl/third_party/complex/catanf.c b/zircon/third_party/ulib/musl/third_party/complex/catanf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/catanf.c
rename to zircon/third_party/ulib/musl/third_party/complex/catanf.c
diff --git a/third_party/ulib/musl/third_party/complex/catanl.c b/zircon/third_party/ulib/musl/third_party/complex/catanl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/catanl.c
rename to zircon/third_party/ulib/musl/third_party/complex/catanl.c
diff --git a/third_party/ulib/musl/third_party/complex/ccosh.c b/zircon/third_party/ulib/musl/third_party/complex/ccosh.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/ccosh.c
rename to zircon/third_party/ulib/musl/third_party/complex/ccosh.c
diff --git a/third_party/ulib/musl/third_party/complex/ccoshf.c b/zircon/third_party/ulib/musl/third_party/complex/ccoshf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/ccoshf.c
rename to zircon/third_party/ulib/musl/third_party/complex/ccoshf.c
diff --git a/third_party/ulib/musl/third_party/complex/cexp.c b/zircon/third_party/ulib/musl/third_party/complex/cexp.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/cexp.c
rename to zircon/third_party/ulib/musl/third_party/complex/cexp.c
diff --git a/third_party/ulib/musl/third_party/complex/cexpf.c b/zircon/third_party/ulib/musl/third_party/complex/cexpf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/cexpf.c
rename to zircon/third_party/ulib/musl/third_party/complex/cexpf.c
diff --git a/third_party/ulib/musl/third_party/complex/csinh.c b/zircon/third_party/ulib/musl/third_party/complex/csinh.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/csinh.c
rename to zircon/third_party/ulib/musl/third_party/complex/csinh.c
diff --git a/third_party/ulib/musl/third_party/complex/csinhf.c b/zircon/third_party/ulib/musl/third_party/complex/csinhf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/csinhf.c
rename to zircon/third_party/ulib/musl/third_party/complex/csinhf.c
diff --git a/third_party/ulib/musl/third_party/complex/csqrt.c b/zircon/third_party/ulib/musl/third_party/complex/csqrt.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/csqrt.c
rename to zircon/third_party/ulib/musl/third_party/complex/csqrt.c
diff --git a/third_party/ulib/musl/third_party/complex/csqrtf.c b/zircon/third_party/ulib/musl/third_party/complex/csqrtf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/csqrtf.c
rename to zircon/third_party/ulib/musl/third_party/complex/csqrtf.c
diff --git a/third_party/ulib/musl/third_party/complex/ctanh.c b/zircon/third_party/ulib/musl/third_party/complex/ctanh.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/ctanh.c
rename to zircon/third_party/ulib/musl/third_party/complex/ctanh.c
diff --git a/third_party/ulib/musl/third_party/complex/ctanhf.c b/zircon/third_party/ulib/musl/third_party/complex/ctanhf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/complex/ctanhf.c
rename to zircon/third_party/ulib/musl/third_party/complex/ctanhf.c
diff --git a/third_party/ulib/musl/third_party/include/libm.h b/zircon/third_party/ulib/musl/third_party/include/libm.h
similarity index 100%
rename from third_party/ulib/musl/third_party/include/libm.h
rename to zircon/third_party/ulib/musl/third_party/include/libm.h
diff --git a/third_party/ulib/musl/third_party/math/__cos.c b/zircon/third_party/ulib/musl/third_party/math/__cos.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__cos.c
rename to zircon/third_party/ulib/musl/third_party/math/__cos.c
diff --git a/third_party/ulib/musl/third_party/math/__cosdf.c b/zircon/third_party/ulib/musl/third_party/math/__cosdf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__cosdf.c
rename to zircon/third_party/ulib/musl/third_party/math/__cosdf.c
diff --git a/third_party/ulib/musl/third_party/math/__cosl.c b/zircon/third_party/ulib/musl/third_party/math/__cosl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__cosl.c
rename to zircon/third_party/ulib/musl/third_party/math/__cosl.c
diff --git a/third_party/ulib/musl/third_party/math/__polevll.c b/zircon/third_party/ulib/musl/third_party/math/__polevll.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__polevll.c
rename to zircon/third_party/ulib/musl/third_party/math/__polevll.c
diff --git a/third_party/ulib/musl/third_party/math/__rem_pio2.c b/zircon/third_party/ulib/musl/third_party/math/__rem_pio2.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__rem_pio2.c
rename to zircon/third_party/ulib/musl/third_party/math/__rem_pio2.c
diff --git a/third_party/ulib/musl/third_party/math/__rem_pio2_large.c b/zircon/third_party/ulib/musl/third_party/math/__rem_pio2_large.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__rem_pio2_large.c
rename to zircon/third_party/ulib/musl/third_party/math/__rem_pio2_large.c
diff --git a/third_party/ulib/musl/third_party/math/__rem_pio2f.c b/zircon/third_party/ulib/musl/third_party/math/__rem_pio2f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__rem_pio2f.c
rename to zircon/third_party/ulib/musl/third_party/math/__rem_pio2f.c
diff --git a/third_party/ulib/musl/third_party/math/__rem_pio2l.c b/zircon/third_party/ulib/musl/third_party/math/__rem_pio2l.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__rem_pio2l.c
rename to zircon/third_party/ulib/musl/third_party/math/__rem_pio2l.c
diff --git a/third_party/ulib/musl/third_party/math/__sin.c b/zircon/third_party/ulib/musl/third_party/math/__sin.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__sin.c
rename to zircon/third_party/ulib/musl/third_party/math/__sin.c
diff --git a/third_party/ulib/musl/third_party/math/__sindf.c b/zircon/third_party/ulib/musl/third_party/math/__sindf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__sindf.c
rename to zircon/third_party/ulib/musl/third_party/math/__sindf.c
diff --git a/third_party/ulib/musl/third_party/math/__sinl.c b/zircon/third_party/ulib/musl/third_party/math/__sinl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__sinl.c
rename to zircon/third_party/ulib/musl/third_party/math/__sinl.c
diff --git a/third_party/ulib/musl/third_party/math/__tan.c b/zircon/third_party/ulib/musl/third_party/math/__tan.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__tan.c
rename to zircon/third_party/ulib/musl/third_party/math/__tan.c
diff --git a/third_party/ulib/musl/third_party/math/__tandf.c b/zircon/third_party/ulib/musl/third_party/math/__tandf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__tandf.c
rename to zircon/third_party/ulib/musl/third_party/math/__tandf.c
diff --git a/third_party/ulib/musl/third_party/math/__tanl.c b/zircon/third_party/ulib/musl/third_party/math/__tanl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/__tanl.c
rename to zircon/third_party/ulib/musl/third_party/math/__tanl.c
diff --git a/third_party/ulib/musl/third_party/math/acos.c b/zircon/third_party/ulib/musl/third_party/math/acos.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/acos.c
rename to zircon/third_party/ulib/musl/third_party/math/acos.c
diff --git a/third_party/ulib/musl/third_party/math/acosf.c b/zircon/third_party/ulib/musl/third_party/math/acosf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/acosf.c
rename to zircon/third_party/ulib/musl/third_party/math/acosf.c
diff --git a/third_party/ulib/musl/third_party/math/acosl.c b/zircon/third_party/ulib/musl/third_party/math/acosl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/acosl.c
rename to zircon/third_party/ulib/musl/third_party/math/acosl.c
diff --git a/third_party/ulib/musl/third_party/math/asin.c b/zircon/third_party/ulib/musl/third_party/math/asin.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/asin.c
rename to zircon/third_party/ulib/musl/third_party/math/asin.c
diff --git a/third_party/ulib/musl/third_party/math/asinf.c b/zircon/third_party/ulib/musl/third_party/math/asinf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/asinf.c
rename to zircon/third_party/ulib/musl/third_party/math/asinf.c
diff --git a/third_party/ulib/musl/third_party/math/asinl.c b/zircon/third_party/ulib/musl/third_party/math/asinl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/asinl.c
rename to zircon/third_party/ulib/musl/third_party/math/asinl.c
diff --git a/third_party/ulib/musl/third_party/math/atan.c b/zircon/third_party/ulib/musl/third_party/math/atan.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/atan.c
rename to zircon/third_party/ulib/musl/third_party/math/atan.c
diff --git a/third_party/ulib/musl/third_party/math/atan2.c b/zircon/third_party/ulib/musl/third_party/math/atan2.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/atan2.c
rename to zircon/third_party/ulib/musl/third_party/math/atan2.c
diff --git a/third_party/ulib/musl/third_party/math/atan2f.c b/zircon/third_party/ulib/musl/third_party/math/atan2f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/atan2f.c
rename to zircon/third_party/ulib/musl/third_party/math/atan2f.c
diff --git a/third_party/ulib/musl/third_party/math/atan2l.c b/zircon/third_party/ulib/musl/third_party/math/atan2l.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/atan2l.c
rename to zircon/third_party/ulib/musl/third_party/math/atan2l.c
diff --git a/third_party/ulib/musl/third_party/math/atanf.c b/zircon/third_party/ulib/musl/third_party/math/atanf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/atanf.c
rename to zircon/third_party/ulib/musl/third_party/math/atanf.c
diff --git a/third_party/ulib/musl/third_party/math/atanl.c b/zircon/third_party/ulib/musl/third_party/math/atanl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/atanl.c
rename to zircon/third_party/ulib/musl/third_party/math/atanl.c
diff --git a/third_party/ulib/musl/third_party/math/cbrt.c b/zircon/third_party/ulib/musl/third_party/math/cbrt.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/cbrt.c
rename to zircon/third_party/ulib/musl/third_party/math/cbrt.c
diff --git a/third_party/ulib/musl/third_party/math/cbrtf.c b/zircon/third_party/ulib/musl/third_party/math/cbrtf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/cbrtf.c
rename to zircon/third_party/ulib/musl/third_party/math/cbrtf.c
diff --git a/third_party/ulib/musl/third_party/math/cbrtl.c b/zircon/third_party/ulib/musl/third_party/math/cbrtl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/cbrtl.c
rename to zircon/third_party/ulib/musl/third_party/math/cbrtl.c
diff --git a/third_party/ulib/musl/third_party/math/cos.c b/zircon/third_party/ulib/musl/third_party/math/cos.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/cos.c
rename to zircon/third_party/ulib/musl/third_party/math/cos.c
diff --git a/third_party/ulib/musl/third_party/math/cosf.c b/zircon/third_party/ulib/musl/third_party/math/cosf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/cosf.c
rename to zircon/third_party/ulib/musl/third_party/math/cosf.c
diff --git a/third_party/ulib/musl/third_party/math/erf.c b/zircon/third_party/ulib/musl/third_party/math/erf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/erf.c
rename to zircon/third_party/ulib/musl/third_party/math/erf.c
diff --git a/third_party/ulib/musl/third_party/math/erff.c b/zircon/third_party/ulib/musl/third_party/math/erff.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/erff.c
rename to zircon/third_party/ulib/musl/third_party/math/erff.c
diff --git a/third_party/ulib/musl/third_party/math/erfl.c b/zircon/third_party/ulib/musl/third_party/math/erfl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/erfl.c
rename to zircon/third_party/ulib/musl/third_party/math/erfl.c
diff --git a/third_party/ulib/musl/third_party/math/exp.c b/zircon/third_party/ulib/musl/third_party/math/exp.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/exp.c
rename to zircon/third_party/ulib/musl/third_party/math/exp.c
diff --git a/third_party/ulib/musl/third_party/math/exp2.c b/zircon/third_party/ulib/musl/third_party/math/exp2.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/exp2.c
rename to zircon/third_party/ulib/musl/third_party/math/exp2.c
diff --git a/third_party/ulib/musl/third_party/math/exp2f.c b/zircon/third_party/ulib/musl/third_party/math/exp2f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/exp2f.c
rename to zircon/third_party/ulib/musl/third_party/math/exp2f.c
diff --git a/third_party/ulib/musl/third_party/math/exp2l.c b/zircon/third_party/ulib/musl/third_party/math/exp2l.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/exp2l.c
rename to zircon/third_party/ulib/musl/third_party/math/exp2l.c
diff --git a/third_party/ulib/musl/third_party/math/expf.c b/zircon/third_party/ulib/musl/third_party/math/expf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/expf.c
rename to zircon/third_party/ulib/musl/third_party/math/expf.c
diff --git a/third_party/ulib/musl/third_party/math/expl.c b/zircon/third_party/ulib/musl/third_party/math/expl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/expl.c
rename to zircon/third_party/ulib/musl/third_party/math/expl.c
diff --git a/third_party/ulib/musl/third_party/math/expm1.c b/zircon/third_party/ulib/musl/third_party/math/expm1.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/expm1.c
rename to zircon/third_party/ulib/musl/third_party/math/expm1.c
diff --git a/third_party/ulib/musl/third_party/math/expm1f.c b/zircon/third_party/ulib/musl/third_party/math/expm1f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/expm1f.c
rename to zircon/third_party/ulib/musl/third_party/math/expm1f.c
diff --git a/third_party/ulib/musl/third_party/math/expm1l.c b/zircon/third_party/ulib/musl/third_party/math/expm1l.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/expm1l.c
rename to zircon/third_party/ulib/musl/third_party/math/expm1l.c
diff --git a/third_party/ulib/musl/third_party/math/fma.c b/zircon/third_party/ulib/musl/third_party/math/fma.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/fma.c
rename to zircon/third_party/ulib/musl/third_party/math/fma.c
diff --git a/third_party/ulib/musl/third_party/math/fmaf.c b/zircon/third_party/ulib/musl/third_party/math/fmaf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/fmaf.c
rename to zircon/third_party/ulib/musl/third_party/math/fmaf.c
diff --git a/third_party/ulib/musl/third_party/math/fmal.c b/zircon/third_party/ulib/musl/third_party/math/fmal.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/fmal.c
rename to zircon/third_party/ulib/musl/third_party/math/fmal.c
diff --git a/third_party/ulib/musl/third_party/math/j0.c b/zircon/third_party/ulib/musl/third_party/math/j0.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/j0.c
rename to zircon/third_party/ulib/musl/third_party/math/j0.c
diff --git a/third_party/ulib/musl/third_party/math/j0f.c b/zircon/third_party/ulib/musl/third_party/math/j0f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/j0f.c
rename to zircon/third_party/ulib/musl/third_party/math/j0f.c
diff --git a/third_party/ulib/musl/third_party/math/j1.c b/zircon/third_party/ulib/musl/third_party/math/j1.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/j1.c
rename to zircon/third_party/ulib/musl/third_party/math/j1.c
diff --git a/third_party/ulib/musl/third_party/math/j1f.c b/zircon/third_party/ulib/musl/third_party/math/j1f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/j1f.c
rename to zircon/third_party/ulib/musl/third_party/math/j1f.c
diff --git a/third_party/ulib/musl/third_party/math/jn.c b/zircon/third_party/ulib/musl/third_party/math/jn.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/jn.c
rename to zircon/third_party/ulib/musl/third_party/math/jn.c
diff --git a/third_party/ulib/musl/third_party/math/jnf.c b/zircon/third_party/ulib/musl/third_party/math/jnf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/jnf.c
rename to zircon/third_party/ulib/musl/third_party/math/jnf.c
diff --git a/third_party/ulib/musl/third_party/math/lgamma_r.c b/zircon/third_party/ulib/musl/third_party/math/lgamma_r.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/lgamma_r.c
rename to zircon/third_party/ulib/musl/third_party/math/lgamma_r.c
diff --git a/third_party/ulib/musl/third_party/math/lgammaf_r.c b/zircon/third_party/ulib/musl/third_party/math/lgammaf_r.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/lgammaf_r.c
rename to zircon/third_party/ulib/musl/third_party/math/lgammaf_r.c
diff --git a/third_party/ulib/musl/third_party/math/lgammal.c b/zircon/third_party/ulib/musl/third_party/math/lgammal.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/lgammal.c
rename to zircon/third_party/ulib/musl/third_party/math/lgammal.c
diff --git a/third_party/ulib/musl/third_party/math/log.c b/zircon/third_party/ulib/musl/third_party/math/log.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log.c
rename to zircon/third_party/ulib/musl/third_party/math/log.c
diff --git a/third_party/ulib/musl/third_party/math/log10.c b/zircon/third_party/ulib/musl/third_party/math/log10.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log10.c
rename to zircon/third_party/ulib/musl/third_party/math/log10.c
diff --git a/third_party/ulib/musl/third_party/math/log10f.c b/zircon/third_party/ulib/musl/third_party/math/log10f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log10f.c
rename to zircon/third_party/ulib/musl/third_party/math/log10f.c
diff --git a/third_party/ulib/musl/third_party/math/log10l.c b/zircon/third_party/ulib/musl/third_party/math/log10l.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log10l.c
rename to zircon/third_party/ulib/musl/third_party/math/log10l.c
diff --git a/third_party/ulib/musl/third_party/math/log1p.c b/zircon/third_party/ulib/musl/third_party/math/log1p.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log1p.c
rename to zircon/third_party/ulib/musl/third_party/math/log1p.c
diff --git a/third_party/ulib/musl/third_party/math/log1pf.c b/zircon/third_party/ulib/musl/third_party/math/log1pf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log1pf.c
rename to zircon/third_party/ulib/musl/third_party/math/log1pf.c
diff --git a/third_party/ulib/musl/third_party/math/log1pl.c b/zircon/third_party/ulib/musl/third_party/math/log1pl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log1pl.c
rename to zircon/third_party/ulib/musl/third_party/math/log1pl.c
diff --git a/third_party/ulib/musl/third_party/math/log2.c b/zircon/third_party/ulib/musl/third_party/math/log2.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log2.c
rename to zircon/third_party/ulib/musl/third_party/math/log2.c
diff --git a/third_party/ulib/musl/third_party/math/log2f.c b/zircon/third_party/ulib/musl/third_party/math/log2f.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log2f.c
rename to zircon/third_party/ulib/musl/third_party/math/log2f.c
diff --git a/third_party/ulib/musl/third_party/math/log2l.c b/zircon/third_party/ulib/musl/third_party/math/log2l.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/log2l.c
rename to zircon/third_party/ulib/musl/third_party/math/log2l.c
diff --git a/third_party/ulib/musl/third_party/math/logf.c b/zircon/third_party/ulib/musl/third_party/math/logf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/logf.c
rename to zircon/third_party/ulib/musl/third_party/math/logf.c
diff --git a/third_party/ulib/musl/third_party/math/logl.c b/zircon/third_party/ulib/musl/third_party/math/logl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/logl.c
rename to zircon/third_party/ulib/musl/third_party/math/logl.c
diff --git a/third_party/ulib/musl/third_party/math/pow.c b/zircon/third_party/ulib/musl/third_party/math/pow.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/pow.c
rename to zircon/third_party/ulib/musl/third_party/math/pow.c
diff --git a/third_party/ulib/musl/third_party/math/powf.c b/zircon/third_party/ulib/musl/third_party/math/powf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/powf.c
rename to zircon/third_party/ulib/musl/third_party/math/powf.c
diff --git a/third_party/ulib/musl/third_party/math/powl.c b/zircon/third_party/ulib/musl/third_party/math/powl.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/powl.c
rename to zircon/third_party/ulib/musl/third_party/math/powl.c
diff --git a/third_party/ulib/musl/third_party/math/scalb.c b/zircon/third_party/ulib/musl/third_party/math/scalb.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/scalb.c
rename to zircon/third_party/ulib/musl/third_party/math/scalb.c
diff --git a/third_party/ulib/musl/third_party/math/scalbf.c b/zircon/third_party/ulib/musl/third_party/math/scalbf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/scalbf.c
rename to zircon/third_party/ulib/musl/third_party/math/scalbf.c
diff --git a/third_party/ulib/musl/third_party/math/sin.c b/zircon/third_party/ulib/musl/third_party/math/sin.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/sin.c
rename to zircon/third_party/ulib/musl/third_party/math/sin.c
diff --git a/third_party/ulib/musl/third_party/math/sincos.c b/zircon/third_party/ulib/musl/third_party/math/sincos.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/sincos.c
rename to zircon/third_party/ulib/musl/third_party/math/sincos.c
diff --git a/third_party/ulib/musl/third_party/math/sincosf.c b/zircon/third_party/ulib/musl/third_party/math/sincosf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/sincosf.c
rename to zircon/third_party/ulib/musl/third_party/math/sincosf.c
diff --git a/third_party/ulib/musl/third_party/math/sinf.c b/zircon/third_party/ulib/musl/third_party/math/sinf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/sinf.c
rename to zircon/third_party/ulib/musl/third_party/math/sinf.c
diff --git a/third_party/ulib/musl/third_party/math/tan.c b/zircon/third_party/ulib/musl/third_party/math/tan.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/tan.c
rename to zircon/third_party/ulib/musl/third_party/math/tan.c
diff --git a/third_party/ulib/musl/third_party/math/tanf.c b/zircon/third_party/ulib/musl/third_party/math/tanf.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/tanf.c
rename to zircon/third_party/ulib/musl/third_party/math/tanf.c
diff --git a/third_party/ulib/musl/third_party/math/tgammal.c b/zircon/third_party/ulib/musl/third_party/math/tgammal.c
similarity index 100%
rename from third_party/ulib/musl/third_party/math/tgammal.c
rename to zircon/third_party/ulib/musl/third_party/math/tgammal.c
diff --git a/third_party/ulib/musl/third_party/smoothsort/qsort.c b/zircon/third_party/ulib/musl/third_party/smoothsort/qsort.c
similarity index 100%
rename from third_party/ulib/musl/third_party/smoothsort/qsort.c
rename to zircon/third_party/ulib/musl/third_party/smoothsort/qsort.c
diff --git a/third_party/ulib/musl/third_party/tre/regcomp.c b/zircon/third_party/ulib/musl/third_party/tre/regcomp.c
similarity index 100%
rename from third_party/ulib/musl/third_party/tre/regcomp.c
rename to zircon/third_party/ulib/musl/third_party/tre/regcomp.c
diff --git a/third_party/ulib/musl/third_party/tre/regerror.c b/zircon/third_party/ulib/musl/third_party/tre/regerror.c
similarity index 100%
rename from third_party/ulib/musl/third_party/tre/regerror.c
rename to zircon/third_party/ulib/musl/third_party/tre/regerror.c
diff --git a/third_party/ulib/musl/third_party/tre/regexec.c b/zircon/third_party/ulib/musl/third_party/tre/regexec.c
similarity index 100%
rename from third_party/ulib/musl/third_party/tre/regexec.c
rename to zircon/third_party/ulib/musl/third_party/tre/regexec.c
diff --git a/third_party/ulib/musl/third_party/tre/tre-mem.c b/zircon/third_party/ulib/musl/third_party/tre/tre-mem.c
similarity index 100%
rename from third_party/ulib/musl/third_party/tre/tre-mem.c
rename to zircon/third_party/ulib/musl/third_party/tre/tre-mem.c
diff --git a/third_party/ulib/musl/third_party/tre/tre.h b/zircon/third_party/ulib/musl/third_party/tre/tre.h
similarity index 100%
rename from third_party/ulib/musl/third_party/tre/tre.h
rename to zircon/third_party/ulib/musl/third_party/tre/tre.h
diff --git a/third_party/ulib/musl/zircon/getentropy.c b/zircon/third_party/ulib/musl/zircon/getentropy.c
similarity index 100%
rename from third_party/ulib/musl/zircon/getentropy.c
rename to zircon/third_party/ulib/musl/zircon/getentropy.c
diff --git a/third_party/ulib/musl/zircon/internal.c b/zircon/third_party/ulib/musl/zircon/internal.c
similarity index 100%
rename from third_party/ulib/musl/zircon/internal.c
rename to zircon/third_party/ulib/musl/zircon/internal.c
diff --git a/third_party/ulib/musl/zircon/take_startup_handle.c b/zircon/third_party/ulib/musl/zircon/take_startup_handle.c
similarity index 100%
rename from third_party/ulib/musl/zircon/take_startup_handle.c
rename to zircon/third_party/ulib/musl/zircon/take_startup_handle.c
diff --git a/third_party/ulib/musl/zircon/thrd_get_zx_handle.c b/zircon/third_party/ulib/musl/zircon/thrd_get_zx_handle.c
similarity index 100%
rename from third_party/ulib/musl/zircon/thrd_get_zx_handle.c
rename to zircon/third_party/ulib/musl/zircon/thrd_get_zx_handle.c
diff --git a/third_party/ulib/ngunwind/AUTHORS b/zircon/third_party/ulib/ngunwind/AUTHORS
similarity index 100%
rename from third_party/ulib/ngunwind/AUTHORS
rename to zircon/third_party/ulib/ngunwind/AUTHORS
diff --git a/third_party/ulib/ngunwind/COPYING b/zircon/third_party/ulib/ngunwind/COPYING
similarity index 100%
rename from third_party/ulib/ngunwind/COPYING
rename to zircon/third_party/ulib/ngunwind/COPYING
diff --git a/third_party/ulib/ngunwind/LICENSE b/zircon/third_party/ulib/ngunwind/LICENSE
similarity index 100%
rename from third_party/ulib/ngunwind/LICENSE
rename to zircon/third_party/ulib/ngunwind/LICENSE
diff --git a/third_party/ulib/ngunwind/README.fuchsia.md b/zircon/third_party/ulib/ngunwind/README.fuchsia.md
similarity index 100%
rename from third_party/ulib/ngunwind/README.fuchsia.md
rename to zircon/third_party/ulib/ngunwind/README.fuchsia.md
diff --git a/third_party/ulib/ngunwind/include/ngunwind/dwarf-eh.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/dwarf-eh.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/dwarf-eh.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/dwarf-eh.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/dwarf.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/dwarf.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/dwarf.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/dwarf.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/fuchsia.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/fuchsia.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/fuchsia.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/fuchsia.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/libunwind.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/libunwind.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/libunwind.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/libunwind.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/compiler.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/compiler.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/compiler.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/compiler.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/config.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/config.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/config.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/config.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/dwarf-config.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/dwarf-config.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/dwarf-config.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/dwarf-config.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/dwarf_i.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/dwarf_i.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/dwarf_i.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/dwarf_i.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/elf32.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/elf32.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/elf32.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/elf32.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/elf64.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/elf64.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/elf64.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/elf64.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/elfxx.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/elfxx.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/elfxx.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/elfxx.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/fuchsia_i.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/fuchsia_i.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/fuchsia_i.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/fuchsia_i.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/libunwind-common.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/libunwind-common.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/libunwind-common.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/libunwind-common.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/libunwind-dynamic.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/libunwind-dynamic.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/libunwind-dynamic.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/libunwind-dynamic.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/libunwind_i.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/libunwind_i.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/libunwind_i.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/libunwind_i.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/mempool.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/mempool.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/mempool.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/mempool.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/remote.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/remote.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/remote.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/remote.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/tgt-aarch64.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt-aarch64.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/tgt-aarch64.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt-aarch64.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/tgt-arm.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt-arm.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/tgt-arm.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt-arm.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/tgt-x86_64.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt-x86_64.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/tgt-x86_64.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt-x86_64.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-aarch64.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-aarch64.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-aarch64.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-aarch64.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-arm.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-arm.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-arm.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-arm.h
diff --git a/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-x86_64.h b/zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-x86_64.h
similarity index 100%
rename from third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-x86_64.h
rename to zircon/third_party/ulib/ngunwind/include/ngunwind/private/tgt_i-x86_64.h
diff --git a/third_party/ulib/ngunwind/rules.mk b/zircon/third_party/ulib/ngunwind/rules.mk
similarity index 100%
rename from third_party/ulib/ngunwind/rules.mk
rename to zircon/third_party/ulib/ngunwind/rules.mk
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gcreate_addr_space.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gcreate_addr_space.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gcreate_addr_space.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gcreate_addr_space.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gget_proc_info.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gget_proc_info.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gget_proc_info.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gget_proc_info.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gget_save_loc.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gget_save_loc.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gget_save_loc.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gget_save_loc.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gglobal.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gglobal.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gglobal.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gglobal.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Ginit.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Ginit.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Ginit.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Ginit.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Ginit_local.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Ginit_local.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Ginit_local.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Ginit_local.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Ginit_remote.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Ginit_remote.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Ginit_remote.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Ginit_remote.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gregs.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gregs.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gregs.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gregs.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gsignal_frame.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gsignal_frame.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gsignal_frame.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gsignal_frame.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gstash_frame.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gstash_frame.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gstash_frame.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gstash_frame.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/Gstep.c b/zircon/third_party/ulib/ngunwind/src/aarch64/Gstep.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/Gstep.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/Gstep.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/fuchsia.c b/zircon/third_party/ulib/ngunwind/src/aarch64/fuchsia.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/fuchsia.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/fuchsia.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/init.h b/zircon/third_party/ulib/ngunwind/src/aarch64/init.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/init.h
rename to zircon/third_party/ulib/ngunwind/src/aarch64/init.h
diff --git a/third_party/ulib/ngunwind/src/aarch64/offsets.h b/zircon/third_party/ulib/ngunwind/src/aarch64/offsets.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/offsets.h
rename to zircon/third_party/ulib/ngunwind/src/aarch64/offsets.h
diff --git a/third_party/ulib/ngunwind/src/aarch64/regname.c b/zircon/third_party/ulib/ngunwind/src/aarch64/regname.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/regname.c
rename to zircon/third_party/ulib/ngunwind/src/aarch64/regname.c
diff --git a/third_party/ulib/ngunwind/src/aarch64/unwind_i.h b/zircon/third_party/ulib/ngunwind/src/aarch64/unwind_i.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/aarch64/unwind_i.h
rename to zircon/third_party/ulib/ngunwind/src/aarch64/unwind_i.h
diff --git a/third_party/ulib/ngunwind/src/arm/Gcreate_addr_space.c b/zircon/third_party/ulib/ngunwind/src/arm/Gcreate_addr_space.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gcreate_addr_space.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gcreate_addr_space.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gex_tables.c b/zircon/third_party/ulib/ngunwind/src/arm/Gex_tables.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gex_tables.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gex_tables.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gget_proc_info.c b/zircon/third_party/ulib/ngunwind/src/arm/Gget_proc_info.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gget_proc_info.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gget_proc_info.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gget_save_loc.c b/zircon/third_party/ulib/ngunwind/src/arm/Gget_save_loc.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gget_save_loc.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gget_save_loc.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gglobal.c b/zircon/third_party/ulib/ngunwind/src/arm/Gglobal.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gglobal.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gglobal.c
diff --git a/third_party/ulib/ngunwind/src/arm/Ginit.c b/zircon/third_party/ulib/ngunwind/src/arm/Ginit.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Ginit.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Ginit.c
diff --git a/third_party/ulib/ngunwind/src/arm/Ginit_local.c b/zircon/third_party/ulib/ngunwind/src/arm/Ginit_local.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Ginit_local.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Ginit_local.c
diff --git a/third_party/ulib/ngunwind/src/arm/Ginit_remote.c b/zircon/third_party/ulib/ngunwind/src/arm/Ginit_remote.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Ginit_remote.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Ginit_remote.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gregs.c b/zircon/third_party/ulib/ngunwind/src/arm/Gregs.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gregs.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gregs.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gsignal_frame.c b/zircon/third_party/ulib/ngunwind/src/arm/Gsignal_frame.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gsignal_frame.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gsignal_frame.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gstash_frame.c b/zircon/third_party/ulib/ngunwind/src/arm/Gstash_frame.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gstash_frame.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gstash_frame.c
diff --git a/third_party/ulib/ngunwind/src/arm/Gstep.c b/zircon/third_party/ulib/ngunwind/src/arm/Gstep.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/Gstep.c
rename to zircon/third_party/ulib/ngunwind/src/arm/Gstep.c
diff --git a/third_party/ulib/ngunwind/src/arm/ex_tables.h b/zircon/third_party/ulib/ngunwind/src/arm/ex_tables.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/ex_tables.h
rename to zircon/third_party/ulib/ngunwind/src/arm/ex_tables.h
diff --git a/third_party/ulib/ngunwind/src/arm/fuchsia.c b/zircon/third_party/ulib/ngunwind/src/arm/fuchsia.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/fuchsia.c
rename to zircon/third_party/ulib/ngunwind/src/arm/fuchsia.c
diff --git a/third_party/ulib/ngunwind/src/arm/init.h b/zircon/third_party/ulib/ngunwind/src/arm/init.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/init.h
rename to zircon/third_party/ulib/ngunwind/src/arm/init.h
diff --git a/third_party/ulib/ngunwind/src/arm/offsets.h b/zircon/third_party/ulib/ngunwind/src/arm/offsets.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/offsets.h
rename to zircon/third_party/ulib/ngunwind/src/arm/offsets.h
diff --git a/third_party/ulib/ngunwind/src/arm/regname.c b/zircon/third_party/ulib/ngunwind/src/arm/regname.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/regname.c
rename to zircon/third_party/ulib/ngunwind/src/arm/regname.c
diff --git a/third_party/ulib/ngunwind/src/arm/unwind_i.h b/zircon/third_party/ulib/ngunwind/src/arm/unwind_i.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/arm/unwind_i.h
rename to zircon/third_party/ulib/ngunwind/src/arm/unwind_i.h
diff --git a/third_party/ulib/ngunwind/src/dwarf/Gexpr.c b/zircon/third_party/ulib/ngunwind/src/dwarf/Gexpr.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/Gexpr.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/Gexpr.c
diff --git a/third_party/ulib/ngunwind/src/dwarf/Gfde.c b/zircon/third_party/ulib/ngunwind/src/dwarf/Gfde.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/Gfde.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/Gfde.c
diff --git a/third_party/ulib/ngunwind/src/dwarf/Gfind_proc_info-lsb.c b/zircon/third_party/ulib/ngunwind/src/dwarf/Gfind_proc_info-lsb.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/Gfind_proc_info-lsb.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/Gfind_proc_info-lsb.c
diff --git a/third_party/ulib/ngunwind/src/dwarf/Gfind_unwind_table.c b/zircon/third_party/ulib/ngunwind/src/dwarf/Gfind_unwind_table.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/Gfind_unwind_table.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/Gfind_unwind_table.c
diff --git a/third_party/ulib/ngunwind/src/dwarf/Gparser.c b/zircon/third_party/ulib/ngunwind/src/dwarf/Gparser.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/Gparser.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/Gparser.c
diff --git a/third_party/ulib/ngunwind/src/dwarf/Gpe.c b/zircon/third_party/ulib/ngunwind/src/dwarf/Gpe.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/Gpe.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/Gpe.c
diff --git a/third_party/ulib/ngunwind/src/dwarf/Gstep.c b/zircon/third_party/ulib/ngunwind/src/dwarf/Gstep.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/Gstep.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/Gstep.c
diff --git a/third_party/ulib/ngunwind/src/dwarf/global.c b/zircon/third_party/ulib/ngunwind/src/dwarf/global.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/dwarf/global.c
rename to zircon/third_party/ulib/ngunwind/src/dwarf/global.c
diff --git a/third_party/ulib/ngunwind/src/elf32.c b/zircon/third_party/ulib/ngunwind/src/elf32.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/elf32.c
rename to zircon/third_party/ulib/ngunwind/src/elf32.c
diff --git a/third_party/ulib/ngunwind/src/elf64.c b/zircon/third_party/ulib/ngunwind/src/elf64.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/elf64.c
rename to zircon/third_party/ulib/ngunwind/src/elf64.c
diff --git a/third_party/ulib/ngunwind/src/elfxx.c b/zircon/third_party/ulib/ngunwind/src/elfxx.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/elfxx.c
rename to zircon/third_party/ulib/ngunwind/src/elfxx.c
diff --git a/third_party/ulib/ngunwind/src/fuchsia.c b/zircon/third_party/ulib/ngunwind/src/fuchsia.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/fuchsia.c
rename to zircon/third_party/ulib/ngunwind/src/fuchsia.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gdestroy_addr_space.c b/zircon/third_party/ulib/ngunwind/src/mi/Gdestroy_addr_space.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gdestroy_addr_space.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gdestroy_addr_space.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gdyn-extract.c b/zircon/third_party/ulib/ngunwind/src/mi/Gdyn-extract.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gdyn-extract.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gdyn-extract.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gdyn-remote.c b/zircon/third_party/ulib/ngunwind/src/mi/Gdyn-remote.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gdyn-remote.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gdyn-remote.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gfind_dynamic_proc_info.c b/zircon/third_party/ulib/ngunwind/src/mi/Gfind_dynamic_proc_info.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gfind_dynamic_proc_info.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gfind_dynamic_proc_info.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gget_accessors.c b/zircon/third_party/ulib/ngunwind/src/mi/Gget_accessors.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gget_accessors.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gget_accessors.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gget_fpreg.c b/zircon/third_party/ulib/ngunwind/src/mi/Gget_fpreg.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gget_fpreg.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gget_fpreg.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gget_proc_info_by_ip.c b/zircon/third_party/ulib/ngunwind/src/mi/Gget_proc_info_by_ip.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gget_proc_info_by_ip.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gget_proc_info_by_ip.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gget_proc_name.c b/zircon/third_party/ulib/ngunwind/src/mi/Gget_proc_name.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gget_proc_name.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gget_proc_name.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gget_reg.c b/zircon/third_party/ulib/ngunwind/src/mi/Gget_reg.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gget_reg.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gget_reg.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gput_dynamic_unwind_info.c b/zircon/third_party/ulib/ngunwind/src/mi/Gput_dynamic_unwind_info.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gput_dynamic_unwind_info.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gput_dynamic_unwind_info.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gset_caching_policy.c b/zircon/third_party/ulib/ngunwind/src/mi/Gset_caching_policy.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gset_caching_policy.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gset_caching_policy.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gset_fpreg.c b/zircon/third_party/ulib/ngunwind/src/mi/Gset_fpreg.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gset_fpreg.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gset_fpreg.c
diff --git a/third_party/ulib/ngunwind/src/mi/Gset_reg.c b/zircon/third_party/ulib/ngunwind/src/mi/Gset_reg.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/Gset_reg.c
rename to zircon/third_party/ulib/ngunwind/src/mi/Gset_reg.c
diff --git a/third_party/ulib/ngunwind/src/mi/common.c b/zircon/third_party/ulib/ngunwind/src/mi/common.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/common.c
rename to zircon/third_party/ulib/ngunwind/src/mi/common.c
diff --git a/third_party/ulib/ngunwind/src/mi/dyn-cancel.c b/zircon/third_party/ulib/ngunwind/src/mi/dyn-cancel.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/dyn-cancel.c
rename to zircon/third_party/ulib/ngunwind/src/mi/dyn-cancel.c
diff --git a/third_party/ulib/ngunwind/src/mi/dyn-info-list.c b/zircon/third_party/ulib/ngunwind/src/mi/dyn-info-list.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/dyn-info-list.c
rename to zircon/third_party/ulib/ngunwind/src/mi/dyn-info-list.c
diff --git a/third_party/ulib/ngunwind/src/mi/dyn-register.c b/zircon/third_party/ulib/ngunwind/src/mi/dyn-register.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/dyn-register.c
rename to zircon/third_party/ulib/ngunwind/src/mi/dyn-register.c
diff --git a/third_party/ulib/ngunwind/src/mi/flush_cache.c b/zircon/third_party/ulib/ngunwind/src/mi/flush_cache.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/flush_cache.c
rename to zircon/third_party/ulib/ngunwind/src/mi/flush_cache.c
diff --git a/third_party/ulib/ngunwind/src/mi/init.c b/zircon/third_party/ulib/ngunwind/src/mi/init.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/init.c
rename to zircon/third_party/ulib/ngunwind/src/mi/init.c
diff --git a/third_party/ulib/ngunwind/src/mi/mempool.c b/zircon/third_party/ulib/ngunwind/src/mi/mempool.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/mempool.c
rename to zircon/third_party/ulib/ngunwind/src/mi/mempool.c
diff --git a/third_party/ulib/ngunwind/src/mi/strerror.c b/zircon/third_party/ulib/ngunwind/src/mi/strerror.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/mi/strerror.c
rename to zircon/third_party/ulib/ngunwind/src/mi/strerror.c
diff --git a/third_party/ulib/ngunwind/src/os-linux.c b/zircon/third_party/ulib/ngunwind/src/os-linux.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/os-linux.c
rename to zircon/third_party/ulib/ngunwind/src/os-linux.c
diff --git a/third_party/ulib/ngunwind/src/os-linux.h b/zircon/third_party/ulib/ngunwind/src/os-linux.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/os-linux.h
rename to zircon/third_party/ulib/ngunwind/src/os-linux.h
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gcreate_addr_space.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gcreate_addr_space.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gcreate_addr_space.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gcreate_addr_space.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gget_proc_info.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gget_proc_info.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gget_proc_info.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gget_proc_info.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gget_save_loc.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gget_save_loc.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gget_save_loc.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gget_save_loc.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gglobal.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gglobal.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gglobal.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gglobal.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Ginit.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Ginit.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Ginit.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Ginit.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Ginit_local.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Ginit_local.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Ginit_local.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Ginit_local.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Ginit_remote.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Ginit_remote.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Ginit_remote.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Ginit_remote.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gregs.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gregs.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gregs.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gregs.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gsignal_frame.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gsignal_frame.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gsignal_frame.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gsignal_frame.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gstash_frame.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gstash_frame.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gstash_frame.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gstash_frame.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/Gstep.c b/zircon/third_party/ulib/ngunwind/src/x86_64/Gstep.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/Gstep.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/Gstep.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/fuchsia.c b/zircon/third_party/ulib/ngunwind/src/x86_64/fuchsia.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/fuchsia.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/fuchsia.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/init.h b/zircon/third_party/ulib/ngunwind/src/x86_64/init.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/init.h
rename to zircon/third_party/ulib/ngunwind/src/x86_64/init.h
diff --git a/third_party/ulib/ngunwind/src/x86_64/offsets.h b/zircon/third_party/ulib/ngunwind/src/x86_64/offsets.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/offsets.h
rename to zircon/third_party/ulib/ngunwind/src/x86_64/offsets.h
diff --git a/third_party/ulib/ngunwind/src/x86_64/regname.c b/zircon/third_party/ulib/ngunwind/src/x86_64/regname.c
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/regname.c
rename to zircon/third_party/ulib/ngunwind/src/x86_64/regname.c
diff --git a/third_party/ulib/ngunwind/src/x86_64/unwind_i.h b/zircon/third_party/ulib/ngunwind/src/x86_64/unwind_i.h
similarity index 100%
rename from third_party/ulib/ngunwind/src/x86_64/unwind_i.h
rename to zircon/third_party/ulib/ngunwind/src/x86_64/unwind_i.h
diff --git a/third_party/ulib/uboringssl/LICENSE b/zircon/third_party/ulib/uboringssl/LICENSE
similarity index 100%
rename from third_party/ulib/uboringssl/LICENSE
rename to zircon/third_party/ulib/uboringssl/LICENSE
diff --git a/third_party/ulib/uboringssl/README.fuchsia.md b/zircon/third_party/ulib/uboringssl/README.fuchsia.md
similarity index 100%
rename from third_party/ulib/uboringssl/README.fuchsia.md
rename to zircon/third_party/ulib/uboringssl/README.fuchsia.md
diff --git a/third_party/ulib/uboringssl/crypto/chacha/chacha.c b/zircon/third_party/ulib/uboringssl/crypto/chacha/chacha.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/chacha/chacha.c
rename to zircon/third_party/ulib/uboringssl/crypto/chacha/chacha.c
diff --git a/third_party/ulib/uboringssl/crypto/chacha/internal.h b/zircon/third_party/ulib/uboringssl/crypto/chacha/internal.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/chacha/internal.h
rename to zircon/third_party/ulib/uboringssl/crypto/chacha/internal.h
diff --git a/third_party/ulib/uboringssl/crypto/cipher_extra/e_aesgcmsiv.c b/zircon/third_party/ulib/uboringssl/crypto/cipher_extra/e_aesgcmsiv.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/cipher_extra/e_aesgcmsiv.c
rename to zircon/third_party/ulib/uboringssl/crypto/cipher_extra/e_aesgcmsiv.c
diff --git a/third_party/ulib/uboringssl/crypto/cpu-aarch64-fuchsia.c b/zircon/third_party/ulib/uboringssl/crypto/cpu-aarch64-fuchsia.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/cpu-aarch64-fuchsia.c
rename to zircon/third_party/ulib/uboringssl/crypto/cpu-aarch64-fuchsia.c
diff --git a/third_party/ulib/uboringssl/crypto/cpu-arm.c b/zircon/third_party/ulib/uboringssl/crypto/cpu-arm.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/cpu-arm.c
rename to zircon/third_party/ulib/uboringssl/crypto/cpu-arm.c
diff --git a/third_party/ulib/uboringssl/crypto/cpu-intel.c b/zircon/third_party/ulib/uboringssl/crypto/cpu-intel.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/cpu-intel.c
rename to zircon/third_party/ulib/uboringssl/crypto/cpu-intel.c
diff --git a/third_party/ulib/uboringssl/crypto/crypto.c b/zircon/third_party/ulib/uboringssl/crypto/crypto.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/crypto.c
rename to zircon/third_party/ulib/uboringssl/crypto/crypto.c
diff --git a/third_party/ulib/uboringssl/crypto/err/err.c b/zircon/third_party/ulib/uboringssl/crypto/err/err.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/err/err.c
rename to zircon/third_party/ulib/uboringssl/crypto/err/err.c
diff --git a/third_party/ulib/uboringssl/crypto/err/internal.h b/zircon/third_party/ulib/uboringssl/crypto/err/internal.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/err/internal.h
rename to zircon/third_party/ulib/uboringssl/crypto/err/internal.h
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/aes/aes.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/aes/aes.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/aes/aes.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/aes/aes.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/aes/internal.h b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/aes/internal.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/aes/internal.h
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/aes/internal.h
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/aes/mode_wrappers.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/aes/mode_wrappers.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/aes/mode_wrappers.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/aes/mode_wrappers.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/aead.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/aead.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/cipher/aead.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/aead.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/cipher.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/cipher.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/cipher/cipher.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/cipher.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/e_aes.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/e_aes.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/cipher/e_aes.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/e_aes.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/internal.h b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/internal.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/cipher/internal.h
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/cipher/internal.h
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/delocate.h b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/delocate.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/delocate.h
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/delocate.h
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/digest/digest.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/digest.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/digest/digest.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/digest.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/digest/digests.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/digests.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/digest/digests.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/digests.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/digest/internal.h b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/internal.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/digest/internal.h
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/internal.h
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/digest/md32_common.h b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/md32_common.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/digest/md32_common.h
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/digest/md32_common.h
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/hmac/hmac.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/hmac/hmac.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/hmac/hmac.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/hmac/hmac.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/modes/gcm.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/modes/gcm.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/modes/gcm.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/modes/gcm.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/modes/internal.h b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/modes/internal.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/modes/internal.h
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/modes/internal.h
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/modes/polyval.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/modes/polyval.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/modes/polyval.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/modes/polyval.c
diff --git a/third_party/ulib/uboringssl/crypto/fipsmodule/sha/sha256.c b/zircon/third_party/ulib/uboringssl/crypto/fipsmodule/sha/sha256.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/fipsmodule/sha/sha256.c
rename to zircon/third_party/ulib/uboringssl/crypto/fipsmodule/sha/sha256.c
diff --git a/third_party/ulib/uboringssl/crypto/hkdf/hkdf.c b/zircon/third_party/ulib/uboringssl/crypto/hkdf/hkdf.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/hkdf/hkdf.c
rename to zircon/third_party/ulib/uboringssl/crypto/hkdf/hkdf.c
diff --git a/third_party/ulib/uboringssl/crypto/internal.h b/zircon/third_party/ulib/uboringssl/crypto/internal.h
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/internal.h
rename to zircon/third_party/ulib/uboringssl/crypto/internal.h
diff --git a/third_party/ulib/uboringssl/crypto/mem.c b/zircon/third_party/ulib/uboringssl/crypto/mem.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/mem.c
rename to zircon/third_party/ulib/uboringssl/crypto/mem.c
diff --git a/third_party/ulib/uboringssl/crypto/rand_extra/fuchsia.c b/zircon/third_party/ulib/uboringssl/crypto/rand_extra/fuchsia.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/rand_extra/fuchsia.c
rename to zircon/third_party/ulib/uboringssl/crypto/rand_extra/fuchsia.c
diff --git a/third_party/ulib/uboringssl/crypto/thread_pthread.c b/zircon/third_party/ulib/uboringssl/crypto/thread_pthread.c
similarity index 100%
rename from third_party/ulib/uboringssl/crypto/thread_pthread.c
rename to zircon/third_party/ulib/uboringssl/crypto/thread_pthread.c
diff --git a/third_party/ulib/uboringssl/decrepit/xts/xts.c b/zircon/third_party/ulib/uboringssl/decrepit/xts/xts.c
similarity index 100%
rename from third_party/ulib/uboringssl/decrepit/xts/xts.c
rename to zircon/third_party/ulib/uboringssl/decrepit/xts/xts.c
diff --git a/third_party/ulib/uboringssl/err_data.c b/zircon/third_party/ulib/uboringssl/err_data.c
similarity index 100%
rename from third_party/ulib/uboringssl/err_data.c
rename to zircon/third_party/ulib/uboringssl/err_data.c
diff --git a/third_party/ulib/uboringssl/include/openssl/aead.h b/zircon/third_party/ulib/uboringssl/include/openssl/aead.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/aead.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/aead.h
diff --git a/third_party/ulib/uboringssl/include/openssl/aes.h b/zircon/third_party/ulib/uboringssl/include/openssl/aes.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/aes.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/aes.h
diff --git a/third_party/ulib/uboringssl/include/openssl/arm_arch.h b/zircon/third_party/ulib/uboringssl/include/openssl/arm_arch.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/arm_arch.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/arm_arch.h
diff --git a/third_party/ulib/uboringssl/include/openssl/base.h b/zircon/third_party/ulib/uboringssl/include/openssl/base.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/base.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/base.h
diff --git a/third_party/ulib/uboringssl/include/openssl/base64.h b/zircon/third_party/ulib/uboringssl/include/openssl/base64.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/base64.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/base64.h
diff --git a/third_party/ulib/uboringssl/include/openssl/chacha.h b/zircon/third_party/ulib/uboringssl/include/openssl/chacha.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/chacha.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/chacha.h
diff --git a/third_party/ulib/uboringssl/include/openssl/cipher.h b/zircon/third_party/ulib/uboringssl/include/openssl/cipher.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/cipher.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/cipher.h
diff --git a/third_party/ulib/uboringssl/include/openssl/cpu.h b/zircon/third_party/ulib/uboringssl/include/openssl/cpu.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/cpu.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/cpu.h
diff --git a/third_party/ulib/uboringssl/include/openssl/crypto.h b/zircon/third_party/ulib/uboringssl/include/openssl/crypto.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/crypto.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/crypto.h
diff --git a/third_party/ulib/uboringssl/include/openssl/digest.h b/zircon/third_party/ulib/uboringssl/include/openssl/digest.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/digest.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/digest.h
diff --git a/third_party/ulib/uboringssl/include/openssl/err.h b/zircon/third_party/ulib/uboringssl/include/openssl/err.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/err.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/err.h
diff --git a/third_party/ulib/uboringssl/include/openssl/evp.h b/zircon/third_party/ulib/uboringssl/include/openssl/evp.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/evp.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/evp.h
diff --git a/third_party/ulib/uboringssl/include/openssl/ex_data.h b/zircon/third_party/ulib/uboringssl/include/openssl/ex_data.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/ex_data.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/ex_data.h
diff --git a/third_party/ulib/uboringssl/include/openssl/hkdf.h b/zircon/third_party/ulib/uboringssl/include/openssl/hkdf.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/hkdf.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/hkdf.h
diff --git a/third_party/ulib/uboringssl/include/openssl/hmac.h b/zircon/third_party/ulib/uboringssl/include/openssl/hmac.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/hmac.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/hmac.h
diff --git a/third_party/ulib/uboringssl/include/openssl/is_boringssl.h b/zircon/third_party/ulib/uboringssl/include/openssl/is_boringssl.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/is_boringssl.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/is_boringssl.h
diff --git a/third_party/ulib/uboringssl/include/openssl/md4.h b/zircon/third_party/ulib/uboringssl/include/openssl/md4.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/md4.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/md4.h
diff --git a/third_party/ulib/uboringssl/include/openssl/md5.h b/zircon/third_party/ulib/uboringssl/include/openssl/md5.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/md5.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/md5.h
diff --git a/third_party/ulib/uboringssl/include/openssl/mem.h b/zircon/third_party/ulib/uboringssl/include/openssl/mem.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/mem.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/mem.h
diff --git a/third_party/ulib/uboringssl/include/openssl/nid.h b/zircon/third_party/ulib/uboringssl/include/openssl/nid.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/nid.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/nid.h
diff --git a/third_party/ulib/uboringssl/include/openssl/opensslconf.h b/zircon/third_party/ulib/uboringssl/include/openssl/opensslconf.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/opensslconf.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/opensslconf.h
diff --git a/third_party/ulib/uboringssl/include/openssl/rand.h b/zircon/third_party/ulib/uboringssl/include/openssl/rand.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/rand.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/rand.h
diff --git a/third_party/ulib/uboringssl/include/openssl/sha.h b/zircon/third_party/ulib/uboringssl/include/openssl/sha.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/sha.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/sha.h
diff --git a/third_party/ulib/uboringssl/include/openssl/stack.h b/zircon/third_party/ulib/uboringssl/include/openssl/stack.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/stack.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/stack.h
diff --git a/third_party/ulib/uboringssl/include/openssl/thread.h b/zircon/third_party/ulib/uboringssl/include/openssl/thread.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/thread.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/thread.h
diff --git a/third_party/ulib/uboringssl/include/openssl/type_check.h b/zircon/third_party/ulib/uboringssl/include/openssl/type_check.h
similarity index 100%
rename from third_party/ulib/uboringssl/include/openssl/type_check.h
rename to zircon/third_party/ulib/uboringssl/include/openssl/type_check.h
diff --git a/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S b/zircon/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S
rename to zircon/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S
diff --git a/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S b/zircon/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S
rename to zircon/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S
diff --git a/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S b/zircon/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
rename to zircon/third_party/ulib/uboringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/bsaes-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/bsaes-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/bsaes-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/bsaes-x86_64.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S
diff --git a/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S b/zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S
rename to zircon/third_party/ulib/uboringssl/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aes-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aes-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aes-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aes-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/bsaes-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/bsaes-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/bsaes-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/bsaes-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S
diff --git a/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S b/zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S
similarity index 100%
rename from third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S
rename to zircon/third_party/ulib/uboringssl/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S
diff --git a/third_party/ulib/uboringssl/rules.mk b/zircon/third_party/ulib/uboringssl/rules.mk
similarity index 100%
rename from third_party/ulib/uboringssl/rules.mk
rename to zircon/third_party/ulib/uboringssl/rules.mk
diff --git a/third_party/ulib/uboringssl/stack-note.S b/zircon/third_party/ulib/uboringssl/stack-note.S
similarity index 100%
rename from third_party/ulib/uboringssl/stack-note.S
rename to zircon/third_party/ulib/uboringssl/stack-note.S
diff --git a/third_party/ulib/uboringssl/zircon-unused.c b/zircon/third_party/ulib/uboringssl/zircon-unused.c
similarity index 100%
rename from third_party/ulib/uboringssl/zircon-unused.c
rename to zircon/third_party/ulib/uboringssl/zircon-unused.c
diff --git a/third_party/ulib/usbhost/LICENSE.txt b/zircon/third_party/ulib/usbhost/LICENSE.txt
similarity index 100%
rename from third_party/ulib/usbhost/LICENSE.txt
rename to zircon/third_party/ulib/usbhost/LICENSE.txt
diff --git a/third_party/ulib/usbhost/README.fuchsia b/zircon/third_party/ulib/usbhost/README.fuchsia
similarity index 100%
rename from third_party/ulib/usbhost/README.fuchsia
rename to zircon/third_party/ulib/usbhost/README.fuchsia
diff --git a/third_party/ulib/usbhost/include/usbhost/usbhost.h b/zircon/third_party/ulib/usbhost/include/usbhost/usbhost.h
similarity index 100%
rename from third_party/ulib/usbhost/include/usbhost/usbhost.h
rename to zircon/third_party/ulib/usbhost/include/usbhost/usbhost.h
diff --git a/third_party/ulib/usbhost/rules.mk b/zircon/third_party/ulib/usbhost/rules.mk
similarity index 100%
rename from third_party/ulib/usbhost/rules.mk
rename to zircon/third_party/ulib/usbhost/rules.mk
diff --git a/third_party/ulib/usbhost/usbhost.c b/zircon/third_party/ulib/usbhost/usbhost.c
similarity index 100%
rename from third_party/ulib/usbhost/usbhost.c
rename to zircon/third_party/ulib/usbhost/usbhost.c
diff --git a/third_party/ulib/zstd/CHANGELOG b/zircon/third_party/ulib/zstd/CHANGELOG
similarity index 100%
rename from third_party/ulib/zstd/CHANGELOG
rename to zircon/third_party/ulib/zstd/CHANGELOG
diff --git a/third_party/ulib/zstd/LICENSE b/zircon/third_party/ulib/zstd/LICENSE
similarity index 100%
rename from third_party/ulib/zstd/LICENSE
rename to zircon/third_party/ulib/zstd/LICENSE
diff --git a/third_party/ulib/zstd/README.fuchsia b/zircon/third_party/ulib/zstd/README.fuchsia
similarity index 100%
rename from third_party/ulib/zstd/README.fuchsia
rename to zircon/third_party/ulib/zstd/README.fuchsia
diff --git a/third_party/ulib/zstd/README.md b/zircon/third_party/ulib/zstd/README.md
similarity index 100%
rename from third_party/ulib/zstd/README.md
rename to zircon/third_party/ulib/zstd/README.md
diff --git a/third_party/ulib/zstd/TESTING.md b/zircon/third_party/ulib/zstd/TESTING.md
similarity index 100%
rename from third_party/ulib/zstd/TESTING.md
rename to zircon/third_party/ulib/zstd/TESTING.md
diff --git a/third_party/ulib/zstd/doc/README.md b/zircon/third_party/ulib/zstd/doc/README.md
similarity index 100%
rename from third_party/ulib/zstd/doc/README.md
rename to zircon/third_party/ulib/zstd/doc/README.md
diff --git a/third_party/ulib/zstd/doc/educational_decoder/Makefile b/zircon/third_party/ulib/zstd/doc/educational_decoder/Makefile
similarity index 100%
rename from third_party/ulib/zstd/doc/educational_decoder/Makefile
rename to zircon/third_party/ulib/zstd/doc/educational_decoder/Makefile
diff --git a/third_party/ulib/zstd/doc/educational_decoder/README.md b/zircon/third_party/ulib/zstd/doc/educational_decoder/README.md
similarity index 100%
rename from third_party/ulib/zstd/doc/educational_decoder/README.md
rename to zircon/third_party/ulib/zstd/doc/educational_decoder/README.md
diff --git a/third_party/ulib/zstd/doc/educational_decoder/harness.c b/zircon/third_party/ulib/zstd/doc/educational_decoder/harness.c
similarity index 100%
rename from third_party/ulib/zstd/doc/educational_decoder/harness.c
rename to zircon/third_party/ulib/zstd/doc/educational_decoder/harness.c
diff --git a/third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.c b/zircon/third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.c
rename to zircon/third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.c
diff --git a/third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.h b/zircon/third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.h
similarity index 100%
rename from third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.h
rename to zircon/third_party/ulib/zstd/doc/educational_decoder/zstd_decompress.h
diff --git a/third_party/ulib/zstd/doc/images/CSpeed2.png b/zircon/third_party/ulib/zstd/doc/images/CSpeed2.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/CSpeed2.png
rename to zircon/third_party/ulib/zstd/doc/images/CSpeed2.png
diff --git a/third_party/ulib/zstd/doc/images/DCspeed5.png b/zircon/third_party/ulib/zstd/doc/images/DCspeed5.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/DCspeed5.png
rename to zircon/third_party/ulib/zstd/doc/images/DCspeed5.png
diff --git a/third_party/ulib/zstd/doc/images/DSpeed3.png b/zircon/third_party/ulib/zstd/doc/images/DSpeed3.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/DSpeed3.png
rename to zircon/third_party/ulib/zstd/doc/images/DSpeed3.png
diff --git a/third_party/ulib/zstd/doc/images/cdict_v136.png b/zircon/third_party/ulib/zstd/doc/images/cdict_v136.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/cdict_v136.png
rename to zircon/third_party/ulib/zstd/doc/images/cdict_v136.png
diff --git a/third_party/ulib/zstd/doc/images/dict-cr.png b/zircon/third_party/ulib/zstd/doc/images/dict-cr.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/dict-cr.png
rename to zircon/third_party/ulib/zstd/doc/images/dict-cr.png
diff --git a/third_party/ulib/zstd/doc/images/dict-cs.png b/zircon/third_party/ulib/zstd/doc/images/dict-cs.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/dict-cs.png
rename to zircon/third_party/ulib/zstd/doc/images/dict-cs.png
diff --git a/third_party/ulib/zstd/doc/images/dict-ds.png b/zircon/third_party/ulib/zstd/doc/images/dict-ds.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/dict-ds.png
rename to zircon/third_party/ulib/zstd/doc/images/dict-ds.png
diff --git a/third_party/ulib/zstd/doc/images/zstd_cdict_v1_3_5.png b/zircon/third_party/ulib/zstd/doc/images/zstd_cdict_v1_3_5.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/zstd_cdict_v1_3_5.png
rename to zircon/third_party/ulib/zstd/doc/images/zstd_cdict_v1_3_5.png
diff --git a/third_party/ulib/zstd/doc/images/zstd_logo86.png b/zircon/third_party/ulib/zstd/doc/images/zstd_logo86.png
similarity index 100%
rename from third_party/ulib/zstd/doc/images/zstd_logo86.png
rename to zircon/third_party/ulib/zstd/doc/images/zstd_logo86.png
diff --git a/third_party/ulib/zstd/doc/zstd_compression_format.md b/zircon/third_party/ulib/zstd/doc/zstd_compression_format.md
similarity index 100%
rename from third_party/ulib/zstd/doc/zstd_compression_format.md
rename to zircon/third_party/ulib/zstd/doc/zstd_compression_format.md
diff --git a/third_party/ulib/zstd/doc/zstd_manual.html b/zircon/third_party/ulib/zstd/doc/zstd_manual.html
similarity index 100%
rename from third_party/ulib/zstd/doc/zstd_manual.html
rename to zircon/third_party/ulib/zstd/doc/zstd_manual.html
diff --git a/third_party/ulib/zstd/examples/.gitignore b/zircon/third_party/ulib/zstd/examples/.gitignore
similarity index 100%
rename from third_party/ulib/zstd/examples/.gitignore
rename to zircon/third_party/ulib/zstd/examples/.gitignore
diff --git a/third_party/ulib/zstd/examples/Makefile b/zircon/third_party/ulib/zstd/examples/Makefile
similarity index 100%
rename from third_party/ulib/zstd/examples/Makefile
rename to zircon/third_party/ulib/zstd/examples/Makefile
diff --git a/third_party/ulib/zstd/examples/README.md b/zircon/third_party/ulib/zstd/examples/README.md
similarity index 100%
rename from third_party/ulib/zstd/examples/README.md
rename to zircon/third_party/ulib/zstd/examples/README.md
diff --git a/third_party/ulib/zstd/examples/dictionary_compression.c b/zircon/third_party/ulib/zstd/examples/dictionary_compression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/dictionary_compression.c
rename to zircon/third_party/ulib/zstd/examples/dictionary_compression.c
diff --git a/third_party/ulib/zstd/examples/dictionary_decompression.c b/zircon/third_party/ulib/zstd/examples/dictionary_decompression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/dictionary_decompression.c
rename to zircon/third_party/ulib/zstd/examples/dictionary_decompression.c
diff --git a/third_party/ulib/zstd/examples/multiple_simple_compression.c b/zircon/third_party/ulib/zstd/examples/multiple_simple_compression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/multiple_simple_compression.c
rename to zircon/third_party/ulib/zstd/examples/multiple_simple_compression.c
diff --git a/third_party/ulib/zstd/examples/multiple_streaming_compression.c b/zircon/third_party/ulib/zstd/examples/multiple_streaming_compression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/multiple_streaming_compression.c
rename to zircon/third_party/ulib/zstd/examples/multiple_streaming_compression.c
diff --git a/third_party/ulib/zstd/examples/simple_compression.c b/zircon/third_party/ulib/zstd/examples/simple_compression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/simple_compression.c
rename to zircon/third_party/ulib/zstd/examples/simple_compression.c
diff --git a/third_party/ulib/zstd/examples/simple_decompression.c b/zircon/third_party/ulib/zstd/examples/simple_decompression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/simple_decompression.c
rename to zircon/third_party/ulib/zstd/examples/simple_decompression.c
diff --git a/third_party/ulib/zstd/examples/streaming_compression.c b/zircon/third_party/ulib/zstd/examples/streaming_compression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/streaming_compression.c
rename to zircon/third_party/ulib/zstd/examples/streaming_compression.c
diff --git a/third_party/ulib/zstd/examples/streaming_decompression.c b/zircon/third_party/ulib/zstd/examples/streaming_decompression.c
similarity index 100%
rename from third_party/ulib/zstd/examples/streaming_decompression.c
rename to zircon/third_party/ulib/zstd/examples/streaming_decompression.c
diff --git a/third_party/ulib/zstd/examples/streaming_memory_usage.c b/zircon/third_party/ulib/zstd/examples/streaming_memory_usage.c
similarity index 100%
rename from third_party/ulib/zstd/examples/streaming_memory_usage.c
rename to zircon/third_party/ulib/zstd/examples/streaming_memory_usage.c
diff --git a/third_party/ulib/zstd/examples/utils.h b/zircon/third_party/ulib/zstd/examples/utils.h
similarity index 100%
rename from third_party/ulib/zstd/examples/utils.h
rename to zircon/third_party/ulib/zstd/examples/utils.h
diff --git a/third_party/ulib/zstd/include/zstd/zstd.h b/zircon/third_party/ulib/zstd/include/zstd/zstd.h
similarity index 100%
rename from third_party/ulib/zstd/include/zstd/zstd.h
rename to zircon/third_party/ulib/zstd/include/zstd/zstd.h
diff --git a/third_party/ulib/zstd/lib/.gitignore b/zircon/third_party/ulib/zstd/lib/.gitignore
similarity index 100%
rename from third_party/ulib/zstd/lib/.gitignore
rename to zircon/third_party/ulib/zstd/lib/.gitignore
diff --git a/third_party/ulib/zstd/lib/Makefile b/zircon/third_party/ulib/zstd/lib/Makefile
similarity index 100%
rename from third_party/ulib/zstd/lib/Makefile
rename to zircon/third_party/ulib/zstd/lib/Makefile
diff --git a/third_party/ulib/zstd/lib/README.md b/zircon/third_party/ulib/zstd/lib/README.md
similarity index 100%
rename from third_party/ulib/zstd/lib/README.md
rename to zircon/third_party/ulib/zstd/lib/README.md
diff --git a/third_party/ulib/zstd/lib/common/bitstream.h b/zircon/third_party/ulib/zstd/lib/common/bitstream.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/bitstream.h
rename to zircon/third_party/ulib/zstd/lib/common/bitstream.h
diff --git a/third_party/ulib/zstd/lib/common/compiler.h b/zircon/third_party/ulib/zstd/lib/common/compiler.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/compiler.h
rename to zircon/third_party/ulib/zstd/lib/common/compiler.h
diff --git a/third_party/ulib/zstd/lib/common/cpu.h b/zircon/third_party/ulib/zstd/lib/common/cpu.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/cpu.h
rename to zircon/third_party/ulib/zstd/lib/common/cpu.h
diff --git a/third_party/ulib/zstd/lib/common/debug.c b/zircon/third_party/ulib/zstd/lib/common/debug.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/debug.c
rename to zircon/third_party/ulib/zstd/lib/common/debug.c
diff --git a/third_party/ulib/zstd/lib/common/debug.h b/zircon/third_party/ulib/zstd/lib/common/debug.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/debug.h
rename to zircon/third_party/ulib/zstd/lib/common/debug.h
diff --git a/third_party/ulib/zstd/lib/common/entropy_common.c b/zircon/third_party/ulib/zstd/lib/common/entropy_common.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/entropy_common.c
rename to zircon/third_party/ulib/zstd/lib/common/entropy_common.c
diff --git a/third_party/ulib/zstd/lib/common/error_private.c b/zircon/third_party/ulib/zstd/lib/common/error_private.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/error_private.c
rename to zircon/third_party/ulib/zstd/lib/common/error_private.c
diff --git a/third_party/ulib/zstd/lib/common/error_private.h b/zircon/third_party/ulib/zstd/lib/common/error_private.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/error_private.h
rename to zircon/third_party/ulib/zstd/lib/common/error_private.h
diff --git a/third_party/ulib/zstd/lib/common/fse.h b/zircon/third_party/ulib/zstd/lib/common/fse.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/fse.h
rename to zircon/third_party/ulib/zstd/lib/common/fse.h
diff --git a/third_party/ulib/zstd/lib/common/fse_decompress.c b/zircon/third_party/ulib/zstd/lib/common/fse_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/fse_decompress.c
rename to zircon/third_party/ulib/zstd/lib/common/fse_decompress.c
diff --git a/third_party/ulib/zstd/lib/common/huf.h b/zircon/third_party/ulib/zstd/lib/common/huf.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/huf.h
rename to zircon/third_party/ulib/zstd/lib/common/huf.h
diff --git a/third_party/ulib/zstd/lib/common/mem.h b/zircon/third_party/ulib/zstd/lib/common/mem.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/mem.h
rename to zircon/third_party/ulib/zstd/lib/common/mem.h
diff --git a/third_party/ulib/zstd/lib/common/pool.c b/zircon/third_party/ulib/zstd/lib/common/pool.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/pool.c
rename to zircon/third_party/ulib/zstd/lib/common/pool.c
diff --git a/third_party/ulib/zstd/lib/common/pool.h b/zircon/third_party/ulib/zstd/lib/common/pool.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/pool.h
rename to zircon/third_party/ulib/zstd/lib/common/pool.h
diff --git a/third_party/ulib/zstd/lib/common/threading.c b/zircon/third_party/ulib/zstd/lib/common/threading.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/threading.c
rename to zircon/third_party/ulib/zstd/lib/common/threading.c
diff --git a/third_party/ulib/zstd/lib/common/threading.h b/zircon/third_party/ulib/zstd/lib/common/threading.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/threading.h
rename to zircon/third_party/ulib/zstd/lib/common/threading.h
diff --git a/third_party/ulib/zstd/lib/common/xxhash.c b/zircon/third_party/ulib/zstd/lib/common/xxhash.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/xxhash.c
rename to zircon/third_party/ulib/zstd/lib/common/xxhash.c
diff --git a/third_party/ulib/zstd/lib/common/xxhash.h b/zircon/third_party/ulib/zstd/lib/common/xxhash.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/xxhash.h
rename to zircon/third_party/ulib/zstd/lib/common/xxhash.h
diff --git a/third_party/ulib/zstd/lib/common/zstd_common.c b/zircon/third_party/ulib/zstd/lib/common/zstd_common.c
similarity index 100%
rename from third_party/ulib/zstd/lib/common/zstd_common.c
rename to zircon/third_party/ulib/zstd/lib/common/zstd_common.c
diff --git a/third_party/ulib/zstd/lib/common/zstd_errors.h b/zircon/third_party/ulib/zstd/lib/common/zstd_errors.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/zstd_errors.h
rename to zircon/third_party/ulib/zstd/lib/common/zstd_errors.h
diff --git a/third_party/ulib/zstd/lib/common/zstd_internal.h b/zircon/third_party/ulib/zstd/lib/common/zstd_internal.h
similarity index 100%
rename from third_party/ulib/zstd/lib/common/zstd_internal.h
rename to zircon/third_party/ulib/zstd/lib/common/zstd_internal.h
diff --git a/third_party/ulib/zstd/lib/compress/fse_compress.c b/zircon/third_party/ulib/zstd/lib/compress/fse_compress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/fse_compress.c
rename to zircon/third_party/ulib/zstd/lib/compress/fse_compress.c
diff --git a/third_party/ulib/zstd/lib/compress/hist.c b/zircon/third_party/ulib/zstd/lib/compress/hist.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/hist.c
rename to zircon/third_party/ulib/zstd/lib/compress/hist.c
diff --git a/third_party/ulib/zstd/lib/compress/hist.h b/zircon/third_party/ulib/zstd/lib/compress/hist.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/hist.h
rename to zircon/third_party/ulib/zstd/lib/compress/hist.h
diff --git a/third_party/ulib/zstd/lib/compress/huf_compress.c b/zircon/third_party/ulib/zstd/lib/compress/huf_compress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/huf_compress.c
rename to zircon/third_party/ulib/zstd/lib/compress/huf_compress.c
diff --git a/third_party/ulib/zstd/lib/compress/zstd_compress.c b/zircon/third_party/ulib/zstd/lib/compress/zstd_compress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_compress.c
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_compress.c
diff --git a/third_party/ulib/zstd/lib/compress/zstd_compress_internal.h b/zircon/third_party/ulib/zstd/lib/compress/zstd_compress_internal.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_compress_internal.h
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_compress_internal.h
diff --git a/third_party/ulib/zstd/lib/compress/zstd_double_fast.c b/zircon/third_party/ulib/zstd/lib/compress/zstd_double_fast.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_double_fast.c
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_double_fast.c
diff --git a/third_party/ulib/zstd/lib/compress/zstd_double_fast.h b/zircon/third_party/ulib/zstd/lib/compress/zstd_double_fast.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_double_fast.h
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_double_fast.h
diff --git a/third_party/ulib/zstd/lib/compress/zstd_fast.c b/zircon/third_party/ulib/zstd/lib/compress/zstd_fast.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_fast.c
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_fast.c
diff --git a/third_party/ulib/zstd/lib/compress/zstd_fast.h b/zircon/third_party/ulib/zstd/lib/compress/zstd_fast.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_fast.h
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_fast.h
diff --git a/third_party/ulib/zstd/lib/compress/zstd_lazy.c b/zircon/third_party/ulib/zstd/lib/compress/zstd_lazy.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_lazy.c
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_lazy.c
diff --git a/third_party/ulib/zstd/lib/compress/zstd_lazy.h b/zircon/third_party/ulib/zstd/lib/compress/zstd_lazy.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_lazy.h
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_lazy.h
diff --git a/third_party/ulib/zstd/lib/compress/zstd_ldm.c b/zircon/third_party/ulib/zstd/lib/compress/zstd_ldm.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_ldm.c
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_ldm.c
diff --git a/third_party/ulib/zstd/lib/compress/zstd_ldm.h b/zircon/third_party/ulib/zstd/lib/compress/zstd_ldm.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_ldm.h
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_ldm.h
diff --git a/third_party/ulib/zstd/lib/compress/zstd_opt.c b/zircon/third_party/ulib/zstd/lib/compress/zstd_opt.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_opt.c
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_opt.c
diff --git a/third_party/ulib/zstd/lib/compress/zstd_opt.h b/zircon/third_party/ulib/zstd/lib/compress/zstd_opt.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstd_opt.h
rename to zircon/third_party/ulib/zstd/lib/compress/zstd_opt.h
diff --git a/third_party/ulib/zstd/lib/compress/zstdmt_compress.c b/zircon/third_party/ulib/zstd/lib/compress/zstdmt_compress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstdmt_compress.c
rename to zircon/third_party/ulib/zstd/lib/compress/zstdmt_compress.c
diff --git a/third_party/ulib/zstd/lib/compress/zstdmt_compress.h b/zircon/third_party/ulib/zstd/lib/compress/zstdmt_compress.h
similarity index 100%
rename from third_party/ulib/zstd/lib/compress/zstdmt_compress.h
rename to zircon/third_party/ulib/zstd/lib/compress/zstdmt_compress.h
diff --git a/third_party/ulib/zstd/lib/decompress/huf_decompress.c b/zircon/third_party/ulib/zstd/lib/decompress/huf_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/decompress/huf_decompress.c
rename to zircon/third_party/ulib/zstd/lib/decompress/huf_decompress.c
diff --git a/third_party/ulib/zstd/lib/decompress/zstd_ddict.c b/zircon/third_party/ulib/zstd/lib/decompress/zstd_ddict.c
similarity index 100%
rename from third_party/ulib/zstd/lib/decompress/zstd_ddict.c
rename to zircon/third_party/ulib/zstd/lib/decompress/zstd_ddict.c
diff --git a/third_party/ulib/zstd/lib/decompress/zstd_ddict.h b/zircon/third_party/ulib/zstd/lib/decompress/zstd_ddict.h
similarity index 100%
rename from third_party/ulib/zstd/lib/decompress/zstd_ddict.h
rename to zircon/third_party/ulib/zstd/lib/decompress/zstd_ddict.h
diff --git a/third_party/ulib/zstd/lib/decompress/zstd_decompress.c b/zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/decompress/zstd_decompress.c
rename to zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress.c
diff --git a/third_party/ulib/zstd/lib/decompress/zstd_decompress_block.c b/zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress_block.c
similarity index 100%
rename from third_party/ulib/zstd/lib/decompress/zstd_decompress_block.c
rename to zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress_block.c
diff --git a/third_party/ulib/zstd/lib/decompress/zstd_decompress_block.h b/zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress_block.h
similarity index 100%
rename from third_party/ulib/zstd/lib/decompress/zstd_decompress_block.h
rename to zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress_block.h
diff --git a/third_party/ulib/zstd/lib/decompress/zstd_decompress_internal.h b/zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress_internal.h
similarity index 100%
rename from third_party/ulib/zstd/lib/decompress/zstd_decompress_internal.h
rename to zircon/third_party/ulib/zstd/lib/decompress/zstd_decompress_internal.h
diff --git a/third_party/ulib/zstd/lib/deprecated/zbuff.h b/zircon/third_party/ulib/zstd/lib/deprecated/zbuff.h
similarity index 100%
rename from third_party/ulib/zstd/lib/deprecated/zbuff.h
rename to zircon/third_party/ulib/zstd/lib/deprecated/zbuff.h
diff --git a/third_party/ulib/zstd/lib/deprecated/zbuff_common.c b/zircon/third_party/ulib/zstd/lib/deprecated/zbuff_common.c
similarity index 100%
rename from third_party/ulib/zstd/lib/deprecated/zbuff_common.c
rename to zircon/third_party/ulib/zstd/lib/deprecated/zbuff_common.c
diff --git a/third_party/ulib/zstd/lib/deprecated/zbuff_compress.c b/zircon/third_party/ulib/zstd/lib/deprecated/zbuff_compress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/deprecated/zbuff_compress.c
rename to zircon/third_party/ulib/zstd/lib/deprecated/zbuff_compress.c
diff --git a/third_party/ulib/zstd/lib/deprecated/zbuff_decompress.c b/zircon/third_party/ulib/zstd/lib/deprecated/zbuff_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/lib/deprecated/zbuff_decompress.c
rename to zircon/third_party/ulib/zstd/lib/deprecated/zbuff_decompress.c
diff --git a/third_party/ulib/zstd/lib/dictBuilder/cover.c b/zircon/third_party/ulib/zstd/lib/dictBuilder/cover.c
similarity index 100%
rename from third_party/ulib/zstd/lib/dictBuilder/cover.c
rename to zircon/third_party/ulib/zstd/lib/dictBuilder/cover.c
diff --git a/third_party/ulib/zstd/lib/dictBuilder/cover.h b/zircon/third_party/ulib/zstd/lib/dictBuilder/cover.h
similarity index 100%
rename from third_party/ulib/zstd/lib/dictBuilder/cover.h
rename to zircon/third_party/ulib/zstd/lib/dictBuilder/cover.h
diff --git a/third_party/ulib/zstd/lib/dictBuilder/divsufsort.c b/zircon/third_party/ulib/zstd/lib/dictBuilder/divsufsort.c
similarity index 100%
rename from third_party/ulib/zstd/lib/dictBuilder/divsufsort.c
rename to zircon/third_party/ulib/zstd/lib/dictBuilder/divsufsort.c
diff --git a/third_party/ulib/zstd/lib/dictBuilder/divsufsort.h b/zircon/third_party/ulib/zstd/lib/dictBuilder/divsufsort.h
similarity index 100%
rename from third_party/ulib/zstd/lib/dictBuilder/divsufsort.h
rename to zircon/third_party/ulib/zstd/lib/dictBuilder/divsufsort.h
diff --git a/third_party/ulib/zstd/lib/dictBuilder/fastcover.c b/zircon/third_party/ulib/zstd/lib/dictBuilder/fastcover.c
similarity index 100%
rename from third_party/ulib/zstd/lib/dictBuilder/fastcover.c
rename to zircon/third_party/ulib/zstd/lib/dictBuilder/fastcover.c
diff --git a/third_party/ulib/zstd/lib/dictBuilder/zdict.c b/zircon/third_party/ulib/zstd/lib/dictBuilder/zdict.c
similarity index 100%
rename from third_party/ulib/zstd/lib/dictBuilder/zdict.c
rename to zircon/third_party/ulib/zstd/lib/dictBuilder/zdict.c
diff --git a/third_party/ulib/zstd/lib/dictBuilder/zdict.h b/zircon/third_party/ulib/zstd/lib/dictBuilder/zdict.h
similarity index 100%
rename from third_party/ulib/zstd/lib/dictBuilder/zdict.h
rename to zircon/third_party/ulib/zstd/lib/dictBuilder/zdict.h
diff --git a/third_party/ulib/zstd/lib/dll/example/Makefile b/zircon/third_party/ulib/zstd/lib/dll/example/Makefile
similarity index 100%
rename from third_party/ulib/zstd/lib/dll/example/Makefile
rename to zircon/third_party/ulib/zstd/lib/dll/example/Makefile
diff --git a/third_party/ulib/zstd/lib/dll/example/README.md b/zircon/third_party/ulib/zstd/lib/dll/example/README.md
similarity index 100%
rename from third_party/ulib/zstd/lib/dll/example/README.md
rename to zircon/third_party/ulib/zstd/lib/dll/example/README.md
diff --git a/third_party/ulib/zstd/lib/dll/example/build_package.bat b/zircon/third_party/ulib/zstd/lib/dll/example/build_package.bat
similarity index 100%
rename from third_party/ulib/zstd/lib/dll/example/build_package.bat
rename to zircon/third_party/ulib/zstd/lib/dll/example/build_package.bat
diff --git a/third_party/ulib/zstd/lib/dll/example/fullbench-dll.sln b/zircon/third_party/ulib/zstd/lib/dll/example/fullbench-dll.sln
similarity index 100%
rename from third_party/ulib/zstd/lib/dll/example/fullbench-dll.sln
rename to zircon/third_party/ulib/zstd/lib/dll/example/fullbench-dll.sln
diff --git a/third_party/ulib/zstd/lib/dll/example/fullbench-dll.vcxproj b/zircon/third_party/ulib/zstd/lib/dll/example/fullbench-dll.vcxproj
similarity index 100%
rename from third_party/ulib/zstd/lib/dll/example/fullbench-dll.vcxproj
rename to zircon/third_party/ulib/zstd/lib/dll/example/fullbench-dll.vcxproj
diff --git a/third_party/ulib/zstd/lib/dll/libzstd.def b/zircon/third_party/ulib/zstd/lib/dll/libzstd.def
similarity index 100%
rename from third_party/ulib/zstd/lib/dll/libzstd.def
rename to zircon/third_party/ulib/zstd/lib/dll/libzstd.def
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_legacy.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_legacy.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_legacy.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_legacy.h
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v01.c b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v01.c
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v01.c
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v01.c
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v01.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v01.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v01.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v01.h
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v02.c b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v02.c
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v02.c
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v02.c
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v02.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v02.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v02.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v02.h
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v03.c b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v03.c
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v03.c
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v03.c
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v03.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v03.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v03.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v03.h
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v04.c b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v04.c
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v04.c
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v04.c
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v04.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v04.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v04.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v04.h
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v05.c b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v05.c
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v05.c
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v05.c
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v05.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v05.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v05.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v05.h
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v06.c b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v06.c
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v06.c
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v06.c
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v06.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v06.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v06.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v06.h
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v07.c b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v07.c
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v07.c
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v07.c
diff --git a/third_party/ulib/zstd/lib/legacy/zstd_v07.h b/zircon/third_party/ulib/zstd/lib/legacy/zstd_v07.h
similarity index 100%
rename from third_party/ulib/zstd/lib/legacy/zstd_v07.h
rename to zircon/third_party/ulib/zstd/lib/legacy/zstd_v07.h
diff --git a/third_party/ulib/zstd/lib/libzstd.pc.in b/zircon/third_party/ulib/zstd/lib/libzstd.pc.in
similarity index 100%
rename from third_party/ulib/zstd/lib/libzstd.pc.in
rename to zircon/third_party/ulib/zstd/lib/libzstd.pc.in
diff --git a/third_party/ulib/zstd/programs/.gitignore b/zircon/third_party/ulib/zstd/programs/.gitignore
similarity index 100%
rename from third_party/ulib/zstd/programs/.gitignore
rename to zircon/third_party/ulib/zstd/programs/.gitignore
diff --git a/third_party/ulib/zstd/programs/Makefile b/zircon/third_party/ulib/zstd/programs/Makefile
similarity index 100%
rename from third_party/ulib/zstd/programs/Makefile
rename to zircon/third_party/ulib/zstd/programs/Makefile
diff --git a/third_party/ulib/zstd/programs/README.md b/zircon/third_party/ulib/zstd/programs/README.md
similarity index 100%
rename from third_party/ulib/zstd/programs/README.md
rename to zircon/third_party/ulib/zstd/programs/README.md
diff --git a/third_party/ulib/zstd/programs/benchfn.c b/zircon/third_party/ulib/zstd/programs/benchfn.c
similarity index 100%
rename from third_party/ulib/zstd/programs/benchfn.c
rename to zircon/third_party/ulib/zstd/programs/benchfn.c
diff --git a/third_party/ulib/zstd/programs/benchfn.h b/zircon/third_party/ulib/zstd/programs/benchfn.h
similarity index 100%
rename from third_party/ulib/zstd/programs/benchfn.h
rename to zircon/third_party/ulib/zstd/programs/benchfn.h
diff --git a/third_party/ulib/zstd/programs/benchzstd.c b/zircon/third_party/ulib/zstd/programs/benchzstd.c
similarity index 100%
rename from third_party/ulib/zstd/programs/benchzstd.c
rename to zircon/third_party/ulib/zstd/programs/benchzstd.c
diff --git a/third_party/ulib/zstd/programs/benchzstd.h b/zircon/third_party/ulib/zstd/programs/benchzstd.h
similarity index 100%
rename from third_party/ulib/zstd/programs/benchzstd.h
rename to zircon/third_party/ulib/zstd/programs/benchzstd.h
diff --git a/third_party/ulib/zstd/programs/datagen.c b/zircon/third_party/ulib/zstd/programs/datagen.c
similarity index 100%
rename from third_party/ulib/zstd/programs/datagen.c
rename to zircon/third_party/ulib/zstd/programs/datagen.c
diff --git a/third_party/ulib/zstd/programs/datagen.h b/zircon/third_party/ulib/zstd/programs/datagen.h
similarity index 100%
rename from third_party/ulib/zstd/programs/datagen.h
rename to zircon/third_party/ulib/zstd/programs/datagen.h
diff --git a/third_party/ulib/zstd/programs/dibio.c b/zircon/third_party/ulib/zstd/programs/dibio.c
similarity index 100%
rename from third_party/ulib/zstd/programs/dibio.c
rename to zircon/third_party/ulib/zstd/programs/dibio.c
diff --git a/third_party/ulib/zstd/programs/dibio.h b/zircon/third_party/ulib/zstd/programs/dibio.h
similarity index 100%
rename from third_party/ulib/zstd/programs/dibio.h
rename to zircon/third_party/ulib/zstd/programs/dibio.h
diff --git a/third_party/ulib/zstd/programs/fileio.c b/zircon/third_party/ulib/zstd/programs/fileio.c
similarity index 100%
rename from third_party/ulib/zstd/programs/fileio.c
rename to zircon/third_party/ulib/zstd/programs/fileio.c
diff --git a/third_party/ulib/zstd/programs/fileio.h b/zircon/third_party/ulib/zstd/programs/fileio.h
similarity index 100%
rename from third_party/ulib/zstd/programs/fileio.h
rename to zircon/third_party/ulib/zstd/programs/fileio.h
diff --git a/third_party/ulib/zstd/programs/platform.h b/zircon/third_party/ulib/zstd/programs/platform.h
similarity index 100%
rename from third_party/ulib/zstd/programs/platform.h
rename to zircon/third_party/ulib/zstd/programs/platform.h
diff --git a/third_party/ulib/zstd/programs/util.c b/zircon/third_party/ulib/zstd/programs/util.c
similarity index 100%
rename from third_party/ulib/zstd/programs/util.c
rename to zircon/third_party/ulib/zstd/programs/util.c
diff --git a/third_party/ulib/zstd/programs/util.h b/zircon/third_party/ulib/zstd/programs/util.h
similarity index 100%
rename from third_party/ulib/zstd/programs/util.h
rename to zircon/third_party/ulib/zstd/programs/util.h
diff --git a/third_party/ulib/zstd/programs/windres/verrsrc.h b/zircon/third_party/ulib/zstd/programs/windres/verrsrc.h
similarity index 100%
rename from third_party/ulib/zstd/programs/windres/verrsrc.h
rename to zircon/third_party/ulib/zstd/programs/windres/verrsrc.h
diff --git a/third_party/ulib/zstd/programs/windres/zstd.rc b/zircon/third_party/ulib/zstd/programs/windres/zstd.rc
similarity index 100%
rename from third_party/ulib/zstd/programs/windres/zstd.rc
rename to zircon/third_party/ulib/zstd/programs/windres/zstd.rc
diff --git a/third_party/ulib/zstd/programs/windres/zstd32.res b/zircon/third_party/ulib/zstd/programs/windres/zstd32.res
similarity index 100%
rename from third_party/ulib/zstd/programs/windres/zstd32.res
rename to zircon/third_party/ulib/zstd/programs/windres/zstd32.res
diff --git a/third_party/ulib/zstd/programs/windres/zstd64.res b/zircon/third_party/ulib/zstd/programs/windres/zstd64.res
similarity index 100%
rename from third_party/ulib/zstd/programs/windres/zstd64.res
rename to zircon/third_party/ulib/zstd/programs/windres/zstd64.res
diff --git a/third_party/ulib/zstd/programs/zstd.1 b/zircon/third_party/ulib/zstd/programs/zstd.1
similarity index 100%
rename from third_party/ulib/zstd/programs/zstd.1
rename to zircon/third_party/ulib/zstd/programs/zstd.1
diff --git a/third_party/ulib/zstd/programs/zstd.1.md b/zircon/third_party/ulib/zstd/programs/zstd.1.md
similarity index 100%
rename from third_party/ulib/zstd/programs/zstd.1.md
rename to zircon/third_party/ulib/zstd/programs/zstd.1.md
diff --git a/third_party/ulib/zstd/programs/zstdcli.c b/zircon/third_party/ulib/zstd/programs/zstdcli.c
similarity index 100%
rename from third_party/ulib/zstd/programs/zstdcli.c
rename to zircon/third_party/ulib/zstd/programs/zstdcli.c
diff --git a/third_party/ulib/zstd/programs/zstdgrep b/zircon/third_party/ulib/zstd/programs/zstdgrep
similarity index 100%
rename from third_party/ulib/zstd/programs/zstdgrep
rename to zircon/third_party/ulib/zstd/programs/zstdgrep
diff --git a/third_party/ulib/zstd/programs/zstdgrep.1 b/zircon/third_party/ulib/zstd/programs/zstdgrep.1
similarity index 100%
rename from third_party/ulib/zstd/programs/zstdgrep.1
rename to zircon/third_party/ulib/zstd/programs/zstdgrep.1
diff --git a/third_party/ulib/zstd/programs/zstdgrep.1.md b/zircon/third_party/ulib/zstd/programs/zstdgrep.1.md
similarity index 100%
rename from third_party/ulib/zstd/programs/zstdgrep.1.md
rename to zircon/third_party/ulib/zstd/programs/zstdgrep.1.md
diff --git a/third_party/ulib/zstd/programs/zstdless b/zircon/third_party/ulib/zstd/programs/zstdless
similarity index 100%
rename from third_party/ulib/zstd/programs/zstdless
rename to zircon/third_party/ulib/zstd/programs/zstdless
diff --git a/third_party/ulib/zstd/programs/zstdless.1 b/zircon/third_party/ulib/zstd/programs/zstdless.1
similarity index 100%
rename from third_party/ulib/zstd/programs/zstdless.1
rename to zircon/third_party/ulib/zstd/programs/zstdless.1
diff --git a/third_party/ulib/zstd/programs/zstdless.1.md b/zircon/third_party/ulib/zstd/programs/zstdless.1.md
similarity index 100%
rename from third_party/ulib/zstd/programs/zstdless.1.md
rename to zircon/third_party/ulib/zstd/programs/zstdless.1.md
diff --git a/third_party/ulib/zstd/rules.mk b/zircon/third_party/ulib/zstd/rules.mk
similarity index 100%
rename from third_party/ulib/zstd/rules.mk
rename to zircon/third_party/ulib/zstd/rules.mk
diff --git a/third_party/ulib/zstd/tests/.gitignore b/zircon/third_party/ulib/zstd/tests/.gitignore
similarity index 100%
rename from third_party/ulib/zstd/tests/.gitignore
rename to zircon/third_party/ulib/zstd/tests/.gitignore
diff --git a/third_party/ulib/zstd/tests/Makefile b/zircon/third_party/ulib/zstd/tests/Makefile
similarity index 100%
rename from third_party/ulib/zstd/tests/Makefile
rename to zircon/third_party/ulib/zstd/tests/Makefile
diff --git a/third_party/ulib/zstd/tests/README.md b/zircon/third_party/ulib/zstd/tests/README.md
similarity index 100%
rename from third_party/ulib/zstd/tests/README.md
rename to zircon/third_party/ulib/zstd/tests/README.md
diff --git a/third_party/ulib/zstd/tests/checkTag.c b/zircon/third_party/ulib/zstd/tests/checkTag.c
similarity index 100%
rename from third_party/ulib/zstd/tests/checkTag.c
rename to zircon/third_party/ulib/zstd/tests/checkTag.c
diff --git a/third_party/ulib/zstd/tests/datagencli.c b/zircon/third_party/ulib/zstd/tests/datagencli.c
similarity index 100%
rename from third_party/ulib/zstd/tests/datagencli.c
rename to zircon/third_party/ulib/zstd/tests/datagencli.c
diff --git a/third_party/ulib/zstd/tests/decodecorpus.c b/zircon/third_party/ulib/zstd/tests/decodecorpus.c
similarity index 100%
rename from third_party/ulib/zstd/tests/decodecorpus.c
rename to zircon/third_party/ulib/zstd/tests/decodecorpus.c
diff --git a/third_party/ulib/zstd/tests/files/huffman-compressed-larger b/zircon/third_party/ulib/zstd/tests/files/huffman-compressed-larger
similarity index 100%
rename from third_party/ulib/zstd/tests/files/huffman-compressed-larger
rename to zircon/third_party/ulib/zstd/tests/files/huffman-compressed-larger
diff --git a/third_party/ulib/zstd/tests/fullbench.c b/zircon/third_party/ulib/zstd/tests/fullbench.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fullbench.c
rename to zircon/third_party/ulib/zstd/tests/fullbench.c
diff --git a/third_party/ulib/zstd/tests/fuzz/.gitignore b/zircon/third_party/ulib/zstd/tests/fuzz/.gitignore
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/.gitignore
rename to zircon/third_party/ulib/zstd/tests/fuzz/.gitignore
diff --git a/third_party/ulib/zstd/tests/fuzz/Makefile b/zircon/third_party/ulib/zstd/tests/fuzz/Makefile
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/Makefile
rename to zircon/third_party/ulib/zstd/tests/fuzz/Makefile
diff --git a/third_party/ulib/zstd/tests/fuzz/README.md b/zircon/third_party/ulib/zstd/tests/fuzz/README.md
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/README.md
rename to zircon/third_party/ulib/zstd/tests/fuzz/README.md
diff --git a/third_party/ulib/zstd/tests/fuzz/block_decompress.c b/zircon/third_party/ulib/zstd/tests/fuzz/block_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/block_decompress.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/block_decompress.c
diff --git a/third_party/ulib/zstd/tests/fuzz/block_round_trip.c b/zircon/third_party/ulib/zstd/tests/fuzz/block_round_trip.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/block_round_trip.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/block_round_trip.c
diff --git a/third_party/ulib/zstd/tests/fuzz/default.options b/zircon/third_party/ulib/zstd/tests/fuzz/default.options
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/default.options
rename to zircon/third_party/ulib/zstd/tests/fuzz/default.options
diff --git a/third_party/ulib/zstd/tests/fuzz/fuzz.h b/zircon/third_party/ulib/zstd/tests/fuzz/fuzz.h
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/fuzz.h
rename to zircon/third_party/ulib/zstd/tests/fuzz/fuzz.h
diff --git a/third_party/ulib/zstd/tests/fuzz/fuzz.py b/zircon/third_party/ulib/zstd/tests/fuzz/fuzz.py
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/fuzz.py
rename to zircon/third_party/ulib/zstd/tests/fuzz/fuzz.py
diff --git a/third_party/ulib/zstd/tests/fuzz/fuzz_helpers.h b/zircon/third_party/ulib/zstd/tests/fuzz/fuzz_helpers.h
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/fuzz_helpers.h
rename to zircon/third_party/ulib/zstd/tests/fuzz/fuzz_helpers.h
diff --git a/third_party/ulib/zstd/tests/fuzz/regression_driver.c b/zircon/third_party/ulib/zstd/tests/fuzz/regression_driver.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/regression_driver.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/regression_driver.c
diff --git a/third_party/ulib/zstd/tests/fuzz/simple_decompress.c b/zircon/third_party/ulib/zstd/tests/fuzz/simple_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/simple_decompress.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/simple_decompress.c
diff --git a/third_party/ulib/zstd/tests/fuzz/simple_round_trip.c b/zircon/third_party/ulib/zstd/tests/fuzz/simple_round_trip.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/simple_round_trip.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/simple_round_trip.c
diff --git a/third_party/ulib/zstd/tests/fuzz/stream_decompress.c b/zircon/third_party/ulib/zstd/tests/fuzz/stream_decompress.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/stream_decompress.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/stream_decompress.c
diff --git a/third_party/ulib/zstd/tests/fuzz/stream_round_trip.c b/zircon/third_party/ulib/zstd/tests/fuzz/stream_round_trip.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/stream_round_trip.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/stream_round_trip.c
diff --git a/third_party/ulib/zstd/tests/fuzz/zstd_helpers.c b/zircon/third_party/ulib/zstd/tests/fuzz/zstd_helpers.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/zstd_helpers.c
rename to zircon/third_party/ulib/zstd/tests/fuzz/zstd_helpers.c
diff --git a/third_party/ulib/zstd/tests/fuzz/zstd_helpers.h b/zircon/third_party/ulib/zstd/tests/fuzz/zstd_helpers.h
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzz/zstd_helpers.h
rename to zircon/third_party/ulib/zstd/tests/fuzz/zstd_helpers.h
diff --git a/third_party/ulib/zstd/tests/fuzzer.c b/zircon/third_party/ulib/zstd/tests/fuzzer.c
similarity index 100%
rename from third_party/ulib/zstd/tests/fuzzer.c
rename to zircon/third_party/ulib/zstd/tests/fuzzer.c
diff --git a/third_party/ulib/zstd/tests/invalidDictionaries.c b/zircon/third_party/ulib/zstd/tests/invalidDictionaries.c
similarity index 100%
rename from third_party/ulib/zstd/tests/invalidDictionaries.c
rename to zircon/third_party/ulib/zstd/tests/invalidDictionaries.c
diff --git a/third_party/ulib/zstd/tests/legacy.c b/zircon/third_party/ulib/zstd/tests/legacy.c
similarity index 100%
rename from third_party/ulib/zstd/tests/legacy.c
rename to zircon/third_party/ulib/zstd/tests/legacy.c
diff --git a/third_party/ulib/zstd/tests/libzstd_partial_builds.sh b/zircon/third_party/ulib/zstd/tests/libzstd_partial_builds.sh
similarity index 100%
rename from third_party/ulib/zstd/tests/libzstd_partial_builds.sh
rename to zircon/third_party/ulib/zstd/tests/libzstd_partial_builds.sh
diff --git a/third_party/ulib/zstd/tests/longmatch.c b/zircon/third_party/ulib/zstd/tests/longmatch.c
similarity index 100%
rename from third_party/ulib/zstd/tests/longmatch.c
rename to zircon/third_party/ulib/zstd/tests/longmatch.c
diff --git a/third_party/ulib/zstd/tests/paramgrill.c b/zircon/third_party/ulib/zstd/tests/paramgrill.c
similarity index 100%
rename from third_party/ulib/zstd/tests/paramgrill.c
rename to zircon/third_party/ulib/zstd/tests/paramgrill.c
diff --git a/third_party/ulib/zstd/tests/playTests.sh b/zircon/third_party/ulib/zstd/tests/playTests.sh
similarity index 100%
rename from third_party/ulib/zstd/tests/playTests.sh
rename to zircon/third_party/ulib/zstd/tests/playTests.sh
diff --git a/third_party/ulib/zstd/tests/poolTests.c b/zircon/third_party/ulib/zstd/tests/poolTests.c
similarity index 100%
rename from third_party/ulib/zstd/tests/poolTests.c
rename to zircon/third_party/ulib/zstd/tests/poolTests.c
diff --git a/third_party/ulib/zstd/tests/rateLimiter.py b/zircon/third_party/ulib/zstd/tests/rateLimiter.py
similarity index 100%
rename from third_party/ulib/zstd/tests/rateLimiter.py
rename to zircon/third_party/ulib/zstd/tests/rateLimiter.py
diff --git a/third_party/ulib/zstd/tests/regression/.gitignore b/zircon/third_party/ulib/zstd/tests/regression/.gitignore
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/.gitignore
rename to zircon/third_party/ulib/zstd/tests/regression/.gitignore
diff --git a/third_party/ulib/zstd/tests/regression/Makefile b/zircon/third_party/ulib/zstd/tests/regression/Makefile
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/Makefile
rename to zircon/third_party/ulib/zstd/tests/regression/Makefile
diff --git a/third_party/ulib/zstd/tests/regression/config.c b/zircon/third_party/ulib/zstd/tests/regression/config.c
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/config.c
rename to zircon/third_party/ulib/zstd/tests/regression/config.c
diff --git a/third_party/ulib/zstd/tests/regression/config.h b/zircon/third_party/ulib/zstd/tests/regression/config.h
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/config.h
rename to zircon/third_party/ulib/zstd/tests/regression/config.h
diff --git a/third_party/ulib/zstd/tests/regression/data.c b/zircon/third_party/ulib/zstd/tests/regression/data.c
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/data.c
rename to zircon/third_party/ulib/zstd/tests/regression/data.c
diff --git a/third_party/ulib/zstd/tests/regression/data.h b/zircon/third_party/ulib/zstd/tests/regression/data.h
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/data.h
rename to zircon/third_party/ulib/zstd/tests/regression/data.h
diff --git a/third_party/ulib/zstd/tests/regression/levels.h b/zircon/third_party/ulib/zstd/tests/regression/levels.h
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/levels.h
rename to zircon/third_party/ulib/zstd/tests/regression/levels.h
diff --git a/third_party/ulib/zstd/tests/regression/method.c b/zircon/third_party/ulib/zstd/tests/regression/method.c
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/method.c
rename to zircon/third_party/ulib/zstd/tests/regression/method.c
diff --git a/third_party/ulib/zstd/tests/regression/method.h b/zircon/third_party/ulib/zstd/tests/regression/method.h
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/method.h
rename to zircon/third_party/ulib/zstd/tests/regression/method.h
diff --git a/third_party/ulib/zstd/tests/regression/result.c b/zircon/third_party/ulib/zstd/tests/regression/result.c
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/result.c
rename to zircon/third_party/ulib/zstd/tests/regression/result.c
diff --git a/third_party/ulib/zstd/tests/regression/result.h b/zircon/third_party/ulib/zstd/tests/regression/result.h
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/result.h
rename to zircon/third_party/ulib/zstd/tests/regression/result.h
diff --git a/third_party/ulib/zstd/tests/regression/results.csv b/zircon/third_party/ulib/zstd/tests/regression/results.csv
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/results.csv
rename to zircon/third_party/ulib/zstd/tests/regression/results.csv
diff --git a/third_party/ulib/zstd/tests/regression/test.c b/zircon/third_party/ulib/zstd/tests/regression/test.c
similarity index 100%
rename from third_party/ulib/zstd/tests/regression/test.c
rename to zircon/third_party/ulib/zstd/tests/regression/test.c
diff --git a/third_party/ulib/zstd/tests/roundTripCrash.c b/zircon/third_party/ulib/zstd/tests/roundTripCrash.c
similarity index 100%
rename from third_party/ulib/zstd/tests/roundTripCrash.c
rename to zircon/third_party/ulib/zstd/tests/roundTripCrash.c
diff --git a/third_party/ulib/zstd/tests/seqgen.c b/zircon/third_party/ulib/zstd/tests/seqgen.c
similarity index 100%
rename from third_party/ulib/zstd/tests/seqgen.c
rename to zircon/third_party/ulib/zstd/tests/seqgen.c
diff --git a/third_party/ulib/zstd/tests/seqgen.h b/zircon/third_party/ulib/zstd/tests/seqgen.h
similarity index 100%
rename from third_party/ulib/zstd/tests/seqgen.h
rename to zircon/third_party/ulib/zstd/tests/seqgen.h
diff --git a/third_party/ulib/zstd/tests/symbols.c b/zircon/third_party/ulib/zstd/tests/symbols.c
similarity index 100%
rename from third_party/ulib/zstd/tests/symbols.c
rename to zircon/third_party/ulib/zstd/tests/symbols.c
diff --git a/third_party/ulib/zstd/tests/test-zstd-speed.py b/zircon/third_party/ulib/zstd/tests/test-zstd-speed.py
similarity index 100%
rename from third_party/ulib/zstd/tests/test-zstd-speed.py
rename to zircon/third_party/ulib/zstd/tests/test-zstd-speed.py
diff --git a/third_party/ulib/zstd/tests/test-zstd-versions.py b/zircon/third_party/ulib/zstd/tests/test-zstd-versions.py
similarity index 100%
rename from third_party/ulib/zstd/tests/test-zstd-versions.py
rename to zircon/third_party/ulib/zstd/tests/test-zstd-versions.py
diff --git a/third_party/ulib/zstd/tests/zbufftest.c b/zircon/third_party/ulib/zstd/tests/zbufftest.c
similarity index 100%
rename from third_party/ulib/zstd/tests/zbufftest.c
rename to zircon/third_party/ulib/zstd/tests/zbufftest.c
diff --git a/third_party/ulib/zstd/tests/zstreamtest.c b/zircon/third_party/ulib/zstd/tests/zstreamtest.c
similarity index 100%
rename from third_party/ulib/zstd/tests/zstreamtest.c
rename to zircon/third_party/ulib/zstd/tests/zstreamtest.c