diff --git a/config/BUILD b/host/config/BUILD
similarity index 100%
rename from config/BUILD
rename to host/config/BUILD
diff --git a/config/README.md b/host/config/README.md
similarity index 100%
rename from config/README.md
rename to host/config/README.md
diff --git a/config/file_partition.cpp b/host/config/file_partition.cpp
similarity index 100%
rename from config/file_partition.cpp
rename to host/config/file_partition.cpp
diff --git a/config/file_partition.h b/host/config/file_partition.h
similarity index 100%
rename from config/file_partition.h
rename to host/config/file_partition.h
diff --git a/config/guest_config.cpp b/host/config/guest_config.cpp
similarity index 100%
rename from config/guest_config.cpp
rename to host/config/guest_config.cpp
diff --git a/config/guest_config.h b/host/config/guest_config.h
similarity index 100%
rename from config/guest_config.h
rename to host/config/guest_config.h
diff --git a/deploy/README.md b/host/deploy/README.md
similarity index 100%
rename from deploy/README.md
rename to host/deploy/README.md
diff --git a/deploy/cmdexec.py b/host/deploy/cmdexec.py
similarity index 100%
rename from deploy/cmdexec.py
rename to host/deploy/cmdexec.py
diff --git a/deploy/config.py b/host/deploy/config.py
similarity index 100%
rename from deploy/config.py
rename to host/deploy/config.py
diff --git a/deploy/deploy.py b/host/deploy/deploy.py
similarity index 100%
rename from deploy/deploy.py
rename to host/deploy/deploy.py
diff --git a/deploy/install_zip.sh b/host/deploy/install_zip.sh
similarity index 100%
rename from deploy/install_zip.sh
rename to host/deploy/install_zip.sh
diff --git a/deploy/main.py b/host/deploy/main.py
similarity index 100%
rename from deploy/main.py
rename to host/deploy/main.py
diff --git a/deploy/unpack_boot_image.py b/host/deploy/unpack_boot_image.py
similarity index 100%
rename from deploy/unpack_boot_image.py
rename to host/deploy/unpack_boot_image.py
diff --git a/ivserver/BUILD b/host/ivserver/BUILD
similarity index 100%
rename from ivserver/BUILD
rename to host/ivserver/BUILD
diff --git a/ivserver/README.md b/host/ivserver/README.md
similarity index 100%
rename from ivserver/README.md
rename to host/ivserver/README.md
diff --git a/ivserver/hald_client.cc b/host/ivserver/hald_client.cc
similarity index 100%
rename from ivserver/hald_client.cc
rename to host/ivserver/hald_client.cc
diff --git a/ivserver/hald_client.h b/host/ivserver/hald_client.h
similarity index 100%
rename from ivserver/hald_client.h
rename to host/ivserver/hald_client.h
diff --git a/ivserver/hald_client_test.cc b/host/ivserver/hald_client_test.cc
similarity index 100%
rename from ivserver/hald_client_test.cc
rename to host/ivserver/hald_client_test.cc
diff --git a/ivserver/ivserver.cc b/host/ivserver/ivserver.cc
similarity index 100%
rename from ivserver/ivserver.cc
rename to host/ivserver/ivserver.cc
diff --git a/ivserver/ivserver.h b/host/ivserver/ivserver.h
similarity index 100%
rename from ivserver/ivserver.h
rename to host/ivserver/ivserver.h
diff --git a/ivserver/options.cc b/host/ivserver/options.cc
similarity index 100%
rename from ivserver/options.cc
rename to host/ivserver/options.cc
diff --git a/ivserver/options.h b/host/ivserver/options.h
similarity index 100%
rename from ivserver/options.h
rename to host/ivserver/options.h
diff --git a/ivserver/qemu_client.cc b/host/ivserver/qemu_client.cc
similarity index 100%
rename from ivserver/qemu_client.cc
rename to host/ivserver/qemu_client.cc
diff --git a/ivserver/qemu_client.h b/host/ivserver/qemu_client.h
similarity index 100%
rename from ivserver/qemu_client.h
rename to host/ivserver/qemu_client.h
diff --git a/ivserver/shm_layout.txt b/host/ivserver/shm_layout.txt
similarity index 100%
rename from ivserver/shm_layout.txt
rename to host/ivserver/shm_layout.txt
diff --git a/ivserver/vsoc_mem.json b/host/ivserver/vsoc_mem.json
similarity index 100%
rename from ivserver/vsoc_mem.json
rename to host/ivserver/vsoc_mem.json
diff --git a/ivserver/vsocsharedmem.cc b/host/ivserver/vsocsharedmem.cc
similarity index 100%
rename from ivserver/vsocsharedmem.cc
rename to host/ivserver/vsocsharedmem.cc
diff --git a/ivserver/vsocsharedmem.h b/host/ivserver/vsocsharedmem.h
similarity index 100%
rename from ivserver/vsocsharedmem.h
rename to host/ivserver/vsocsharedmem.h
diff --git a/ivserver/vsocsharedmem_mock.h b/host/ivserver/vsocsharedmem_mock.h
similarity index 100%
rename from ivserver/vsocsharedmem_mock.h
rename to host/ivserver/vsocsharedmem_mock.h
diff --git a/launcher/BUILD b/host/launcher/BUILD
similarity index 100%
rename from launcher/BUILD
rename to host/launcher/BUILD
diff --git a/launcher/README.md b/host/launcher/README.md
similarity index 100%
rename from launcher/README.md
rename to host/launcher/README.md
diff --git a/launcher/main.cc b/host/launcher/main.cc
similarity index 100%
rename from launcher/main.cc
rename to host/launcher/main.cc
diff --git a/launcher/network-abr0.xml b/host/launcher/network-abr0.xml
similarity index 100%
rename from launcher/network-abr0.xml
rename to host/launcher/network-abr0.xml
diff --git a/vadb/BUILD b/host/vadb/BUILD
similarity index 100%
rename from vadb/BUILD
rename to host/vadb/BUILD
diff --git a/vadb/README.md b/host/vadb/README.md
similarity index 100%
rename from vadb/README.md
rename to host/vadb/README.md
diff --git a/vadb/adbshell.c b/host/vadb/adbshell.c
similarity index 100%
rename from vadb/adbshell.c
rename to host/vadb/adbshell.c
diff --git a/vadb/usb_cmd.h b/host/vadb/usb_cmd.h
similarity index 100%
rename from vadb/usb_cmd.h
rename to host/vadb/usb_cmd.h
diff --git a/vadb/usb_cmd_attach.cpp b/host/vadb/usb_cmd_attach.cpp
similarity index 100%
rename from vadb/usb_cmd_attach.cpp
rename to host/vadb/usb_cmd_attach.cpp
diff --git a/vadb/usb_cmd_attach.h b/host/vadb/usb_cmd_attach.h
similarity index 100%
rename from vadb/usb_cmd_attach.h
rename to host/vadb/usb_cmd_attach.h
diff --git a/vadb/usb_cmd_control_transfer.cpp b/host/vadb/usb_cmd_control_transfer.cpp
similarity index 100%
rename from vadb/usb_cmd_control_transfer.cpp
rename to host/vadb/usb_cmd_control_transfer.cpp
diff --git a/vadb/usb_cmd_control_transfer.h b/host/vadb/usb_cmd_control_transfer.h
similarity index 100%
rename from vadb/usb_cmd_control_transfer.h
rename to host/vadb/usb_cmd_control_transfer.h
diff --git a/vadb/usb_cmd_data_transfer.cpp b/host/vadb/usb_cmd_data_transfer.cpp
similarity index 100%
rename from vadb/usb_cmd_data_transfer.cpp
rename to host/vadb/usb_cmd_data_transfer.cpp
diff --git a/vadb/usb_cmd_data_transfer.h b/host/vadb/usb_cmd_data_transfer.h
similarity index 100%
rename from vadb/usb_cmd_data_transfer.h
rename to host/vadb/usb_cmd_data_transfer.h
diff --git a/vadb/usb_cmd_device_list.cpp b/host/vadb/usb_cmd_device_list.cpp
similarity index 100%
rename from vadb/usb_cmd_device_list.cpp
rename to host/vadb/usb_cmd_device_list.cpp
diff --git a/vadb/usb_cmd_device_list.h b/host/vadb/usb_cmd_device_list.h
similarity index 100%
rename from vadb/usb_cmd_device_list.h
rename to host/vadb/usb_cmd_device_list.h
diff --git a/vadb/usb_cmd_heartbeat.cpp b/host/vadb/usb_cmd_heartbeat.cpp
similarity index 100%
rename from vadb/usb_cmd_heartbeat.cpp
rename to host/vadb/usb_cmd_heartbeat.cpp
diff --git a/vadb/usb_cmd_heartbeat.h b/host/vadb/usb_cmd_heartbeat.h
similarity index 100%
rename from vadb/usb_cmd_heartbeat.h
rename to host/vadb/usb_cmd_heartbeat.h
diff --git a/vadb/usbip/BUILD b/host/vadb/usbip/BUILD
similarity index 100%
rename from vadb/usbip/BUILD
rename to host/vadb/usbip/BUILD
diff --git a/vadb/usbip/README.md b/host/vadb/usbip/README.md
similarity index 100%
rename from vadb/usbip/README.md
rename to host/vadb/usbip/README.md
diff --git a/vadb/usbip/client.cpp b/host/vadb/usbip/client.cpp
similarity index 100%
rename from vadb/usbip/client.cpp
rename to host/vadb/usbip/client.cpp
diff --git a/vadb/usbip/client.h b/host/vadb/usbip/client.h
similarity index 100%
rename from vadb/usbip/client.h
rename to host/vadb/usbip/client.h
diff --git a/vadb/usbip/device.h b/host/vadb/usbip/device.h
similarity index 100%
rename from vadb/usbip/device.h
rename to host/vadb/usbip/device.h
diff --git a/vadb/usbip/device_pool.cpp b/host/vadb/usbip/device_pool.cpp
similarity index 100%
rename from vadb/usbip/device_pool.cpp
rename to host/vadb/usbip/device_pool.cpp
diff --git a/vadb/usbip/device_pool.h b/host/vadb/usbip/device_pool.h
similarity index 100%
rename from vadb/usbip/device_pool.h
rename to host/vadb/usbip/device_pool.h
diff --git a/vadb/usbip/messages.cpp b/host/vadb/usbip/messages.cpp
similarity index 100%
rename from vadb/usbip/messages.cpp
rename to host/vadb/usbip/messages.cpp
diff --git a/vadb/usbip/messages.h b/host/vadb/usbip/messages.h
similarity index 100%
rename from vadb/usbip/messages.h
rename to host/vadb/usbip/messages.h
diff --git a/vadb/usbip/server.cpp b/host/vadb/usbip/server.cpp
similarity index 100%
rename from vadb/usbip/server.cpp
rename to host/vadb/usbip/server.cpp
diff --git a/vadb/usbip/server.h b/host/vadb/usbip/server.h
similarity index 100%
rename from vadb/usbip/server.h
rename to host/vadb/usbip/server.h
diff --git a/vadb/usbip/vhci_instrument.cpp b/host/vadb/usbip/vhci_instrument.cpp
similarity index 100%
rename from vadb/usbip/vhci_instrument.cpp
rename to host/vadb/usbip/vhci_instrument.cpp
diff --git a/vadb/usbip/vhci_instrument.h b/host/vadb/usbip/vhci_instrument.h
similarity index 100%
rename from vadb/usbip/vhci_instrument.h
rename to host/vadb/usbip/vhci_instrument.h
diff --git a/vadb/virtual_adb_client.cpp b/host/vadb/virtual_adb_client.cpp
similarity index 100%
rename from vadb/virtual_adb_client.cpp
rename to host/vadb/virtual_adb_client.cpp
diff --git a/vadb/virtual_adb_client.h b/host/vadb/virtual_adb_client.h
similarity index 100%
rename from vadb/virtual_adb_client.h
rename to host/vadb/virtual_adb_client.h
diff --git a/vadb/virtual_adb_server.cpp b/host/vadb/virtual_adb_server.cpp
similarity index 100%
rename from vadb/virtual_adb_server.cpp
rename to host/vadb/virtual_adb_server.cpp
diff --git a/vadb/virtual_adb_server.h b/host/vadb/virtual_adb_server.h
similarity index 100%
rename from vadb/virtual_adb_server.h
rename to host/vadb/virtual_adb_server.h