diff --git a/upb-temp/.bazelci/presubmit.yml b/upb/.bazelci/presubmit.yml
similarity index 100%
rename from upb-temp/.bazelci/presubmit.yml
rename to upb/.bazelci/presubmit.yml
diff --git a/upb-temp/.bazelignore b/upb/.bazelignore
similarity index 100%
rename from upb-temp/.bazelignore
rename to upb/.bazelignore
diff --git a/upb-temp/.bazelrc b/upb/.bazelrc
similarity index 100%
rename from upb-temp/.bazelrc
rename to upb/.bazelrc
diff --git a/upb-temp/.clang-format b/upb/.clang-format
similarity index 100%
rename from upb-temp/.clang-format
rename to upb/.clang-format
diff --git a/upb-temp/.github/actions/setup-bazel-cache/action.yml b/upb/.github/actions/setup-bazel-cache/action.yml
similarity index 100%
rename from upb-temp/.github/actions/setup-bazel-cache/action.yml
rename to upb/.github/actions/setup-bazel-cache/action.yml
diff --git a/upb-temp/.github/workflows/bazel_tests.yml b/upb/.github/workflows/bazel_tests.yml
similarity index 100%
rename from upb-temp/.github/workflows/bazel_tests.yml
rename to upb/.github/workflows/bazel_tests.yml
diff --git a/upb-temp/.github/workflows/clang_format.yml b/upb/.github/workflows/clang_format.yml
similarity index 100%
rename from upb-temp/.github/workflows/clang_format.yml
rename to upb/.github/workflows/clang_format.yml
diff --git a/upb-temp/.github/workflows/generate_files.yml b/upb/.github/workflows/generate_files.yml
similarity index 100%
rename from upb-temp/.github/workflows/generate_files.yml
rename to upb/.github/workflows/generate_files.yml
diff --git a/upb-temp/.github/workflows/mergeable.yml b/upb/.github/workflows/mergeable.yml
similarity index 100%
rename from upb-temp/.github/workflows/mergeable.yml
rename to upb/.github/workflows/mergeable.yml
diff --git a/upb-temp/.github/workflows/python_tests.yml b/upb/.github/workflows/python_tests.yml
similarity index 100%
rename from upb-temp/.github/workflows/python_tests.yml
rename to upb/.github/workflows/python_tests.yml
diff --git a/upb-temp/.gitignore b/upb/.gitignore
similarity index 100%
rename from upb-temp/.gitignore
rename to upb/.gitignore
diff --git a/upb-temp/BUILD b/upb/BUILD
similarity index 100%
rename from upb-temp/BUILD
rename to upb/BUILD
diff --git a/upb-temp/CONTRIBUTING.md b/upb/CONTRIBUTING.md
similarity index 100%
rename from upb-temp/CONTRIBUTING.md
rename to upb/CONTRIBUTING.md
diff --git a/upb-temp/LICENSE b/upb/LICENSE
similarity index 100%
rename from upb-temp/LICENSE
rename to upb/LICENSE
diff --git a/upb-temp/README.md b/upb/README.md
similarity index 100%
rename from upb-temp/README.md
rename to upb/README.md
diff --git a/upb-temp/WORKSPACE b/upb/WORKSPACE
similarity index 100%
rename from upb-temp/WORKSPACE
rename to upb/WORKSPACE
diff --git a/upb-temp/bazel/BUILD b/upb/bazel/BUILD
similarity index 100%
rename from upb-temp/bazel/BUILD
rename to upb/bazel/BUILD
diff --git a/upb-temp/bazel/amalgamate.py b/upb/bazel/amalgamate.py
similarity index 100%
rename from upb-temp/bazel/amalgamate.py
rename to upb/bazel/amalgamate.py
diff --git a/upb-temp/bazel/amalgamation.bzl b/upb/bazel/amalgamation.bzl
similarity index 100%
rename from upb-temp/bazel/amalgamation.bzl
rename to upb/bazel/amalgamation.bzl
diff --git a/upb-temp/bazel/build_defs.bzl b/upb/bazel/build_defs.bzl
similarity index 100%
rename from upb-temp/bazel/build_defs.bzl
rename to upb/bazel/build_defs.bzl
diff --git a/upb-temp/bazel/lua.BUILD b/upb/bazel/lua.BUILD
similarity index 100%
rename from upb-temp/bazel/lua.BUILD
rename to upb/bazel/lua.BUILD
diff --git a/upb-temp/bazel/protobuf.patch b/upb/bazel/protobuf.patch
similarity index 100%
rename from upb-temp/bazel/protobuf.patch
rename to upb/bazel/protobuf.patch
diff --git a/upb-temp/bazel/py_proto_library.bzl b/upb/bazel/py_proto_library.bzl
similarity index 100%
rename from upb-temp/bazel/py_proto_library.bzl
rename to upb/bazel/py_proto_library.bzl
diff --git a/upb-temp/bazel/python_downloads.bzl b/upb/bazel/python_downloads.bzl
similarity index 100%
rename from upb-temp/bazel/python_downloads.bzl
rename to upb/bazel/python_downloads.bzl
diff --git a/upb-temp/bazel/system_python.bzl b/upb/bazel/system_python.bzl
similarity index 100%
rename from upb-temp/bazel/system_python.bzl
rename to upb/bazel/system_python.bzl
diff --git a/upb-temp/bazel/upb_proto_library.bzl b/upb/bazel/upb_proto_library.bzl
similarity index 100%
rename from upb-temp/bazel/upb_proto_library.bzl
rename to upb/bazel/upb_proto_library.bzl
diff --git a/upb-temp/bazel/workspace_deps.bzl b/upb/bazel/workspace_deps.bzl
similarity index 100%
rename from upb-temp/bazel/workspace_deps.bzl
rename to upb/bazel/workspace_deps.bzl
diff --git a/upb-temp/benchmarks/BUILD b/upb/benchmarks/BUILD
similarity index 100%
rename from upb-temp/benchmarks/BUILD
rename to upb/benchmarks/BUILD
diff --git a/upb-temp/benchmarks/BUILD.googleapis b/upb/benchmarks/BUILD.googleapis
similarity index 100%
rename from upb-temp/benchmarks/BUILD.googleapis
rename to upb/benchmarks/BUILD.googleapis
diff --git a/upb-temp/benchmarks/benchmark.cc b/upb/benchmarks/benchmark.cc
similarity index 100%
rename from upb-temp/benchmarks/benchmark.cc
rename to upb/benchmarks/benchmark.cc
diff --git a/upb-temp/benchmarks/build_defs.bzl b/upb/benchmarks/build_defs.bzl
similarity index 100%
rename from upb-temp/benchmarks/build_defs.bzl
rename to upb/benchmarks/build_defs.bzl
diff --git a/upb-temp/benchmarks/compare.py b/upb/benchmarks/compare.py
similarity index 100%
rename from upb-temp/benchmarks/compare.py
rename to upb/benchmarks/compare.py
diff --git a/upb-temp/benchmarks/descriptor.proto b/upb/benchmarks/descriptor.proto
similarity index 100%
rename from upb-temp/benchmarks/descriptor.proto
rename to upb/benchmarks/descriptor.proto
diff --git a/upb-temp/benchmarks/descriptor_sv.proto b/upb/benchmarks/descriptor_sv.proto
similarity index 100%
rename from upb-temp/benchmarks/descriptor_sv.proto
rename to upb/benchmarks/descriptor_sv.proto
diff --git a/upb-temp/benchmarks/empty.proto b/upb/benchmarks/empty.proto
similarity index 100%
rename from upb-temp/benchmarks/empty.proto
rename to upb/benchmarks/empty.proto
diff --git a/upb-temp/benchmarks/gen_protobuf_binary_cc.py b/upb/benchmarks/gen_protobuf_binary_cc.py
similarity index 100%
rename from upb-temp/benchmarks/gen_protobuf_binary_cc.py
rename to upb/benchmarks/gen_protobuf_binary_cc.py
diff --git a/upb-temp/benchmarks/gen_synthetic_protos.py b/upb/benchmarks/gen_synthetic_protos.py
similarity index 100%
rename from upb-temp/benchmarks/gen_synthetic_protos.py
rename to upb/benchmarks/gen_synthetic_protos.py
diff --git a/upb-temp/benchmarks/gen_upb_binary_c.py b/upb/benchmarks/gen_upb_binary_c.py
similarity index 100%
rename from upb-temp/benchmarks/gen_upb_binary_c.py
rename to upb/benchmarks/gen_upb_binary_c.py
diff --git a/upb-temp/cmake/BUILD.bazel b/upb/cmake/BUILD.bazel
similarity index 100%
rename from upb-temp/cmake/BUILD.bazel
rename to upb/cmake/BUILD.bazel
diff --git a/upb-temp/cmake/CMakeLists.txt b/upb/cmake/CMakeLists.txt
similarity index 100%
rename from upb-temp/cmake/CMakeLists.txt
rename to upb/cmake/CMakeLists.txt
diff --git a/upb-temp/cmake/README.md b/upb/cmake/README.md
similarity index 100%
rename from upb-temp/cmake/README.md
rename to upb/cmake/README.md
diff --git a/upb-temp/cmake/build_defs.bzl b/upb/cmake/build_defs.bzl
similarity index 100%
rename from upb-temp/cmake/build_defs.bzl
rename to upb/cmake/build_defs.bzl
diff --git a/upb-temp/cmake/google/protobuf/descriptor.upb.c b/upb/cmake/google/protobuf/descriptor.upb.c
similarity index 100%
rename from upb-temp/cmake/google/protobuf/descriptor.upb.c
rename to upb/cmake/google/protobuf/descriptor.upb.c
diff --git a/upb-temp/cmake/google/protobuf/descriptor.upb.h b/upb/cmake/google/protobuf/descriptor.upb.h
similarity index 100%
rename from upb-temp/cmake/google/protobuf/descriptor.upb.h
rename to upb/cmake/google/protobuf/descriptor.upb.h
diff --git a/upb-temp/cmake/make_cmakelists.py b/upb/cmake/make_cmakelists.py
similarity index 100%
rename from upb-temp/cmake/make_cmakelists.py
rename to upb/cmake/make_cmakelists.py
diff --git a/upb-temp/cmake/push_auto_update.sh b/upb/cmake/push_auto_update.sh
similarity index 100%
rename from upb-temp/cmake/push_auto_update.sh
rename to upb/cmake/push_auto_update.sh
diff --git a/upb-temp/cmake/staleness_test.py b/upb/cmake/staleness_test.py
similarity index 100%
rename from upb-temp/cmake/staleness_test.py
rename to upb/cmake/staleness_test.py
diff --git a/upb-temp/cmake/staleness_test_lib.py b/upb/cmake/staleness_test_lib.py
similarity index 100%
rename from upb-temp/cmake/staleness_test_lib.py
rename to upb/cmake/staleness_test_lib.py
diff --git a/upb-temp/docs/design.md b/upb/docs/design.md
similarity index 100%
rename from upb-temp/docs/design.md
rename to upb/docs/design.md
diff --git a/upb-temp/docs/render.py b/upb/docs/render.py
similarity index 100%
rename from upb-temp/docs/render.py
rename to upb/docs/render.py
diff --git a/upb-temp/docs/style-guide.md b/upb/docs/style-guide.md
similarity index 100%
rename from upb-temp/docs/style-guide.md
rename to upb/docs/style-guide.md
diff --git a/upb-temp/docs/vs-cpp-protos.md b/upb/docs/vs-cpp-protos.md
similarity index 100%
rename from upb-temp/docs/vs-cpp-protos.md
rename to upb/docs/vs-cpp-protos.md
diff --git a/upb-temp/docs/wrapping-upb.md b/upb/docs/wrapping-upb.md
similarity index 100%
rename from upb-temp/docs/wrapping-upb.md
rename to upb/docs/wrapping-upb.md
diff --git a/upb-temp/lua/BUILD.bazel b/upb/lua/BUILD.bazel
similarity index 100%
rename from upb-temp/lua/BUILD.bazel
rename to upb/lua/BUILD.bazel
diff --git a/upb-temp/lua/README.md b/upb/lua/README.md
similarity index 100%
rename from upb-temp/lua/README.md
rename to upb/lua/README.md
diff --git a/upb-temp/lua/def.c b/upb/lua/def.c
similarity index 100%
rename from upb-temp/lua/def.c
rename to upb/lua/def.c
diff --git a/upb-temp/lua/lua_proto_library.bzl b/upb/lua/lua_proto_library.bzl
similarity index 100%
rename from upb-temp/lua/lua_proto_library.bzl
rename to upb/lua/lua_proto_library.bzl
diff --git a/upb-temp/lua/main.c b/upb/lua/main.c
similarity index 100%
rename from upb-temp/lua/main.c
rename to upb/lua/main.c
diff --git a/upb-temp/lua/msg.c b/upb/lua/msg.c
similarity index 100%
rename from upb-temp/lua/msg.c
rename to upb/lua/msg.c
diff --git a/upb-temp/lua/test.proto b/upb/lua/test.proto
similarity index 100%
rename from upb-temp/lua/test.proto
rename to upb/lua/test.proto
diff --git a/upb-temp/lua/test_upb.lua b/upb/lua/test_upb.lua
similarity index 100%
rename from upb-temp/lua/test_upb.lua
rename to upb/lua/test_upb.lua
diff --git a/upb-temp/lua/upb.c b/upb/lua/upb.c
similarity index 100%
rename from upb-temp/lua/upb.c
rename to upb/lua/upb.c
diff --git a/upb-temp/lua/upb.h b/upb/lua/upb.h
similarity index 100%
rename from upb-temp/lua/upb.h
rename to upb/lua/upb.h
diff --git a/upb-temp/lua/upb.lua b/upb/lua/upb.lua
similarity index 100%
rename from upb-temp/lua/upb.lua
rename to upb/lua/upb.lua
diff --git a/upb-temp/lua/upbc.cc b/upb/lua/upbc.cc
similarity index 100%
rename from upb-temp/lua/upbc.cc
rename to upb/lua/upbc.cc
diff --git a/upb-temp/protos/BUILD b/upb/protos/BUILD
similarity index 100%
rename from upb-temp/protos/BUILD
rename to upb/protos/BUILD
diff --git a/upb-temp/protos/bazel/BUILD b/upb/protos/bazel/BUILD
similarity index 100%
rename from upb-temp/protos/bazel/BUILD
rename to upb/protos/bazel/BUILD
diff --git a/upb-temp/protos/bazel/upb_cc_proto_library.bzl b/upb/protos/bazel/upb_cc_proto_library.bzl
similarity index 100%
rename from upb-temp/protos/bazel/upb_cc_proto_library.bzl
rename to upb/protos/bazel/upb_cc_proto_library.bzl
diff --git a/upb-temp/protos/protos.cc b/upb/protos/protos.cc
similarity index 100%
rename from upb-temp/protos/protos.cc
rename to upb/protos/protos.cc
diff --git a/upb-temp/protos/protos.h b/upb/protos/protos.h
similarity index 100%
rename from upb-temp/protos/protos.h
rename to upb/protos/protos.h
diff --git a/upb-temp/protos/protos_extension_lock.cc b/upb/protos/protos_extension_lock.cc
similarity index 100%
rename from upb-temp/protos/protos_extension_lock.cc
rename to upb/protos/protos_extension_lock.cc
diff --git a/upb-temp/protos/protos_extension_lock.h b/upb/protos/protos_extension_lock.h
similarity index 100%
rename from upb-temp/protos/protos_extension_lock.h
rename to upb/protos/protos_extension_lock.h
diff --git a/upb-temp/protos/protos_extension_lock_test.cc b/upb/protos/protos_extension_lock_test.cc
similarity index 100%
rename from upb-temp/protos/protos_extension_lock_test.cc
rename to upb/protos/protos_extension_lock_test.cc
diff --git a/upb-temp/protos/protos_internal.h b/upb/protos/protos_internal.h
similarity index 100%
rename from upb-temp/protos/protos_internal.h
rename to upb/protos/protos_internal.h
diff --git a/upb-temp/protos/protos_internal_test.cc b/upb/protos/protos_internal_test.cc
similarity index 100%
rename from upb-temp/protos/protos_internal_test.cc
rename to upb/protos/protos_internal_test.cc
diff --git a/upb-temp/protos/protos_traits.h b/upb/protos/protos_traits.h
similarity index 100%
rename from upb-temp/protos/protos_traits.h
rename to upb/protos/protos_traits.h
diff --git a/upb-temp/protos/repeated_field.h b/upb/protos/repeated_field.h
similarity index 100%
rename from upb-temp/protos/repeated_field.h
rename to upb/protos/repeated_field.h
diff --git a/upb-temp/protos/repeated_field_iterator.h b/upb/protos/repeated_field_iterator.h
similarity index 100%
rename from upb-temp/protos/repeated_field_iterator.h
rename to upb/protos/repeated_field_iterator.h
diff --git a/upb-temp/protos/repeated_field_iterator_test.cc b/upb/protos/repeated_field_iterator_test.cc
similarity index 100%
rename from upb-temp/protos/repeated_field_iterator_test.cc
rename to upb/protos/repeated_field_iterator_test.cc
diff --git a/upb-temp/protos_generator/BUILD b/upb/protos_generator/BUILD
similarity index 100%
rename from upb-temp/protos_generator/BUILD
rename to upb/protos_generator/BUILD
diff --git a/upb-temp/protos_generator/gen_accessors.cc b/upb/protos_generator/gen_accessors.cc
similarity index 100%
rename from upb-temp/protos_generator/gen_accessors.cc
rename to upb/protos_generator/gen_accessors.cc
diff --git a/upb-temp/protos_generator/gen_accessors.h b/upb/protos_generator/gen_accessors.h
similarity index 100%
rename from upb-temp/protos_generator/gen_accessors.h
rename to upb/protos_generator/gen_accessors.h
diff --git a/upb-temp/protos_generator/gen_enums.cc b/upb/protos_generator/gen_enums.cc
similarity index 100%
rename from upb-temp/protos_generator/gen_enums.cc
rename to upb/protos_generator/gen_enums.cc
diff --git a/upb-temp/protos_generator/gen_enums.h b/upb/protos_generator/gen_enums.h
similarity index 100%
rename from upb-temp/protos_generator/gen_enums.h
rename to upb/protos_generator/gen_enums.h
diff --git a/upb-temp/protos_generator/gen_extensions.cc b/upb/protos_generator/gen_extensions.cc
similarity index 100%
rename from upb-temp/protos_generator/gen_extensions.cc
rename to upb/protos_generator/gen_extensions.cc
diff --git a/upb-temp/protos_generator/gen_extensions.h b/upb/protos_generator/gen_extensions.h
similarity index 100%
rename from upb-temp/protos_generator/gen_extensions.h
rename to upb/protos_generator/gen_extensions.h
diff --git a/upb-temp/protos_generator/gen_messages.cc b/upb/protos_generator/gen_messages.cc
similarity index 100%
rename from upb-temp/protos_generator/gen_messages.cc
rename to upb/protos_generator/gen_messages.cc
diff --git a/upb-temp/protos_generator/gen_messages.h b/upb/protos_generator/gen_messages.h
similarity index 100%
rename from upb-temp/protos_generator/gen_messages.h
rename to upb/protos_generator/gen_messages.h
diff --git a/upb-temp/protos_generator/gen_repeated_fields.cc b/upb/protos_generator/gen_repeated_fields.cc
similarity index 100%
rename from upb-temp/protos_generator/gen_repeated_fields.cc
rename to upb/protos_generator/gen_repeated_fields.cc
diff --git a/upb-temp/protos_generator/gen_repeated_fields.h b/upb/protos_generator/gen_repeated_fields.h
similarity index 100%
rename from upb-temp/protos_generator/gen_repeated_fields.h
rename to upb/protos_generator/gen_repeated_fields.h
diff --git a/upb-temp/protos_generator/gen_utils.cc b/upb/protos_generator/gen_utils.cc
similarity index 100%
rename from upb-temp/protos_generator/gen_utils.cc
rename to upb/protos_generator/gen_utils.cc
diff --git a/upb-temp/protos_generator/gen_utils.h b/upb/protos_generator/gen_utils.h
similarity index 100%
rename from upb-temp/protos_generator/gen_utils.h
rename to upb/protos_generator/gen_utils.h
diff --git a/upb-temp/protos_generator/names.cc b/upb/protos_generator/names.cc
similarity index 100%
rename from upb-temp/protos_generator/names.cc
rename to upb/protos_generator/names.cc
diff --git a/upb-temp/protos_generator/names.h b/upb/protos_generator/names.h
similarity index 100%
rename from upb-temp/protos_generator/names.h
rename to upb/protos_generator/names.h
diff --git a/upb-temp/protos_generator/output.cc b/upb/protos_generator/output.cc
similarity index 100%
rename from upb-temp/protos_generator/output.cc
rename to upb/protos_generator/output.cc
diff --git a/upb-temp/protos_generator/output.h b/upb/protos_generator/output.h
similarity index 100%
rename from upb-temp/protos_generator/output.h
rename to upb/protos_generator/output.h
diff --git a/upb-temp/protos_generator/protoc-gen-upb-protos.cc b/upb/protos_generator/protoc-gen-upb-protos.cc
similarity index 100%
rename from upb-temp/protos_generator/protoc-gen-upb-protos.cc
rename to upb/protos_generator/protoc-gen-upb-protos.cc
diff --git a/upb-temp/protos_generator/tests/BUILD b/upb/protos_generator/tests/BUILD
similarity index 100%
rename from upb-temp/protos_generator/tests/BUILD
rename to upb/protos_generator/tests/BUILD
diff --git a/upb-temp/protos_generator/tests/child_model.proto b/upb/protos_generator/tests/child_model.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/child_model.proto
rename to upb/protos_generator/tests/child_model.proto
diff --git a/upb-temp/protos_generator/tests/legacy-name.proto b/upb/protos_generator/tests/legacy-name.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/legacy-name.proto
rename to upb/protos_generator/tests/legacy-name.proto
diff --git a/upb-temp/protos_generator/tests/naming_conflict.proto b/upb/protos_generator/tests/naming_conflict.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/naming_conflict.proto
rename to upb/protos_generator/tests/naming_conflict.proto
diff --git a/upb-temp/protos_generator/tests/no_package.proto b/upb/protos_generator/tests/no_package.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/no_package.proto
rename to upb/protos_generator/tests/no_package.proto
diff --git a/upb-temp/protos_generator/tests/no_package_enum_user.proto b/upb/protos_generator/tests/no_package_enum_user.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/no_package_enum_user.proto
rename to upb/protos_generator/tests/no_package_enum_user.proto
diff --git a/upb-temp/protos_generator/tests/test_enum.proto b/upb/protos_generator/tests/test_enum.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/test_enum.proto
rename to upb/protos_generator/tests/test_enum.proto
diff --git a/upb-temp/protos_generator/tests/test_extension.proto b/upb/protos_generator/tests/test_extension.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/test_extension.proto
rename to upb/protos_generator/tests/test_extension.proto
diff --git a/upb-temp/protos_generator/tests/test_generated.cc b/upb/protos_generator/tests/test_generated.cc
similarity index 100%
rename from upb-temp/protos_generator/tests/test_generated.cc
rename to upb/protos_generator/tests/test_generated.cc
diff --git a/upb-temp/protos_generator/tests/test_model.proto b/upb/protos_generator/tests/test_model.proto
similarity index 100%
rename from upb-temp/protos_generator/tests/test_model.proto
rename to upb/protos_generator/tests/test_model.proto
diff --git a/upb-temp/python/BUILD b/upb/python/BUILD
similarity index 100%
rename from upb-temp/python/BUILD
rename to upb/python/BUILD
diff --git a/upb-temp/python/convert.c b/upb/python/convert.c
similarity index 100%
rename from upb-temp/python/convert.c
rename to upb/python/convert.c
diff --git a/upb-temp/python/convert.h b/upb/python/convert.h
similarity index 100%
rename from upb-temp/python/convert.h
rename to upb/python/convert.h
diff --git a/upb-temp/python/descriptor.c b/upb/python/descriptor.c
similarity index 100%
rename from upb-temp/python/descriptor.c
rename to upb/python/descriptor.c
diff --git a/upb-temp/python/descriptor.h b/upb/python/descriptor.h
similarity index 100%
rename from upb-temp/python/descriptor.h
rename to upb/python/descriptor.h
diff --git a/upb-temp/python/descriptor_containers.c b/upb/python/descriptor_containers.c
similarity index 100%
rename from upb-temp/python/descriptor_containers.c
rename to upb/python/descriptor_containers.c
diff --git a/upb-temp/python/descriptor_containers.h b/upb/python/descriptor_containers.h
similarity index 100%
rename from upb-temp/python/descriptor_containers.h
rename to upb/python/descriptor_containers.h
diff --git a/upb-temp/python/descriptor_pool.c b/upb/python/descriptor_pool.c
similarity index 100%
rename from upb-temp/python/descriptor_pool.c
rename to upb/python/descriptor_pool.c
diff --git a/upb-temp/python/descriptor_pool.h b/upb/python/descriptor_pool.h
similarity index 100%
rename from upb-temp/python/descriptor_pool.h
rename to upb/python/descriptor_pool.h
diff --git a/upb-temp/python/dist/BUILD.bazel b/upb/python/dist/BUILD.bazel
similarity index 100%
rename from upb-temp/python/dist/BUILD.bazel
rename to upb/python/dist/BUILD.bazel
diff --git a/upb-temp/python/dist/MANIFEST.in b/upb/python/dist/MANIFEST.in
similarity index 100%
rename from upb-temp/python/dist/MANIFEST.in
rename to upb/python/dist/MANIFEST.in
diff --git a/upb-temp/python/dist/dist.bzl b/upb/python/dist/dist.bzl
similarity index 100%
rename from upb-temp/python/dist/dist.bzl
rename to upb/python/dist/dist.bzl
diff --git a/upb-temp/python/dist/setup.py b/upb/python/dist/setup.py
similarity index 100%
rename from upb-temp/python/dist/setup.py
rename to upb/python/dist/setup.py
diff --git a/upb-temp/python/extension_dict.c b/upb/python/extension_dict.c
similarity index 100%
rename from upb-temp/python/extension_dict.c
rename to upb/python/extension_dict.c
diff --git a/upb-temp/python/extension_dict.h b/upb/python/extension_dict.h
similarity index 100%
rename from upb-temp/python/extension_dict.h
rename to upb/python/extension_dict.h
diff --git a/upb-temp/python/map.c b/upb/python/map.c
similarity index 100%
rename from upb-temp/python/map.c
rename to upb/python/map.c
diff --git a/upb-temp/python/map.h b/upb/python/map.h
similarity index 100%
rename from upb-temp/python/map.h
rename to upb/python/map.h
diff --git a/upb-temp/python/message.c b/upb/python/message.c
similarity index 100%
rename from upb-temp/python/message.c
rename to upb/python/message.c
diff --git a/upb-temp/python/message.h b/upb/python/message.h
similarity index 100%
rename from upb-temp/python/message.h
rename to upb/python/message.h
diff --git a/upb-temp/python/minimal_test.py b/upb/python/minimal_test.py
similarity index 100%
rename from upb-temp/python/minimal_test.py
rename to upb/python/minimal_test.py
diff --git a/upb-temp/python/pb_unit_tests/BUILD b/upb/python/pb_unit_tests/BUILD
similarity index 100%
rename from upb-temp/python/pb_unit_tests/BUILD
rename to upb/python/pb_unit_tests/BUILD
diff --git a/upb-temp/python/pb_unit_tests/README.md b/upb/python/pb_unit_tests/README.md
similarity index 100%
rename from upb-temp/python/pb_unit_tests/README.md
rename to upb/python/pb_unit_tests/README.md
diff --git a/upb-temp/python/pb_unit_tests/descriptor_database_test_wrapper.py b/upb/python/pb_unit_tests/descriptor_database_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/descriptor_database_test_wrapper.py
rename to upb/python/pb_unit_tests/descriptor_database_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/descriptor_pool_test_wrapper.py b/upb/python/pb_unit_tests/descriptor_pool_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/descriptor_pool_test_wrapper.py
rename to upb/python/pb_unit_tests/descriptor_pool_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/descriptor_test_wrapper.py b/upb/python/pb_unit_tests/descriptor_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/descriptor_test_wrapper.py
rename to upb/python/pb_unit_tests/descriptor_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/generator_test_wrapper.py b/upb/python/pb_unit_tests/generator_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/generator_test_wrapper.py
rename to upb/python/pb_unit_tests/generator_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/json_format_test_wrapper.py b/upb/python/pb_unit_tests/json_format_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/json_format_test_wrapper.py
rename to upb/python/pb_unit_tests/json_format_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/keywords_test_wrapper.py b/upb/python/pb_unit_tests/keywords_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/keywords_test_wrapper.py
rename to upb/python/pb_unit_tests/keywords_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/message_factory_test_wrapper.py b/upb/python/pb_unit_tests/message_factory_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/message_factory_test_wrapper.py
rename to upb/python/pb_unit_tests/message_factory_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/message_test_wrapper.py b/upb/python/pb_unit_tests/message_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/message_test_wrapper.py
rename to upb/python/pb_unit_tests/message_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/numpy_test_wrapper.py b/upb/python/pb_unit_tests/numpy_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/numpy_test_wrapper.py
rename to upb/python/pb_unit_tests/numpy_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/proto_builder_test_wrapper.py b/upb/python/pb_unit_tests/proto_builder_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/proto_builder_test_wrapper.py
rename to upb/python/pb_unit_tests/proto_builder_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/pyproto_test_wrapper.bzl b/upb/python/pb_unit_tests/pyproto_test_wrapper.bzl
similarity index 100%
rename from upb-temp/python/pb_unit_tests/pyproto_test_wrapper.bzl
rename to upb/python/pb_unit_tests/pyproto_test_wrapper.bzl
diff --git a/upb-temp/python/pb_unit_tests/reflection_test_wrapper.py b/upb/python/pb_unit_tests/reflection_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/reflection_test_wrapper.py
rename to upb/python/pb_unit_tests/reflection_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/service_reflection_test_wrapper.py b/upb/python/pb_unit_tests/service_reflection_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/service_reflection_test_wrapper.py
rename to upb/python/pb_unit_tests/service_reflection_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/symbol_database_test_wrapper.py b/upb/python/pb_unit_tests/symbol_database_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/symbol_database_test_wrapper.py
rename to upb/python/pb_unit_tests/symbol_database_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/text_encoding_test_wrapper.py b/upb/python/pb_unit_tests/text_encoding_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/text_encoding_test_wrapper.py
rename to upb/python/pb_unit_tests/text_encoding_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/text_format_test_wrapper.py b/upb/python/pb_unit_tests/text_format_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/text_format_test_wrapper.py
rename to upb/python/pb_unit_tests/text_format_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/unknown_fields_test_wrapper.py b/upb/python/pb_unit_tests/unknown_fields_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/unknown_fields_test_wrapper.py
rename to upb/python/pb_unit_tests/unknown_fields_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/well_known_types_test_wrapper.py b/upb/python/pb_unit_tests/well_known_types_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/well_known_types_test_wrapper.py
rename to upb/python/pb_unit_tests/well_known_types_test_wrapper.py
diff --git a/upb-temp/python/pb_unit_tests/wire_format_test_wrapper.py b/upb/python/pb_unit_tests/wire_format_test_wrapper.py
similarity index 100%
rename from upb-temp/python/pb_unit_tests/wire_format_test_wrapper.py
rename to upb/python/pb_unit_tests/wire_format_test_wrapper.py
diff --git a/upb-temp/python/protobuf.c b/upb/python/protobuf.c
similarity index 100%
rename from upb-temp/python/protobuf.c
rename to upb/python/protobuf.c
diff --git a/upb-temp/python/protobuf.h b/upb/python/protobuf.h
similarity index 100%
rename from upb-temp/python/protobuf.h
rename to upb/python/protobuf.h
diff --git a/upb-temp/python/py_extension.bzl b/upb/python/py_extension.bzl
similarity index 100%
rename from upb-temp/python/py_extension.bzl
rename to upb/python/py_extension.bzl
diff --git a/upb-temp/python/python_api.h b/upb/python/python_api.h
similarity index 100%
rename from upb-temp/python/python_api.h
rename to upb/python/python_api.h
diff --git a/upb-temp/python/repeated.c b/upb/python/repeated.c
similarity index 100%
rename from upb-temp/python/repeated.c
rename to upb/python/repeated.c
diff --git a/upb-temp/python/repeated.h b/upb/python/repeated.h
similarity index 100%
rename from upb-temp/python/repeated.h
rename to upb/python/repeated.h
diff --git a/upb-temp/python/requirements.txt b/upb/python/requirements.txt
similarity index 100%
rename from upb-temp/python/requirements.txt
rename to upb/python/requirements.txt
diff --git a/upb-temp/python/requirements_311.txt b/upb/python/requirements_311.txt
similarity index 100%
rename from upb-temp/python/requirements_311.txt
rename to upb/python/requirements_311.txt
diff --git a/upb-temp/python/unknown_fields.c b/upb/python/unknown_fields.c
similarity index 100%
rename from upb-temp/python/unknown_fields.c
rename to upb/python/unknown_fields.c
diff --git a/upb-temp/python/unknown_fields.h b/upb/python/unknown_fields.h
similarity index 100%
rename from upb-temp/python/unknown_fields.h
rename to upb/python/unknown_fields.h
diff --git a/upb-temp/python/version_script.lds b/upb/python/version_script.lds
similarity index 100%
rename from upb-temp/python/version_script.lds
rename to upb/python/version_script.lds
diff --git a/upb-temp/third_party/lunit/LICENSE b/upb/third_party/lunit/LICENSE
similarity index 100%
rename from upb-temp/third_party/lunit/LICENSE
rename to upb/third_party/lunit/LICENSE
diff --git a/upb-temp/third_party/lunit/README.google b/upb/third_party/lunit/README.google
similarity index 100%
rename from upb-temp/third_party/lunit/README.google
rename to upb/third_party/lunit/README.google
diff --git a/upb-temp/third_party/lunit/console.lua b/upb/third_party/lunit/console.lua
similarity index 100%
rename from upb-temp/third_party/lunit/console.lua
rename to upb/third_party/lunit/console.lua
diff --git a/upb-temp/third_party/lunit/lunit.lua b/upb/third_party/lunit/lunit.lua
similarity index 100%
rename from upb-temp/third_party/lunit/lunit.lua
rename to upb/third_party/lunit/lunit.lua
diff --git a/upb-temp/upb/base/BUILD b/upb/upb/base/BUILD
similarity index 100%
rename from upb-temp/upb/base/BUILD
rename to upb/upb/base/BUILD
diff --git a/upb-temp/upb/base/descriptor_constants.h b/upb/upb/base/descriptor_constants.h
similarity index 100%
rename from upb-temp/upb/base/descriptor_constants.h
rename to upb/upb/base/descriptor_constants.h
diff --git a/upb-temp/upb/base/internal/log2.h b/upb/upb/base/internal/log2.h
similarity index 100%
rename from upb-temp/upb/base/internal/log2.h
rename to upb/upb/base/internal/log2.h
diff --git a/upb-temp/upb/base/status.c b/upb/upb/base/status.c
similarity index 100%
rename from upb-temp/upb/base/status.c
rename to upb/upb/base/status.c
diff --git a/upb-temp/upb/base/status.h b/upb/upb/base/status.h
similarity index 100%
rename from upb-temp/upb/base/status.h
rename to upb/upb/base/status.h
diff --git a/upb-temp/upb/base/status.hpp b/upb/upb/base/status.hpp
similarity index 100%
rename from upb-temp/upb/base/status.hpp
rename to upb/upb/base/status.hpp
diff --git a/upb-temp/upb/base/string_view.h b/upb/upb/base/string_view.h
similarity index 100%
rename from upb-temp/upb/base/string_view.h
rename to upb/upb/base/string_view.h
diff --git a/upb-temp/upb/collections/BUILD b/upb/upb/collections/BUILD
similarity index 100%
rename from upb-temp/upb/collections/BUILD
rename to upb/upb/collections/BUILD
diff --git a/upb-temp/upb/collections/array.c b/upb/upb/collections/array.c
similarity index 100%
rename from upb-temp/upb/collections/array.c
rename to upb/upb/collections/array.c
diff --git a/upb-temp/upb/collections/array.h b/upb/upb/collections/array.h
similarity index 100%
rename from upb-temp/upb/collections/array.h
rename to upb/upb/collections/array.h
diff --git a/upb-temp/upb/collections/array_split64.h b/upb/upb/collections/array_split64.h
similarity index 100%
rename from upb-temp/upb/collections/array_split64.h
rename to upb/upb/collections/array_split64.h
diff --git a/upb-temp/upb/collections/array_test.cc b/upb/upb/collections/array_test.cc
similarity index 100%
rename from upb-temp/upb/collections/array_test.cc
rename to upb/upb/collections/array_test.cc
diff --git a/upb-temp/upb/collections/internal/array.h b/upb/upb/collections/internal/array.h
similarity index 100%
rename from upb-temp/upb/collections/internal/array.h
rename to upb/upb/collections/internal/array.h
diff --git a/upb-temp/upb/collections/internal/map.h b/upb/upb/collections/internal/map.h
similarity index 100%
rename from upb-temp/upb/collections/internal/map.h
rename to upb/upb/collections/internal/map.h
diff --git a/upb-temp/upb/collections/internal/map_sorter.h b/upb/upb/collections/internal/map_sorter.h
similarity index 100%
rename from upb-temp/upb/collections/internal/map_sorter.h
rename to upb/upb/collections/internal/map_sorter.h
diff --git a/upb-temp/upb/collections/map.c b/upb/upb/collections/map.c
similarity index 100%
rename from upb-temp/upb/collections/map.c
rename to upb/upb/collections/map.c
diff --git a/upb-temp/upb/collections/map.h b/upb/upb/collections/map.h
similarity index 100%
rename from upb-temp/upb/collections/map.h
rename to upb/upb/collections/map.h
diff --git a/upb-temp/upb/collections/map_gencode_util.h b/upb/upb/collections/map_gencode_util.h
similarity index 100%
rename from upb-temp/upb/collections/map_gencode_util.h
rename to upb/upb/collections/map_gencode_util.h
diff --git a/upb-temp/upb/collections/map_sorter.c b/upb/upb/collections/map_sorter.c
similarity index 100%
rename from upb-temp/upb/collections/map_sorter.c
rename to upb/upb/collections/map_sorter.c
diff --git a/upb-temp/upb/collections/map_test.cc b/upb/upb/collections/map_test.cc
similarity index 100%
rename from upb-temp/upb/collections/map_test.cc
rename to upb/upb/collections/map_test.cc
diff --git a/upb-temp/upb/collections/message_value.h b/upb/upb/collections/message_value.h
similarity index 100%
rename from upb-temp/upb/collections/message_value.h
rename to upb/upb/collections/message_value.h
diff --git a/upb-temp/upb/conformance/BUILD b/upb/upb/conformance/BUILD
similarity index 100%
rename from upb-temp/upb/conformance/BUILD
rename to upb/upb/conformance/BUILD
diff --git a/upb-temp/upb/conformance/conformance_upb.c b/upb/upb/conformance/conformance_upb.c
similarity index 100%
rename from upb-temp/upb/conformance/conformance_upb.c
rename to upb/upb/conformance/conformance_upb.c
diff --git a/upb-temp/upb/conformance/conformance_upb_failures.txt b/upb/upb/conformance/conformance_upb_failures.txt
similarity index 100%
rename from upb-temp/upb/conformance/conformance_upb_failures.txt
rename to upb/upb/conformance/conformance_upb_failures.txt
diff --git a/upb-temp/upb/generated_code_support.h b/upb/upb/generated_code_support.h
similarity index 100%
rename from upb-temp/upb/generated_code_support.h
rename to upb/upb/generated_code_support.h
diff --git a/upb-temp/upb/hash/BUILD b/upb/upb/hash/BUILD
similarity index 100%
rename from upb-temp/upb/hash/BUILD
rename to upb/upb/hash/BUILD
diff --git a/upb-temp/upb/hash/common.c b/upb/upb/hash/common.c
similarity index 100%
rename from upb-temp/upb/hash/common.c
rename to upb/upb/hash/common.c
diff --git a/upb-temp/upb/hash/common.h b/upb/upb/hash/common.h
similarity index 100%
rename from upb-temp/upb/hash/common.h
rename to upb/upb/hash/common.h
diff --git a/upb-temp/upb/hash/int_table.h b/upb/upb/hash/int_table.h
similarity index 100%
rename from upb-temp/upb/hash/int_table.h
rename to upb/upb/hash/int_table.h
diff --git a/upb-temp/upb/hash/str_table.h b/upb/upb/hash/str_table.h
similarity index 100%
rename from upb-temp/upb/hash/str_table.h
rename to upb/upb/hash/str_table.h
diff --git a/upb-temp/upb/hash/test.cc b/upb/upb/hash/test.cc
similarity index 100%
rename from upb-temp/upb/hash/test.cc
rename to upb/upb/hash/test.cc
diff --git a/upb-temp/upb/io/BUILD b/upb/upb/io/BUILD
similarity index 100%
rename from upb-temp/upb/io/BUILD
rename to upb/upb/io/BUILD
diff --git a/upb-temp/upb/io/README.md b/upb/upb/io/README.md
similarity index 100%
rename from upb-temp/upb/io/README.md
rename to upb/upb/io/README.md
diff --git a/upb-temp/upb/io/chunked_input_stream.c b/upb/upb/io/chunked_input_stream.c
similarity index 100%
rename from upb-temp/upb/io/chunked_input_stream.c
rename to upb/upb/io/chunked_input_stream.c
diff --git a/upb-temp/upb/io/chunked_input_stream.h b/upb/upb/io/chunked_input_stream.h
similarity index 100%
rename from upb-temp/upb/io/chunked_input_stream.h
rename to upb/upb/io/chunked_input_stream.h
diff --git a/upb-temp/upb/io/chunked_output_stream.c b/upb/upb/io/chunked_output_stream.c
similarity index 100%
rename from upb-temp/upb/io/chunked_output_stream.c
rename to upb/upb/io/chunked_output_stream.c
diff --git a/upb-temp/upb/io/chunked_output_stream.h b/upb/upb/io/chunked_output_stream.h
similarity index 100%
rename from upb-temp/upb/io/chunked_output_stream.h
rename to upb/upb/io/chunked_output_stream.h
diff --git a/upb-temp/upb/io/string.h b/upb/upb/io/string.h
similarity index 100%
rename from upb-temp/upb/io/string.h
rename to upb/upb/io/string.h
diff --git a/upb-temp/upb/io/string_test.cc b/upb/upb/io/string_test.cc
similarity index 100%
rename from upb-temp/upb/io/string_test.cc
rename to upb/upb/io/string_test.cc
diff --git a/upb-temp/upb/io/tokenizer.c b/upb/upb/io/tokenizer.c
similarity index 100%
rename from upb-temp/upb/io/tokenizer.c
rename to upb/upb/io/tokenizer.c
diff --git a/upb-temp/upb/io/tokenizer.h b/upb/upb/io/tokenizer.h
similarity index 100%
rename from upb-temp/upb/io/tokenizer.h
rename to upb/upb/io/tokenizer.h
diff --git a/upb-temp/upb/io/tokenizer_test.cc b/upb/upb/io/tokenizer_test.cc
similarity index 100%
rename from upb-temp/upb/io/tokenizer_test.cc
rename to upb/upb/io/tokenizer_test.cc
diff --git a/upb-temp/upb/io/zero_copy_input_stream.h b/upb/upb/io/zero_copy_input_stream.h
similarity index 100%
rename from upb-temp/upb/io/zero_copy_input_stream.h
rename to upb/upb/io/zero_copy_input_stream.h
diff --git a/upb-temp/upb/io/zero_copy_output_stream.h b/upb/upb/io/zero_copy_output_stream.h
similarity index 100%
rename from upb-temp/upb/io/zero_copy_output_stream.h
rename to upb/upb/io/zero_copy_output_stream.h
diff --git a/upb-temp/upb/io/zero_copy_stream_test.cc b/upb/upb/io/zero_copy_stream_test.cc
similarity index 100%
rename from upb-temp/upb/io/zero_copy_stream_test.cc
rename to upb/upb/io/zero_copy_stream_test.cc
diff --git a/upb-temp/upb/json/BUILD b/upb/upb/json/BUILD
similarity index 100%
rename from upb-temp/upb/json/BUILD
rename to upb/upb/json/BUILD
diff --git a/upb-temp/upb/json/decode.c b/upb/upb/json/decode.c
similarity index 100%
rename from upb-temp/upb/json/decode.c
rename to upb/upb/json/decode.c
diff --git a/upb-temp/upb/json/decode.h b/upb/upb/json/decode.h
similarity index 100%
rename from upb-temp/upb/json/decode.h
rename to upb/upb/json/decode.h
diff --git a/upb-temp/upb/json/decode_test.cc b/upb/upb/json/decode_test.cc
similarity index 100%
rename from upb-temp/upb/json/decode_test.cc
rename to upb/upb/json/decode_test.cc
diff --git a/upb-temp/upb/json/encode.c b/upb/upb/json/encode.c
similarity index 100%
rename from upb-temp/upb/json/encode.c
rename to upb/upb/json/encode.c
diff --git a/upb-temp/upb/json/encode.h b/upb/upb/json/encode.h
similarity index 100%
rename from upb-temp/upb/json/encode.h
rename to upb/upb/json/encode.h
diff --git a/upb-temp/upb/json/encode_test.cc b/upb/upb/json/encode_test.cc
similarity index 100%
rename from upb-temp/upb/json/encode_test.cc
rename to upb/upb/json/encode_test.cc
diff --git a/upb-temp/upb/json/test.proto b/upb/upb/json/test.proto
similarity index 100%
rename from upb-temp/upb/json/test.proto
rename to upb/upb/json/test.proto
diff --git a/upb-temp/upb/lex/BUILD b/upb/upb/lex/BUILD
similarity index 100%
rename from upb-temp/upb/lex/BUILD
rename to upb/upb/lex/BUILD
diff --git a/upb-temp/upb/lex/atoi.c b/upb/upb/lex/atoi.c
similarity index 100%
rename from upb-temp/upb/lex/atoi.c
rename to upb/upb/lex/atoi.c
diff --git a/upb-temp/upb/lex/atoi.h b/upb/upb/lex/atoi.h
similarity index 100%
rename from upb-temp/upb/lex/atoi.h
rename to upb/upb/lex/atoi.h
diff --git a/upb-temp/upb/lex/atoi_test.cc b/upb/upb/lex/atoi_test.cc
similarity index 100%
rename from upb-temp/upb/lex/atoi_test.cc
rename to upb/upb/lex/atoi_test.cc
diff --git a/upb-temp/upb/lex/round_trip.c b/upb/upb/lex/round_trip.c
similarity index 100%
rename from upb-temp/upb/lex/round_trip.c
rename to upb/upb/lex/round_trip.c
diff --git a/upb-temp/upb/lex/round_trip.h b/upb/upb/lex/round_trip.h
similarity index 100%
rename from upb-temp/upb/lex/round_trip.h
rename to upb/upb/lex/round_trip.h
diff --git a/upb-temp/upb/lex/strtod.c b/upb/upb/lex/strtod.c
similarity index 100%
rename from upb-temp/upb/lex/strtod.c
rename to upb/upb/lex/strtod.c
diff --git a/upb-temp/upb/lex/strtod.h b/upb/upb/lex/strtod.h
similarity index 100%
rename from upb-temp/upb/lex/strtod.h
rename to upb/upb/lex/strtod.h
diff --git a/upb-temp/upb/lex/unicode.c b/upb/upb/lex/unicode.c
similarity index 100%
rename from upb-temp/upb/lex/unicode.c
rename to upb/upb/lex/unicode.c
diff --git a/upb-temp/upb/lex/unicode.h b/upb/upb/lex/unicode.h
similarity index 100%
rename from upb-temp/upb/lex/unicode.h
rename to upb/upb/lex/unicode.h
diff --git a/upb-temp/upb/mem/BUILD b/upb/upb/mem/BUILD
similarity index 100%
rename from upb-temp/upb/mem/BUILD
rename to upb/upb/mem/BUILD
diff --git a/upb-temp/upb/mem/alloc.c b/upb/upb/mem/alloc.c
similarity index 100%
rename from upb-temp/upb/mem/alloc.c
rename to upb/upb/mem/alloc.c
diff --git a/upb-temp/upb/mem/alloc.h b/upb/upb/mem/alloc.h
similarity index 100%
rename from upb-temp/upb/mem/alloc.h
rename to upb/upb/mem/alloc.h
diff --git a/upb-temp/upb/mem/arena.c b/upb/upb/mem/arena.c
similarity index 100%
rename from upb-temp/upb/mem/arena.c
rename to upb/upb/mem/arena.c
diff --git a/upb-temp/upb/mem/arena.h b/upb/upb/mem/arena.h
similarity index 100%
rename from upb-temp/upb/mem/arena.h
rename to upb/upb/mem/arena.h
diff --git a/upb-temp/upb/mem/arena.hpp b/upb/upb/mem/arena.hpp
similarity index 100%
rename from upb-temp/upb/mem/arena.hpp
rename to upb/upb/mem/arena.hpp
diff --git a/upb-temp/upb/mem/arena_test.cc b/upb/upb/mem/arena_test.cc
similarity index 100%
rename from upb-temp/upb/mem/arena_test.cc
rename to upb/upb/mem/arena_test.cc
diff --git a/upb-temp/upb/mem/internal/arena.h b/upb/upb/mem/internal/arena.h
similarity index 100%
rename from upb-temp/upb/mem/internal/arena.h
rename to upb/upb/mem/internal/arena.h
diff --git a/upb-temp/upb/message/BUILD b/upb/upb/message/BUILD
similarity index 100%
rename from upb-temp/upb/message/BUILD
rename to upb/upb/message/BUILD
diff --git a/upb-temp/upb/message/accessors.c b/upb/upb/message/accessors.c
similarity index 100%
rename from upb-temp/upb/message/accessors.c
rename to upb/upb/message/accessors.c
diff --git a/upb-temp/upb/message/accessors.h b/upb/upb/message/accessors.h
similarity index 100%
rename from upb-temp/upb/message/accessors.h
rename to upb/upb/message/accessors.h
diff --git a/upb-temp/upb/message/accessors_split64.h b/upb/upb/message/accessors_split64.h
similarity index 100%
rename from upb-temp/upb/message/accessors_split64.h
rename to upb/upb/message/accessors_split64.h
diff --git a/upb-temp/upb/message/accessors_test.cc b/upb/upb/message/accessors_test.cc
similarity index 100%
rename from upb-temp/upb/message/accessors_test.cc
rename to upb/upb/message/accessors_test.cc
diff --git a/upb-temp/upb/message/copy.c b/upb/upb/message/copy.c
similarity index 100%
rename from upb-temp/upb/message/copy.c
rename to upb/upb/message/copy.c
diff --git a/upb-temp/upb/message/copy.h b/upb/upb/message/copy.h
similarity index 100%
rename from upb-temp/upb/message/copy.h
rename to upb/upb/message/copy.h
diff --git a/upb-temp/upb/message/copy_test.cc b/upb/upb/message/copy_test.cc
similarity index 100%
rename from upb-temp/upb/message/copy_test.cc
rename to upb/upb/message/copy_test.cc
diff --git a/upb-temp/upb/message/internal/accessors.h b/upb/upb/message/internal/accessors.h
similarity index 100%
rename from upb-temp/upb/message/internal/accessors.h
rename to upb/upb/message/internal/accessors.h
diff --git a/upb-temp/upb/message/internal/extension.h b/upb/upb/message/internal/extension.h
similarity index 100%
rename from upb-temp/upb/message/internal/extension.h
rename to upb/upb/message/internal/extension.h
diff --git a/upb-temp/upb/message/internal/map_entry.h b/upb/upb/message/internal/map_entry.h
similarity index 100%
rename from upb-temp/upb/message/internal/map_entry.h
rename to upb/upb/message/internal/map_entry.h
diff --git a/upb-temp/upb/message/internal/message.h b/upb/upb/message/internal/message.h
similarity index 100%
rename from upb-temp/upb/message/internal/message.h
rename to upb/upb/message/internal/message.h
diff --git a/upb-temp/upb/message/message.c b/upb/upb/message/message.c
similarity index 100%
rename from upb-temp/upb/message/message.c
rename to upb/upb/message/message.c
diff --git a/upb-temp/upb/message/message.h b/upb/upb/message/message.h
similarity index 100%
rename from upb-temp/upb/message/message.h
rename to upb/upb/message/message.h
diff --git a/upb-temp/upb/message/promote.c b/upb/upb/message/promote.c
similarity index 100%
rename from upb-temp/upb/message/promote.c
rename to upb/upb/message/promote.c
diff --git a/upb-temp/upb/message/promote.h b/upb/upb/message/promote.h
similarity index 100%
rename from upb-temp/upb/message/promote.h
rename to upb/upb/message/promote.h
diff --git a/upb-temp/upb/message/promote_test.cc b/upb/upb/message/promote_test.cc
similarity index 100%
rename from upb-temp/upb/message/promote_test.cc
rename to upb/upb/message/promote_test.cc
diff --git a/upb-temp/upb/message/tagged_ptr.h b/upb/upb/message/tagged_ptr.h
similarity index 100%
rename from upb-temp/upb/message/tagged_ptr.h
rename to upb/upb/message/tagged_ptr.h
diff --git a/upb-temp/upb/message/test.cc b/upb/upb/message/test.cc
similarity index 100%
rename from upb-temp/upb/message/test.cc
rename to upb/upb/message/test.cc
diff --git a/upb-temp/upb/message/test.proto b/upb/upb/message/test.proto
similarity index 100%
rename from upb-temp/upb/message/test.proto
rename to upb/upb/message/test.proto
diff --git a/upb-temp/upb/message/types.h b/upb/upb/message/types.h
similarity index 100%
rename from upb-temp/upb/message/types.h
rename to upb/upb/message/types.h
diff --git a/upb-temp/upb/mini_descriptor/BUILD b/upb/upb/mini_descriptor/BUILD
similarity index 100%
rename from upb-temp/upb/mini_descriptor/BUILD
rename to upb/upb/mini_descriptor/BUILD
diff --git a/upb-temp/upb/mini_descriptor/build_enum.c b/upb/upb/mini_descriptor/build_enum.c
similarity index 100%
rename from upb-temp/upb/mini_descriptor/build_enum.c
rename to upb/upb/mini_descriptor/build_enum.c
diff --git a/upb-temp/upb/mini_descriptor/build_enum.h b/upb/upb/mini_descriptor/build_enum.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/build_enum.h
rename to upb/upb/mini_descriptor/build_enum.h
diff --git a/upb-temp/upb/mini_descriptor/decode.c b/upb/upb/mini_descriptor/decode.c
similarity index 100%
rename from upb-temp/upb/mini_descriptor/decode.c
rename to upb/upb/mini_descriptor/decode.c
diff --git a/upb-temp/upb/mini_descriptor/decode.h b/upb/upb/mini_descriptor/decode.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/decode.h
rename to upb/upb/mini_descriptor/decode.h
diff --git a/upb-temp/upb/mini_descriptor/internal/base92.c b/upb/upb/mini_descriptor/internal/base92.c
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/base92.c
rename to upb/upb/mini_descriptor/internal/base92.c
diff --git a/upb-temp/upb/mini_descriptor/internal/base92.h b/upb/upb/mini_descriptor/internal/base92.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/base92.h
rename to upb/upb/mini_descriptor/internal/base92.h
diff --git a/upb-temp/upb/mini_descriptor/internal/decoder.h b/upb/upb/mini_descriptor/internal/decoder.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/decoder.h
rename to upb/upb/mini_descriptor/internal/decoder.h
diff --git a/upb-temp/upb/mini_descriptor/internal/encode.c b/upb/upb/mini_descriptor/internal/encode.c
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/encode.c
rename to upb/upb/mini_descriptor/internal/encode.c
diff --git a/upb-temp/upb/mini_descriptor/internal/encode.h b/upb/upb/mini_descriptor/internal/encode.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/encode.h
rename to upb/upb/mini_descriptor/internal/encode.h
diff --git a/upb-temp/upb/mini_descriptor/internal/encode.hpp b/upb/upb/mini_descriptor/internal/encode.hpp
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/encode.hpp
rename to upb/upb/mini_descriptor/internal/encode.hpp
diff --git a/upb-temp/upb/mini_descriptor/internal/encode_test.cc b/upb/upb/mini_descriptor/internal/encode_test.cc
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/encode_test.cc
rename to upb/upb/mini_descriptor/internal/encode_test.cc
diff --git a/upb-temp/upb/mini_descriptor/internal/modifiers.h b/upb/upb/mini_descriptor/internal/modifiers.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/modifiers.h
rename to upb/upb/mini_descriptor/internal/modifiers.h
diff --git a/upb-temp/upb/mini_descriptor/internal/wire_constants.h b/upb/upb/mini_descriptor/internal/wire_constants.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/internal/wire_constants.h
rename to upb/upb/mini_descriptor/internal/wire_constants.h
diff --git a/upb-temp/upb/mini_descriptor/link.c b/upb/upb/mini_descriptor/link.c
similarity index 100%
rename from upb-temp/upb/mini_descriptor/link.c
rename to upb/upb/mini_descriptor/link.c
diff --git a/upb-temp/upb/mini_descriptor/link.h b/upb/upb/mini_descriptor/link.h
similarity index 100%
rename from upb-temp/upb/mini_descriptor/link.h
rename to upb/upb/mini_descriptor/link.h
diff --git a/upb-temp/upb/mini_table/BUILD b/upb/upb/mini_table/BUILD
similarity index 100%
rename from upb-temp/upb/mini_table/BUILD
rename to upb/upb/mini_table/BUILD
diff --git a/upb-temp/upb/mini_table/compat.c b/upb/upb/mini_table/compat.c
similarity index 100%
rename from upb-temp/upb/mini_table/compat.c
rename to upb/upb/mini_table/compat.c
diff --git a/upb-temp/upb/mini_table/compat.h b/upb/upb/mini_table/compat.h
similarity index 100%
rename from upb-temp/upb/mini_table/compat.h
rename to upb/upb/mini_table/compat.h
diff --git a/upb-temp/upb/mini_table/enum.h b/upb/upb/mini_table/enum.h
similarity index 100%
rename from upb-temp/upb/mini_table/enum.h
rename to upb/upb/mini_table/enum.h
diff --git a/upb-temp/upb/mini_table/extension.h b/upb/upb/mini_table/extension.h
similarity index 100%
rename from upb-temp/upb/mini_table/extension.h
rename to upb/upb/mini_table/extension.h
diff --git a/upb-temp/upb/mini_table/extension_registry.c b/upb/upb/mini_table/extension_registry.c
similarity index 100%
rename from upb-temp/upb/mini_table/extension_registry.c
rename to upb/upb/mini_table/extension_registry.c
diff --git a/upb-temp/upb/mini_table/extension_registry.h b/upb/upb/mini_table/extension_registry.h
similarity index 100%
rename from upb-temp/upb/mini_table/extension_registry.h
rename to upb/upb/mini_table/extension_registry.h
diff --git a/upb-temp/upb/mini_table/field.h b/upb/upb/mini_table/field.h
similarity index 100%
rename from upb-temp/upb/mini_table/field.h
rename to upb/upb/mini_table/field.h
diff --git a/upb-temp/upb/mini_table/file.h b/upb/upb/mini_table/file.h
similarity index 100%
rename from upb-temp/upb/mini_table/file.h
rename to upb/upb/mini_table/file.h
diff --git a/upb-temp/upb/mini_table/internal/enum.h b/upb/upb/mini_table/internal/enum.h
similarity index 100%
rename from upb-temp/upb/mini_table/internal/enum.h
rename to upb/upb/mini_table/internal/enum.h
diff --git a/upb-temp/upb/mini_table/internal/extension.h b/upb/upb/mini_table/internal/extension.h
similarity index 100%
rename from upb-temp/upb/mini_table/internal/extension.h
rename to upb/upb/mini_table/internal/extension.h
diff --git a/upb-temp/upb/mini_table/internal/field.h b/upb/upb/mini_table/internal/field.h
similarity index 100%
rename from upb-temp/upb/mini_table/internal/field.h
rename to upb/upb/mini_table/internal/field.h
diff --git a/upb-temp/upb/mini_table/internal/file.h b/upb/upb/mini_table/internal/file.h
similarity index 100%
rename from upb-temp/upb/mini_table/internal/file.h
rename to upb/upb/mini_table/internal/file.h
diff --git a/upb-temp/upb/mini_table/internal/message.c b/upb/upb/mini_table/internal/message.c
similarity index 100%
rename from upb-temp/upb/mini_table/internal/message.c
rename to upb/upb/mini_table/internal/message.c
diff --git a/upb-temp/upb/mini_table/internal/message.h b/upb/upb/mini_table/internal/message.h
similarity index 100%
rename from upb-temp/upb/mini_table/internal/message.h
rename to upb/upb/mini_table/internal/message.h
diff --git a/upb-temp/upb/mini_table/internal/sub.h b/upb/upb/mini_table/internal/sub.h
similarity index 100%
rename from upb-temp/upb/mini_table/internal/sub.h
rename to upb/upb/mini_table/internal/sub.h
diff --git a/upb-temp/upb/mini_table/message.c b/upb/upb/mini_table/message.c
similarity index 100%
rename from upb-temp/upb/mini_table/message.c
rename to upb/upb/mini_table/message.c
diff --git a/upb-temp/upb/mini_table/message.h b/upb/upb/mini_table/message.h
similarity index 100%
rename from upb-temp/upb/mini_table/message.h
rename to upb/upb/mini_table/message.h
diff --git a/upb-temp/upb/mini_table/sub.h b/upb/upb/mini_table/sub.h
similarity index 100%
rename from upb-temp/upb/mini_table/sub.h
rename to upb/upb/mini_table/sub.h
diff --git a/upb-temp/upb/port/BUILD b/upb/upb/port/BUILD
similarity index 100%
rename from upb-temp/upb/port/BUILD
rename to upb/upb/port/BUILD
diff --git a/upb-temp/upb/port/atomic.h b/upb/upb/port/atomic.h
similarity index 100%
rename from upb-temp/upb/port/atomic.h
rename to upb/upb/port/atomic.h
diff --git a/upb-temp/upb/port/def.inc b/upb/upb/port/def.inc
similarity index 100%
rename from upb-temp/upb/port/def.inc
rename to upb/upb/port/def.inc
diff --git a/upb-temp/upb/port/undef.inc b/upb/upb/port/undef.inc
similarity index 100%
rename from upb-temp/upb/port/undef.inc
rename to upb/upb/port/undef.inc
diff --git a/upb-temp/upb/port/vsnprintf_compat.h b/upb/upb/port/vsnprintf_compat.h
similarity index 100%
rename from upb-temp/upb/port/vsnprintf_compat.h
rename to upb/upb/port/vsnprintf_compat.h
diff --git a/upb-temp/upb/reflection/common.h b/upb/upb/reflection/common.h
similarity index 100%
rename from upb-temp/upb/reflection/common.h
rename to upb/upb/reflection/common.h
diff --git a/upb-temp/upb/reflection/def.h b/upb/upb/reflection/def.h
similarity index 100%
rename from upb-temp/upb/reflection/def.h
rename to upb/upb/reflection/def.h
diff --git a/upb-temp/upb/reflection/def.hpp b/upb/upb/reflection/def.hpp
similarity index 100%
rename from upb-temp/upb/reflection/def.hpp
rename to upb/upb/reflection/def.hpp
diff --git a/upb-temp/upb/reflection/def_builder.c b/upb/upb/reflection/def_builder.c
similarity index 100%
rename from upb-temp/upb/reflection/def_builder.c
rename to upb/upb/reflection/def_builder.c
diff --git a/upb-temp/upb/reflection/def_builder_test.cc b/upb/upb/reflection/def_builder_test.cc
similarity index 100%
rename from upb-temp/upb/reflection/def_builder_test.cc
rename to upb/upb/reflection/def_builder_test.cc
diff --git a/upb-temp/upb/reflection/def_pool.c b/upb/upb/reflection/def_pool.c
similarity index 100%
rename from upb-temp/upb/reflection/def_pool.c
rename to upb/upb/reflection/def_pool.c
diff --git a/upb-temp/upb/reflection/def_pool.h b/upb/upb/reflection/def_pool.h
similarity index 100%
rename from upb-temp/upb/reflection/def_pool.h
rename to upb/upb/reflection/def_pool.h
diff --git a/upb-temp/upb/reflection/def_type.c b/upb/upb/reflection/def_type.c
similarity index 100%
rename from upb-temp/upb/reflection/def_type.c
rename to upb/upb/reflection/def_type.c
diff --git a/upb-temp/upb/reflection/def_type.h b/upb/upb/reflection/def_type.h
similarity index 100%
rename from upb-temp/upb/reflection/def_type.h
rename to upb/upb/reflection/def_type.h
diff --git a/upb-temp/upb/reflection/desc_state.c b/upb/upb/reflection/desc_state.c
similarity index 100%
rename from upb-temp/upb/reflection/desc_state.c
rename to upb/upb/reflection/desc_state.c
diff --git a/upb-temp/upb/reflection/enum_def.c b/upb/upb/reflection/enum_def.c
similarity index 100%
rename from upb-temp/upb/reflection/enum_def.c
rename to upb/upb/reflection/enum_def.c
diff --git a/upb-temp/upb/reflection/enum_def.h b/upb/upb/reflection/enum_def.h
similarity index 100%
rename from upb-temp/upb/reflection/enum_def.h
rename to upb/upb/reflection/enum_def.h
diff --git a/upb-temp/upb/reflection/enum_reserved_range.c b/upb/upb/reflection/enum_reserved_range.c
similarity index 100%
rename from upb-temp/upb/reflection/enum_reserved_range.c
rename to upb/upb/reflection/enum_reserved_range.c
diff --git a/upb-temp/upb/reflection/enum_reserved_range.h b/upb/upb/reflection/enum_reserved_range.h
similarity index 100%
rename from upb-temp/upb/reflection/enum_reserved_range.h
rename to upb/upb/reflection/enum_reserved_range.h
diff --git a/upb-temp/upb/reflection/enum_value_def.c b/upb/upb/reflection/enum_value_def.c
similarity index 100%
rename from upb-temp/upb/reflection/enum_value_def.c
rename to upb/upb/reflection/enum_value_def.c
diff --git a/upb-temp/upb/reflection/enum_value_def.h b/upb/upb/reflection/enum_value_def.h
similarity index 100%
rename from upb-temp/upb/reflection/enum_value_def.h
rename to upb/upb/reflection/enum_value_def.h
diff --git a/upb-temp/upb/reflection/extension_range.c b/upb/upb/reflection/extension_range.c
similarity index 100%
rename from upb-temp/upb/reflection/extension_range.c
rename to upb/upb/reflection/extension_range.c
diff --git a/upb-temp/upb/reflection/extension_range.h b/upb/upb/reflection/extension_range.h
similarity index 100%
rename from upb-temp/upb/reflection/extension_range.h
rename to upb/upb/reflection/extension_range.h
diff --git a/upb-temp/upb/reflection/field_def.c b/upb/upb/reflection/field_def.c
similarity index 100%
rename from upb-temp/upb/reflection/field_def.c
rename to upb/upb/reflection/field_def.c
diff --git a/upb-temp/upb/reflection/field_def.h b/upb/upb/reflection/field_def.h
similarity index 100%
rename from upb-temp/upb/reflection/field_def.h
rename to upb/upb/reflection/field_def.h
diff --git a/upb-temp/upb/reflection/file_def.c b/upb/upb/reflection/file_def.c
similarity index 100%
rename from upb-temp/upb/reflection/file_def.c
rename to upb/upb/reflection/file_def.c
diff --git a/upb-temp/upb/reflection/file_def.h b/upb/upb/reflection/file_def.h
similarity index 100%
rename from upb-temp/upb/reflection/file_def.h
rename to upb/upb/reflection/file_def.h
diff --git a/upb-temp/upb/reflection/internal/def_builder.h b/upb/upb/reflection/internal/def_builder.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/def_builder.h
rename to upb/upb/reflection/internal/def_builder.h
diff --git a/upb-temp/upb/reflection/internal/def_pool.h b/upb/upb/reflection/internal/def_pool.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/def_pool.h
rename to upb/upb/reflection/internal/def_pool.h
diff --git a/upb-temp/upb/reflection/internal/desc_state.h b/upb/upb/reflection/internal/desc_state.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/desc_state.h
rename to upb/upb/reflection/internal/desc_state.h
diff --git a/upb-temp/upb/reflection/internal/enum_def.h b/upb/upb/reflection/internal/enum_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/enum_def.h
rename to upb/upb/reflection/internal/enum_def.h
diff --git a/upb-temp/upb/reflection/internal/enum_reserved_range.h b/upb/upb/reflection/internal/enum_reserved_range.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/enum_reserved_range.h
rename to upb/upb/reflection/internal/enum_reserved_range.h
diff --git a/upb-temp/upb/reflection/internal/enum_value_def.h b/upb/upb/reflection/internal/enum_value_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/enum_value_def.h
rename to upb/upb/reflection/internal/enum_value_def.h
diff --git a/upb-temp/upb/reflection/internal/extension_range.h b/upb/upb/reflection/internal/extension_range.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/extension_range.h
rename to upb/upb/reflection/internal/extension_range.h
diff --git a/upb-temp/upb/reflection/internal/field_def.h b/upb/upb/reflection/internal/field_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/field_def.h
rename to upb/upb/reflection/internal/field_def.h
diff --git a/upb-temp/upb/reflection/internal/file_def.h b/upb/upb/reflection/internal/file_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/file_def.h
rename to upb/upb/reflection/internal/file_def.h
diff --git a/upb-temp/upb/reflection/internal/message_def.h b/upb/upb/reflection/internal/message_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/message_def.h
rename to upb/upb/reflection/internal/message_def.h
diff --git a/upb-temp/upb/reflection/internal/message_reserved_range.h b/upb/upb/reflection/internal/message_reserved_range.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/message_reserved_range.h
rename to upb/upb/reflection/internal/message_reserved_range.h
diff --git a/upb-temp/upb/reflection/internal/method_def.h b/upb/upb/reflection/internal/method_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/method_def.h
rename to upb/upb/reflection/internal/method_def.h
diff --git a/upb-temp/upb/reflection/internal/oneof_def.h b/upb/upb/reflection/internal/oneof_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/oneof_def.h
rename to upb/upb/reflection/internal/oneof_def.h
diff --git a/upb-temp/upb/reflection/internal/service_def.h b/upb/upb/reflection/internal/service_def.h
similarity index 100%
rename from upb-temp/upb/reflection/internal/service_def.h
rename to upb/upb/reflection/internal/service_def.h
diff --git a/upb-temp/upb/reflection/message.c b/upb/upb/reflection/message.c
similarity index 100%
rename from upb-temp/upb/reflection/message.c
rename to upb/upb/reflection/message.c
diff --git a/upb-temp/upb/reflection/message.h b/upb/upb/reflection/message.h
similarity index 100%
rename from upb-temp/upb/reflection/message.h
rename to upb/upb/reflection/message.h
diff --git a/upb-temp/upb/reflection/message.hpp b/upb/upb/reflection/message.hpp
similarity index 100%
rename from upb-temp/upb/reflection/message.hpp
rename to upb/upb/reflection/message.hpp
diff --git a/upb-temp/upb/reflection/message_def.c b/upb/upb/reflection/message_def.c
similarity index 100%
rename from upb-temp/upb/reflection/message_def.c
rename to upb/upb/reflection/message_def.c
diff --git a/upb-temp/upb/reflection/message_def.h b/upb/upb/reflection/message_def.h
similarity index 100%
rename from upb-temp/upb/reflection/message_def.h
rename to upb/upb/reflection/message_def.h
diff --git a/upb-temp/upb/reflection/message_reserved_range.c b/upb/upb/reflection/message_reserved_range.c
similarity index 100%
rename from upb-temp/upb/reflection/message_reserved_range.c
rename to upb/upb/reflection/message_reserved_range.c
diff --git a/upb-temp/upb/reflection/message_reserved_range.h b/upb/upb/reflection/message_reserved_range.h
similarity index 100%
rename from upb-temp/upb/reflection/message_reserved_range.h
rename to upb/upb/reflection/message_reserved_range.h
diff --git a/upb-temp/upb/reflection/method_def.c b/upb/upb/reflection/method_def.c
similarity index 100%
rename from upb-temp/upb/reflection/method_def.c
rename to upb/upb/reflection/method_def.c
diff --git a/upb-temp/upb/reflection/method_def.h b/upb/upb/reflection/method_def.h
similarity index 100%
rename from upb-temp/upb/reflection/method_def.h
rename to upb/upb/reflection/method_def.h
diff --git a/upb-temp/upb/reflection/oneof_def.c b/upb/upb/reflection/oneof_def.c
similarity index 100%
rename from upb-temp/upb/reflection/oneof_def.c
rename to upb/upb/reflection/oneof_def.c
diff --git a/upb-temp/upb/reflection/oneof_def.h b/upb/upb/reflection/oneof_def.h
similarity index 100%
rename from upb-temp/upb/reflection/oneof_def.h
rename to upb/upb/reflection/oneof_def.h
diff --git a/upb-temp/upb/reflection/service_def.c b/upb/upb/reflection/service_def.c
similarity index 100%
rename from upb-temp/upb/reflection/service_def.c
rename to upb/upb/reflection/service_def.c
diff --git a/upb-temp/upb/reflection/service_def.h b/upb/upb/reflection/service_def.h
similarity index 100%
rename from upb-temp/upb/reflection/service_def.h
rename to upb/upb/reflection/service_def.h
diff --git a/upb-temp/upb/reflection/stage0/google/protobuf/descriptor.upb.c b/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
similarity index 100%
rename from upb-temp/upb/reflection/stage0/google/protobuf/descriptor.upb.c
rename to upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
diff --git a/upb-temp/upb/reflection/stage0/google/protobuf/descriptor.upb.h b/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
similarity index 100%
rename from upb-temp/upb/reflection/stage0/google/protobuf/descriptor.upb.h
rename to upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
diff --git a/upb-temp/upb/test/BUILD b/upb/upb/test/BUILD
similarity index 100%
rename from upb-temp/upb/test/BUILD
rename to upb/upb/test/BUILD
diff --git a/upb-temp/upb/test/empty.proto b/upb/upb/test/empty.proto
similarity index 100%
rename from upb-temp/upb/test/empty.proto
rename to upb/upb/test/empty.proto
diff --git a/upb-temp/upb/test/fuzz_util.cc b/upb/upb/test/fuzz_util.cc
similarity index 100%
rename from upb-temp/upb/test/fuzz_util.cc
rename to upb/upb/test/fuzz_util.cc
diff --git a/upb-temp/upb/test/fuzz_util.h b/upb/upb/test/fuzz_util.h
similarity index 100%
rename from upb-temp/upb/test/fuzz_util.h
rename to upb/upb/test/fuzz_util.h
diff --git a/upb-temp/upb/test/parse_text_proto.h b/upb/upb/test/parse_text_proto.h
similarity index 100%
rename from upb-temp/upb/test/parse_text_proto.h
rename to upb/upb/test/parse_text_proto.h
diff --git a/upb-temp/upb/test/proto3_test.cc b/upb/upb/test/proto3_test.cc
similarity index 100%
rename from upb-temp/upb/test/proto3_test.cc
rename to upb/upb/test/proto3_test.cc
diff --git a/upb-temp/upb/test/proto3_test.proto b/upb/upb/test/proto3_test.proto
similarity index 100%
rename from upb-temp/upb/test/proto3_test.proto
rename to upb/upb/test/proto3_test.proto
diff --git a/upb-temp/upb/test/test.proto b/upb/upb/test/test.proto
similarity index 100%
rename from upb-temp/upb/test/test.proto
rename to upb/upb/test/test.proto
diff --git a/upb-temp/upb/test/test_cpp.cc b/upb/upb/test/test_cpp.cc
similarity index 100%
rename from upb-temp/upb/test/test_cpp.cc
rename to upb/upb/test/test_cpp.cc
diff --git a/upb-temp/upb/test/test_cpp.proto b/upb/upb/test/test_cpp.proto
similarity index 100%
rename from upb-temp/upb/test/test_cpp.proto
rename to upb/upb/test/test_cpp.proto
diff --git a/upb-temp/upb/test/test_generated_code.cc b/upb/upb/test/test_generated_code.cc
similarity index 100%
rename from upb-temp/upb/test/test_generated_code.cc
rename to upb/upb/test/test_generated_code.cc
diff --git a/upb-temp/upb/test/test_import_empty_srcs.cc b/upb/upb/test/test_import_empty_srcs.cc
similarity index 100%
rename from upb-temp/upb/test/test_import_empty_srcs.cc
rename to upb/upb/test/test_import_empty_srcs.cc
diff --git a/upb-temp/upb/test/test_import_empty_srcs.proto b/upb/upb/test/test_import_empty_srcs.proto
similarity index 100%
rename from upb-temp/upb/test/test_import_empty_srcs.proto
rename to upb/upb/test/test_import_empty_srcs.proto
diff --git a/upb-temp/upb/test/test_mini_table_oneof.cc b/upb/upb/test/test_mini_table_oneof.cc
similarity index 100%
rename from upb-temp/upb/test/test_mini_table_oneof.cc
rename to upb/upb/test/test_mini_table_oneof.cc
diff --git a/upb-temp/upb/text/BUILD b/upb/upb/text/BUILD
similarity index 100%
rename from upb-temp/upb/text/BUILD
rename to upb/upb/text/BUILD
diff --git a/upb-temp/upb/text/encode.c b/upb/upb/text/encode.c
similarity index 100%
rename from upb-temp/upb/text/encode.c
rename to upb/upb/text/encode.c
diff --git a/upb-temp/upb/text/encode.h b/upb/upb/text/encode.h
similarity index 100%
rename from upb-temp/upb/text/encode.h
rename to upb/upb/text/encode.h
diff --git a/upb-temp/upb/upb.hpp b/upb/upb/upb.hpp
similarity index 100%
rename from upb-temp/upb/upb.hpp
rename to upb/upb/upb.hpp
diff --git a/upb-temp/upb/upb_so.c b/upb/upb/upb_so.c
similarity index 100%
rename from upb-temp/upb/upb_so.c
rename to upb/upb/upb_so.c
diff --git a/upb-temp/upb/util/BUILD b/upb/upb/util/BUILD
similarity index 100%
rename from upb-temp/upb/util/BUILD
rename to upb/upb/util/BUILD
diff --git a/upb-temp/upb/util/README.md b/upb/upb/util/README.md
similarity index 100%
rename from upb-temp/upb/util/README.md
rename to upb/upb/util/README.md
diff --git a/upb-temp/upb/util/compare.c b/upb/upb/util/compare.c
similarity index 100%
rename from upb-temp/upb/util/compare.c
rename to upb/upb/util/compare.c
diff --git a/upb-temp/upb/util/compare.h b/upb/upb/util/compare.h
similarity index 100%
rename from upb-temp/upb/util/compare.h
rename to upb/upb/util/compare.h
diff --git a/upb-temp/upb/util/compare_test.cc b/upb/upb/util/compare_test.cc
similarity index 100%
rename from upb-temp/upb/util/compare_test.cc
rename to upb/upb/util/compare_test.cc
diff --git a/upb-temp/upb/util/def_to_proto.c b/upb/upb/util/def_to_proto.c
similarity index 100%
rename from upb-temp/upb/util/def_to_proto.c
rename to upb/upb/util/def_to_proto.c
diff --git a/upb-temp/upb/util/def_to_proto.h b/upb/upb/util/def_to_proto.h
similarity index 100%
rename from upb-temp/upb/util/def_to_proto.h
rename to upb/upb/util/def_to_proto.h
diff --git a/upb-temp/upb/util/def_to_proto_fuzz_test.cc b/upb/upb/util/def_to_proto_fuzz_test.cc
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_fuzz_test.cc
rename to upb/upb/util/def_to_proto_fuzz_test.cc
diff --git a/upb-temp/upb/util/def_to_proto_public_import_test.proto b/upb/upb/util/def_to_proto_public_import_test.proto
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_public_import_test.proto
rename to upb/upb/util/def_to_proto_public_import_test.proto
diff --git a/upb-temp/upb/util/def_to_proto_regular_import_test.proto b/upb/upb/util/def_to_proto_regular_import_test.proto
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_regular_import_test.proto
rename to upb/upb/util/def_to_proto_regular_import_test.proto
diff --git a/upb-temp/upb/util/def_to_proto_test.cc b/upb/upb/util/def_to_proto_test.cc
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_test.cc
rename to upb/upb/util/def_to_proto_test.cc
diff --git a/upb-temp/upb/util/def_to_proto_test.h b/upb/upb/util/def_to_proto_test.h
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_test.h
rename to upb/upb/util/def_to_proto_test.h
diff --git a/upb-temp/upb/util/def_to_proto_test.proto b/upb/upb/util/def_to_proto_test.proto
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_test.proto
rename to upb/upb/util/def_to_proto_test.proto
diff --git a/upb-temp/upb/util/def_to_proto_weak_import_test.proto b/upb/upb/util/def_to_proto_weak_import_test.proto
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_weak_import_test.proto
rename to upb/upb/util/def_to_proto_weak_import_test.proto
diff --git a/upb-temp/upb/util/def_to_proto_wweak_import_test.proto b/upb/upb/util/def_to_proto_wweak_import_test.proto
similarity index 100%
rename from upb-temp/upb/util/def_to_proto_wweak_import_test.proto
rename to upb/upb/util/def_to_proto_wweak_import_test.proto
diff --git a/upb-temp/upb/util/required_fields.c b/upb/upb/util/required_fields.c
similarity index 100%
rename from upb-temp/upb/util/required_fields.c
rename to upb/upb/util/required_fields.c
diff --git a/upb-temp/upb/util/required_fields.h b/upb/upb/util/required_fields.h
similarity index 100%
rename from upb-temp/upb/util/required_fields.h
rename to upb/upb/util/required_fields.h
diff --git a/upb-temp/upb/util/required_fields_test.cc b/upb/upb/util/required_fields_test.cc
similarity index 100%
rename from upb-temp/upb/util/required_fields_test.cc
rename to upb/upb/util/required_fields_test.cc
diff --git a/upb-temp/upb/util/required_fields_test.proto b/upb/upb/util/required_fields_test.proto
similarity index 100%
rename from upb-temp/upb/util/required_fields_test.proto
rename to upb/upb/util/required_fields_test.proto
diff --git a/upb-temp/upb/wire/BUILD b/upb/upb/wire/BUILD
similarity index 100%
rename from upb-temp/upb/wire/BUILD
rename to upb/upb/wire/BUILD
diff --git a/upb-temp/upb/wire/decode.c b/upb/upb/wire/decode.c
similarity index 100%
rename from upb-temp/upb/wire/decode.c
rename to upb/upb/wire/decode.c
diff --git a/upb-temp/upb/wire/decode.h b/upb/upb/wire/decode.h
similarity index 100%
rename from upb-temp/upb/wire/decode.h
rename to upb/upb/wire/decode.h
diff --git a/upb-temp/upb/wire/decode_fast.c b/upb/upb/wire/decode_fast.c
similarity index 100%
rename from upb-temp/upb/wire/decode_fast.c
rename to upb/upb/wire/decode_fast.c
diff --git a/upb-temp/upb/wire/decode_fast.h b/upb/upb/wire/decode_fast.h
similarity index 100%
rename from upb-temp/upb/wire/decode_fast.h
rename to upb/upb/wire/decode_fast.h
diff --git a/upb-temp/upb/wire/encode.c b/upb/upb/wire/encode.c
similarity index 100%
rename from upb-temp/upb/wire/encode.c
rename to upb/upb/wire/encode.c
diff --git a/upb-temp/upb/wire/encode.h b/upb/upb/wire/encode.h
similarity index 100%
rename from upb-temp/upb/wire/encode.h
rename to upb/upb/wire/encode.h
diff --git a/upb-temp/upb/wire/eps_copy_input_stream.c b/upb/upb/wire/eps_copy_input_stream.c
similarity index 100%
rename from upb-temp/upb/wire/eps_copy_input_stream.c
rename to upb/upb/wire/eps_copy_input_stream.c
diff --git a/upb-temp/upb/wire/eps_copy_input_stream.h b/upb/upb/wire/eps_copy_input_stream.h
similarity index 100%
rename from upb-temp/upb/wire/eps_copy_input_stream.h
rename to upb/upb/wire/eps_copy_input_stream.h
diff --git a/upb-temp/upb/wire/eps_copy_input_stream_test.cc b/upb/upb/wire/eps_copy_input_stream_test.cc
similarity index 100%
rename from upb-temp/upb/wire/eps_copy_input_stream_test.cc
rename to upb/upb/wire/eps_copy_input_stream_test.cc
diff --git a/upb-temp/upb/wire/internal/common.h b/upb/upb/wire/internal/common.h
similarity index 100%
rename from upb-temp/upb/wire/internal/common.h
rename to upb/upb/wire/internal/common.h
diff --git a/upb-temp/upb/wire/internal/decode.h b/upb/upb/wire/internal/decode.h
similarity index 100%
rename from upb-temp/upb/wire/internal/decode.h
rename to upb/upb/wire/internal/decode.h
diff --git a/upb-temp/upb/wire/internal/swap.h b/upb/upb/wire/internal/swap.h
similarity index 100%
rename from upb-temp/upb/wire/internal/swap.h
rename to upb/upb/wire/internal/swap.h
diff --git a/upb-temp/upb/wire/reader.c b/upb/upb/wire/reader.c
similarity index 100%
rename from upb-temp/upb/wire/reader.c
rename to upb/upb/wire/reader.c
diff --git a/upb-temp/upb/wire/reader.h b/upb/upb/wire/reader.h
similarity index 100%
rename from upb-temp/upb/wire/reader.h
rename to upb/upb/wire/reader.h
diff --git a/upb-temp/upb/wire/types.h b/upb/upb/wire/types.h
similarity index 100%
rename from upb-temp/upb/wire/types.h
rename to upb/upb/wire/types.h
diff --git a/upb-temp/upbc/BUILD b/upb/upbc/BUILD
similarity index 100%
rename from upb-temp/upbc/BUILD
rename to upb/upbc/BUILD
diff --git a/upb-temp/upbc/bootstrap_compiler.bzl b/upb/upbc/bootstrap_compiler.bzl
similarity index 100%
rename from upb-temp/upbc/bootstrap_compiler.bzl
rename to upb/upbc/bootstrap_compiler.bzl
diff --git a/upb-temp/upbc/code_generator_request.c b/upb/upbc/code_generator_request.c
similarity index 100%
rename from upb-temp/upbc/code_generator_request.c
rename to upb/upbc/code_generator_request.c
diff --git a/upb-temp/upbc/code_generator_request.h b/upb/upbc/code_generator_request.h
similarity index 100%
rename from upb-temp/upbc/code_generator_request.h
rename to upb/upbc/code_generator_request.h
diff --git a/upb-temp/upbc/code_generator_request.proto b/upb/upbc/code_generator_request.proto
similarity index 100%
rename from upb-temp/upbc/code_generator_request.proto
rename to upb/upbc/code_generator_request.proto
diff --git a/upb-temp/upbc/common.cc b/upb/upbc/common.cc
similarity index 100%
rename from upb-temp/upbc/common.cc
rename to upb/upbc/common.cc
diff --git a/upb-temp/upbc/common.h b/upb/upbc/common.h
similarity index 100%
rename from upb-temp/upbc/common.h
rename to upb/upbc/common.h
diff --git a/upb-temp/upbc/file_layout.cc b/upb/upbc/file_layout.cc
similarity index 100%
rename from upb-temp/upbc/file_layout.cc
rename to upb/upbc/file_layout.cc
diff --git a/upb-temp/upbc/file_layout.h b/upb/upbc/file_layout.h
similarity index 100%
rename from upb-temp/upbc/file_layout.h
rename to upb/upbc/file_layout.h
diff --git a/upb-temp/upbc/get_used_fields.c b/upb/upbc/get_used_fields.c
similarity index 100%
rename from upb-temp/upbc/get_used_fields.c
rename to upb/upbc/get_used_fields.c
diff --git a/upb-temp/upbc/get_used_fields.h b/upb/upbc/get_used_fields.h
similarity index 100%
rename from upb-temp/upbc/get_used_fields.h
rename to upb/upbc/get_used_fields.h
diff --git a/upb-temp/upbc/keywords.cc b/upb/upbc/keywords.cc
similarity index 100%
rename from upb-temp/upbc/keywords.cc
rename to upb/upbc/keywords.cc
diff --git a/upb-temp/upbc/keywords.h b/upb/upbc/keywords.h
similarity index 100%
rename from upb-temp/upbc/keywords.h
rename to upb/upbc/keywords.h
diff --git a/upb-temp/upbc/names.cc b/upb/upbc/names.cc
similarity index 100%
rename from upb-temp/upbc/names.cc
rename to upb/upbc/names.cc
diff --git a/upb-temp/upbc/names.h b/upb/upbc/names.h
similarity index 100%
rename from upb-temp/upbc/names.h
rename to upb/upbc/names.h
diff --git a/upb-temp/upbc/plugin.h b/upb/upbc/plugin.h
similarity index 100%
rename from upb-temp/upbc/plugin.h
rename to upb/upbc/plugin.h
diff --git a/upb-temp/upbc/protoc-gen-upb.cc b/upb/upbc/protoc-gen-upb.cc
similarity index 100%
rename from upb-temp/upbc/protoc-gen-upb.cc
rename to upb/upbc/protoc-gen-upb.cc
diff --git a/upb-temp/upbc/protoc-gen-upbdefs.cc b/upb/upbc/protoc-gen-upbdefs.cc
similarity index 100%
rename from upb-temp/upbc/protoc-gen-upbdefs.cc
rename to upb/upbc/protoc-gen-upbdefs.cc
diff --git a/upb-temp/upbc/protoc-gen-upbdev.cc b/upb/upbc/protoc-gen-upbdev.cc
similarity index 100%
rename from upb-temp/upbc/protoc-gen-upbdev.cc
rename to upb/upbc/protoc-gen-upbdev.cc
diff --git a/upb-temp/upbc/stage0/google/protobuf/compiler/plugin.upb.c b/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.c
similarity index 100%
rename from upb-temp/upbc/stage0/google/protobuf/compiler/plugin.upb.c
rename to upb/upbc/stage0/google/protobuf/compiler/plugin.upb.c
diff --git a/upb-temp/upbc/stage0/google/protobuf/compiler/plugin.upb.h b/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.h
similarity index 100%
rename from upb-temp/upbc/stage0/google/protobuf/compiler/plugin.upb.h
rename to upb/upbc/stage0/google/protobuf/compiler/plugin.upb.h
diff --git a/upb-temp/upbc/subprocess.cc b/upb/upbc/subprocess.cc
similarity index 100%
rename from upb-temp/upbc/subprocess.cc
rename to upb/upbc/subprocess.cc
diff --git a/upb-temp/upbc/subprocess.h b/upb/upbc/subprocess.h
similarity index 100%
rename from upb-temp/upbc/subprocess.h
rename to upb/upbc/subprocess.h
diff --git a/upb-temp/upbc/upbc_so.c b/upb/upbc/upbc_so.c
similarity index 100%
rename from upb-temp/upbc/upbc_so.c
rename to upb/upbc/upbc_so.c
diff --git a/upb-temp/upbc/upbdev.c b/upb/upbc/upbdev.c
similarity index 100%
rename from upb-temp/upbc/upbdev.c
rename to upb/upbc/upbdev.c
diff --git a/upb-temp/upbc/upbdev.h b/upb/upbc/upbdev.h
similarity index 100%
rename from upb-temp/upbc/upbdev.h
rename to upb/upbc/upbdev.h