diff --git a/libweave/.gitignore b/.gitignore
similarity index 100%
rename from libweave/.gitignore
rename to .gitignore
diff --git a/libweave/AUTHORS b/AUTHORS
similarity index 100%
rename from libweave/AUTHORS
rename to AUTHORS
diff --git a/libweave/CONTRIBUTORS b/CONTRIBUTORS
similarity index 100%
rename from libweave/CONTRIBUTORS
rename to CONTRIBUTORS
diff --git a/libweave/LICENSE b/LICENSE
similarity index 100%
rename from libweave/LICENSE
rename to LICENSE
diff --git a/libweave/README b/README
similarity index 100%
rename from libweave/README
rename to README
diff --git a/libweave/examples/build.sh b/examples/build.sh
similarity index 100%
rename from libweave/examples/build.sh
rename to examples/build.sh
diff --git a/libweave/examples/daemon/README b/examples/daemon/README
similarity index 100%
rename from libweave/examples/daemon/README
rename to examples/daemon/README
diff --git a/libweave/examples/daemon/daemon.gyp b/examples/daemon/daemon.gyp
similarity index 100%
rename from libweave/examples/daemon/daemon.gyp
rename to examples/daemon/daemon.gyp
diff --git a/libweave/examples/daemon/ledflasher_handler.h b/examples/daemon/ledflasher_handler.h
similarity index 100%
rename from libweave/examples/daemon/ledflasher_handler.h
rename to examples/daemon/ledflasher_handler.h
diff --git a/libweave/examples/daemon/light_handler.h b/examples/daemon/light_handler.h
similarity index 100%
rename from libweave/examples/daemon/light_handler.h
rename to examples/daemon/light_handler.h
diff --git a/libweave/examples/daemon/lock_handler.h b/examples/daemon/lock_handler.h
similarity index 100%
rename from libweave/examples/daemon/lock_handler.h
rename to examples/daemon/lock_handler.h
diff --git a/libweave/examples/daemon/main.cc b/examples/daemon/main.cc
similarity index 100%
rename from libweave/examples/daemon/main.cc
rename to examples/daemon/main.cc
diff --git a/libweave/examples/daemon/sample_handler.h b/examples/daemon/sample_handler.h
similarity index 100%
rename from libweave/examples/daemon/sample_handler.h
rename to examples/daemon/sample_handler.h
diff --git a/libweave/examples/prerequisites.sh b/examples/prerequisites.sh
similarity index 100%
rename from libweave/examples/prerequisites.sh
rename to examples/prerequisites.sh
diff --git a/libweave/examples/provider/avahi_client.cc b/examples/provider/avahi_client.cc
similarity index 100%
rename from libweave/examples/provider/avahi_client.cc
rename to examples/provider/avahi_client.cc
diff --git a/libweave/examples/provider/avahi_client.h b/examples/provider/avahi_client.h
similarity index 100%
rename from libweave/examples/provider/avahi_client.h
rename to examples/provider/avahi_client.h
diff --git a/libweave/examples/provider/bluez_client.cc b/examples/provider/bluez_client.cc
similarity index 100%
rename from libweave/examples/provider/bluez_client.cc
rename to examples/provider/bluez_client.cc
diff --git a/libweave/examples/provider/bluez_client.h b/examples/provider/bluez_client.h
similarity index 100%
rename from libweave/examples/provider/bluez_client.h
rename to examples/provider/bluez_client.h
diff --git a/libweave/examples/provider/curl_http_client.cc b/examples/provider/curl_http_client.cc
similarity index 100%
rename from libweave/examples/provider/curl_http_client.cc
rename to examples/provider/curl_http_client.cc
diff --git a/libweave/examples/provider/curl_http_client.h b/examples/provider/curl_http_client.h
similarity index 100%
rename from libweave/examples/provider/curl_http_client.h
rename to examples/provider/curl_http_client.h
diff --git a/libweave/examples/provider/event_http_client.cc b/examples/provider/event_http_client.cc
similarity index 100%
rename from libweave/examples/provider/event_http_client.cc
rename to examples/provider/event_http_client.cc
diff --git a/libweave/examples/provider/event_http_client.h b/examples/provider/event_http_client.h
similarity index 100%
rename from libweave/examples/provider/event_http_client.h
rename to examples/provider/event_http_client.h
diff --git a/libweave/examples/provider/event_http_server.cc b/examples/provider/event_http_server.cc
similarity index 100%
rename from libweave/examples/provider/event_http_server.cc
rename to examples/provider/event_http_server.cc
diff --git a/libweave/examples/provider/event_http_server.h b/examples/provider/event_http_server.h
similarity index 100%
rename from libweave/examples/provider/event_http_server.h
rename to examples/provider/event_http_server.h
diff --git a/libweave/examples/provider/event_network.cc b/examples/provider/event_network.cc
similarity index 100%
rename from libweave/examples/provider/event_network.cc
rename to examples/provider/event_network.cc
diff --git a/libweave/examples/provider/event_network.h b/examples/provider/event_network.h
similarity index 100%
rename from libweave/examples/provider/event_network.h
rename to examples/provider/event_network.h
diff --git a/libweave/examples/provider/event_task_runner.cc b/examples/provider/event_task_runner.cc
similarity index 100%
rename from libweave/examples/provider/event_task_runner.cc
rename to examples/provider/event_task_runner.cc
diff --git a/libweave/examples/provider/event_task_runner.h b/examples/provider/event_task_runner.h
similarity index 100%
rename from libweave/examples/provider/event_task_runner.h
rename to examples/provider/event_task_runner.h
diff --git a/libweave/examples/provider/file_config_store.cc b/examples/provider/file_config_store.cc
similarity index 100%
rename from libweave/examples/provider/file_config_store.cc
rename to examples/provider/file_config_store.cc
diff --git a/libweave/examples/provider/file_config_store.h b/examples/provider/file_config_store.h
similarity index 100%
rename from libweave/examples/provider/file_config_store.h
rename to examples/provider/file_config_store.h
diff --git a/libweave/examples/provider/provider.gyp b/examples/provider/provider.gyp
similarity index 100%
rename from libweave/examples/provider/provider.gyp
rename to examples/provider/provider.gyp
diff --git a/libweave/examples/provider/ssl_stream.cc b/examples/provider/ssl_stream.cc
similarity index 100%
rename from libweave/examples/provider/ssl_stream.cc
rename to examples/provider/ssl_stream.cc
diff --git a/libweave/examples/provider/ssl_stream.h b/examples/provider/ssl_stream.h
similarity index 100%
rename from libweave/examples/provider/ssl_stream.h
rename to examples/provider/ssl_stream.h
diff --git a/libweave/examples/provider/wifi_manager.cc b/examples/provider/wifi_manager.cc
similarity index 100%
rename from libweave/examples/provider/wifi_manager.cc
rename to examples/provider/wifi_manager.cc
diff --git a/libweave/examples/provider/wifi_manager.h b/examples/provider/wifi_manager.h
similarity index 100%
rename from libweave/examples/provider/wifi_manager.h
rename to examples/provider/wifi_manager.h
diff --git a/libweave/include/weave/command.h b/include/weave/command.h
similarity index 100%
rename from libweave/include/weave/command.h
rename to include/weave/command.h
diff --git a/libweave/include/weave/device.h b/include/weave/device.h
similarity index 100%
rename from libweave/include/weave/device.h
rename to include/weave/device.h
diff --git a/libweave/include/weave/enum_to_string.h b/include/weave/enum_to_string.h
similarity index 100%
rename from libweave/include/weave/enum_to_string.h
rename to include/weave/enum_to_string.h
diff --git a/libweave/include/weave/error.h b/include/weave/error.h
similarity index 100%
rename from libweave/include/weave/error.h
rename to include/weave/error.h
diff --git a/libweave/include/weave/export.h b/include/weave/export.h
similarity index 100%
rename from libweave/include/weave/export.h
rename to include/weave/export.h
diff --git a/libweave/include/weave/provider/bluetooth.h b/include/weave/provider/bluetooth.h
similarity index 100%
rename from libweave/include/weave/provider/bluetooth.h
rename to include/weave/provider/bluetooth.h
diff --git a/libweave/include/weave/provider/config_store.h b/include/weave/provider/config_store.h
similarity index 100%
rename from libweave/include/weave/provider/config_store.h
rename to include/weave/provider/config_store.h
diff --git a/libweave/include/weave/provider/dns_service_discovery.h b/include/weave/provider/dns_service_discovery.h
similarity index 100%
rename from libweave/include/weave/provider/dns_service_discovery.h
rename to include/weave/provider/dns_service_discovery.h
diff --git a/libweave/include/weave/provider/http_client.h b/include/weave/provider/http_client.h
similarity index 100%
rename from libweave/include/weave/provider/http_client.h
rename to include/weave/provider/http_client.h
diff --git a/libweave/include/weave/provider/http_server.h b/include/weave/provider/http_server.h
similarity index 100%
rename from libweave/include/weave/provider/http_server.h
rename to include/weave/provider/http_server.h
diff --git a/libweave/include/weave/provider/network.h b/include/weave/provider/network.h
similarity index 100%
rename from libweave/include/weave/provider/network.h
rename to include/weave/provider/network.h
diff --git a/libweave/include/weave/provider/task_runner.h b/include/weave/provider/task_runner.h
similarity index 100%
rename from libweave/include/weave/provider/task_runner.h
rename to include/weave/provider/task_runner.h
diff --git a/libweave/include/weave/provider/test/fake_task_runner.h b/include/weave/provider/test/fake_task_runner.h
similarity index 100%
rename from libweave/include/weave/provider/test/fake_task_runner.h
rename to include/weave/provider/test/fake_task_runner.h
diff --git a/libweave/include/weave/provider/test/mock_bluetooth.h b/include/weave/provider/test/mock_bluetooth.h
similarity index 100%
rename from libweave/include/weave/provider/test/mock_bluetooth.h
rename to include/weave/provider/test/mock_bluetooth.h
diff --git a/libweave/include/weave/provider/test/mock_config_store.h b/include/weave/provider/test/mock_config_store.h
similarity index 100%
rename from libweave/include/weave/provider/test/mock_config_store.h
rename to include/weave/provider/test/mock_config_store.h
diff --git a/libweave/include/weave/provider/test/mock_dns_service_discovery.h b/include/weave/provider/test/mock_dns_service_discovery.h
similarity index 100%
rename from libweave/include/weave/provider/test/mock_dns_service_discovery.h
rename to include/weave/provider/test/mock_dns_service_discovery.h
diff --git a/libweave/include/weave/provider/test/mock_http_client.h b/include/weave/provider/test/mock_http_client.h
similarity index 100%
rename from libweave/include/weave/provider/test/mock_http_client.h
rename to include/weave/provider/test/mock_http_client.h
diff --git a/libweave/include/weave/provider/test/mock_http_server.h b/include/weave/provider/test/mock_http_server.h
similarity index 100%
rename from libweave/include/weave/provider/test/mock_http_server.h
rename to include/weave/provider/test/mock_http_server.h
diff --git a/libweave/include/weave/provider/test/mock_network.h b/include/weave/provider/test/mock_network.h
similarity index 100%
rename from libweave/include/weave/provider/test/mock_network.h
rename to include/weave/provider/test/mock_network.h
diff --git a/libweave/include/weave/provider/test/mock_wifi.h b/include/weave/provider/test/mock_wifi.h
similarity index 100%
rename from libweave/include/weave/provider/test/mock_wifi.h
rename to include/weave/provider/test/mock_wifi.h
diff --git a/libweave/include/weave/provider/wifi.h b/include/weave/provider/wifi.h
similarity index 100%
rename from libweave/include/weave/provider/wifi.h
rename to include/weave/provider/wifi.h
diff --git a/libweave/include/weave/settings.h b/include/weave/settings.h
similarity index 100%
rename from libweave/include/weave/settings.h
rename to include/weave/settings.h
diff --git a/libweave/include/weave/stream.h b/include/weave/stream.h
similarity index 100%
rename from libweave/include/weave/stream.h
rename to include/weave/stream.h
diff --git a/libweave/include/weave/test/fake_stream.h b/include/weave/test/fake_stream.h
similarity index 100%
rename from libweave/include/weave/test/fake_stream.h
rename to include/weave/test/fake_stream.h
diff --git a/libweave/include/weave/test/mock_command.h b/include/weave/test/mock_command.h
similarity index 100%
rename from libweave/include/weave/test/mock_command.h
rename to include/weave/test/mock_command.h
diff --git a/libweave/include/weave/test/mock_device.h b/include/weave/test/mock_device.h
similarity index 100%
rename from libweave/include/weave/test/mock_device.h
rename to include/weave/test/mock_device.h
diff --git a/libweave/include/weave/test/unittest_utils.h b/include/weave/test/unittest_utils.h
similarity index 100%
rename from libweave/include/weave/test/unittest_utils.h
rename to include/weave/test/unittest_utils.h
diff --git a/libweave/libweave-test.pc.in b/libweave-test.pc.in
similarity index 100%
rename from libweave/libweave-test.pc.in
rename to libweave-test.pc.in
diff --git a/libweave/libweave.gypi b/libweave.gypi
similarity index 100%
rename from libweave/libweave.gypi
rename to libweave.gypi
diff --git a/libweave/libweave.pc.in b/libweave.pc.in
similarity index 100%
rename from libweave/libweave.pc.in
rename to libweave.pc.in
diff --git a/libweave/libweave_common.gypi b/libweave_common.gypi
similarity index 100%
rename from libweave/libweave_common.gypi
rename to libweave_common.gypi
diff --git a/libweave/libweave_standalone.gyp b/libweave_standalone.gyp
similarity index 100%
rename from libweave/libweave_standalone.gyp
rename to libweave_standalone.gyp
diff --git a/libweave/src/backoff_entry.cc b/src/backoff_entry.cc
similarity index 100%
rename from libweave/src/backoff_entry.cc
rename to src/backoff_entry.cc
diff --git a/libweave/src/backoff_entry.h b/src/backoff_entry.h
similarity index 100%
rename from libweave/src/backoff_entry.h
rename to src/backoff_entry.h
diff --git a/libweave/src/backoff_entry_unittest.cc b/src/backoff_entry_unittest.cc
similarity index 100%
rename from libweave/src/backoff_entry_unittest.cc
rename to src/backoff_entry_unittest.cc
diff --git a/libweave/src/base_api_handler.cc b/src/base_api_handler.cc
similarity index 100%
rename from libweave/src/base_api_handler.cc
rename to src/base_api_handler.cc
diff --git a/libweave/src/base_api_handler.h b/src/base_api_handler.h
similarity index 100%
rename from libweave/src/base_api_handler.h
rename to src/base_api_handler.h
diff --git a/libweave/src/base_api_handler_unittest.cc b/src/base_api_handler_unittest.cc
similarity index 100%
rename from libweave/src/base_api_handler_unittest.cc
rename to src/base_api_handler_unittest.cc
diff --git a/libweave/src/bind_lambda.h b/src/bind_lambda.h
similarity index 100%
rename from libweave/src/bind_lambda.h
rename to src/bind_lambda.h
diff --git a/libweave/src/commands/cloud_command_proxy.cc b/src/commands/cloud_command_proxy.cc
similarity index 100%
rename from libweave/src/commands/cloud_command_proxy.cc
rename to src/commands/cloud_command_proxy.cc
diff --git a/libweave/src/commands/cloud_command_proxy.h b/src/commands/cloud_command_proxy.h
similarity index 100%
rename from libweave/src/commands/cloud_command_proxy.h
rename to src/commands/cloud_command_proxy.h
diff --git a/libweave/src/commands/cloud_command_proxy_unittest.cc b/src/commands/cloud_command_proxy_unittest.cc
similarity index 100%
rename from libweave/src/commands/cloud_command_proxy_unittest.cc
rename to src/commands/cloud_command_proxy_unittest.cc
diff --git a/libweave/src/commands/cloud_command_update_interface.h b/src/commands/cloud_command_update_interface.h
similarity index 100%
rename from libweave/src/commands/cloud_command_update_interface.h
rename to src/commands/cloud_command_update_interface.h
diff --git a/libweave/src/commands/command_definition.cc b/src/commands/command_definition.cc
similarity index 100%
rename from libweave/src/commands/command_definition.cc
rename to src/commands/command_definition.cc
diff --git a/libweave/src/commands/command_definition.h b/src/commands/command_definition.h
similarity index 100%
rename from libweave/src/commands/command_definition.h
rename to src/commands/command_definition.h
diff --git a/libweave/src/commands/command_definition_unittest.cc b/src/commands/command_definition_unittest.cc
similarity index 100%
rename from libweave/src/commands/command_definition_unittest.cc
rename to src/commands/command_definition_unittest.cc
diff --git a/libweave/src/commands/command_dictionary.cc b/src/commands/command_dictionary.cc
similarity index 100%
rename from libweave/src/commands/command_dictionary.cc
rename to src/commands/command_dictionary.cc
diff --git a/libweave/src/commands/command_dictionary.h b/src/commands/command_dictionary.h
similarity index 100%
rename from libweave/src/commands/command_dictionary.h
rename to src/commands/command_dictionary.h
diff --git a/libweave/src/commands/command_dictionary_unittest.cc b/src/commands/command_dictionary_unittest.cc
similarity index 100%
rename from libweave/src/commands/command_dictionary_unittest.cc
rename to src/commands/command_dictionary_unittest.cc
diff --git a/libweave/src/commands/command_instance.cc b/src/commands/command_instance.cc
similarity index 100%
rename from libweave/src/commands/command_instance.cc
rename to src/commands/command_instance.cc
diff --git a/libweave/src/commands/command_instance.h b/src/commands/command_instance.h
similarity index 100%
rename from libweave/src/commands/command_instance.h
rename to src/commands/command_instance.h
diff --git a/libweave/src/commands/command_instance_unittest.cc b/src/commands/command_instance_unittest.cc
similarity index 100%
rename from libweave/src/commands/command_instance_unittest.cc
rename to src/commands/command_instance_unittest.cc
diff --git a/libweave/src/commands/command_manager.cc b/src/commands/command_manager.cc
similarity index 100%
rename from libweave/src/commands/command_manager.cc
rename to src/commands/command_manager.cc
diff --git a/libweave/src/commands/command_manager.h b/src/commands/command_manager.h
similarity index 100%
rename from libweave/src/commands/command_manager.h
rename to src/commands/command_manager.h
diff --git a/libweave/src/commands/command_manager_unittest.cc b/src/commands/command_manager_unittest.cc
similarity index 100%
rename from libweave/src/commands/command_manager_unittest.cc
rename to src/commands/command_manager_unittest.cc
diff --git a/libweave/src/commands/command_queue.cc b/src/commands/command_queue.cc
similarity index 100%
rename from libweave/src/commands/command_queue.cc
rename to src/commands/command_queue.cc
diff --git a/libweave/src/commands/command_queue.h b/src/commands/command_queue.h
similarity index 100%
rename from libweave/src/commands/command_queue.h
rename to src/commands/command_queue.h
diff --git a/libweave/src/commands/command_queue_unittest.cc b/src/commands/command_queue_unittest.cc
similarity index 100%
rename from libweave/src/commands/command_queue_unittest.cc
rename to src/commands/command_queue_unittest.cc
diff --git a/libweave/src/commands/object_schema.cc b/src/commands/object_schema.cc
similarity index 100%
rename from libweave/src/commands/object_schema.cc
rename to src/commands/object_schema.cc
diff --git a/libweave/src/commands/object_schema.h b/src/commands/object_schema.h
similarity index 100%
rename from libweave/src/commands/object_schema.h
rename to src/commands/object_schema.h
diff --git a/libweave/src/commands/object_schema_unittest.cc b/src/commands/object_schema_unittest.cc
similarity index 100%
rename from libweave/src/commands/object_schema_unittest.cc
rename to src/commands/object_schema_unittest.cc
diff --git a/libweave/src/commands/prop_constraints.cc b/src/commands/prop_constraints.cc
similarity index 100%
rename from libweave/src/commands/prop_constraints.cc
rename to src/commands/prop_constraints.cc
diff --git a/libweave/src/commands/prop_constraints.h b/src/commands/prop_constraints.h
similarity index 100%
rename from libweave/src/commands/prop_constraints.h
rename to src/commands/prop_constraints.h
diff --git a/libweave/src/commands/prop_types.cc b/src/commands/prop_types.cc
similarity index 100%
rename from libweave/src/commands/prop_types.cc
rename to src/commands/prop_types.cc
diff --git a/libweave/src/commands/prop_types.h b/src/commands/prop_types.h
similarity index 100%
rename from libweave/src/commands/prop_types.h
rename to src/commands/prop_types.h
diff --git a/libweave/src/commands/prop_values.cc b/src/commands/prop_values.cc
similarity index 100%
rename from libweave/src/commands/prop_values.cc
rename to src/commands/prop_values.cc
diff --git a/libweave/src/commands/prop_values.h b/src/commands/prop_values.h
similarity index 100%
rename from libweave/src/commands/prop_values.h
rename to src/commands/prop_values.h
diff --git a/libweave/src/commands/schema_constants.cc b/src/commands/schema_constants.cc
similarity index 100%
rename from libweave/src/commands/schema_constants.cc
rename to src/commands/schema_constants.cc
diff --git a/libweave/src/commands/schema_constants.h b/src/commands/schema_constants.h
similarity index 100%
rename from libweave/src/commands/schema_constants.h
rename to src/commands/schema_constants.h
diff --git a/libweave/src/commands/schema_utils.cc b/src/commands/schema_utils.cc
similarity index 100%
rename from libweave/src/commands/schema_utils.cc
rename to src/commands/schema_utils.cc
diff --git a/libweave/src/commands/schema_utils.h b/src/commands/schema_utils.h
similarity index 100%
rename from libweave/src/commands/schema_utils.h
rename to src/commands/schema_utils.h
diff --git a/libweave/src/commands/schema_utils_unittest.cc b/src/commands/schema_utils_unittest.cc
similarity index 100%
rename from libweave/src/commands/schema_utils_unittest.cc
rename to src/commands/schema_utils_unittest.cc
diff --git a/libweave/src/commands/unittest_utils.h b/src/commands/unittest_utils.h
similarity index 100%
rename from libweave/src/commands/unittest_utils.h
rename to src/commands/unittest_utils.h
diff --git a/libweave/src/config.cc b/src/config.cc
similarity index 100%
rename from libweave/src/config.cc
rename to src/config.cc
diff --git a/libweave/src/config.h b/src/config.h
similarity index 100%
rename from libweave/src/config.h
rename to src/config.h
diff --git a/libweave/src/config_unittest.cc b/src/config_unittest.cc
similarity index 100%
rename from libweave/src/config_unittest.cc
rename to src/config_unittest.cc
diff --git a/libweave/src/data_encoding.cc b/src/data_encoding.cc
similarity index 100%
rename from libweave/src/data_encoding.cc
rename to src/data_encoding.cc
diff --git a/libweave/src/data_encoding.h b/src/data_encoding.h
similarity index 100%
rename from libweave/src/data_encoding.h
rename to src/data_encoding.h
diff --git a/libweave/src/data_encoding_unittest.cc b/src/data_encoding_unittest.cc
similarity index 100%
rename from libweave/src/data_encoding_unittest.cc
rename to src/data_encoding_unittest.cc
diff --git a/libweave/src/device_manager.cc b/src/device_manager.cc
similarity index 100%
rename from libweave/src/device_manager.cc
rename to src/device_manager.cc
diff --git a/libweave/src/device_manager.h b/src/device_manager.h
similarity index 100%
rename from libweave/src/device_manager.h
rename to src/device_manager.h
diff --git a/libweave/src/device_registration_info.cc b/src/device_registration_info.cc
similarity index 100%
rename from libweave/src/device_registration_info.cc
rename to src/device_registration_info.cc
diff --git a/libweave/src/device_registration_info.h b/src/device_registration_info.h
similarity index 100%
rename from libweave/src/device_registration_info.h
rename to src/device_registration_info.h
diff --git a/libweave/src/device_registration_info_unittest.cc b/src/device_registration_info_unittest.cc
similarity index 100%
rename from libweave/src/device_registration_info_unittest.cc
rename to src/device_registration_info_unittest.cc
diff --git a/libweave/src/empty.cc b/src/empty.cc
similarity index 100%
rename from libweave/src/empty.cc
rename to src/empty.cc
diff --git a/libweave/src/error.cc b/src/error.cc
similarity index 100%
rename from libweave/src/error.cc
rename to src/error.cc
diff --git a/libweave/src/error_unittest.cc b/src/error_unittest.cc
similarity index 100%
rename from libweave/src/error_unittest.cc
rename to src/error_unittest.cc
diff --git a/libweave/src/http_constants.cc b/src/http_constants.cc
similarity index 100%
rename from libweave/src/http_constants.cc
rename to src/http_constants.cc
diff --git a/libweave/src/http_constants.h b/src/http_constants.h
similarity index 100%
rename from libweave/src/http_constants.h
rename to src/http_constants.h
diff --git a/libweave/src/json_error_codes.cc b/src/json_error_codes.cc
similarity index 100%
rename from libweave/src/json_error_codes.cc
rename to src/json_error_codes.cc
diff --git a/libweave/src/json_error_codes.h b/src/json_error_codes.h
similarity index 100%
rename from libweave/src/json_error_codes.h
rename to src/json_error_codes.h
diff --git a/libweave/src/notification/notification_channel.h b/src/notification/notification_channel.h
similarity index 100%
rename from libweave/src/notification/notification_channel.h
rename to src/notification/notification_channel.h
diff --git a/libweave/src/notification/notification_delegate.h b/src/notification/notification_delegate.h
similarity index 100%
rename from libweave/src/notification/notification_delegate.h
rename to src/notification/notification_delegate.h
diff --git a/libweave/src/notification/notification_parser.cc b/src/notification/notification_parser.cc
similarity index 100%
rename from libweave/src/notification/notification_parser.cc
rename to src/notification/notification_parser.cc
diff --git a/libweave/src/notification/notification_parser.h b/src/notification/notification_parser.h
similarity index 100%
rename from libweave/src/notification/notification_parser.h
rename to src/notification/notification_parser.h
diff --git a/libweave/src/notification/notification_parser_unittest.cc b/src/notification/notification_parser_unittest.cc
similarity index 100%
rename from libweave/src/notification/notification_parser_unittest.cc
rename to src/notification/notification_parser_unittest.cc
diff --git a/libweave/src/notification/pull_channel.cc b/src/notification/pull_channel.cc
similarity index 100%
rename from libweave/src/notification/pull_channel.cc
rename to src/notification/pull_channel.cc
diff --git a/libweave/src/notification/pull_channel.h b/src/notification/pull_channel.h
similarity index 100%
rename from libweave/src/notification/pull_channel.h
rename to src/notification/pull_channel.h
diff --git a/libweave/src/notification/xml_node.cc b/src/notification/xml_node.cc
similarity index 100%
rename from libweave/src/notification/xml_node.cc
rename to src/notification/xml_node.cc
diff --git a/libweave/src/notification/xml_node.h b/src/notification/xml_node.h
similarity index 100%
rename from libweave/src/notification/xml_node.h
rename to src/notification/xml_node.h
diff --git a/libweave/src/notification/xml_node_unittest.cc b/src/notification/xml_node_unittest.cc
similarity index 100%
rename from libweave/src/notification/xml_node_unittest.cc
rename to src/notification/xml_node_unittest.cc
diff --git a/libweave/src/notification/xmpp_channel.cc b/src/notification/xmpp_channel.cc
similarity index 100%
rename from libweave/src/notification/xmpp_channel.cc
rename to src/notification/xmpp_channel.cc
diff --git a/libweave/src/notification/xmpp_channel.h b/src/notification/xmpp_channel.h
similarity index 100%
rename from libweave/src/notification/xmpp_channel.h
rename to src/notification/xmpp_channel.h
diff --git a/libweave/src/notification/xmpp_channel_unittest.cc b/src/notification/xmpp_channel_unittest.cc
similarity index 100%
rename from libweave/src/notification/xmpp_channel_unittest.cc
rename to src/notification/xmpp_channel_unittest.cc
diff --git a/libweave/src/notification/xmpp_iq_stanza_handler.cc b/src/notification/xmpp_iq_stanza_handler.cc
similarity index 100%
rename from libweave/src/notification/xmpp_iq_stanza_handler.cc
rename to src/notification/xmpp_iq_stanza_handler.cc
diff --git a/libweave/src/notification/xmpp_iq_stanza_handler.h b/src/notification/xmpp_iq_stanza_handler.h
similarity index 100%
rename from libweave/src/notification/xmpp_iq_stanza_handler.h
rename to src/notification/xmpp_iq_stanza_handler.h
diff --git a/libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc b/src/notification/xmpp_iq_stanza_handler_unittest.cc
similarity index 100%
rename from libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc
rename to src/notification/xmpp_iq_stanza_handler_unittest.cc
diff --git a/libweave/src/notification/xmpp_stream_parser.cc b/src/notification/xmpp_stream_parser.cc
similarity index 100%
rename from libweave/src/notification/xmpp_stream_parser.cc
rename to src/notification/xmpp_stream_parser.cc
diff --git a/libweave/src/notification/xmpp_stream_parser.h b/src/notification/xmpp_stream_parser.h
similarity index 100%
rename from libweave/src/notification/xmpp_stream_parser.h
rename to src/notification/xmpp_stream_parser.h
diff --git a/libweave/src/notification/xmpp_stream_parser_unittest.cc b/src/notification/xmpp_stream_parser_unittest.cc
similarity index 100%
rename from libweave/src/notification/xmpp_stream_parser_unittest.cc
rename to src/notification/xmpp_stream_parser_unittest.cc
diff --git a/libweave/src/privet/cloud_delegate.cc b/src/privet/cloud_delegate.cc
similarity index 100%
rename from libweave/src/privet/cloud_delegate.cc
rename to src/privet/cloud_delegate.cc
diff --git a/libweave/src/privet/cloud_delegate.h b/src/privet/cloud_delegate.h
similarity index 100%
rename from libweave/src/privet/cloud_delegate.h
rename to src/privet/cloud_delegate.h
diff --git a/libweave/src/privet/constants.cc b/src/privet/constants.cc
similarity index 100%
rename from libweave/src/privet/constants.cc
rename to src/privet/constants.cc
diff --git a/libweave/src/privet/constants.h b/src/privet/constants.h
similarity index 100%
rename from libweave/src/privet/constants.h
rename to src/privet/constants.h
diff --git a/libweave/src/privet/device_delegate.cc b/src/privet/device_delegate.cc
similarity index 100%
rename from libweave/src/privet/device_delegate.cc
rename to src/privet/device_delegate.cc
diff --git a/libweave/src/privet/device_delegate.h b/src/privet/device_delegate.h
similarity index 100%
rename from libweave/src/privet/device_delegate.h
rename to src/privet/device_delegate.h
diff --git a/libweave/src/privet/device_ui_kind.cc b/src/privet/device_ui_kind.cc
similarity index 100%
rename from libweave/src/privet/device_ui_kind.cc
rename to src/privet/device_ui_kind.cc
diff --git a/libweave/src/privet/device_ui_kind.h b/src/privet/device_ui_kind.h
similarity index 100%
rename from libweave/src/privet/device_ui_kind.h
rename to src/privet/device_ui_kind.h
diff --git a/libweave/src/privet/mock_delegates.h b/src/privet/mock_delegates.h
similarity index 100%
rename from libweave/src/privet/mock_delegates.h
rename to src/privet/mock_delegates.h
diff --git a/libweave/src/privet/openssl_utils.cc b/src/privet/openssl_utils.cc
similarity index 100%
rename from libweave/src/privet/openssl_utils.cc
rename to src/privet/openssl_utils.cc
diff --git a/libweave/src/privet/openssl_utils.h b/src/privet/openssl_utils.h
similarity index 100%
rename from libweave/src/privet/openssl_utils.h
rename to src/privet/openssl_utils.h
diff --git a/libweave/src/privet/privet_handler.cc b/src/privet/privet_handler.cc
similarity index 100%
rename from libweave/src/privet/privet_handler.cc
rename to src/privet/privet_handler.cc
diff --git a/libweave/src/privet/privet_handler.h b/src/privet/privet_handler.h
similarity index 100%
rename from libweave/src/privet/privet_handler.h
rename to src/privet/privet_handler.h
diff --git a/libweave/src/privet/privet_handler_unittest.cc b/src/privet/privet_handler_unittest.cc
similarity index 100%
rename from libweave/src/privet/privet_handler_unittest.cc
rename to src/privet/privet_handler_unittest.cc
diff --git a/libweave/src/privet/privet_manager.cc b/src/privet/privet_manager.cc
similarity index 100%
rename from libweave/src/privet/privet_manager.cc
rename to src/privet/privet_manager.cc
diff --git a/libweave/src/privet/privet_manager.h b/src/privet/privet_manager.h
similarity index 100%
rename from libweave/src/privet/privet_manager.h
rename to src/privet/privet_manager.h
diff --git a/libweave/src/privet/privet_types.cc b/src/privet/privet_types.cc
similarity index 100%
rename from libweave/src/privet/privet_types.cc
rename to src/privet/privet_types.cc
diff --git a/libweave/src/privet/privet_types.h b/src/privet/privet_types.h
similarity index 100%
rename from libweave/src/privet/privet_types.h
rename to src/privet/privet_types.h
diff --git a/libweave/src/privet/publisher.cc b/src/privet/publisher.cc
similarity index 100%
rename from libweave/src/privet/publisher.cc
rename to src/privet/publisher.cc
diff --git a/libweave/src/privet/publisher.h b/src/privet/publisher.h
similarity index 100%
rename from libweave/src/privet/publisher.h
rename to src/privet/publisher.h
diff --git a/libweave/src/privet/security_delegate.h b/src/privet/security_delegate.h
similarity index 100%
rename from libweave/src/privet/security_delegate.h
rename to src/privet/security_delegate.h
diff --git a/libweave/src/privet/security_manager.cc b/src/privet/security_manager.cc
similarity index 100%
rename from libweave/src/privet/security_manager.cc
rename to src/privet/security_manager.cc
diff --git a/libweave/src/privet/security_manager.h b/src/privet/security_manager.h
similarity index 100%
rename from libweave/src/privet/security_manager.h
rename to src/privet/security_manager.h
diff --git a/libweave/src/privet/security_manager_unittest.cc b/src/privet/security_manager_unittest.cc
similarity index 100%
rename from libweave/src/privet/security_manager_unittest.cc
rename to src/privet/security_manager_unittest.cc
diff --git a/libweave/src/privet/wifi_bootstrap_manager.cc b/src/privet/wifi_bootstrap_manager.cc
similarity index 100%
rename from libweave/src/privet/wifi_bootstrap_manager.cc
rename to src/privet/wifi_bootstrap_manager.cc
diff --git a/libweave/src/privet/wifi_bootstrap_manager.h b/src/privet/wifi_bootstrap_manager.h
similarity index 100%
rename from libweave/src/privet/wifi_bootstrap_manager.h
rename to src/privet/wifi_bootstrap_manager.h
diff --git a/libweave/src/privet/wifi_delegate.h b/src/privet/wifi_delegate.h
similarity index 100%
rename from libweave/src/privet/wifi_delegate.h
rename to src/privet/wifi_delegate.h
diff --git a/libweave/src/privet/wifi_ssid_generator.cc b/src/privet/wifi_ssid_generator.cc
similarity index 100%
rename from libweave/src/privet/wifi_ssid_generator.cc
rename to src/privet/wifi_ssid_generator.cc
diff --git a/libweave/src/privet/wifi_ssid_generator.h b/src/privet/wifi_ssid_generator.h
similarity index 100%
rename from libweave/src/privet/wifi_ssid_generator.h
rename to src/privet/wifi_ssid_generator.h
diff --git a/libweave/src/privet/wifi_ssid_generator_unittest.cc b/src/privet/wifi_ssid_generator_unittest.cc
similarity index 100%
rename from libweave/src/privet/wifi_ssid_generator_unittest.cc
rename to src/privet/wifi_ssid_generator_unittest.cc
diff --git a/libweave/src/registration_status.cc b/src/registration_status.cc
similarity index 100%
rename from libweave/src/registration_status.cc
rename to src/registration_status.cc
diff --git a/libweave/src/states/error_codes.cc b/src/states/error_codes.cc
similarity index 100%
rename from libweave/src/states/error_codes.cc
rename to src/states/error_codes.cc
diff --git a/libweave/src/states/error_codes.h b/src/states/error_codes.h
similarity index 100%
rename from libweave/src/states/error_codes.h
rename to src/states/error_codes.h
diff --git a/libweave/src/states/mock_state_change_queue_interface.h b/src/states/mock_state_change_queue_interface.h
similarity index 100%
rename from libweave/src/states/mock_state_change_queue_interface.h
rename to src/states/mock_state_change_queue_interface.h
diff --git a/libweave/src/states/state_change_queue.cc b/src/states/state_change_queue.cc
similarity index 100%
rename from libweave/src/states/state_change_queue.cc
rename to src/states/state_change_queue.cc
diff --git a/libweave/src/states/state_change_queue.h b/src/states/state_change_queue.h
similarity index 100%
rename from libweave/src/states/state_change_queue.h
rename to src/states/state_change_queue.h
diff --git a/libweave/src/states/state_change_queue_interface.h b/src/states/state_change_queue_interface.h
similarity index 100%
rename from libweave/src/states/state_change_queue_interface.h
rename to src/states/state_change_queue_interface.h
diff --git a/libweave/src/states/state_change_queue_unittest.cc b/src/states/state_change_queue_unittest.cc
similarity index 100%
rename from libweave/src/states/state_change_queue_unittest.cc
rename to src/states/state_change_queue_unittest.cc
diff --git a/libweave/src/states/state_manager.cc b/src/states/state_manager.cc
similarity index 100%
rename from libweave/src/states/state_manager.cc
rename to src/states/state_manager.cc
diff --git a/libweave/src/states/state_manager.h b/src/states/state_manager.h
similarity index 100%
rename from libweave/src/states/state_manager.h
rename to src/states/state_manager.h
diff --git a/libweave/src/states/state_manager_unittest.cc b/src/states/state_manager_unittest.cc
similarity index 100%
rename from libweave/src/states/state_manager_unittest.cc
rename to src/states/state_manager_unittest.cc
diff --git a/libweave/src/states/state_package.cc b/src/states/state_package.cc
similarity index 100%
rename from libweave/src/states/state_package.cc
rename to src/states/state_package.cc
diff --git a/libweave/src/states/state_package.h b/src/states/state_package.h
similarity index 100%
rename from libweave/src/states/state_package.h
rename to src/states/state_package.h
diff --git a/libweave/src/states/state_package_unittest.cc b/src/states/state_package_unittest.cc
similarity index 100%
rename from libweave/src/states/state_package_unittest.cc
rename to src/states/state_package_unittest.cc
diff --git a/libweave/src/streams.cc b/src/streams.cc
similarity index 100%
rename from libweave/src/streams.cc
rename to src/streams.cc
diff --git a/libweave/src/streams.h b/src/streams.h
similarity index 100%
rename from libweave/src/streams.h
rename to src/streams.h
diff --git a/libweave/src/streams_unittest.cc b/src/streams_unittest.cc
similarity index 100%
rename from libweave/src/streams_unittest.cc
rename to src/streams_unittest.cc
diff --git a/libweave/src/string_utils.cc b/src/string_utils.cc
similarity index 100%
rename from libweave/src/string_utils.cc
rename to src/string_utils.cc
diff --git a/libweave/src/string_utils.h b/src/string_utils.h
similarity index 100%
rename from libweave/src/string_utils.h
rename to src/string_utils.h
diff --git a/libweave/src/string_utils_unittest.cc b/src/string_utils_unittest.cc
similarity index 100%
rename from libweave/src/string_utils_unittest.cc
rename to src/string_utils_unittest.cc
diff --git a/libweave/src/test/fake_stream.cc b/src/test/fake_stream.cc
similarity index 100%
rename from libweave/src/test/fake_stream.cc
rename to src/test/fake_stream.cc
diff --git a/libweave/src/test/fake_task_runner.cc b/src/test/fake_task_runner.cc
similarity index 100%
rename from libweave/src/test/fake_task_runner.cc
rename to src/test/fake_task_runner.cc
diff --git a/libweave/src/test/mock_command.cc b/src/test/mock_command.cc
similarity index 100%
rename from libweave/src/test/mock_command.cc
rename to src/test/mock_command.cc
diff --git a/libweave/src/test/unittest_utils.cc b/src/test/unittest_utils.cc
similarity index 100%
rename from libweave/src/test/unittest_utils.cc
rename to src/test/unittest_utils.cc
diff --git a/libweave/src/test/weave_testrunner.cc b/src/test/weave_testrunner.cc
similarity index 100%
rename from libweave/src/test/weave_testrunner.cc
rename to src/test/weave_testrunner.cc
diff --git a/libweave/src/utils.cc b/src/utils.cc
similarity index 100%
rename from libweave/src/utils.cc
rename to src/utils.cc
diff --git a/libweave/src/utils.h b/src/utils.h
similarity index 100%
rename from libweave/src/utils.h
rename to src/utils.h
diff --git a/libweave/src/weave_unittest.cc b/src/weave_unittest.cc
similarity index 100%
rename from libweave/src/weave_unittest.cc
rename to src/weave_unittest.cc
diff --git a/libweave/third_party/chromium/LICENSE b/third_party/chromium/LICENSE
similarity index 100%
rename from libweave/third_party/chromium/LICENSE
rename to third_party/chromium/LICENSE
diff --git a/libweave/third_party/chromium/LICENSE.chromium_os b/third_party/chromium/LICENSE.chromium_os
similarity index 100%
rename from libweave/third_party/chromium/LICENSE.chromium_os
rename to third_party/chromium/LICENSE.chromium_os
diff --git a/libweave/third_party/chromium/base/base_export.h b/third_party/chromium/base/base_export.h
similarity index 100%
rename from libweave/third_party/chromium/base/base_export.h
rename to third_party/chromium/base/base_export.h
diff --git a/libweave/third_party/chromium/base/basictypes.h b/third_party/chromium/base/basictypes.h
similarity index 100%
rename from libweave/third_party/chromium/base/basictypes.h
rename to third_party/chromium/base/basictypes.h
diff --git a/libweave/third_party/chromium/base/bind.h b/third_party/chromium/base/bind.h
similarity index 100%
rename from libweave/third_party/chromium/base/bind.h
rename to third_party/chromium/base/bind.h
diff --git a/libweave/third_party/chromium/base/bind_helpers.cc b/third_party/chromium/base/bind_helpers.cc
similarity index 100%
rename from libweave/third_party/chromium/base/bind_helpers.cc
rename to third_party/chromium/base/bind_helpers.cc
diff --git a/libweave/third_party/chromium/base/bind_helpers.h b/third_party/chromium/base/bind_helpers.h
similarity index 100%
rename from libweave/third_party/chromium/base/bind_helpers.h
rename to third_party/chromium/base/bind_helpers.h
diff --git a/libweave/third_party/chromium/base/bind_internal.h b/third_party/chromium/base/bind_internal.h
similarity index 100%
rename from libweave/third_party/chromium/base/bind_internal.h
rename to third_party/chromium/base/bind_internal.h
diff --git a/libweave/third_party/chromium/base/bind_unittest.cc b/third_party/chromium/base/bind_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/bind_unittest.cc
rename to third_party/chromium/base/bind_unittest.cc
diff --git a/libweave/third_party/chromium/base/build/build_config.h b/third_party/chromium/base/build/build_config.h
similarity index 100%
rename from libweave/third_party/chromium/base/build/build_config.h
rename to third_party/chromium/base/build/build_config.h
diff --git a/libweave/third_party/chromium/base/callback.h b/third_party/chromium/base/callback.h
similarity index 100%
rename from libweave/third_party/chromium/base/callback.h
rename to third_party/chromium/base/callback.h
diff --git a/libweave/third_party/chromium/base/callback_forward.h b/third_party/chromium/base/callback_forward.h
similarity index 100%
rename from libweave/third_party/chromium/base/callback_forward.h
rename to third_party/chromium/base/callback_forward.h
diff --git a/libweave/third_party/chromium/base/callback_internal.cc b/third_party/chromium/base/callback_internal.cc
similarity index 100%
rename from libweave/third_party/chromium/base/callback_internal.cc
rename to third_party/chromium/base/callback_internal.cc
diff --git a/libweave/third_party/chromium/base/callback_internal.h b/third_party/chromium/base/callback_internal.h
similarity index 100%
rename from libweave/third_party/chromium/base/callback_internal.h
rename to third_party/chromium/base/callback_internal.h
diff --git a/libweave/third_party/chromium/base/callback_list.h b/third_party/chromium/base/callback_list.h
similarity index 100%
rename from libweave/third_party/chromium/base/callback_list.h
rename to third_party/chromium/base/callback_list.h
diff --git a/libweave/third_party/chromium/base/callback_list_unittest.cc b/third_party/chromium/base/callback_list_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/callback_list_unittest.cc
rename to third_party/chromium/base/callback_list_unittest.cc
diff --git a/libweave/third_party/chromium/base/callback_unittest.cc b/third_party/chromium/base/callback_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/callback_unittest.cc
rename to third_party/chromium/base/callback_unittest.cc
diff --git a/libweave/third_party/chromium/base/command_line.h b/third_party/chromium/base/command_line.h
similarity index 100%
rename from libweave/third_party/chromium/base/command_line.h
rename to third_party/chromium/base/command_line.h
diff --git a/libweave/third_party/chromium/base/compiler_specific.h b/third_party/chromium/base/compiler_specific.h
similarity index 100%
rename from libweave/third_party/chromium/base/compiler_specific.h
rename to third_party/chromium/base/compiler_specific.h
diff --git a/libweave/third_party/chromium/base/gtest_prod_util.h b/third_party/chromium/base/gtest_prod_util.h
similarity index 100%
rename from libweave/third_party/chromium/base/gtest_prod_util.h
rename to third_party/chromium/base/gtest_prod_util.h
diff --git a/libweave/third_party/chromium/base/guid.h b/third_party/chromium/base/guid.h
similarity index 100%
rename from libweave/third_party/chromium/base/guid.h
rename to third_party/chromium/base/guid.h
diff --git a/libweave/third_party/chromium/base/guid_posix.cc b/third_party/chromium/base/guid_posix.cc
similarity index 100%
rename from libweave/third_party/chromium/base/guid_posix.cc
rename to third_party/chromium/base/guid_posix.cc
diff --git a/libweave/third_party/chromium/base/guid_unittest.cc b/third_party/chromium/base/guid_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/guid_unittest.cc
rename to third_party/chromium/base/guid_unittest.cc
diff --git a/libweave/third_party/chromium/base/json/json_parser.cc b/third_party/chromium/base/json/json_parser.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_parser.cc
rename to third_party/chromium/base/json/json_parser.cc
diff --git a/libweave/third_party/chromium/base/json/json_parser.h b/third_party/chromium/base/json/json_parser.h
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_parser.h
rename to third_party/chromium/base/json/json_parser.h
diff --git a/libweave/third_party/chromium/base/json/json_parser_unittest.cc b/third_party/chromium/base/json/json_parser_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_parser_unittest.cc
rename to third_party/chromium/base/json/json_parser_unittest.cc
diff --git a/libweave/third_party/chromium/base/json/json_reader.cc b/third_party/chromium/base/json/json_reader.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_reader.cc
rename to third_party/chromium/base/json/json_reader.cc
diff --git a/libweave/third_party/chromium/base/json/json_reader.h b/third_party/chromium/base/json/json_reader.h
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_reader.h
rename to third_party/chromium/base/json/json_reader.h
diff --git a/libweave/third_party/chromium/base/json/json_reader_unittest.cc b/third_party/chromium/base/json/json_reader_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_reader_unittest.cc
rename to third_party/chromium/base/json/json_reader_unittest.cc
diff --git a/libweave/third_party/chromium/base/json/json_writer.cc b/third_party/chromium/base/json/json_writer.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_writer.cc
rename to third_party/chromium/base/json/json_writer.cc
diff --git a/libweave/third_party/chromium/base/json/json_writer.h b/third_party/chromium/base/json/json_writer.h
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_writer.h
rename to third_party/chromium/base/json/json_writer.h
diff --git a/libweave/third_party/chromium/base/json/json_writer_unittest.cc b/third_party/chromium/base/json/json_writer_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/json_writer_unittest.cc
rename to third_party/chromium/base/json/json_writer_unittest.cc
diff --git a/libweave/third_party/chromium/base/json/string_escape.cc b/third_party/chromium/base/json/string_escape.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/string_escape.cc
rename to third_party/chromium/base/json/string_escape.cc
diff --git a/libweave/third_party/chromium/base/json/string_escape.h b/third_party/chromium/base/json/string_escape.h
similarity index 100%
rename from libweave/third_party/chromium/base/json/string_escape.h
rename to third_party/chromium/base/json/string_escape.h
diff --git a/libweave/third_party/chromium/base/json/string_escape_unittest.cc b/third_party/chromium/base/json/string_escape_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/json/string_escape_unittest.cc
rename to third_party/chromium/base/json/string_escape_unittest.cc
diff --git a/libweave/third_party/chromium/base/location.cc b/third_party/chromium/base/location.cc
similarity index 100%
rename from libweave/third_party/chromium/base/location.cc
rename to third_party/chromium/base/location.cc
diff --git a/libweave/third_party/chromium/base/location.h b/third_party/chromium/base/location.h
similarity index 100%
rename from libweave/third_party/chromium/base/location.h
rename to third_party/chromium/base/location.h
diff --git a/libweave/third_party/chromium/base/logging.cc b/third_party/chromium/base/logging.cc
similarity index 100%
rename from libweave/third_party/chromium/base/logging.cc
rename to third_party/chromium/base/logging.cc
diff --git a/libweave/third_party/chromium/base/logging.h b/third_party/chromium/base/logging.h
similarity index 100%
rename from libweave/third_party/chromium/base/logging.h
rename to third_party/chromium/base/logging.h
diff --git a/libweave/third_party/chromium/base/logging_unittest.cc b/third_party/chromium/base/logging_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/logging_unittest.cc
rename to third_party/chromium/base/logging_unittest.cc
diff --git a/libweave/third_party/chromium/base/macros.h b/third_party/chromium/base/macros.h
similarity index 100%
rename from libweave/third_party/chromium/base/macros.h
rename to third_party/chromium/base/macros.h
diff --git a/libweave/third_party/chromium/base/memory/ref_counted.cc b/third_party/chromium/base/memory/ref_counted.cc
similarity index 100%
rename from libweave/third_party/chromium/base/memory/ref_counted.cc
rename to third_party/chromium/base/memory/ref_counted.cc
diff --git a/libweave/third_party/chromium/base/memory/ref_counted.h b/third_party/chromium/base/memory/ref_counted.h
similarity index 100%
rename from libweave/third_party/chromium/base/memory/ref_counted.h
rename to third_party/chromium/base/memory/ref_counted.h
diff --git a/libweave/third_party/chromium/base/memory/ref_counted_unittest.cc b/third_party/chromium/base/memory/ref_counted_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/memory/ref_counted_unittest.cc
rename to third_party/chromium/base/memory/ref_counted_unittest.cc
diff --git a/libweave/third_party/chromium/base/memory/scoped_ptr.h b/third_party/chromium/base/memory/scoped_ptr.h
similarity index 100%
rename from libweave/third_party/chromium/base/memory/scoped_ptr.h
rename to third_party/chromium/base/memory/scoped_ptr.h
diff --git a/libweave/third_party/chromium/base/memory/scoped_ptr_unittest.cc b/third_party/chromium/base/memory/scoped_ptr_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/memory/scoped_ptr_unittest.cc
rename to third_party/chromium/base/memory/scoped_ptr_unittest.cc
diff --git a/libweave/third_party/chromium/base/memory/weak_ptr.cc b/third_party/chromium/base/memory/weak_ptr.cc
similarity index 100%
rename from libweave/third_party/chromium/base/memory/weak_ptr.cc
rename to third_party/chromium/base/memory/weak_ptr.cc
diff --git a/libweave/third_party/chromium/base/memory/weak_ptr.h b/third_party/chromium/base/memory/weak_ptr.h
similarity index 100%
rename from libweave/third_party/chromium/base/memory/weak_ptr.h
rename to third_party/chromium/base/memory/weak_ptr.h
diff --git a/libweave/third_party/chromium/base/memory/weak_ptr_unittest.cc b/third_party/chromium/base/memory/weak_ptr_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/memory/weak_ptr_unittest.cc
rename to third_party/chromium/base/memory/weak_ptr_unittest.cc
diff --git a/libweave/third_party/chromium/base/move.h b/third_party/chromium/base/move.h
similarity index 100%
rename from libweave/third_party/chromium/base/move.h
rename to third_party/chromium/base/move.h
diff --git a/libweave/third_party/chromium/base/move_unittest.cc b/third_party/chromium/base/move_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/move_unittest.cc
rename to third_party/chromium/base/move_unittest.cc
diff --git a/libweave/third_party/chromium/base/numerics/safe_conversions.h b/third_party/chromium/base/numerics/safe_conversions.h
similarity index 100%
rename from libweave/third_party/chromium/base/numerics/safe_conversions.h
rename to third_party/chromium/base/numerics/safe_conversions.h
diff --git a/libweave/third_party/chromium/base/numerics/safe_conversions_impl.h b/third_party/chromium/base/numerics/safe_conversions_impl.h
similarity index 100%
rename from libweave/third_party/chromium/base/numerics/safe_conversions_impl.h
rename to third_party/chromium/base/numerics/safe_conversions_impl.h
diff --git a/libweave/third_party/chromium/base/numerics/safe_math.h b/third_party/chromium/base/numerics/safe_math.h
similarity index 100%
rename from libweave/third_party/chromium/base/numerics/safe_math.h
rename to third_party/chromium/base/numerics/safe_math.h
diff --git a/libweave/third_party/chromium/base/numerics/safe_math_impl.h b/third_party/chromium/base/numerics/safe_math_impl.h
similarity index 100%
rename from libweave/third_party/chromium/base/numerics/safe_math_impl.h
rename to third_party/chromium/base/numerics/safe_math_impl.h
diff --git a/libweave/third_party/chromium/base/numerics/safe_numerics_unittest.cc b/third_party/chromium/base/numerics/safe_numerics_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/numerics/safe_numerics_unittest.cc
rename to third_party/chromium/base/numerics/safe_numerics_unittest.cc
diff --git a/libweave/third_party/chromium/base/observer_list.h b/third_party/chromium/base/observer_list.h
similarity index 100%
rename from libweave/third_party/chromium/base/observer_list.h
rename to third_party/chromium/base/observer_list.h
diff --git a/libweave/third_party/chromium/base/observer_list_unittest.cc b/third_party/chromium/base/observer_list_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/observer_list_unittest.cc
rename to third_party/chromium/base/observer_list_unittest.cc
diff --git a/libweave/third_party/chromium/base/posix/eintr_wrapper.h b/third_party/chromium/base/posix/eintr_wrapper.h
similarity index 100%
rename from libweave/third_party/chromium/base/posix/eintr_wrapper.h
rename to third_party/chromium/base/posix/eintr_wrapper.h
diff --git a/libweave/third_party/chromium/base/rand_util.cc b/third_party/chromium/base/rand_util.cc
similarity index 100%
rename from libweave/third_party/chromium/base/rand_util.cc
rename to third_party/chromium/base/rand_util.cc
diff --git a/libweave/third_party/chromium/base/rand_util.h b/third_party/chromium/base/rand_util.h
similarity index 100%
rename from libweave/third_party/chromium/base/rand_util.h
rename to third_party/chromium/base/rand_util.h
diff --git a/libweave/third_party/chromium/base/rand_util_posix.cc b/third_party/chromium/base/rand_util_posix.cc
similarity index 100%
rename from libweave/third_party/chromium/base/rand_util_posix.cc
rename to third_party/chromium/base/rand_util_posix.cc
diff --git a/libweave/third_party/chromium/base/rand_util_unittest.cc b/third_party/chromium/base/rand_util_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/rand_util_unittest.cc
rename to third_party/chromium/base/rand_util_unittest.cc
diff --git a/libweave/third_party/chromium/base/scoped_clear_errno.h b/third_party/chromium/base/scoped_clear_errno.h
similarity index 100%
rename from libweave/third_party/chromium/base/scoped_clear_errno.h
rename to third_party/chromium/base/scoped_clear_errno.h
diff --git a/libweave/third_party/chromium/base/scoped_clear_errno_unittest.cc b/third_party/chromium/base/scoped_clear_errno_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/scoped_clear_errno_unittest.cc
rename to third_party/chromium/base/scoped_clear_errno_unittest.cc
diff --git a/libweave/third_party/chromium/base/scoped_observer.h b/third_party/chromium/base/scoped_observer.h
similarity index 100%
rename from libweave/third_party/chromium/base/scoped_observer.h
rename to third_party/chromium/base/scoped_observer.h
diff --git a/libweave/third_party/chromium/base/strings/string_number_conversions.cc b/third_party/chromium/base/strings/string_number_conversions.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_number_conversions.cc
rename to third_party/chromium/base/strings/string_number_conversions.cc
diff --git a/libweave/third_party/chromium/base/strings/string_number_conversions.h b/third_party/chromium/base/strings/string_number_conversions.h
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_number_conversions.h
rename to third_party/chromium/base/strings/string_number_conversions.h
diff --git a/libweave/third_party/chromium/base/strings/string_number_conversions_unittest.cc b/third_party/chromium/base/strings/string_number_conversions_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_number_conversions_unittest.cc
rename to third_party/chromium/base/strings/string_number_conversions_unittest.cc
diff --git a/libweave/third_party/chromium/base/strings/string_piece.cc b/third_party/chromium/base/strings/string_piece.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_piece.cc
rename to third_party/chromium/base/strings/string_piece.cc
diff --git a/libweave/third_party/chromium/base/strings/string_piece.h b/third_party/chromium/base/strings/string_piece.h
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_piece.h
rename to third_party/chromium/base/strings/string_piece.h
diff --git a/libweave/third_party/chromium/base/strings/string_piece_unittest.cc b/third_party/chromium/base/strings/string_piece_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_piece_unittest.cc
rename to third_party/chromium/base/strings/string_piece_unittest.cc
diff --git a/libweave/third_party/chromium/base/strings/string_util.cc b/third_party/chromium/base/strings/string_util.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_util.cc
rename to third_party/chromium/base/strings/string_util.cc
diff --git a/libweave/third_party/chromium/base/strings/string_util.h b/third_party/chromium/base/strings/string_util.h
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_util.h
rename to third_party/chromium/base/strings/string_util.h
diff --git a/libweave/third_party/chromium/base/strings/string_util_constants.cc b/third_party/chromium/base/strings/string_util_constants.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_util_constants.cc
rename to third_party/chromium/base/strings/string_util_constants.cc
diff --git a/libweave/third_party/chromium/base/strings/string_util_posix.h b/third_party/chromium/base/strings/string_util_posix.h
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_util_posix.h
rename to third_party/chromium/base/strings/string_util_posix.h
diff --git a/libweave/third_party/chromium/base/strings/string_util_unittest.cc b/third_party/chromium/base/strings/string_util_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/string_util_unittest.cc
rename to third_party/chromium/base/strings/string_util_unittest.cc
diff --git a/libweave/third_party/chromium/base/strings/stringprintf.cc b/third_party/chromium/base/strings/stringprintf.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/stringprintf.cc
rename to third_party/chromium/base/strings/stringprintf.cc
diff --git a/libweave/third_party/chromium/base/strings/stringprintf.h b/third_party/chromium/base/strings/stringprintf.h
similarity index 100%
rename from libweave/third_party/chromium/base/strings/stringprintf.h
rename to third_party/chromium/base/strings/stringprintf.h
diff --git a/libweave/third_party/chromium/base/strings/stringprintf_unittest.cc b/third_party/chromium/base/strings/stringprintf_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/stringprintf_unittest.cc
rename to third_party/chromium/base/strings/stringprintf_unittest.cc
diff --git a/libweave/third_party/chromium/base/strings/utf_string_conversion_utils.cc b/third_party/chromium/base/strings/utf_string_conversion_utils.cc
similarity index 100%
rename from libweave/third_party/chromium/base/strings/utf_string_conversion_utils.cc
rename to third_party/chromium/base/strings/utf_string_conversion_utils.cc
diff --git a/libweave/third_party/chromium/base/strings/utf_string_conversion_utils.h b/third_party/chromium/base/strings/utf_string_conversion_utils.h
similarity index 100%
rename from libweave/third_party/chromium/base/strings/utf_string_conversion_utils.h
rename to third_party/chromium/base/strings/utf_string_conversion_utils.h
diff --git a/libweave/third_party/chromium/base/template_util.h b/third_party/chromium/base/template_util.h
similarity index 100%
rename from libweave/third_party/chromium/base/template_util.h
rename to third_party/chromium/base/template_util.h
diff --git a/libweave/third_party/chromium/base/template_util_unittest.cc b/third_party/chromium/base/template_util_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/template_util_unittest.cc
rename to third_party/chromium/base/template_util_unittest.cc
diff --git a/libweave/third_party/chromium/base/third_party/dmg_fp/LICENSE b/third_party/chromium/base/third_party/dmg_fp/LICENSE
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/dmg_fp/LICENSE
rename to third_party/chromium/base/third_party/dmg_fp/LICENSE
diff --git a/libweave/third_party/chromium/base/third_party/dmg_fp/README.chromium b/third_party/chromium/base/third_party/dmg_fp/README.chromium
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/dmg_fp/README.chromium
rename to third_party/chromium/base/third_party/dmg_fp/README.chromium
diff --git a/libweave/third_party/chromium/base/third_party/dmg_fp/dmg_fp.h b/third_party/chromium/base/third_party/dmg_fp/dmg_fp.h
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/dmg_fp/dmg_fp.h
rename to third_party/chromium/base/third_party/dmg_fp/dmg_fp.h
diff --git a/libweave/third_party/chromium/base/third_party/dmg_fp/dtoa.cc b/third_party/chromium/base/third_party/dmg_fp/dtoa.cc
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/dmg_fp/dtoa.cc
rename to third_party/chromium/base/third_party/dmg_fp/dtoa.cc
diff --git a/libweave/third_party/chromium/base/third_party/dmg_fp/g_fmt.cc b/third_party/chromium/base/third_party/dmg_fp/g_fmt.cc
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/dmg_fp/g_fmt.cc
rename to third_party/chromium/base/third_party/dmg_fp/g_fmt.cc
diff --git a/libweave/third_party/chromium/base/third_party/icu/LICENSE b/third_party/chromium/base/third_party/icu/LICENSE
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/icu/LICENSE
rename to third_party/chromium/base/third_party/icu/LICENSE
diff --git a/libweave/third_party/chromium/base/third_party/icu/README.chromium b/third_party/chromium/base/third_party/icu/README.chromium
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/icu/README.chromium
rename to third_party/chromium/base/third_party/icu/README.chromium
diff --git a/libweave/third_party/chromium/base/third_party/icu/icu_utf.cc b/third_party/chromium/base/third_party/icu/icu_utf.cc
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/icu/icu_utf.cc
rename to third_party/chromium/base/third_party/icu/icu_utf.cc
diff --git a/libweave/third_party/chromium/base/third_party/icu/icu_utf.h b/third_party/chromium/base/third_party/icu/icu_utf.h
similarity index 100%
rename from libweave/third_party/chromium/base/third_party/icu/icu_utf.h
rename to third_party/chromium/base/third_party/icu/icu_utf.h
diff --git a/libweave/third_party/chromium/base/time/clock.cc b/third_party/chromium/base/time/clock.cc
similarity index 100%
rename from libweave/third_party/chromium/base/time/clock.cc
rename to third_party/chromium/base/time/clock.cc
diff --git a/libweave/third_party/chromium/base/time/clock.h b/third_party/chromium/base/time/clock.h
similarity index 100%
rename from libweave/third_party/chromium/base/time/clock.h
rename to third_party/chromium/base/time/clock.h
diff --git a/libweave/third_party/chromium/base/time/default_clock.cc b/third_party/chromium/base/time/default_clock.cc
similarity index 100%
rename from libweave/third_party/chromium/base/time/default_clock.cc
rename to third_party/chromium/base/time/default_clock.cc
diff --git a/libweave/third_party/chromium/base/time/default_clock.h b/third_party/chromium/base/time/default_clock.h
similarity index 100%
rename from libweave/third_party/chromium/base/time/default_clock.h
rename to third_party/chromium/base/time/default_clock.h
diff --git a/libweave/third_party/chromium/base/time/time.cc b/third_party/chromium/base/time/time.cc
similarity index 100%
rename from libweave/third_party/chromium/base/time/time.cc
rename to third_party/chromium/base/time/time.cc
diff --git a/libweave/third_party/chromium/base/time/time.h b/third_party/chromium/base/time/time.h
similarity index 100%
rename from libweave/third_party/chromium/base/time/time.h
rename to third_party/chromium/base/time/time.h
diff --git a/libweave/third_party/chromium/base/time/time_posix.cc b/third_party/chromium/base/time/time_posix.cc
similarity index 100%
rename from libweave/third_party/chromium/base/time/time_posix.cc
rename to third_party/chromium/base/time/time_posix.cc
diff --git a/libweave/third_party/chromium/base/time/time_unittest.cc b/third_party/chromium/base/time/time_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/time/time_unittest.cc
rename to third_party/chromium/base/time/time_unittest.cc
diff --git a/libweave/third_party/chromium/base/tuple.h b/third_party/chromium/base/tuple.h
similarity index 100%
rename from libweave/third_party/chromium/base/tuple.h
rename to third_party/chromium/base/tuple.h
diff --git a/libweave/third_party/chromium/base/tuple_unittest.cc b/third_party/chromium/base/tuple_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/tuple_unittest.cc
rename to third_party/chromium/base/tuple_unittest.cc
diff --git a/libweave/third_party/chromium/base/values.cc b/third_party/chromium/base/values.cc
similarity index 100%
rename from libweave/third_party/chromium/base/values.cc
rename to third_party/chromium/base/values.cc
diff --git a/libweave/third_party/chromium/base/values.h b/third_party/chromium/base/values.h
similarity index 100%
rename from libweave/third_party/chromium/base/values.h
rename to third_party/chromium/base/values.h
diff --git a/libweave/third_party/chromium/base/values_unittest.cc b/third_party/chromium/base/values_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/base/values_unittest.cc
rename to third_party/chromium/base/values_unittest.cc
diff --git a/libweave/third_party/chromium/crypto/p224.cc b/third_party/chromium/crypto/p224.cc
similarity index 100%
rename from libweave/third_party/chromium/crypto/p224.cc
rename to third_party/chromium/crypto/p224.cc
diff --git a/libweave/third_party/chromium/crypto/p224.h b/third_party/chromium/crypto/p224.h
similarity index 100%
rename from libweave/third_party/chromium/crypto/p224.h
rename to third_party/chromium/crypto/p224.h
diff --git a/libweave/third_party/chromium/crypto/p224_spake.cc b/third_party/chromium/crypto/p224_spake.cc
similarity index 100%
rename from libweave/third_party/chromium/crypto/p224_spake.cc
rename to third_party/chromium/crypto/p224_spake.cc
diff --git a/libweave/third_party/chromium/crypto/p224_spake.h b/third_party/chromium/crypto/p224_spake.h
similarity index 100%
rename from libweave/third_party/chromium/crypto/p224_spake.h
rename to third_party/chromium/crypto/p224_spake.h
diff --git a/libweave/third_party/chromium/crypto/p224_spake_unittest.cc b/third_party/chromium/crypto/p224_spake_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/crypto/p224_spake_unittest.cc
rename to third_party/chromium/crypto/p224_spake_unittest.cc
diff --git a/libweave/third_party/chromium/crypto/p224_unittest.cc b/third_party/chromium/crypto/p224_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/crypto/p224_unittest.cc
rename to third_party/chromium/crypto/p224_unittest.cc
diff --git a/libweave/third_party/chromium/crypto/sha2.cc b/third_party/chromium/crypto/sha2.cc
similarity index 100%
rename from libweave/third_party/chromium/crypto/sha2.cc
rename to third_party/chromium/crypto/sha2.cc
diff --git a/libweave/third_party/chromium/crypto/sha2.h b/third_party/chromium/crypto/sha2.h
similarity index 100%
rename from libweave/third_party/chromium/crypto/sha2.h
rename to third_party/chromium/crypto/sha2.h
diff --git a/libweave/third_party/chromium/crypto/sha2_unittest.cc b/third_party/chromium/crypto/sha2_unittest.cc
similarity index 100%
rename from libweave/third_party/chromium/crypto/sha2_unittest.cc
rename to third_party/chromium/crypto/sha2_unittest.cc
diff --git a/libweave/third_party/modp_b64/LICENSE b/third_party/modp_b64/LICENSE
similarity index 100%
rename from libweave/third_party/modp_b64/LICENSE
rename to third_party/modp_b64/LICENSE
diff --git a/libweave/third_party/modp_b64/MODULE_LICENSE_BSD b/third_party/modp_b64/MODULE_LICENSE_BSD
similarity index 100%
rename from libweave/third_party/modp_b64/MODULE_LICENSE_BSD
rename to third_party/modp_b64/MODULE_LICENSE_BSD
diff --git a/libweave/third_party/modp_b64/NOTICE b/third_party/modp_b64/NOTICE
similarity index 100%
rename from libweave/third_party/modp_b64/NOTICE
rename to third_party/modp_b64/NOTICE
diff --git a/libweave/third_party/modp_b64/README.chromium b/third_party/modp_b64/README.chromium
similarity index 100%
rename from libweave/third_party/modp_b64/README.chromium
rename to third_party/modp_b64/README.chromium
diff --git a/libweave/third_party/modp_b64/modp_b64.cc b/third_party/modp_b64/modp_b64.cc
similarity index 100%
rename from libweave/third_party/modp_b64/modp_b64.cc
rename to third_party/modp_b64/modp_b64.cc
diff --git a/libweave/third_party/modp_b64/modp_b64/modp_b64.h b/third_party/modp_b64/modp_b64/modp_b64.h
similarity index 100%
rename from libweave/third_party/modp_b64/modp_b64/modp_b64.h
rename to third_party/modp_b64/modp_b64/modp_b64.h
diff --git a/libweave/third_party/modp_b64/modp_b64_data.h b/third_party/modp_b64/modp_b64_data.h
similarity index 100%
rename from libweave/third_party/modp_b64/modp_b64_data.h
rename to third_party/modp_b64/modp_b64_data.h