diff --git a/BUILD b/BUILD
index 44a3ad6b..7bf664db 100644
--- a/BUILD
+++ b/BUILD
@@ -34,6 +34,10 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":jni_dep",
+        "//bind_lang/metaprogramming:corpus",
+        "//bind_lang/metaprogramming:corpus_tag",
+        "//bind_lang/metaprogramming:singleton",
+        "//bind_lang/metaprogramming:string_literal",
         "//class_defs:java_lang_classes",
         "//class_defs:java_lang_exception",
         "//class_defs:java_lang_throwable",
@@ -92,10 +96,6 @@ cc_library(
         "//implementation/jni_helper:jni_env",
         "//implementation/jni_helper:lifecycle",
         "//implementation/jni_helper:static_field_value",
-        "//metaprogramming:corpus",
-        "//metaprogramming:corpus_tag",
-        "//metaprogramming:singleton",
-        "//metaprogramming:string_literal",
     ],
 )
 
@@ -175,11 +175,11 @@ genrule(
         ":headers_for_export",
         ":jni_bind_decorative_text",
         ":jni_bind_release_input",
+        "//bind_lang/metaprogramming:headers_for_export",
         "//class_defs:headers_for_export",
         "//class_defs/android:headers_for_export",
         "//implementation:headers_for_export",
         "//implementation/jni_helper:headers_for_export",
-        "//metaprogramming:headers_for_export",
     ],
     visibility = ["//third_party/jni_wrapper/godbolt:__pkg__"],
 )
@@ -199,11 +199,11 @@ genrule(
         ":headers_for_export",
         ":jni_bind_decorative_text",
         ":jni_bind_release_input",
+        "//bind_lang/metaprogramming:headers_for_export",
         "//class_defs:headers_for_export",
         "//class_defs/android:headers_for_export",
         "//implementation:headers_for_export",
         "//implementation/jni_helper:headers_for_export",
-        "//metaprogramming:headers_for_export",
     ],
     visibility = ["//visibility:private"],
 )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeebb074..496374c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ target_include_directories(jni_bind INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/class_defs
     ${CMAKE_CURRENT_SOURCE_DIR}/implementation
     ${CMAKE_CURRENT_SOURCE_DIR}/implementation/jni_helper
-    ${CMAKE_CURRENT_SOURCE_DIR}/metaprogramming)
+    ${CMAKE_CURRENT_SOURCE_DIR}/bind_lang/metaprogramming)
 
 target_link_libraries(jni_bind INTERFACE jdk:jni)
 
@@ -26,7 +26,7 @@ endif()
 
 enable_testing()
 
-file(GLOB METAPROGRAMMING_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/metaprogramming/*_test.cc")
+file(GLOB METAPROGRAMMING_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/bind_lang/metaprogramming/*_test.cc")
 foreach(TEST_SRC ${METAPROGRAMMING_TESTS})
     get_filename_component(TEST_NAME ${TEST_SRC} NAME_WE)
     add_jni_test(${TEST_NAME} ${TEST_SRC})
diff --git a/README.md b/README.md
index bab86e17..d52bc8de 100755
--- a/README.md
+++ b/README.md
@@ -610,7 +610,7 @@ obj.Call<"Foo">(1.5f, "argString");
 obj.Access<"intField">().Set(123);
 ```
 
-This syntax was all that could be supported in C++17, and unfortunately [relies on a clang extension](metaprogramming/invocable_map.h). Because C++17 does not support string literals in non-type template parameters, the new syntax is not possible. Conversely, the syntax enabled by the clang extension is not possible to represent in standard C++20.
+This syntax was all that could be supported in C++17, and unfortunately [relies on a clang extension](bind_lang/metaprogramming/invocable_map.h). Because C++17 does not support string literals in non-type template parameters, the new syntax is not possible. Conversely, the syntax enabled by the clang extension is not possible to represent in standard C++20.
 
 As such, the documentation and sample code all use the new syntax, and because this uses standard C++20, it is portable. The old syntax is fully unit tested under the [legacy directory](implementation/legacy), and will continue to be supported for clang on C++17 and onwards. In the unlikely event this syntax needed deprecation I will only do so after a major version bump.
 
diff --git a/metaprogramming/BUILD b/bind_lang/metaprogramming/BUILD
similarity index 99%
rename from metaprogramming/BUILD
rename to bind_lang/metaprogramming/BUILD
index 341bc57a..bd78b41c 100644
--- a/metaprogramming/BUILD
+++ b/bind_lang/metaprogramming/BUILD
@@ -7,8 +7,6 @@ package(
 
 licenses(["notice"])
 
-exports_files(["LICENSE"])
-
 ################################################################################
 # All.
 ################################################################################
@@ -599,6 +597,7 @@ cc_library(
         ":per_element",
         ":tuple_manipulation",
         ":type_of_nth_element",
+        ":unwrap",
     ],
 )
 
@@ -715,6 +714,7 @@ cc_test(
     deps = [
         ":min_max",
         ":reduce",
+        ":vals",
         "@googletest//:gtest_main",
     ],
 )
@@ -1239,6 +1239,7 @@ cc_test(
     name = "vals_equal_diminished_test",
     srcs = ["vals_equal_diminished_test.cc"],
     deps = [
+        ":vals",
         ":vals_equal_diminished",
         "@googletest//:gtest_main",
     ],
diff --git a/metaprogramming/all.h b/bind_lang/metaprogramming/all.h
similarity index 87%
rename from metaprogramming/all.h
rename to bind_lang/metaprogramming/all.h
index ca32be8c..503ff0d3 100644
--- a/metaprogramming/all.h
+++ b/bind_lang/metaprogramming/all.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_ALL_H_
-#define JNI_BIND_METAPROGRAMMING_ALL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_H_
 
 #include <type_traits>
 
@@ -36,4 +36,4 @@ static constexpr bool All_v = All_t<Func, Ts...>::value;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_ALL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_H_
diff --git a/metaprogramming/all_test.cc b/bind_lang/metaprogramming/all_test.cc
similarity index 100%
rename from metaprogramming/all_test.cc
rename to bind_lang/metaprogramming/all_test.cc
diff --git a/metaprogramming/all_unique.h b/bind_lang/metaprogramming/all_unique.h
similarity index 88%
rename from metaprogramming/all_unique.h
rename to bind_lang/metaprogramming/all_unique.h
index 91b928a7..923d291a 100644
--- a/metaprogramming/all_unique.h
+++ b/bind_lang/metaprogramming/all_unique.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_ALL_UNIQUE_H_
-#define JNI_BIND_METAPROGRAMMING_ALL_UNIQUE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_UNIQUE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_UNIQUE_H_
 
 #include <type_traits>
 
@@ -49,4 +49,4 @@ constexpr bool AllUniqueValues(const T1&& t1, const Ts&&... ts) {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_ALL_UNIQUE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_ALL_UNIQUE_H_
diff --git a/metaprogramming/all_unique_test.cc b/bind_lang/metaprogramming/all_unique_test.cc
similarity index 100%
rename from metaprogramming/all_unique_test.cc
rename to bind_lang/metaprogramming/all_unique_test.cc
diff --git a/metaprogramming/any.h b/bind_lang/metaprogramming/any.h
similarity index 89%
rename from metaprogramming/any.h
rename to bind_lang/metaprogramming/any.h
index c98e32ee..5fc9aee6 100644
--- a/metaprogramming/any.h
+++ b/bind_lang/metaprogramming/any.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_ANY_H_
-#define JNI_BIND_METAPROGRAMMING_ANY_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_ANY_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_ANY_H_
 
 #include <type_traits>
 
@@ -44,4 +44,4 @@ static constexpr bool Any_Tup_v = TupleUnroller_t<Any<Func>, Ts>::value;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_ANY_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_ANY_H_
diff --git a/metaprogramming/any_test.cc b/bind_lang/metaprogramming/any_test.cc
similarity index 100%
rename from metaprogramming/any_test.cc
rename to bind_lang/metaprogramming/any_test.cc
diff --git a/metaprogramming/apply.h b/bind_lang/metaprogramming/apply.h
similarity index 89%
rename from metaprogramming/apply.h
rename to bind_lang/metaprogramming/apply.h
index 7d007a70..597a2d7f 100644
--- a/metaprogramming/apply.h
+++ b/bind_lang/metaprogramming/apply.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_APPLY_H_
-#define JNI_BIND_METAPROGRAMMING_APPLY_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_APPLY_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_APPLY_H_
 
 #include "tuple_manipulation.h"
 
@@ -39,4 +39,4 @@ using ApplyTup_t = TupleUnroller_t<Apply<Function>, TupleType>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_APPLY_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_APPLY_H_
diff --git a/metaprogramming/apply_test.cc b/bind_lang/metaprogramming/apply_test.cc
similarity index 100%
rename from metaprogramming/apply_test.cc
rename to bind_lang/metaprogramming/apply_test.cc
diff --git a/metaprogramming/base.h b/bind_lang/metaprogramming/base.h
similarity index 86%
rename from metaprogramming/base.h
rename to bind_lang/metaprogramming/base.h
index 1a4967f0..af80e712 100644
--- a/metaprogramming/base.h
+++ b/bind_lang/metaprogramming/base.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_BASE_H_
-#define JNI_BIND_METAPROGRAMMING_BASE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_H_
 
 #include <type_traits>
 
@@ -32,4 +32,4 @@ using Base_t = typename Base<BaseToTest>::template type<TypeToTest>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_BASE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_H_
diff --git a/metaprogramming/base_filter.h b/bind_lang/metaprogramming/base_filter.h
similarity index 92%
rename from metaprogramming/base_filter.h
rename to bind_lang/metaprogramming/base_filter.h
index 45706702..11c57b09 100644
--- a/metaprogramming/base_filter.h
+++ b/bind_lang/metaprogramming/base_filter.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_BASE_FILTER_H_
-#define JNI_BIND_METAPROGRAMMING_BASE_FILTER_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_FILTER_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_FILTER_H_
 
 #include <tuple>
 #include <type_traits>
@@ -67,4 +67,4 @@ using BaseFilterWithDefault_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_BASE_FILTER_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_BASE_FILTER_H_
diff --git a/metaprogramming/base_filter_test.cc b/bind_lang/metaprogramming/base_filter_test.cc
similarity index 100%
rename from metaprogramming/base_filter_test.cc
rename to bind_lang/metaprogramming/base_filter_test.cc
diff --git a/metaprogramming/call.h b/bind_lang/metaprogramming/call.h
similarity index 88%
rename from metaprogramming/call.h
rename to bind_lang/metaprogramming/call.h
index 72098da5..7b61ab34 100644
--- a/metaprogramming/call.h
+++ b/bind_lang/metaprogramming/call.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef JNI_BIND_METAPROGRAMMING_CALL_H_
-#define JNI_BIND_METAPROGRAMMING_CALL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CALL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CALL_H_
 
 #include <tuple>
 
@@ -41,4 +41,4 @@ using Call_t = typename Call::type<T>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CALL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CALL_H_
diff --git a/metaprogramming/call_test.cc b/bind_lang/metaprogramming/call_test.cc
similarity index 96%
rename from metaprogramming/call_test.cc
rename to bind_lang/metaprogramming/call_test.cc
index 0c0f6ac1..9b393c8e 100644
--- a/metaprogramming/call_test.cc
+++ b/bind_lang/metaprogramming/call_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/call.h"
+#include "bind_lang/metaprogramming/call.h"
 
 #include <tuple>
 #include <type_traits>
diff --git a/metaprogramming/cartesian_product.h b/bind_lang/metaprogramming/cartesian_product.h
similarity index 94%
rename from metaprogramming/cartesian_product.h
rename to bind_lang/metaprogramming/cartesian_product.h
index 159e7d34..ab923d9e 100644
--- a/metaprogramming/cartesian_product.h
+++ b/bind_lang/metaprogramming/cartesian_product.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
-#define JNI_BIND_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
 
 #include <cstddef>
 #include <tuple>
@@ -102,4 +102,4 @@ using CartesianProduct_t = typename CartesianProduct::template type<Tups...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CARTESIAN_PRODUCT_H_
diff --git a/metaprogramming/cartesian_product_test.cc b/bind_lang/metaprogramming/cartesian_product_test.cc
similarity index 99%
rename from metaprogramming/cartesian_product_test.cc
rename to bind_lang/metaprogramming/cartesian_product_test.cc
index 341a8f3e..fd09319c 100644
--- a/metaprogramming/cartesian_product_test.cc
+++ b/bind_lang/metaprogramming/cartesian_product_test.cc
@@ -31,7 +31,6 @@ using ::jni::metaprogramming::GenerateBitSequenceFromTupSets_t;
 using ::jni::metaprogramming::InvokeAsPack_t;
 using ::jni::metaprogramming::NBit;
 using ::jni::metaprogramming::NBitSequence;
-using ::jni::metaprogramming::TupleUnroller_t;
 
 template <typename... Ts>
 using Tup = std::tuple<Ts...>;
diff --git a/metaprogramming/chain.h b/bind_lang/metaprogramming/chain.h
similarity index 89%
rename from metaprogramming/chain.h
rename to bind_lang/metaprogramming/chain.h
index 1f699ee9..288c0910 100644
--- a/metaprogramming/chain.h
+++ b/bind_lang/metaprogramming/chain.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CHAIN_H_
-#define JNI_BIND_METAPROGRAMMING_CHAIN_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CHAIN_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CHAIN_H_
 
 #include "invoke.h"
 
@@ -44,4 +44,4 @@ struct Chain<FirstFunc, Funcs...> {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CHAIN_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CHAIN_H_
diff --git a/metaprogramming/chain_test.cc b/bind_lang/metaprogramming/chain_test.cc
similarity index 100%
rename from metaprogramming/chain_test.cc
rename to bind_lang/metaprogramming/chain_test.cc
diff --git a/metaprogramming/color.h b/bind_lang/metaprogramming/color.h
similarity index 95%
rename from metaprogramming/color.h
rename to bind_lang/metaprogramming/color.h
index e6d5edc4..a83289fb 100644
--- a/metaprogramming/color.h
+++ b/bind_lang/metaprogramming/color.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_COLOUR_H_
-#define JNI_BIND_METAPROGRAMMING_COLOUR_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_COLOR_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_COLOR_H_
 
 #include <string>
 #include <string_view>
@@ -73,4 +73,4 @@ inline std::string Colorize(std::string_view colour, std::string_view str,
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_COLOUR_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_COLOR_H_
diff --git a/metaprogramming/color_test.cc b/bind_lang/metaprogramming/color_test.cc
similarity index 100%
rename from metaprogramming/color_test.cc
rename to bind_lang/metaprogramming/color_test.cc
diff --git a/metaprogramming/combine.h b/bind_lang/metaprogramming/combine.h
similarity index 88%
rename from metaprogramming/combine.h
rename to bind_lang/metaprogramming/combine.h
index 96c55ae6..8bd23f07 100644
--- a/metaprogramming/combine.h
+++ b/bind_lang/metaprogramming/combine.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_COMBINE_H_
-#define JNI_BIND_METAPROGRAMMING_COMBINE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_COMBINE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_COMBINE_H_
 
 #include <tuple>
 
@@ -43,4 +43,4 @@ using Combine_t = typename Combine::template type<Tup1, Tup2>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_COMBINE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_COMBINE_H_
diff --git a/metaprogramming/combine_test.cc b/bind_lang/metaprogramming/combine_test.cc
similarity index 100%
rename from metaprogramming/combine_test.cc
rename to bind_lang/metaprogramming/combine_test.cc
diff --git a/metaprogramming/concatenate.h b/bind_lang/metaprogramming/concatenate.h
similarity index 88%
rename from metaprogramming/concatenate.h
rename to bind_lang/metaprogramming/concatenate.h
index 97153c6e..17f4e18a 100644
--- a/metaprogramming/concatenate.h
+++ b/bind_lang/metaprogramming/concatenate.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONCATENATE_H_
-#define JNI_BIND_METAPROGRAMMING_CONCATENATE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONCATENATE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONCATENATE_H_
 
 #include <tuple>
 
@@ -49,4 +49,4 @@ using ConcatenateTup_t = Reduce_t<Combine, Tups...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONCATENATE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONCATENATE_H_
diff --git a/metaprogramming/concatenate_test.cc b/bind_lang/metaprogramming/concatenate_test.cc
similarity index 100%
rename from metaprogramming/concatenate_test.cc
rename to bind_lang/metaprogramming/concatenate_test.cc
diff --git a/metaprogramming/conditional.h b/bind_lang/metaprogramming/conditional.h
similarity index 88%
rename from metaprogramming/conditional.h
rename to bind_lang/metaprogramming/conditional.h
index 8b141533..6ea7dd9f 100644
--- a/metaprogramming/conditional.h
+++ b/bind_lang/metaprogramming/conditional.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONDITIONAL_H_
-#define JNI_BIND_METAPROGRAMMING_CONDITIONAL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONDITIONAL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONDITIONAL_H_
 
 #include <tuple>
 #include <type_traits>
@@ -40,4 +40,4 @@ using Conditional_t = typename Conditional<Func>::template type<Ts...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONDITIONAL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONDITIONAL_H_
diff --git a/metaprogramming/conditional_test.cc b/bind_lang/metaprogramming/conditional_test.cc
similarity index 100%
rename from metaprogramming/conditional_test.cc
rename to bind_lang/metaprogramming/conditional_test.cc
diff --git a/metaprogramming/contains.h b/bind_lang/metaprogramming/contains.h
similarity index 89%
rename from metaprogramming/contains.h
rename to bind_lang/metaprogramming/contains.h
index 7ff48460..ac1703e3 100644
--- a/metaprogramming/contains.h
+++ b/bind_lang/metaprogramming/contains.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONTAINS_H_
-#define JNI_BIND_METAPROGRAMMING_CONTAINS_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_H_
 
 #include "any.h"
 #include "invoke.h"
@@ -44,4 +44,4 @@ constexpr bool ContainsValue(const SoughtType& sought_value, Ts&&... ts) {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONTAINS_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_H_
diff --git a/metaprogramming/contains_base.h b/bind_lang/metaprogramming/contains_base.h
similarity index 87%
rename from metaprogramming/contains_base.h
rename to bind_lang/metaprogramming/contains_base.h
index 631b8592..7b35d08f 100644
--- a/metaprogramming/contains_base.h
+++ b/bind_lang/metaprogramming/contains_base.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_CONTAINS_BASE_H_
-#define JNI_BIND_METAPROGRAMMING_CONTAINS_BASE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_BASE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_BASE_H_
 
 #include "any.h"
 #include "base.h"
@@ -41,4 +41,4 @@ static constexpr bool TupContainsBase_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_CONTAINS_BASE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CONTAINS_BASE_H_
diff --git a/metaprogramming/contains_base_test.cc b/bind_lang/metaprogramming/contains_base_test.cc
similarity index 100%
rename from metaprogramming/contains_base_test.cc
rename to bind_lang/metaprogramming/contains_base_test.cc
diff --git a/metaprogramming/contains_test.cc b/bind_lang/metaprogramming/contains_test.cc
similarity index 100%
rename from metaprogramming/contains_test.cc
rename to bind_lang/metaprogramming/contains_test.cc
diff --git a/metaprogramming/corpus.h b/bind_lang/metaprogramming/corpus.h
similarity index 89%
rename from metaprogramming/corpus.h
rename to bind_lang/metaprogramming/corpus.h
index 45c83b47..9d46b7a3 100644
--- a/metaprogramming/corpus.h
+++ b/bind_lang/metaprogramming/corpus.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_IMPLEMENTATION_CORPUS_H_
-#define JNI_BIND_IMPLEMENTATION_CORPUS_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_H_
 
 #include <tuple>
 
@@ -49,4 +49,4 @@ using Corpus_t = typename Corpus<Defaults...>::template type<T>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_IMPLEMENTATION_CORPUS_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_H_
diff --git a/metaprogramming/corpus_tag.h b/bind_lang/metaprogramming/corpus_tag.h
similarity index 81%
rename from metaprogramming/corpus_tag.h
rename to bind_lang/metaprogramming/corpus_tag.h
index 09dcafb9..b748b664 100644
--- a/metaprogramming/corpus_tag.h
+++ b/bind_lang/metaprogramming/corpus_tag.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_IMPLEMENTATION_CORPUS_TAG_H_
-#define JNI_BIND_IMPLEMENTATION_CORPUS_TAG_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_TAG_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_TAG_H_
 
 namespace jni::metaprogramming {
 
@@ -25,4 +25,4 @@ struct UserDefined;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_IMPLEMENTATION_CORPUS_TAG_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_CORPUS_TAG_H_
diff --git a/metaprogramming/corpus_test.cc b/bind_lang/metaprogramming/corpus_test.cc
similarity index 93%
rename from metaprogramming/corpus_test.cc
rename to bind_lang/metaprogramming/corpus_test.cc
index 43ec91b3..52c23c47 100644
--- a/metaprogramming/corpus_test.cc
+++ b/bind_lang/metaprogramming/corpus_test.cc
@@ -35,8 +35,8 @@ struct UserDefined<CorpusTag> {
 
 }  // namespace jni::metaprogramming
 
-#include "metaprogramming/corpus.h"
-#include "metaprogramming/detect.h"
+#include "bind_lang/metaprogramming/corpus.h"
+#include "bind_lang/metaprogramming/detect.h"
 
 using ::jni::metaprogramming::Corpus_t;
 using ::jni::metaprogramming::Detect_t;
diff --git a/metaprogramming/deep_equal.h b/bind_lang/metaprogramming/deep_equal.h
similarity index 91%
rename from metaprogramming/deep_equal.h
rename to bind_lang/metaprogramming/deep_equal.h
index 61c8157a..fbcd991e 100644
--- a/metaprogramming/deep_equal.h
+++ b/bind_lang/metaprogramming/deep_equal.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_DEEP_EQUAL_H_
-#define JNI_BIND_METAPROGRAMMING_DEEP_EQUAL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_DEEP_EQUAL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_DEEP_EQUAL_H_
 
 #include <type_traits>
 
-#include "metaprogramming/pack_discriminator.h"
-#include "metaprogramming/vals_equal.h"
+#include "bind_lang/metaprogramming/pack_discriminator.h"
+#include "bind_lang/metaprogramming/vals_equal.h"
 
 namespace jni::metaprogramming {
 
@@ -105,4 +105,4 @@ struct DeepEqual {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_DEEP_EQUAL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_DEEP_EQUAL_H_
diff --git a/metaprogramming/deep_equal_diminished.h b/bind_lang/metaprogramming/deep_equal_diminished.h
similarity index 91%
rename from metaprogramming/deep_equal_diminished.h
rename to bind_lang/metaprogramming/deep_equal_diminished.h
index 875804cd..2283715c 100644
--- a/metaprogramming/deep_equal_diminished.h
+++ b/bind_lang/metaprogramming/deep_equal_diminished.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_DEEP_EQUAL_DIMINISHED_H_
-#define JNI_BIND_METAPROGRAMMING_DEEP_EQUAL_DIMINISHED_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_DEEP_EQUAL_DIMINISHED_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_DEEP_EQUAL_DIMINISHED_H_
 
 #include <type_traits>
 
-#include "metaprogramming/pack_discriminator.h"
-#include "metaprogramming/vals_equal_diminished.h"
+#include "bind_lang/metaprogramming/pack_discriminator.h"
+#include "bind_lang/metaprogramming/vals_equal_diminished.h"
 
 namespace jni::metaprogramming {
 
@@ -108,4 +108,4 @@ struct DeepEqualDiminished {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_DEEP_EQUAL_DIMINISHED_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_DEEP_EQUAL_DIMINISHED_H_
diff --git a/metaprogramming/deep_equal_diminished_test.cc b/bind_lang/metaprogramming/deep_equal_diminished_test.cc
similarity index 98%
rename from metaprogramming/deep_equal_diminished_test.cc
rename to bind_lang/metaprogramming/deep_equal_diminished_test.cc
index d37b3b4d..49afb1ff 100644
--- a/metaprogramming/deep_equal_diminished_test.cc
+++ b/bind_lang/metaprogramming/deep_equal_diminished_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/deep_equal_diminished.h"
+#include "bind_lang/metaprogramming/deep_equal_diminished.h"
 
 #include <tuple>
 
diff --git a/metaprogramming/deep_equal_test.cc b/bind_lang/metaprogramming/deep_equal_test.cc
similarity index 98%
rename from metaprogramming/deep_equal_test.cc
rename to bind_lang/metaprogramming/deep_equal_test.cc
index 4c3ce676..68e5c164 100644
--- a/metaprogramming/deep_equal_test.cc
+++ b/bind_lang/metaprogramming/deep_equal_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/deep_equal.h"
+#include "bind_lang/metaprogramming/deep_equal.h"
 
 #include <tuple>
 
diff --git a/metaprogramming/detect.h b/bind_lang/metaprogramming/detect.h
similarity index 90%
rename from metaprogramming/detect.h
rename to bind_lang/metaprogramming/detect.h
index ec4fa2ba..bbccb364 100644
--- a/metaprogramming/detect.h
+++ b/bind_lang/metaprogramming/detect.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_DETECT_H_
-#define JNI_BIND_METAPROGRAMMING_DETECT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_DETECT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_DETECT_H_
 
 #include <tuple>
 #include <type_traits>
@@ -52,4 +52,4 @@ static constexpr bool Detect_v = Detect<Container>::template val<T>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_DETECT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_DETECT_H_
diff --git a/metaprogramming/detect_test.cc b/bind_lang/metaprogramming/detect_test.cc
similarity index 96%
rename from metaprogramming/detect_test.cc
rename to bind_lang/metaprogramming/detect_test.cc
index 2734c46f..2a84a826 100644
--- a/metaprogramming/detect_test.cc
+++ b/bind_lang/metaprogramming/detect_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/detect.h"
+#include "bind_lang/metaprogramming/detect.h"
 
 #include <tuple>
 #include <type_traits>
diff --git a/metaprogramming/double_locked_value.h b/bind_lang/metaprogramming/double_locked_value.h
similarity index 92%
rename from metaprogramming/double_locked_value.h
rename to bind_lang/metaprogramming/double_locked_value.h
index d8ebc906..39e9d571 100644
--- a/metaprogramming/double_locked_value.h
+++ b/bind_lang/metaprogramming/double_locked_value.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_DOUBLE_LOCKED_VALUE_H_
-#define JNI_BIND_METAPROGRAMMING_DOUBLE_LOCKED_VALUE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_DOUBLE_LOCKED_VALUE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_DOUBLE_LOCKED_VALUE_H_
 
 #include <atomic>
 #include <mutex>
@@ -81,4 +81,4 @@ class DoubleLockedValue {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_DOUBLE_LOCKED_VALUE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_DOUBLE_LOCKED_VALUE_H_
diff --git a/metaprogramming/double_locked_value_test.cc b/bind_lang/metaprogramming/double_locked_value_test.cc
similarity index 100%
rename from metaprogramming/double_locked_value_test.cc
rename to bind_lang/metaprogramming/double_locked_value_test.cc
diff --git a/metaprogramming/even_odd.h b/bind_lang/metaprogramming/even_odd.h
similarity index 91%
rename from metaprogramming/even_odd.h
rename to bind_lang/metaprogramming/even_odd.h
index 4fe516ca..2b0410cf 100644
--- a/metaprogramming/even_odd.h
+++ b/bind_lang/metaprogramming/even_odd.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_EVEN_ODD_H_
-#define JNI_BIND_METAPROGRAMMING_EVEN_ODD_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_EVEN_ODD_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_EVEN_ODD_H_
 
 #include <tuple>
 
@@ -70,4 +70,4 @@ using Odd_t = typename Odd::template type<Ts...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_EVEN_ODD_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_EVEN_ODD_H_
diff --git a/metaprogramming/even_odd_test.cc b/bind_lang/metaprogramming/even_odd_test.cc
similarity index 100%
rename from metaprogramming/even_odd_test.cc
rename to bind_lang/metaprogramming/even_odd_test.cc
diff --git a/metaprogramming/filter.h b/bind_lang/metaprogramming/filter.h
similarity index 90%
rename from metaprogramming/filter.h
rename to bind_lang/metaprogramming/filter.h
index 10d83dc6..e54dd084 100644
--- a/metaprogramming/filter.h
+++ b/bind_lang/metaprogramming/filter.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_FILTER_H_
-#define JNI_BIND_METAPROGRAMMING_FILTER_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_FILTER_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_FILTER_H_
 
 #include <tuple>
 
@@ -53,4 +53,4 @@ using Filter_t = typename Filter<Func>::template type<Ts...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_FILTER_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_FILTER_H_
diff --git a/metaprogramming/filter_test.cc b/bind_lang/metaprogramming/filter_test.cc
similarity index 100%
rename from metaprogramming/filter_test.cc
rename to bind_lang/metaprogramming/filter_test.cc
diff --git a/metaprogramming/find_idx_of_val.h b/bind_lang/metaprogramming/find_idx_of_val.h
similarity index 93%
rename from metaprogramming/find_idx_of_val.h
rename to bind_lang/metaprogramming/find_idx_of_val.h
index e2480137..fc04b684 100644
--- a/metaprogramming/find_idx_of_val.h
+++ b/bind_lang/metaprogramming/find_idx_of_val.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_FIND_IDX_OF_VAL_H_
-#define JNI_BIND_METAPROGRAMMING_FIND_IDX_OF_VAL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_FIND_IDX_OF_VAL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_FIND_IDX_OF_VAL_H_
 
 #include <cstddef>
 
@@ -85,4 +85,4 @@ static constexpr std::size_t FindIdxOfValInTup_idx =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_FIND_IDX_OF_VAL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_FIND_IDX_OF_VAL_H_
diff --git a/metaprogramming/find_idx_of_val_test.cc b/bind_lang/metaprogramming/find_idx_of_val_test.cc
similarity index 100%
rename from metaprogramming/find_idx_of_val_test.cc
rename to bind_lang/metaprogramming/find_idx_of_val_test.cc
diff --git a/metaprogramming/flatten.h b/bind_lang/metaprogramming/flatten.h
similarity index 92%
rename from metaprogramming/flatten.h
rename to bind_lang/metaprogramming/flatten.h
index 92024938..f9a8656f 100644
--- a/metaprogramming/flatten.h
+++ b/bind_lang/metaprogramming/flatten.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_FLATTEN_H_
-#define JNI_BIND_METAPROGRAMMING_FLATTEN_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_FLATTEN_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_FLATTEN_H_
 
 #include <tuple>
 
@@ -58,4 +58,4 @@ using Flatten_t = typename Flatten::template type<Ts...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_FLATTEN_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_FLATTEN_H_
diff --git a/metaprogramming/flatten_test.cc b/bind_lang/metaprogramming/flatten_test.cc
similarity index 100%
rename from metaprogramming/flatten_test.cc
rename to bind_lang/metaprogramming/flatten_test.cc
diff --git a/metaprogramming/function_traits.h b/bind_lang/metaprogramming/function_traits.h
similarity index 91%
rename from metaprogramming/function_traits.h
rename to bind_lang/metaprogramming/function_traits.h
index f6d91fc4..49e74765 100644
--- a/metaprogramming/function_traits.h
+++ b/bind_lang/metaprogramming/function_traits.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_FunctionTraits_H_
-#define JNI_BIND_METAPROGRAMMING_FunctionTraits_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_FUNCTION_TRAITS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_FUNCTION_TRAITS_H_
 
 #include <cstddef>
 #include <tuple>
@@ -68,4 +68,4 @@ using FunctionTraitsArg_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_FunctionTraits_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_FUNCTION_TRAITS_H_
diff --git a/metaprogramming/function_traits_test.cc b/bind_lang/metaprogramming/function_traits_test.cc
similarity index 100%
rename from metaprogramming/function_traits_test.cc
rename to bind_lang/metaprogramming/function_traits_test.cc
diff --git a/metaprogramming/increment.h b/bind_lang/metaprogramming/increment.h
similarity index 88%
rename from metaprogramming/increment.h
rename to bind_lang/metaprogramming/increment.h
index e365cb8f..34de493e 100644
--- a/metaprogramming/increment.h
+++ b/bind_lang/metaprogramming/increment.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_INCREMENT_H_
-#define JNI_BIND_METAPROGRAMMING_INCREMENT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_INCREMENT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_INCREMENT_H_
 
 #include <cstddef>
 
@@ -44,4 +44,4 @@ using Increment_t = typename Increment<I>::template type<T>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_INCREMENT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_INCREMENT_H_
diff --git a/metaprogramming/increment_test.cc b/bind_lang/metaprogramming/increment_test.cc
similarity index 100%
rename from metaprogramming/increment_test.cc
rename to bind_lang/metaprogramming/increment_test.cc
diff --git a/metaprogramming/index.h b/bind_lang/metaprogramming/index.h
similarity index 89%
rename from metaprogramming/index.h
rename to bind_lang/metaprogramming/index.h
index 7a8ce0a6..60ca649d 100644
--- a/metaprogramming/index.h
+++ b/bind_lang/metaprogramming/index.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef JNI_BIND_METAPROGRAMMING_INDEX_H_
-#define JNI_BIND_METAPROGRAMMING_INDEX_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_INDEX_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_INDEX_H_
 
 #include <cstddef>
 #include <tuple>
@@ -52,4 +52,4 @@ using Index_Tup = TupleUnroller_t<Index, Tup>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_INDEX_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_INDEX_H_
diff --git a/metaprogramming/index_test.cc b/bind_lang/metaprogramming/index_test.cc
similarity index 96%
rename from metaprogramming/index_test.cc
rename to bind_lang/metaprogramming/index_test.cc
index f8ccc75d..d8e115eb 100644
--- a/metaprogramming/index_test.cc
+++ b/bind_lang/metaprogramming/index_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/index.h"
+#include "bind_lang/metaprogramming/index.h"
 
 #include <tuple>
 #include <type_traits>
diff --git a/metaprogramming/interleave.h b/bind_lang/metaprogramming/interleave.h
similarity index 91%
rename from metaprogramming/interleave.h
rename to bind_lang/metaprogramming/interleave.h
index 273d7fe1..20b74429 100644
--- a/metaprogramming/interleave.h
+++ b/bind_lang/metaprogramming/interleave.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_INTERLEAVE_H_
-#define JNI_BIND_METAPROGRAMMING_INTERLEAVE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_INTERLEAVE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_INTERLEAVE_H_
 
 #include <cstddef>
 #include <tuple>
@@ -54,4 +54,4 @@ struct Interleaved<std::tuple<T0...>, std::tuple<T1...>> {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_INTERLEAVE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_INTERLEAVE_H_
diff --git a/metaprogramming/interleave_test.cc b/bind_lang/metaprogramming/interleave_test.cc
similarity index 100%
rename from metaprogramming/interleave_test.cc
rename to bind_lang/metaprogramming/interleave_test.cc
diff --git a/metaprogramming/invocable_map.h b/bind_lang/metaprogramming/invocable_map.h
similarity index 95%
rename from metaprogramming/invocable_map.h
rename to bind_lang/metaprogramming/invocable_map.h
index 01ed9b58..688bf739 100644
--- a/metaprogramming/invocable_map.h
+++ b/bind_lang/metaprogramming/invocable_map.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_INVOCABLE_MAP_H
-#define JNI_BIND_METAPROGRAMMING_INVOCABLE_MAP_H
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOCABLE_MAP_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOCABLE_MAP_H_
 
 #include <cstddef>
 #include <string_view>
@@ -74,8 +74,7 @@ class InvocableMapBase<CrtpBase, tup_container_v, TupContainerT, MemberT,
  public:
 #if __clang__
   using InvocableMapEntry<CrtpBase, tup_container_v, TupContainerT, MemberT,
-                          nameable_member, idxs>::
-  operator()...;
+                          nameable_member, idxs>::operator()...;
 #endif  // __clang__
 };
 
@@ -122,4 +121,4 @@ class InvocableMap
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_INVOCABLE_MAP_H
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOCABLE_MAP_H_
diff --git a/metaprogramming/invocable_map_20.h b/bind_lang/metaprogramming/invocable_map_20.h
similarity index 95%
rename from metaprogramming/invocable_map_20.h
rename to bind_lang/metaprogramming/invocable_map_20.h
index 16152ecf..0d5cbff3 100644
--- a/metaprogramming/invocable_map_20.h
+++ b/bind_lang/metaprogramming/invocable_map_20.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_INVOCABLE_MAP_20_H
-#define JNI_BIND_METAPROGRAMMING_INVOCABLE_MAP_20_H
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOCABLE_MAP_20_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOCABLE_MAP_20_H_
 
 #include <cstddef>
 #include <string_view>
@@ -95,4 +95,4 @@ class InvocableMap20 {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_INVOCABLE_MAP_20_H
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOCABLE_MAP_20_H_
diff --git a/metaprogramming/invocable_map_20_test.cc b/bind_lang/metaprogramming/invocable_map_20_test.cc
similarity index 100%
rename from metaprogramming/invocable_map_20_test.cc
rename to bind_lang/metaprogramming/invocable_map_20_test.cc
diff --git a/metaprogramming/invocable_map_test.cc b/bind_lang/metaprogramming/invocable_map_test.cc
similarity index 100%
rename from metaprogramming/invocable_map_test.cc
rename to bind_lang/metaprogramming/invocable_map_test.cc
diff --git a/metaprogramming/invoke.h b/bind_lang/metaprogramming/invoke.h
similarity index 92%
rename from metaprogramming/invoke.h
rename to bind_lang/metaprogramming/invoke.h
index 8fdb93b9..9405b5e0 100644
--- a/metaprogramming/invoke.h
+++ b/bind_lang/metaprogramming/invoke.h
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_MONOID_H_
-#define JNI_BIND_METAPROGRAMMING_MONOID_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOKE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOKE_H_
 
 #include <tuple>
 
 #include "per_element.h"
 #include "tuple_manipulation.h"
+#include "unwrap.h"
 
 namespace jni::metaprogramming {
 
@@ -68,4 +69,4 @@ using InvokePerTupArgAsPack_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_MONOID_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_INVOKE_H_
diff --git a/metaprogramming/invoke_test.cc b/bind_lang/metaprogramming/invoke_test.cc
similarity index 100%
rename from metaprogramming/invoke_test.cc
rename to bind_lang/metaprogramming/invoke_test.cc
diff --git a/metaprogramming/lambda_string.h b/bind_lang/metaprogramming/lambda_string.h
similarity index 91%
rename from metaprogramming/lambda_string.h
rename to bind_lang/metaprogramming/lambda_string.h
index 37a59376..7e0aadf6 100644
--- a/metaprogramming/lambda_string.h
+++ b/bind_lang/metaprogramming/lambda_string.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_LAMBDA_STRING_H_
-#define JNI_BIND_METAPROGRAMMING_LAMBDA_STRING_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_LAMBDA_STRING_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_LAMBDA_STRING_H_
 
 #include <cstddef>
 #include <string_view>
@@ -63,4 +63,4 @@ using LambdaStringToType = decltype(LambdaToStr(std::declval<NameLambda>()));
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_LAMBDA_STRING_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_LAMBDA_STRING_H_
diff --git a/metaprogramming/lambda_string_test.cc b/bind_lang/metaprogramming/lambda_string_test.cc
similarity index 100%
rename from metaprogramming/lambda_string_test.cc
rename to bind_lang/metaprogramming/lambda_string_test.cc
diff --git a/metaprogramming/min_max.h b/bind_lang/metaprogramming/min_max.h
similarity index 90%
rename from metaprogramming/min_max.h
rename to bind_lang/metaprogramming/min_max.h
index e8cd3457..1921e48e 100644
--- a/metaprogramming/min_max.h
+++ b/bind_lang/metaprogramming/min_max.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef JNI_BIND_METAPROGRAMMING_MIN_MAX_H_
-#define JNI_BIND_METAPROGRAMMING_MIN_MAX_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_MIN_MAX_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_MIN_MAX_H_
 
 #include <type_traits>
 
@@ -62,4 +62,4 @@ static constexpr auto Min_v = Min_t<T1, T2>::val;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_MIN_MAX_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_MIN_MAX_H_
diff --git a/metaprogramming/min_max_test.cc b/bind_lang/metaprogramming/min_max_test.cc
similarity index 99%
rename from metaprogramming/min_max_test.cc
rename to bind_lang/metaprogramming/min_max_test.cc
index 0fd3fa98..f9717bcc 100644
--- a/metaprogramming/min_max_test.cc
+++ b/bind_lang/metaprogramming/min_max_test.cc
@@ -19,6 +19,7 @@
 #include <tuple>
 
 #include "reduce.h"
+#include "vals.h"
 
 namespace {
 
diff --git a/metaprogramming/modified_max.h b/bind_lang/metaprogramming/modified_max.h
similarity index 86%
rename from metaprogramming/modified_max.h
rename to bind_lang/metaprogramming/modified_max.h
index 8f578e66..6e2a5e1a 100644
--- a/metaprogramming/modified_max.h
+++ b/bind_lang/metaprogramming/modified_max.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef LOCAL_GOOGLE_HOME_JWHPRYOR_JNI_BIND_GERRIT_JNI_BIND_METAPROGRAMMING_SIZE_T_MAX_H_
-#define LOCAL_GOOGLE_HOME_JWHPRYOR_JNI_BIND_GERRIT_JNI_BIND_METAPROGRAMMING_SIZE_T_MAX_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_MODIFIED_MAX_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_MODIFIED_MAX_H_
 
 #include <cstddef>
 #include <initializer_list>
@@ -58,4 +58,4 @@ constexpr std::size_t ModifiedMax(
 
 }  // namespace jni::metaprogramming
 
-#endif  // LOCAL_GOOGLE_HOME_JWHPRYOR_JNI_BIND_GERRIT_JNI_BIND_METAPROGRAMMING_SIZE_T_MAX_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_MODIFIED_MAX_H_
diff --git a/metaprogramming/modified_max_test.cc b/bind_lang/metaprogramming/modified_max_test.cc
similarity index 100%
rename from metaprogramming/modified_max_test.cc
rename to bind_lang/metaprogramming/modified_max_test.cc
diff --git a/metaprogramming/n_bit.h b/bind_lang/metaprogramming/n_bit.h
similarity index 88%
rename from metaprogramming/n_bit.h
rename to bind_lang/metaprogramming/n_bit.h
index 4295698d..bafe806d 100644
--- a/metaprogramming/n_bit.h
+++ b/bind_lang/metaprogramming/n_bit.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_N_BIT_H_
-#define JNI_BIND_METAPROGRAMMING_N_BIT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_N_BIT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_N_BIT_H_
 
 #include <algorithm>
 #include <cstddef>
@@ -39,4 +39,4 @@ struct NBit {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_N_BIT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_N_BIT_H_
diff --git a/metaprogramming/n_bit_sequence.h b/bind_lang/metaprogramming/n_bit_sequence.h
similarity index 95%
rename from metaprogramming/n_bit_sequence.h
rename to bind_lang/metaprogramming/n_bit_sequence.h
index 2ca60827..66856c55 100644
--- a/metaprogramming/n_bit_sequence.h
+++ b/bind_lang/metaprogramming/n_bit_sequence.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_N_BIT_SEQUENCE_H
-#define JNI_BIND_METAPROGRAMMING_N_BIT_SEQUENCE_H
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_N_BIT_SEQUENCE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_N_BIT_SEQUENCE_H_
 
 #include <cstddef>
 #include <tuple>
@@ -100,4 +100,4 @@ struct NBitSequence<NBit<values, max_values, overflows>...> {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_N_BIT_SEQUENCE_H
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_N_BIT_SEQUENCE_H_
diff --git a/metaprogramming/n_bit_sequence_test.cc b/bind_lang/metaprogramming/n_bit_sequence_test.cc
similarity index 100%
rename from metaprogramming/n_bit_sequence_test.cc
rename to bind_lang/metaprogramming/n_bit_sequence_test.cc
diff --git a/metaprogramming/n_bit_test.cc b/bind_lang/metaprogramming/n_bit_test.cc
similarity index 100%
rename from metaprogramming/n_bit_test.cc
rename to bind_lang/metaprogramming/n_bit_test.cc
diff --git a/metaprogramming/name_constants.h b/bind_lang/metaprogramming/name_constants.h
similarity index 94%
rename from metaprogramming/name_constants.h
rename to bind_lang/metaprogramming/name_constants.h
index d520ac37..a8eb9b22 100644
--- a/metaprogramming/name_constants.h
+++ b/bind_lang/metaprogramming/name_constants.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_NAME_CONSTANTS_H_
-#define JNI_BIND_METAPROGRAMMING_NAME_CONSTANTS_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_NAME_CONSTANTS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_NAME_CONSTANTS_H_
 
 #include <string_view>
 
@@ -91,4 +91,4 @@ struct Constants {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_NAME_CONSTANTS_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_NAME_CONSTANTS_H_
diff --git a/metaprogramming/next.h b/bind_lang/metaprogramming/next.h
similarity index 90%
rename from metaprogramming/next.h
rename to bind_lang/metaprogramming/next.h
index d139a950..0ecfdf9b 100644
--- a/metaprogramming/next.h
+++ b/bind_lang/metaprogramming/next.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_NEXT_H_
-#define JNI_BIND_METAPROGRAMMING_NEXT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_NEXT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_NEXT_H_
 
 #include "pack_discriminator.h"
 
@@ -48,4 +48,4 @@ using Next_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_NEXT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_NEXT_H_
diff --git a/metaprogramming/next_test.cc b/bind_lang/metaprogramming/next_test.cc
similarity index 99%
rename from metaprogramming/next_test.cc
rename to bind_lang/metaprogramming/next_test.cc
index 59f01fea..5048fc98 100644
--- a/metaprogramming/next_test.cc
+++ b/bind_lang/metaprogramming/next_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/next.h"
+#include "bind_lang/metaprogramming/next.h"
 
 #include <cstddef>
 #include <type_traits>
diff --git a/metaprogramming/optional_wrap.h b/bind_lang/metaprogramming/optional_wrap.h
similarity index 85%
rename from metaprogramming/optional_wrap.h
rename to bind_lang/metaprogramming/optional_wrap.h
index 139ed841..2a8552fe 100644
--- a/metaprogramming/optional_wrap.h
+++ b/bind_lang/metaprogramming/optional_wrap.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_OPTIONAL_WRAP_H_
-#define JNI_BIND_METAPROGRAMMING_OPTIONAL_WRAP_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_OPTIONAL_WRAP_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_OPTIONAL_WRAP_H_
 
 #include <optional>
 #include <tuple>
@@ -37,4 +37,4 @@ using OptionalTup_t = typename OptionalTup<Ts...>::type;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_OPTIONAL_WRAP_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_OPTIONAL_WRAP_H_
diff --git a/metaprogramming/optional_wrap_test.cc b/bind_lang/metaprogramming/optional_wrap_test.cc
similarity index 100%
rename from metaprogramming/optional_wrap_test.cc
rename to bind_lang/metaprogramming/optional_wrap_test.cc
diff --git a/metaprogramming/pack_discriminator.h b/bind_lang/metaprogramming/pack_discriminator.h
similarity index 92%
rename from metaprogramming/pack_discriminator.h
rename to bind_lang/metaprogramming/pack_discriminator.h
index 33c05775..98011cc1 100644
--- a/metaprogramming/pack_discriminator.h
+++ b/bind_lang/metaprogramming/pack_discriminator.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_PACK_DISCRIMINATOR_H_
-#define JNI_BIND_METAPROGRAMMING_PACK_DISCRIMINATOR_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_PACK_DISCRIMINATOR_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_PACK_DISCRIMINATOR_H_
 
 namespace jni::metaprogramming {
 
@@ -78,4 +78,4 @@ struct PackDiscriminatedForward {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_PACK_DISCRIMINATOR_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_PACK_DISCRIMINATOR_H_
diff --git a/metaprogramming/pack_discriminator_test.cc b/bind_lang/metaprogramming/pack_discriminator_test.cc
similarity index 96%
rename from metaprogramming/pack_discriminator_test.cc
rename to bind_lang/metaprogramming/pack_discriminator_test.cc
index 41ef6029..c7264889 100644
--- a/metaprogramming/pack_discriminator_test.cc
+++ b/bind_lang/metaprogramming/pack_discriminator_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/pack_discriminator.h"
+#include "bind_lang/metaprogramming/pack_discriminator.h"
 
 namespace {
 
diff --git a/metaprogramming/passthrough.h b/bind_lang/metaprogramming/passthrough.h
similarity index 91%
rename from metaprogramming/passthrough.h
rename to bind_lang/metaprogramming/passthrough.h
index c8b15b98..85f35c2c 100644
--- a/metaprogramming/passthrough.h
+++ b/bind_lang/metaprogramming/passthrough.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_PASSTHROUGH_H_
-#define JNI_BIND_METAPROGRAMMING_PASSTHROUGH_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_PASSTHROUGH_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_PASSTHROUGH_H_
 
 #include <utility>
 
@@ -71,4 +71,4 @@ bool operator!=(const Passthrough<U, CustomDeleter>& lhs, const T& rhs) {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_PASSTHROUGH_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_PASSTHROUGH_H_
diff --git a/metaprogramming/passthrough_test.cc b/bind_lang/metaprogramming/passthrough_test.cc
similarity index 97%
rename from metaprogramming/passthrough_test.cc
rename to bind_lang/metaprogramming/passthrough_test.cc
index 44d1d8dd..c34c327e 100644
--- a/metaprogramming/passthrough_test.cc
+++ b/bind_lang/metaprogramming/passthrough_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/passthrough.h"
+#include "bind_lang/metaprogramming/passthrough.h"
 
 #include <gtest/gtest.h>
 
diff --git a/metaprogramming/per_element.h b/bind_lang/metaprogramming/per_element.h
similarity index 90%
rename from metaprogramming/per_element.h
rename to bind_lang/metaprogramming/per_element.h
index 08f83c7d..f5c73122 100644
--- a/metaprogramming/per_element.h
+++ b/bind_lang/metaprogramming/per_element.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_PER_ELEMENT_H_
-#define JNI_BIND_METAPROGRAMMING_PER_ELEMENT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_PER_ELEMENT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_PER_ELEMENT_H_
 
 #include <cstddef>
 #include <tuple>
@@ -50,4 +50,4 @@ using PerElement_t = typename PerElement<Func>::template type<Ts...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_PER_ELEMENT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_PER_ELEMENT_H_
diff --git a/metaprogramming/per_element_test.cc b/bind_lang/metaprogramming/per_element_test.cc
similarity index 100%
rename from metaprogramming/per_element_test.cc
rename to bind_lang/metaprogramming/per_element_test.cc
diff --git a/metaprogramming/per_element_val.h b/bind_lang/metaprogramming/per_element_val.h
similarity index 85%
rename from metaprogramming/per_element_val.h
rename to bind_lang/metaprogramming/per_element_val.h
index e2332377..090852cd 100644
--- a/metaprogramming/per_element_val.h
+++ b/bind_lang/metaprogramming/per_element_val.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_PER_ELEMENT_VAL_H_
-#define JNI_BIND_METAPROGRAMMING_PER_ELEMENT_VAL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_PER_ELEMENT_VAL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_PER_ELEMENT_VAL_H_
 
 #include <array>
 
@@ -38,4 +38,4 @@ static constexpr auto PerElementVal_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_PER_ELEMENT_VAL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_PER_ELEMENT_VAL_H_
diff --git a/metaprogramming/per_element_val_test.cc b/bind_lang/metaprogramming/per_element_val_test.cc
similarity index 100%
rename from metaprogramming/per_element_val_test.cc
rename to bind_lang/metaprogramming/per_element_val_test.cc
diff --git a/metaprogramming/queryable_map.h b/bind_lang/metaprogramming/queryable_map.h
similarity index 96%
rename from metaprogramming/queryable_map.h
rename to bind_lang/metaprogramming/queryable_map.h
index fc55a3dc..b6e30d7b 100644
--- a/metaprogramming/queryable_map.h
+++ b/bind_lang/metaprogramming/queryable_map.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_QUERYABLE_MAP_H
-#define JNI_BIND_METAPROGRAMMING_QUERYABLE_MAP_H
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_QUERYABLE_MAP_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_QUERYABLE_MAP_H_
 
 #include <cstddef>
 #include <string_view>
@@ -128,4 +128,4 @@ class QueryableMapEntry {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_QUERYABLE_MAP_H
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_QUERYABLE_MAP_H_
diff --git a/metaprogramming/queryable_map_20.h b/bind_lang/metaprogramming/queryable_map_20.h
similarity index 94%
rename from metaprogramming/queryable_map_20.h
rename to bind_lang/metaprogramming/queryable_map_20.h
index db862668..725c3e1a 100644
--- a/metaprogramming/queryable_map_20.h
+++ b/bind_lang/metaprogramming/queryable_map_20.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_QUERYABLE_MAP_20_H
-#define JNI_BIND_METAPROGRAMMING_QUERYABLE_MAP_20_H
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_QUERYABLE_MAP_20_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_QUERYABLE_MAP_20_H_
 
 #include <cstddef>
 #include <string_view>
@@ -87,4 +87,4 @@ class QueryableMap20 {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_QUERYABLE_MAP_20_H
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_QUERYABLE_MAP_20_H_
diff --git a/metaprogramming/queryable_map_20_test.cc b/bind_lang/metaprogramming/queryable_map_20_test.cc
similarity index 99%
rename from metaprogramming/queryable_map_20_test.cc
rename to bind_lang/metaprogramming/queryable_map_20_test.cc
index 270b4c04..4b839a1c 100644
--- a/metaprogramming/queryable_map_20_test.cc
+++ b/bind_lang/metaprogramming/queryable_map_20_test.cc
@@ -19,7 +19,6 @@
 #include <cstddef>
 #include <string_view>
 #include <tuple>
-#include <type_traits>
 
 #include "string_literal.h"
 #include <gtest/gtest.h>
diff --git a/metaprogramming/queryable_map_test.cc b/bind_lang/metaprogramming/queryable_map_test.cc
similarity index 100%
rename from metaprogramming/queryable_map_test.cc
rename to bind_lang/metaprogramming/queryable_map_test.cc
diff --git a/metaprogramming/reduce.h b/bind_lang/metaprogramming/reduce.h
similarity index 92%
rename from metaprogramming/reduce.h
rename to bind_lang/metaprogramming/reduce.h
index 60e62a96..1a4e751c 100644
--- a/metaprogramming/reduce.h
+++ b/bind_lang/metaprogramming/reduce.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_REDUCE_H_
-#define JNI_BIND_METAPROGRAMMING_REDUCE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_REDUCE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_REDUCE_H_
 
 #include "tuple_manipulation.h"
 
@@ -68,4 +68,4 @@ static constexpr auto ReduceAsPack_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_REDUCE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_REDUCE_H_
diff --git a/metaprogramming/reduce_test.cc b/bind_lang/metaprogramming/reduce_test.cc
similarity index 100%
rename from metaprogramming/reduce_test.cc
rename to bind_lang/metaprogramming/reduce_test.cc
diff --git a/metaprogramming/repeat_string.h b/bind_lang/metaprogramming/repeat_string.h
similarity index 87%
rename from metaprogramming/repeat_string.h
rename to bind_lang/metaprogramming/repeat_string.h
index 0a5e74ea..ffbf78ca 100644
--- a/metaprogramming/repeat_string.h
+++ b/bind_lang/metaprogramming/repeat_string.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef JNI_BIND_METAPROGRAMMING_REPEAT_H_
-#define JNI_BIND_METAPROGRAMMING_REPEAT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_REPEAT_STRING_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_REPEAT_STRING_H_
 
 #include <cstddef>
 #include <string_view>
@@ -42,4 +42,4 @@ static constexpr auto RepeatString_v{
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_REPEAT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_REPEAT_STRING_H_
diff --git a/metaprogramming/repeat_string_test.cc b/bind_lang/metaprogramming/repeat_string_test.cc
similarity index 97%
rename from metaprogramming/repeat_string_test.cc
rename to bind_lang/metaprogramming/repeat_string_test.cc
index 526935db..f48d112d 100644
--- a/metaprogramming/repeat_string_test.cc
+++ b/bind_lang/metaprogramming/repeat_string_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/repeat_string.h"
+#include "bind_lang/metaprogramming/repeat_string.h"
 
 #include <string_view>
 
diff --git a/metaprogramming/replace_string.h b/bind_lang/metaprogramming/replace_string.h
similarity index 88%
rename from metaprogramming/replace_string.h
rename to bind_lang/metaprogramming/replace_string.h
index 27f63e19..15a22bc3 100644
--- a/metaprogramming/replace_string.h
+++ b/bind_lang/metaprogramming/replace_string.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_REPLACE_STRING_H_
-#define JNI_BIND_METAPROGRAMMING_REPLACE_STRING_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_REPLACE_STRING_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_REPLACE_STRING_H_
 
 #include <cstddef>
 #include <string_view>
@@ -47,4 +47,4 @@ static constexpr auto Replace_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_REPLACE_STRING_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_REPLACE_STRING_H_
diff --git a/metaprogramming/replace_string_test.cc b/bind_lang/metaprogramming/replace_string_test.cc
similarity index 95%
rename from metaprogramming/replace_string_test.cc
rename to bind_lang/metaprogramming/replace_string_test.cc
index 3fd5315d..c27af4e2 100644
--- a/metaprogramming/replace_string_test.cc
+++ b/bind_lang/metaprogramming/replace_string_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/replace_string.h"
+#include "bind_lang/metaprogramming/replace_string.h"
 
 #include <string_view>
 
diff --git a/metaprogramming/reverse.h b/bind_lang/metaprogramming/reverse.h
similarity index 88%
rename from metaprogramming/reverse.h
rename to bind_lang/metaprogramming/reverse.h
index 162b45d7..98a8e0db 100644
--- a/metaprogramming/reverse.h
+++ b/bind_lang/metaprogramming/reverse.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_REVERSE_H_
-#define JNI_BIND_METAPROGRAMMING_REVERSE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_REVERSE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_REVERSE_H_
 
 #include <tuple>
 
@@ -50,4 +50,4 @@ using Reverse_Tup = TupleUnroller_t<Reverse, Tup>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_REVERSE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_REVERSE_H_
diff --git a/metaprogramming/reverse_test.cc b/bind_lang/metaprogramming/reverse_test.cc
similarity index 100%
rename from metaprogramming/reverse_test.cc
rename to bind_lang/metaprogramming/reverse_test.cc
diff --git a/metaprogramming/same.h b/bind_lang/metaprogramming/same.h
similarity index 87%
rename from metaprogramming/same.h
rename to bind_lang/metaprogramming/same.h
index 5eabc176..6b6cf07a 100644
--- a/metaprogramming/same.h
+++ b/bind_lang/metaprogramming/same.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_SAME_H_
-#define JNI_BIND_METAPROGRAMMING_SAME_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_SAME_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_SAME_H_
 
 #include <tuple>
 #include <type_traits>
@@ -36,4 +36,4 @@ struct Same {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_SAME_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_SAME_H_
diff --git a/metaprogramming/same_test.cc b/bind_lang/metaprogramming/same_test.cc
similarity index 100%
rename from metaprogramming/same_test.cc
rename to bind_lang/metaprogramming/same_test.cc
diff --git a/metaprogramming/singleton.h b/bind_lang/metaprogramming/singleton.h
similarity index 81%
rename from metaprogramming/singleton.h
rename to bind_lang/metaprogramming/singleton.h
index 0ca0917b..990cd68f 100644
--- a/metaprogramming/singleton.h
+++ b/bind_lang/metaprogramming/singleton.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_SINGLETON_H_
-#define JNI_BIND_METAPROGRAMMING_SINGLETON_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_SINGLETON_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_SINGLETON_H_
 
 namespace jni::metaprogramming {
 
@@ -26,4 +26,4 @@ struct Singleton {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_SINGLETON_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_SINGLETON_H_
diff --git a/metaprogramming/singleton_test.cc b/bind_lang/metaprogramming/singleton_test.cc
similarity index 94%
rename from metaprogramming/singleton_test.cc
rename to bind_lang/metaprogramming/singleton_test.cc
index 8cb411d1..51c1ddbf 100644
--- a/metaprogramming/singleton_test.cc
+++ b/bind_lang/metaprogramming/singleton_test.cc
@@ -1,4 +1,4 @@
-#include "metaprogramming/singleton.h"
+#include "bind_lang/metaprogramming/singleton.h"
 
 #include <memory>
 
diff --git a/metaprogramming/string_concatenate.h b/bind_lang/metaprogramming/string_concatenate.h
similarity index 89%
rename from metaprogramming/string_concatenate.h
rename to bind_lang/metaprogramming/string_concatenate.h
index adb6eaad..b1135910 100644
--- a/metaprogramming/string_concatenate.h
+++ b/bind_lang/metaprogramming/string_concatenate.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_STRING_CONCATENATE_H_
-#define JNI_BIND_METAPROGRAMMING_STRING_CONCATENATE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_CONCATENATE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_CONCATENATE_H_
 
 #include <array>
 #include <cstddef>
@@ -55,4 +55,4 @@ static constexpr auto StringConcatenate_v = StringConcatenate::value<Vs...>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_STRING_CONCATENATE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_CONCATENATE_H_
diff --git a/metaprogramming/string_concatenate_test.cc b/bind_lang/metaprogramming/string_concatenate_test.cc
similarity index 94%
rename from metaprogramming/string_concatenate_test.cc
rename to bind_lang/metaprogramming/string_concatenate_test.cc
index c57fb468..0a7064ab 100644
--- a/metaprogramming/string_concatenate_test.cc
+++ b/bind_lang/metaprogramming/string_concatenate_test.cc
@@ -1,4 +1,4 @@
-#include "metaprogramming/string_concatenate.h"
+#include "bind_lang/metaprogramming/string_concatenate.h"
 
 #include <string_view>
 
diff --git a/metaprogramming/string_contains.h b/bind_lang/metaprogramming/string_contains.h
similarity index 87%
rename from metaprogramming/string_contains.h
rename to bind_lang/metaprogramming/string_contains.h
index fa011fb4..b11963c3 100644
--- a/metaprogramming/string_contains.h
+++ b/bind_lang/metaprogramming/string_contains.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_STRING_CONTAINS_H_
-#define JNI_BIND_METAPROGRAMMING_STRING_CONTAINS_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_CONTAINS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_CONTAINS_H_
 
 #include <cstddef>
 #include <string_view>
@@ -44,4 +44,4 @@ static constexpr bool StringContains_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_STRING_CONTAINS_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_CONTAINS_H_
diff --git a/metaprogramming/string_contains_test.cc b/bind_lang/metaprogramming/string_contains_test.cc
similarity index 95%
rename from metaprogramming/string_contains_test.cc
rename to bind_lang/metaprogramming/string_contains_test.cc
index 91ad17b8..d0e9db6e 100644
--- a/metaprogramming/string_contains_test.cc
+++ b/bind_lang/metaprogramming/string_contains_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/string_contains.h"
+#include "bind_lang/metaprogramming/string_contains.h"
 
 #include <string_view>
 
diff --git a/metaprogramming/string_literal.h b/bind_lang/metaprogramming/string_literal.h
similarity index 90%
rename from metaprogramming/string_literal.h
rename to bind_lang/metaprogramming/string_literal.h
index b6b88ab1..bbdd3034 100644
--- a/metaprogramming/string_literal.h
+++ b/bind_lang/metaprogramming/string_literal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_STRING_LITERAL_H_
-#define JNI_BIND_METAPROGRAMMING_STRING_LITERAL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_LITERAL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_LITERAL_H_
 
 #ifdef __cplusplus
 #if __cplusplus >= 202002L
@@ -63,4 +63,4 @@ StringLiteral(const char (&str)[N]) -> StringLiteral<N>;
 #endif  // __cplusplus >= 202002L
 #endif  // __cplusplus
 
-#endif  // JNI_BIND_METAPROGRAMMING_STRING_LITERAL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_STRING_LITERAL_H_
diff --git a/metaprogramming/string_literal_test.cc b/bind_lang/metaprogramming/string_literal_test.cc
similarity index 100%
rename from metaprogramming/string_literal_test.cc
rename to bind_lang/metaprogramming/string_literal_test.cc
diff --git a/metaprogramming/tuple_from_size.h b/bind_lang/metaprogramming/tuple_from_size.h
similarity index 86%
rename from metaprogramming/tuple_from_size.h
rename to bind_lang/metaprogramming/tuple_from_size.h
index 2d7eb972..f6a052e1 100644
--- a/metaprogramming/tuple_from_size.h
+++ b/bind_lang/metaprogramming/tuple_from_size.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_TUPLE_FROM_SIZE_H_
-#define JNI_BIND_METAPROGRAMMING_TUPLE_FROM_SIZE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_TUPLE_FROM_SIZE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_TUPLE_FROM_SIZE_H_
 
 #include <cstddef>
 #include <tuple>
@@ -42,4 +42,4 @@ using TupleFromSize_t = decltype(TupleFromSize<DefaultType, N>());
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_TUPLE_FROM_SIZE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_TUPLE_FROM_SIZE_H_
diff --git a/metaprogramming/tuple_from_size_test.cc b/bind_lang/metaprogramming/tuple_from_size_test.cc
similarity index 100%
rename from metaprogramming/tuple_from_size_test.cc
rename to bind_lang/metaprogramming/tuple_from_size_test.cc
diff --git a/metaprogramming/tuple_manipulation.h b/bind_lang/metaprogramming/tuple_manipulation.h
similarity index 93%
rename from metaprogramming/tuple_manipulation.h
rename to bind_lang/metaprogramming/tuple_manipulation.h
index b5124ab3..13614861 100644
--- a/metaprogramming/tuple_manipulation.h
+++ b/bind_lang/metaprogramming/tuple_manipulation.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_TUPLE_MANIPULATION_H_
-#define JNI_BIND_METAPROGRAMMING_TUPLE_MANIPULATION_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_TUPLE_MANIPULATION_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_TUPLE_MANIPULATION_H_
 
 #include <tuple>
 #include <type_traits>
@@ -93,4 +93,4 @@ using ExtractTupleFromType_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_TUPLE_MANIPULATION_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_TUPLE_MANIPULATION_H_
diff --git a/metaprogramming/tuple_manipulation_test.cc b/bind_lang/metaprogramming/tuple_manipulation_test.cc
similarity index 100%
rename from metaprogramming/tuple_manipulation_test.cc
rename to bind_lang/metaprogramming/tuple_manipulation_test.cc
diff --git a/metaprogramming/type_index_mask.h b/bind_lang/metaprogramming/type_index_mask.h
similarity index 89%
rename from metaprogramming/type_index_mask.h
rename to bind_lang/metaprogramming/type_index_mask.h
index 48f10ac1..5a72a4b6 100644
--- a/metaprogramming/type_index_mask.h
+++ b/bind_lang/metaprogramming/type_index_mask.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_TYPE_INDEX_MASK_H_
-#define JNI_BIND_METAPROGRAMMING_TYPE_INDEX_MASK_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_INDEX_MASK_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_INDEX_MASK_H_
 
 #include <cstddef>
 #include <tuple>
@@ -58,4 +58,4 @@ using TypeTupFromIndexMask_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_TYPE_INDEX_MASK_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_INDEX_MASK_H_
diff --git a/metaprogramming/type_index_mask_test.cc b/bind_lang/metaprogramming/type_index_mask_test.cc
similarity index 100%
rename from metaprogramming/type_index_mask_test.cc
rename to bind_lang/metaprogramming/type_index_mask_test.cc
diff --git a/metaprogramming/type_of_nth_element.h b/bind_lang/metaprogramming/type_of_nth_element.h
similarity index 87%
rename from metaprogramming/type_of_nth_element.h
rename to bind_lang/metaprogramming/type_of_nth_element.h
index 0a51dac2..7ae33e37 100644
--- a/metaprogramming/type_of_nth_element.h
+++ b/bind_lang/metaprogramming/type_of_nth_element.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_TYPE_OF_NTH_ELEMENT_H_
-#define JNI_BIND_METAPROGRAMMING_TYPE_OF_NTH_ELEMENT_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_OF_NTH_ELEMENT_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_OF_NTH_ELEMENT_H_
 
 #include <cstddef>
 
@@ -50,4 +50,4 @@ using TypeOfNthTupleElement_t = Unwrap_t<TypeOfNthElement<N>, TupType>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_TYPE_OF_NTH_ELEMENT_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_OF_NTH_ELEMENT_H_
diff --git a/metaprogramming/type_of_nth_element_test.cc b/bind_lang/metaprogramming/type_of_nth_element_test.cc
similarity index 100%
rename from metaprogramming/type_of_nth_element_test.cc
rename to bind_lang/metaprogramming/type_of_nth_element_test.cc
diff --git a/metaprogramming/type_to_type_map.h b/bind_lang/metaprogramming/type_to_type_map.h
similarity index 93%
rename from metaprogramming/type_to_type_map.h
rename to bind_lang/metaprogramming/type_to_type_map.h
index d9565dde..259e2be9 100644
--- a/metaprogramming/type_to_type_map.h
+++ b/bind_lang/metaprogramming/type_to_type_map.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_TYPE_TO_TYPE_MAP_H_
-#define JNI_BIND_METAPROGRAMMING_TYPE_TO_TYPE_MAP_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_TO_TYPE_MAP_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_TO_TYPE_MAP_H_
 
 #include <tuple>
 
@@ -77,4 +77,4 @@ using TypeToTypeMapFromKeyValuesTup_t =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_TYPE_TO_TYPE_MAP_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_TYPE_TO_TYPE_MAP_H_
diff --git a/metaprogramming/type_to_type_map_test.cc b/bind_lang/metaprogramming/type_to_type_map_test.cc
similarity index 100%
rename from metaprogramming/type_to_type_map_test.cc
rename to bind_lang/metaprogramming/type_to_type_map_test.cc
diff --git a/metaprogramming/unfurl.h b/bind_lang/metaprogramming/unfurl.h
similarity index 94%
rename from metaprogramming/unfurl.h
rename to bind_lang/metaprogramming/unfurl.h
index b504fae7..92f35d70 100644
--- a/metaprogramming/unfurl.h
+++ b/bind_lang/metaprogramming/unfurl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_UNFURL_H_
-#define JNI_BIND_METAPROGRAMMING_UNFURL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_UNFURL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_UNFURL_H_
 
 #include <cstddef>
 #include <tuple>
@@ -73,4 +73,4 @@ static constexpr bool UnfurlDisjunction_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_UNFURL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_UNFURL_H_
diff --git a/metaprogramming/unfurl_test.cc b/bind_lang/metaprogramming/unfurl_test.cc
similarity index 100%
rename from metaprogramming/unfurl_test.cc
rename to bind_lang/metaprogramming/unfurl_test.cc
diff --git a/metaprogramming/unique_set.h b/bind_lang/metaprogramming/unique_set.h
similarity index 91%
rename from metaprogramming/unique_set.h
rename to bind_lang/metaprogramming/unique_set.h
index b86ff4d2..ba89be2a 100644
--- a/metaprogramming/unique_set.h
+++ b/bind_lang/metaprogramming/unique_set.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_UNIQUE_SET_H_
-#define JNI_BIND_METAPROGRAMMING_UNIQUE_SET_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_UNIQUE_SET_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_UNIQUE_SET_H_
 
 #include <tuple>
 #include <type_traits>
@@ -66,4 +66,4 @@ using UniqueSet_Tup = TupleUnroller_t<UniqueSet, Tup>;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_UNIQUE_SET_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_UNIQUE_SET_H_
diff --git a/metaprogramming/unique_set_test.cc b/bind_lang/metaprogramming/unique_set_test.cc
similarity index 100%
rename from metaprogramming/unique_set_test.cc
rename to bind_lang/metaprogramming/unique_set_test.cc
diff --git a/metaprogramming/unwrap.h b/bind_lang/metaprogramming/unwrap.h
similarity index 87%
rename from metaprogramming/unwrap.h
rename to bind_lang/metaprogramming/unwrap.h
index 1c084430..88bd8235 100644
--- a/metaprogramming/unwrap.h
+++ b/bind_lang/metaprogramming/unwrap.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_UNWRAP_H_
-#define JNI_BIND_METAPROGRAMMING_UNWRAP_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_UNWRAP_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_UNWRAP_H_
 
 #include "tuple_manipulation.h"
 
@@ -37,4 +37,4 @@ static constexpr auto Unwrap_v = Unwrap_t<Func, Ts...>::value;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_UNWRAP_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_UNWRAP_H_
diff --git a/metaprogramming/unwrap_test.cc b/bind_lang/metaprogramming/unwrap_test.cc
similarity index 100%
rename from metaprogramming/unwrap_test.cc
rename to bind_lang/metaprogramming/unwrap_test.cc
diff --git a/metaprogramming/vals.h b/bind_lang/metaprogramming/vals.h
similarity index 90%
rename from metaprogramming/vals.h
rename to bind_lang/metaprogramming/vals.h
index cc8984ea..3b90788f 100644
--- a/metaprogramming/vals.h
+++ b/bind_lang/metaprogramming/vals.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_VALS_H_
-#define JNI_BIND_METAPROGRAMMING_VALS_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_H_
 
 #include <array>
 
@@ -57,4 +57,4 @@ struct ValsConstRef {
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_VALS_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_H_
diff --git a/metaprogramming/vals_equal.h b/bind_lang/metaprogramming/vals_equal.h
similarity index 93%
rename from metaprogramming/vals_equal.h
rename to bind_lang/metaprogramming/vals_equal.h
index 0b7865e4..baf91516 100644
--- a/metaprogramming/vals_equal.h
+++ b/bind_lang/metaprogramming/vals_equal.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_VALS_EQUAL_H_
-#define JNI_BIND_METAPROGRAMMING_VALS_EQUAL_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_EQUAL_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_EQUAL_H_
 
 #include <type_traits>
 
-#include "metaprogramming/vals.h"
+#include "bind_lang/metaprogramming/vals.h"
 
 namespace jni::metaprogramming {
 
@@ -86,4 +86,4 @@ static constexpr bool ValsEqual_cr_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_VALS_EQUAL_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_EQUAL_H_
diff --git a/metaprogramming/vals_equal_diminished.h b/bind_lang/metaprogramming/vals_equal_diminished.h
similarity index 88%
rename from metaprogramming/vals_equal_diminished.h
rename to bind_lang/metaprogramming/vals_equal_diminished.h
index c9b6e9c8..be5d6096 100644
--- a/metaprogramming/vals_equal_diminished.h
+++ b/bind_lang/metaprogramming/vals_equal_diminished.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_VALS_EQUAL_DIMINISHED_H_
-#define JNI_BIND_METAPROGRAMMING_VALS_EQUAL_DIMINISHED_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_EQUAL_DIMINISHED_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_EQUAL_DIMINISHED_H_
 
-#include "metaprogramming/vals.h"
+#include "bind_lang/metaprogramming/vals.h"
 
 namespace jni::metaprogramming {
 
@@ -59,4 +59,4 @@ static constexpr bool ValsEqualDiminished_cr_v =
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_VALS_EQUAL_DIMINISHED_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_VALS_EQUAL_DIMINISHED_H_
diff --git a/metaprogramming/vals_equal_diminished_test.cc b/bind_lang/metaprogramming/vals_equal_diminished_test.cc
similarity index 98%
rename from metaprogramming/vals_equal_diminished_test.cc
rename to bind_lang/metaprogramming/vals_equal_diminished_test.cc
index b244b90f..81592d9a 100644
--- a/metaprogramming/vals_equal_diminished_test.cc
+++ b/bind_lang/metaprogramming/vals_equal_diminished_test.cc
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/vals_equal_diminished.h"
+#include "bind_lang/metaprogramming/vals_equal_diminished.h"
+
+#include "bind_lang/metaprogramming/vals.h"
 
 namespace {
 
diff --git a/metaprogramming/vals_equal_test.cc b/bind_lang/metaprogramming/vals_equal_test.cc
similarity index 98%
rename from metaprogramming/vals_equal_test.cc
rename to bind_lang/metaprogramming/vals_equal_test.cc
index 4ab191b3..7cb65520 100644
--- a/metaprogramming/vals_equal_test.cc
+++ b/bind_lang/metaprogramming/vals_equal_test.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "metaprogramming/vals_equal.h"
+#include "bind_lang/metaprogramming/vals_equal.h"
 
-#include "metaprogramming/vals.h"
+#include "bind_lang/metaprogramming/vals.h"
 
 namespace {
 
diff --git a/metaprogramming/zip_invoke.h b/bind_lang/metaprogramming/zip_invoke.h
similarity index 89%
rename from metaprogramming/zip_invoke.h
rename to bind_lang/metaprogramming/zip_invoke.h
index f4fdf5b4..827c22cf 100644
--- a/metaprogramming/zip_invoke.h
+++ b/bind_lang/metaprogramming/zip_invoke.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef JNI_BIND_METAPROGRAMMING_ZIP_INVOKE_H_
-#define JNI_BIND_METAPROGRAMMING_ZIP_INVOKE_H_
+#ifndef JNI_BIND_BIND_LANG_METAPROGRAMMING_ZIP_INVOKE_H_
+#define JNI_BIND_BIND_LANG_METAPROGRAMMING_ZIP_INVOKE_H_
 
 #include <tuple>
 #include <type_traits>
@@ -45,4 +45,4 @@ using ZipInvoke_t = typename ZipInvoke<Func, Knobs, Args>::type;
 
 }  // namespace jni::metaprogramming
 
-#endif  // JNI_BIND_METAPROGRAMMING_ZIP_INVOKE_H_
+#endif  // JNI_BIND_BIND_LANG_METAPROGRAMMING_ZIP_INVOKE_H_
diff --git a/metaprogramming/zip_invoke_test.cc b/bind_lang/metaprogramming/zip_invoke_test.cc
similarity index 100%
rename from metaprogramming/zip_invoke_test.cc
rename to bind_lang/metaprogramming/zip_invoke_test.cc
diff --git a/implementation/BUILD b/implementation/BUILD
index c331583e..11c21191 100644
--- a/implementation/BUILD
+++ b/implementation/BUILD
@@ -23,8 +23,8 @@ cc_library(
         ":object",
         ":return",
         "//:jni_dep",
-        "//metaprogramming:contains",
-        "//metaprogramming:type_to_type_map",
+        "//bind_lang/metaprogramming:contains",
+        "//bind_lang/metaprogramming:type_to_type_map",
     ],
 )
 
@@ -60,7 +60,7 @@ cc_library(
     hdrs = ["array_type_conversion.h"],
     deps = [
         "//:jni_dep",
-        "//metaprogramming:type_to_type_map",
+        "//bind_lang/metaprogramming:type_to_type_map",
     ],
 )
 
@@ -110,9 +110,9 @@ cc_library(
         ":no_class_specified",
         ":object",
         ":static",
-        "//metaprogramming:base_filter",
-        "//metaprogramming:tuple_manipulation",
-        "//metaprogramming:type_of_nth_element",
+        "//bind_lang/metaprogramming:base_filter",
+        "//bind_lang/metaprogramming:tuple_manipulation",
+        "//bind_lang/metaprogramming:type_of_nth_element",
     ],
 )
 
@@ -126,13 +126,13 @@ cc_library(
         ":ref_storage",
         ":selector_static_info",
         "//:jni_dep",
+        "//bind_lang/metaprogramming:double_locked_value",
         "//class_defs:java_lang_classes",
         "//implementation/jni_helper",
         "//implementation/jni_helper:invoke",
         "//implementation/jni_helper:lifecycle",
         "//implementation/jni_helper:lifecycle_object",
         "//implementation/jni_helper:lifecycle_string",
-        "//metaprogramming:double_locked_value",
     ],
 )
 
@@ -159,10 +159,10 @@ cc_library(
         ":no_idx",
         ":object",
         ":supported_class_set",
+        "//bind_lang/metaprogramming:all_unique",
+        "//bind_lang/metaprogramming:base_filter",
+        "//bind_lang/metaprogramming:modified_max",
         "//class_defs:java_lang_classes",
-        "//metaprogramming:all_unique",
-        "//metaprogramming:base_filter",
-        "//metaprogramming:modified_max",
     ],
 )
 
@@ -230,7 +230,7 @@ cc_test(
 cc_library(
     name = "configuration",
     hdrs = ["configuration.h"],
-    deps = ["//metaprogramming:detect"],
+    deps = ["//bind_lang/metaprogramming:detect"],
 )
 
 ################################################################################
@@ -266,7 +266,7 @@ cc_library(
     hdrs = ["default_class_loader.h"],
     deps = [
         ":no_idx",
-        "//metaprogramming:modified_max",
+        "//bind_lang/metaprogramming:modified_max",
     ],
 )
 
@@ -278,8 +278,8 @@ cc_library(
     hdrs = ["extends.h"],
     deps = [
         ":no_class_specified",
-        "//metaprogramming:tuple_manipulation",
-        "//metaprogramming:type_of_nth_element",
+        "//bind_lang/metaprogramming:tuple_manipulation",
+        "//bind_lang/metaprogramming:type_of_nth_element",
     ],
 )
 
@@ -308,9 +308,9 @@ cc_library(
         ":ref_base",
         ":signature",
         "//:jni_dep",
+        "//bind_lang/metaprogramming:double_locked_value",
         "//implementation/jni_helper",
         "//implementation/jni_helper:field_value_getter",
-        "//metaprogramming:double_locked_value",
     ],
 )
 
@@ -335,8 +335,8 @@ cc_library(
         ":no_idx",
         ":object",
         ":selector_static_info",
+        "//bind_lang/metaprogramming:string_concatenate",
         "//implementation/jni_helper:jni_typename_to_string",
-        "//metaprogramming:string_concatenate",
     ],
 )
 
@@ -437,9 +437,9 @@ cc_library(
         ":promotion_mechanics",
         ":ref_base",
         "//:jni_dep",
+        "//bind_lang/metaprogramming:deep_equal_diminished",
         "//implementation/jni_helper:lifecycle",
         "//implementation/jni_helper:lifecycle_object",
-        "//metaprogramming:deep_equal_diminished",
     ],
 )
 
@@ -617,7 +617,7 @@ cc_library(
         ":proxy_definitions_string",
         ":self",
         ":void",
-        "//metaprogramming:replace_string",
+        "//bind_lang/metaprogramming:replace_string",
     ],
 )
 
@@ -651,8 +651,8 @@ cc_library(
         ":no_class_specified",
         ":no_idx",
         "//:jni_dep",
-        "//metaprogramming:replace_string",
-        "//metaprogramming:vals_equal_diminished",
+        "//bind_lang/metaprogramming:replace_string",
+        "//bind_lang/metaprogramming:vals_equal_diminished",
     ],
 )
 
@@ -674,7 +674,7 @@ cc_library(
     hdrs = ["jvm.h"],
     deps = [
         ":default_class_loader",
-        "//metaprogramming:modified_max",
+        "//bind_lang/metaprogramming:modified_max",
     ],
 )
 
@@ -710,6 +710,7 @@ cc_library(
         ":static_ref",
         ":thread_guard",
         "//:jni_dep",
+        "//bind_lang/metaprogramming:double_locked_value",
         "//class_defs:java_lang_classes",
         "//class_defs/android:activity_thread",
         "//class_defs/android:application",
@@ -718,7 +719,6 @@ cc_library(
         "//implementation/jni_helper:jni_env",
         "//implementation/jni_helper:lifecycle",
         "//implementation/jni_helper:lifecycle_object",
-        "//metaprogramming:double_locked_value",
     ],
 )
 
@@ -884,12 +884,12 @@ cc_library(
         ":ref_storage",
         ":signature",
         "//:jni_dep",
+        "//bind_lang/metaprogramming:double_locked_value",
+        "//bind_lang/metaprogramming:string_concatenate",
         "//implementation/jni_helper",
         "//implementation/jni_helper:invoke",
         "//implementation/jni_helper:lifecycle",
         "//implementation/jni_helper:lifecycle_object",
-        "//metaprogramming:double_locked_value",
-        "//metaprogramming:string_concatenate",
     ],
 )
 
@@ -916,12 +916,12 @@ cc_library(
         ":proxy_definitions",
         ":proxy_definitions_array",
         ":proxy_definitions_string",
-        "//metaprogramming:call",
-        "//metaprogramming:min_max",
-        "//metaprogramming:reduce",
-        "//metaprogramming:type_of_nth_element",
-        "//metaprogramming:unfurl",
-        "//metaprogramming:vals",
+        "//bind_lang/metaprogramming:call",
+        "//bind_lang/metaprogramming:min_max",
+        "//bind_lang/metaprogramming:reduce",
+        "//bind_lang/metaprogramming:type_of_nth_element",
+        "//bind_lang/metaprogramming:unfurl",
+        "//bind_lang/metaprogramming:vals",
     ],
 )
 
@@ -1003,13 +1003,13 @@ cc_library(
         ":no_idx",
         ":ref_base",
         "//:jni_dep",
+        "//bind_lang/metaprogramming:invocable_map",
+        "//bind_lang/metaprogramming:invocable_map_20",
+        "//bind_lang/metaprogramming:queryable_map",
+        "//bind_lang/metaprogramming:queryable_map_20",
+        "//bind_lang/metaprogramming:string_contains",
+        "//bind_lang/metaprogramming:string_literal",
         "//implementation/jni_helper:lifecycle",
-        "//metaprogramming:invocable_map",
-        "//metaprogramming:invocable_map_20",
-        "//metaprogramming:queryable_map",
-        "//metaprogramming:queryable_map_20",
-        "//metaprogramming:string_contains",
-        "//metaprogramming:string_literal",
     ],
 )
 
@@ -1046,11 +1046,11 @@ cc_library(
         ":promotion_mechanics_tags",
         ":ref_base",
         "//:jni_dep",
+        "//bind_lang/metaprogramming:deep_equal_diminished",
+        "//bind_lang/metaprogramming:pack_discriminator",
         "//implementation/jni_helper",
         "//implementation/jni_helper:lifecycle",
         "//implementation/jni_helper:lifecycle_object",
-        "//metaprogramming:deep_equal_diminished",
-        "//metaprogramming:pack_discriminator",
     ],
 )
 
@@ -1074,20 +1074,20 @@ cc_library(
         ":ref_base",
         ":self",
         "//:jni_dep",
-        "//metaprogramming:cartesian_product",
-        "//metaprogramming:combine",
-        "//metaprogramming:concatenate",
-        "//metaprogramming:corpus",
-        "//metaprogramming:corpus_tag",
-        "//metaprogramming:flatten",
-        "//metaprogramming:invoke",
-        "//metaprogramming:per_element",
-        "//metaprogramming:reduce",
-        "//metaprogramming:tuple_manipulation",
-        "//metaprogramming:type_of_nth_element",
-        "//metaprogramming:type_to_type_map",
-        "//metaprogramming:unique_set",
-        "//metaprogramming:unwrap",
+        "//bind_lang/metaprogramming:cartesian_product",
+        "//bind_lang/metaprogramming:combine",
+        "//bind_lang/metaprogramming:concatenate",
+        "//bind_lang/metaprogramming:corpus",
+        "//bind_lang/metaprogramming:corpus_tag",
+        "//bind_lang/metaprogramming:flatten",
+        "//bind_lang/metaprogramming:invoke",
+        "//bind_lang/metaprogramming:per_element",
+        "//bind_lang/metaprogramming:reduce",
+        "//bind_lang/metaprogramming:tuple_manipulation",
+        "//bind_lang/metaprogramming:type_of_nth_element",
+        "//bind_lang/metaprogramming:type_to_type_map",
+        "//bind_lang/metaprogramming:unique_set",
+        "//bind_lang/metaprogramming:unwrap",
     ],
 )
 
@@ -1158,7 +1158,7 @@ cc_test(
     deps = [
         "//:jni_bind",
         "//:jni_test",
-        "//metaprogramming:type_to_type_map",
+        "//bind_lang/metaprogramming:type_to_type_map",
         "@googletest//:gtest_main",
     ],
 )
@@ -1190,8 +1190,8 @@ cc_library(
     hdrs = ["ref_storage.h"],
     deps = [
         ":signature",
-        "//metaprogramming:double_locked_value",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:double_locked_value",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -1220,7 +1220,7 @@ cc_library(
         ":no_idx",
         ":proxy_convenience_aliases",
         ":selector_static_info",
-        "//metaprogramming:name_constants",
+        "//bind_lang/metaprogramming:name_constants",
     ],
 )
 
@@ -1297,10 +1297,10 @@ cc_library(
         ":object",
         ":self",
         ":void",
+        "//bind_lang/metaprogramming:name_constants",
+        "//bind_lang/metaprogramming:repeat_string",
+        "//bind_lang/metaprogramming:string_concatenate",
         "//implementation/jni_helper:jni_typename_to_string",
-        "//metaprogramming:name_constants",
-        "//metaprogramming:repeat_string",
-        "//metaprogramming:string_concatenate",
     ],
 )
 
@@ -1314,7 +1314,7 @@ cc_library(
         ":field",
         ":method",
         ":params",
-        "//metaprogramming:base_filter",
+        "//bind_lang/metaprogramming:base_filter",
     ],
 )
 
@@ -1332,11 +1332,11 @@ cc_library(
         ":method_selection",
         ":no_idx",
         "//:jni_dep",
-        "//metaprogramming:invocable_map",
-        "//metaprogramming:invocable_map_20",
-        "//metaprogramming:queryable_map",
-        "//metaprogramming:queryable_map_20",
-        "//metaprogramming:string_literal",
+        "//bind_lang/metaprogramming:invocable_map",
+        "//bind_lang/metaprogramming:invocable_map_20",
+        "//bind_lang/metaprogramming:queryable_map",
+        "//bind_lang/metaprogramming:queryable_map_20",
+        "//bind_lang/metaprogramming:string_literal",
     ],
 )
 
@@ -1370,7 +1370,7 @@ cc_library(
     hdrs = ["supported_class_set.h"],
     deps = [
         ":class",
-        "//metaprogramming:all_unique",
+        "//bind_lang/metaprogramming:all_unique",
     ],
 )
 
@@ -1403,7 +1403,7 @@ cc_library(
         ":forward_declarations",
         ":jvm_ref_base",
         "//:jni_dep",
-        "//metaprogramming:function_traits",
+        "//bind_lang/metaprogramming:function_traits",
     ],
 )
 
diff --git a/implementation/array_type_conversion.h b/implementation/array_type_conversion.h
index a042b9c0..be31977d 100644
--- a/implementation/array_type_conversion.h
+++ b/implementation/array_type_conversion.h
@@ -22,8 +22,8 @@
 #include <cstddef>
 #include <tuple>
 
+#include "bind_lang/metaprogramming/type_to_type_map.h"
 #include "jni_dep.h"
-#include "metaprogramming/type_to_type_map.h"
 
 namespace jni {
 
diff --git a/implementation/class.h b/implementation/class.h
index 18a52196..119e3158 100644
--- a/implementation/class.h
+++ b/implementation/class.h
@@ -22,6 +22,8 @@
 #include <string_view>
 #include <tuple>
 
+#include "bind_lang/metaprogramming/base_filter.h"
+#include "bind_lang/metaprogramming/type_of_nth_element.h"
 #include "implementation/constructor.h"
 #include "implementation/extends.h"
 #include "implementation/field.h"
@@ -29,8 +31,6 @@
 #include "implementation/no_class_specified.h"
 #include "implementation/object.h"
 #include "implementation/static.h"
-#include "metaprogramming/base_filter.h"
-#include "metaprogramming/type_of_nth_element.h"
 
 namespace jni {
 
diff --git a/implementation/class_loader.h b/implementation/class_loader.h
index c2d49ce1..ae3f6c75 100644
--- a/implementation/class_loader.h
+++ b/implementation/class_loader.h
@@ -24,10 +24,10 @@
 #include <type_traits>
 #include <utility>
 
+#include "bind_lang/metaprogramming/modified_max.h"
 #include "implementation/default_class_loader.h"
 #include "implementation/object.h"
 #include "implementation/supported_class_set.h"
-#include "metaprogramming/modified_max.h"
 
 namespace jni {
 
diff --git a/implementation/class_ref.h b/implementation/class_ref.h
index bf90d0ca..dfef8542 100644
--- a/implementation/class_ref.h
+++ b/implementation/class_ref.h
@@ -22,6 +22,7 @@
 #include <type_traits>
 #include <vector>
 
+#include "bind_lang/metaprogramming/double_locked_value.h"
 #include "class_defs/java_lang_classes.h"
 #include "implementation/configuration.h"
 #include "implementation/default_class_loader.h"
@@ -34,7 +35,6 @@
 #include "implementation/ref_storage.h"
 #include "implementation/selector_static_info.h"
 #include "jni_dep.h"
-#include "metaprogramming/double_locked_value.h"
 
 namespace jni {
 
diff --git a/implementation/default_class_loader.h b/implementation/default_class_loader.h
index b939be59..3c8eece2 100644
--- a/implementation/default_class_loader.h
+++ b/implementation/default_class_loader.h
@@ -22,8 +22,8 @@
 #include <cstddef>
 #include <tuple>
 
+#include "bind_lang/metaprogramming/modified_max.h"
 #include "implementation/no_idx.h"
-#include "metaprogramming/modified_max.h"
 
 namespace jni {
 
diff --git a/implementation/extends.h b/implementation/extends.h
index bddf8f98..b03cb5c9 100644
--- a/implementation/extends.h
+++ b/implementation/extends.h
@@ -19,9 +19,9 @@
 
 // IWYU pragma: private, include "third_party/jni_wrapper/jni_bind.h"
 
+#include "bind_lang/metaprogramming/tuple_manipulation.h"
+#include "bind_lang/metaprogramming/type_of_nth_element.h"
 #include "implementation/no_class_specified.h"
-#include "metaprogramming/tuple_manipulation.h"
-#include "metaprogramming/type_of_nth_element.h"
 
 namespace jni {
 
diff --git a/implementation/field_ref.h b/implementation/field_ref.h
index 1f457465..c5a2f168 100644
--- a/implementation/field_ref.h
+++ b/implementation/field_ref.h
@@ -24,6 +24,7 @@
 #include <utility>
 #include <vector>
 
+#include "bind_lang/metaprogramming/double_locked_value.h"
 #include "implementation/configuration.h"
 #include "implementation/default_class_loader.h"
 #include "implementation/field_selection.h"
@@ -38,7 +39,6 @@
 #include "implementation/ref_base.h"
 #include "implementation/signature.h"
 #include "jni_dep.h"
-#include "metaprogramming/double_locked_value.h"
 
 namespace jni {
 
diff --git a/implementation/field_selection.h b/implementation/field_selection.h
index 96ff5776..8d8d3dbb 100644
--- a/implementation/field_selection.h
+++ b/implementation/field_selection.h
@@ -19,6 +19,7 @@
 
 // IWYU pragma: private, include "third_party/jni_wrapper/jni_bind.h"
 
+#include "bind_lang/metaprogramming/string_concatenate.h"
 #include "implementation/id.h"
 #include "implementation/id_type.h"
 #include "implementation/jni_helper/jni_typename_to_string.h"
@@ -26,7 +27,6 @@
 #include "implementation/no_idx.h"
 #include "implementation/object.h"
 #include "implementation/selector_static_info.h"
-#include "metaprogramming/string_concatenate.h"
 
 namespace jni {
 
diff --git a/implementation/global_object.h b/implementation/global_object.h
index 88056ad9..01e37a4b 100644
--- a/implementation/global_object.h
+++ b/implementation/global_object.h
@@ -19,6 +19,7 @@
 
 // IWYU pragma: private, include "third_party/jni_wrapper/jni_bind.h"
 
+#include "bind_lang/metaprogramming/deep_equal_diminished.h"
 #include "implementation/default_class_loader.h"
 #include "implementation/forward_declarations.h"
 #include "implementation/jni_helper/lifecycle.h"
@@ -29,7 +30,6 @@
 #include "implementation/promotion_mechanics.h"
 #include "implementation/ref_base.h"
 #include "jni_dep.h"
-#include "metaprogramming/deep_equal_diminished.h"
 
 namespace jni {
 
diff --git a/implementation/id.h b/implementation/id.h
index d1688551..996b5ddc 100644
--- a/implementation/id.h
+++ b/implementation/id.h
@@ -22,13 +22,13 @@
 #include <cstddef>
 #include <string_view>
 
+#include "bind_lang/metaprogramming/replace_string.h"
 #include "implementation/array.h"
 #include "implementation/id_type.h"
 #include "implementation/no_idx.h"
 #include "implementation/proxy_convenience_aliases.h"
 #include "implementation/self.h"
 #include "implementation/void.h"
-#include "metaprogramming/replace_string.h"
 
 namespace jni {
 
diff --git a/implementation/jni_helper/BUILD b/implementation/jni_helper/BUILD
index 3c497967..10b835e1 100644
--- a/implementation/jni_helper/BUILD
+++ b/implementation/jni_helper/BUILD
@@ -51,7 +51,7 @@ cc_library(
         ":jni_env",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -82,7 +82,7 @@ cc_library(
         ":jni_env",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -110,7 +110,7 @@ cc_library(
         ":jni_env",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -125,7 +125,7 @@ cc_library(
         ":jni_env",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -160,7 +160,7 @@ cc_library(
         ":jni_env",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -209,7 +209,7 @@ cc_library(
         ":jni_env",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -221,7 +221,7 @@ cc_library(
         ":lifecycle",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -244,7 +244,7 @@ cc_library(
         ":lifecycle",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -270,7 +270,7 @@ cc_library(
         ":jni_env",
         ":trace",
         "//:jni_dep",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
 
@@ -282,7 +282,7 @@ cc_library(
     hdrs = ["trace.h"],
     deps = [
         ":arg_string",
-        "//metaprogramming:color",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:color",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
 )
diff --git a/implementation/jni_helper/field_value.h b/implementation/jni_helper/field_value.h
index baaa9419..c6538bc2 100644
--- a/implementation/jni_helper/field_value.h
+++ b/implementation/jni_helper/field_value.h
@@ -21,8 +21,8 @@
 #include <type_traits>
 
 #include "jni_env.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/invoke.h b/implementation/jni_helper/invoke.h
index 9be92b19..afcb2320 100644
--- a/implementation/jni_helper/invoke.h
+++ b/implementation/jni_helper/invoke.h
@@ -22,8 +22,8 @@
 #include <utility>
 
 #include "jni_env.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/invoke_static.h b/implementation/jni_helper/invoke_static.h
index f6124589..9aaf7c1e 100644
--- a/implementation/jni_helper/invoke_static.h
+++ b/implementation/jni_helper/invoke_static.h
@@ -23,8 +23,8 @@
 
 #include "invoke.h"
 #include "jni_env.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/jni_array_helper.h b/implementation/jni_helper/jni_array_helper.h
index 46ab9396..b900b8d5 100644
--- a/implementation/jni_helper/jni_array_helper.h
+++ b/implementation/jni_helper/jni_array_helper.h
@@ -20,9 +20,9 @@
 #include <cstddef>
 
 #include "get_array_element_result.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "implementation/jni_helper/jni_env.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/jni_helper.h b/implementation/jni_helper/jni_helper.h
index 820632f8..0d8abe5a 100644
--- a/implementation/jni_helper/jni_helper.h
+++ b/implementation/jni_helper/jni_helper.h
@@ -18,8 +18,8 @@
 #define JNI_BIND_JNI_HELPER_JNI_HELPER_H_
 
 #include "jni_env.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/lifecycle.h b/implementation/jni_helper/lifecycle.h
index a042fe15..63f14b49 100644
--- a/implementation/jni_helper/lifecycle.h
+++ b/implementation/jni_helper/lifecycle.h
@@ -17,8 +17,8 @@
 #define JNI_BIND_IMPLEMENTATION_JNI_HELPER_LIFECYCLE_H_
 
 #include "jni_env.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/lifecycle_object.h b/implementation/jni_helper/lifecycle_object.h
index 32c66b40..953de537 100644
--- a/implementation/jni_helper/lifecycle_object.h
+++ b/implementation/jni_helper/lifecycle_object.h
@@ -17,10 +17,10 @@
 #ifndef JNI_BIND_IMPLEMENTATION_JNI_HELPER_LIFECYCLE_OBJECT_H_
 #define JNI_BIND_IMPLEMENTATION_JNI_HELPER_LIFECYCLE_OBJECT_H_
 
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "implementation/jni_helper/jni_env.h"
 #include "implementation/jni_helper/lifecycle.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/lifecycle_string.h b/implementation/jni_helper/lifecycle_string.h
index 1ea3ca36..66c10621 100644
--- a/implementation/jni_helper/lifecycle_string.h
+++ b/implementation/jni_helper/lifecycle_string.h
@@ -18,9 +18,9 @@
 #define JNI_BIND_IMPLEMENTATION_JNI_HELPER_LIFECYCLE_STRING_H_
 
 #include "jni_env.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "implementation/jni_helper/lifecycle.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/static_field_value.h b/implementation/jni_helper/static_field_value.h
index f95bda1c..ba7bd565 100644
--- a/implementation/jni_helper/static_field_value.h
+++ b/implementation/jni_helper/static_field_value.h
@@ -21,9 +21,9 @@
 #include <type_traits>
 
 #include "jni_env.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "implementation/jni_helper/field_value.h"
 #include "jni_dep.h"
-#include "metaprogramming/lambda_string.h"
 #include "trace.h"
 
 namespace jni {
diff --git a/implementation/jni_helper/trace.h b/implementation/jni_helper/trace.h
index bc063b30..a56776ba 100644
--- a/implementation/jni_helper/trace.h
+++ b/implementation/jni_helper/trace.h
@@ -23,8 +23,8 @@
 #include <utility>
 
 #include "arg_string.h"
-#include "metaprogramming/color.h"
-#include "metaprogramming/lambda_string.h"
+#include "bind_lang/metaprogramming/color.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 
 namespace jni {
 
diff --git a/implementation/jni_helper/trace_test.cc b/implementation/jni_helper/trace_test.cc
index 4583f945..adc69416 100644
--- a/implementation/jni_helper/trace_test.cc
+++ b/implementation/jni_helper/trace_test.cc
@@ -19,7 +19,7 @@
 #include <string>
 
 #include <gtest/gtest.h>
-#include "metaprogramming/lambda_string.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 
 using ::jni::Trace;
 using ::jni::metaprogramming::LambdaToStr;
diff --git a/implementation/jni_type.h b/implementation/jni_type.h
index 5a33be98..fda2f623 100644
--- a/implementation/jni_type.h
+++ b/implementation/jni_type.h
@@ -23,6 +23,8 @@
 #include <string_view>
 #include <type_traits>
 
+#include "bind_lang/metaprogramming/replace_string.h"
+#include "bind_lang/metaprogramming/vals_equal_diminished.h"
 #include "implementation/array.h"
 #include "implementation/array_type_conversion.h"
 #include "implementation/class_loader.h"
@@ -32,8 +34,6 @@
 #include "implementation/no_class_specified.h"
 #include "implementation/no_idx.h"
 #include "jni_dep.h"
-#include "metaprogramming/replace_string.h"
-#include "metaprogramming/vals_equal_diminished.h"
 
 namespace jni {
 
diff --git a/implementation/jvm.h b/implementation/jvm.h
index 52e9c2fb..00f4c391 100644
--- a/implementation/jvm.h
+++ b/implementation/jvm.h
@@ -23,8 +23,8 @@
 #include <tuple>
 #include <utility>
 
+#include "bind_lang/metaprogramming/modified_max.h"
 #include "implementation/default_class_loader.h"
-#include "metaprogramming/modified_max.h"
 
 namespace jni {
 
diff --git a/implementation/jvm_ref.h b/implementation/jvm_ref.h
index dad62c95..84ac4574 100644
--- a/implementation/jvm_ref.h
+++ b/implementation/jvm_ref.h
@@ -23,6 +23,7 @@
 #include <memory>
 #include <utility>
 
+#include "bind_lang/metaprogramming/double_locked_value.h"
 #include "class_defs/android/activity_thread.h"
 #include "class_defs/android/application.h"
 #include "class_defs/java_lang_classes.h"
@@ -47,7 +48,6 @@
 #include "implementation/static_ref.h"
 #include "implementation/thread_guard.h"
 #include "jni_dep.h"
-#include "metaprogramming/double_locked_value.h"
 
 namespace jni {
 
diff --git a/implementation/method_selection.h b/implementation/method_selection.h
index 976f474e..49827410 100644
--- a/implementation/method_selection.h
+++ b/implementation/method_selection.h
@@ -22,17 +22,17 @@
 #include <cstddef>
 #include <type_traits>
 
+#include "bind_lang/metaprogramming/call.h"
+#include "bind_lang/metaprogramming/min_max.h"
+#include "bind_lang/metaprogramming/reduce.h"
+#include "bind_lang/metaprogramming/type_of_nth_element.h"
+#include "bind_lang/metaprogramming/unfurl.h"
+#include "bind_lang/metaprogramming/vals.h"
 #include "implementation/id.h"
 #include "implementation/id_type.h"
 #include "implementation/no_idx.h"
 #include "implementation/overload_ref.h"
 #include "implementation/proxy_convenience_aliases.h"
-#include "metaprogramming/call.h"
-#include "metaprogramming/min_max.h"
-#include "metaprogramming/reduce.h"
-#include "metaprogramming/type_of_nth_element.h"
-#include "metaprogramming/unfurl.h"
-#include "metaprogramming/vals.h"
 
 namespace jni {
 
diff --git a/implementation/object_ref.h b/implementation/object_ref.h
index 2685d752..e452696b 100644
--- a/implementation/object_ref.h
+++ b/implementation/object_ref.h
@@ -23,6 +23,12 @@
 #include <type_traits>
 #include <utility>
 
+#include "bind_lang/metaprogramming/invocable_map.h"
+#include "bind_lang/metaprogramming/invocable_map_20.h"
+#include "bind_lang/metaprogramming/queryable_map.h"
+#include "bind_lang/metaprogramming/queryable_map_20.h"
+#include "bind_lang/metaprogramming/string_contains.h"
+#include "bind_lang/metaprogramming/string_literal.h"
 #include "implementation/class_ref.h"
 #include "implementation/field_ref.h"
 #include "implementation/id.h"
@@ -33,12 +39,6 @@
 #include "implementation/no_idx.h"
 #include "implementation/ref_base.h"
 #include "jni_dep.h"
-#include "metaprogramming/invocable_map.h"
-#include "metaprogramming/invocable_map_20.h"
-#include "metaprogramming/queryable_map.h"
-#include "metaprogramming/queryable_map_20.h"
-#include "metaprogramming/string_contains.h"
-#include "metaprogramming/string_literal.h"
 
 namespace jni {
 
diff --git a/implementation/overload_ref.h b/implementation/overload_ref.h
index 584c37b8..4d8c4f41 100644
--- a/implementation/overload_ref.h
+++ b/implementation/overload_ref.h
@@ -24,6 +24,8 @@
 #include <type_traits>
 #include <utility>
 
+#include "bind_lang/metaprogramming/double_locked_value.h"
+#include "bind_lang/metaprogramming/string_concatenate.h"
 #include "implementation/configuration.h"
 #include "implementation/id_type.h"
 #include "implementation/jni_helper/invoke.h"
@@ -39,8 +41,6 @@
 #include "implementation/ref_storage.h"
 #include "implementation/signature.h"
 #include "jni_dep.h"
-#include "metaprogramming/double_locked_value.h"
-#include "metaprogramming/string_concatenate.h"
 
 namespace jni {
 
diff --git a/implementation/promotion_mechanics.h b/implementation/promotion_mechanics.h
index d457eeee..26142b03 100644
--- a/implementation/promotion_mechanics.h
+++ b/implementation/promotion_mechanics.h
@@ -21,12 +21,12 @@
 
 #include <type_traits>
 
+#include "bind_lang/metaprogramming/deep_equal_diminished.h"
 #include "implementation/forward_declarations.h"
 #include "implementation/jni_helper/lifecycle.h"
 #include "implementation/object_ref.h"
 #include "implementation/promotion_mechanics_tags.h"
 #include "implementation/ref_base.h"
-#include "metaprogramming/deep_equal_diminished.h"
 
 namespace jni {
 
diff --git a/implementation/proxy.h b/implementation/proxy.h
index b81c025f..ca8e5f67 100644
--- a/implementation/proxy.h
+++ b/implementation/proxy.h
@@ -23,19 +23,19 @@
 #include <type_traits>
 #include <utility>
 
+#include "bind_lang/metaprogramming/cartesian_product.h"
+#include "bind_lang/metaprogramming/combine.h"
+#include "bind_lang/metaprogramming/concatenate.h"
+#include "bind_lang/metaprogramming/corpus.h"
+#include "bind_lang/metaprogramming/flatten.h"
+#include "bind_lang/metaprogramming/invoke.h"
+#include "bind_lang/metaprogramming/reduce.h"
+#include "bind_lang/metaprogramming/type_to_type_map.h"
+#include "bind_lang/metaprogramming/unique_set.h"
 #include "implementation/forward_declarations.h"
 #include "implementation/proxy_convenience_aliases.h"
 #include "implementation/self.h"
 #include "jni_dep.h"
-#include "metaprogramming/cartesian_product.h"
-#include "metaprogramming/combine.h"
-#include "metaprogramming/concatenate.h"
-#include "metaprogramming/corpus.h"
-#include "metaprogramming/flatten.h"
-#include "metaprogramming/invoke.h"
-#include "metaprogramming/reduce.h"
-#include "metaprogramming/type_to_type_map.h"
-#include "metaprogramming/unique_set.h"
 
 namespace jni {
 
diff --git a/implementation/proxy_test.cc b/implementation/proxy_test.cc
index 3a9a15e5..f4235c74 100644
--- a/implementation/proxy_test.cc
+++ b/implementation/proxy_test.cc
@@ -21,9 +21,9 @@
 #include <utility>
 
 #include <gtest/gtest.h>
+#include "bind_lang/metaprogramming/type_to_type_map.h"
 #include "jni_bind.h"
 #include "jni_test.h"
-#include "metaprogramming/type_to_type_map.h"
 
 using ::jni::AsDecl_t;
 using ::jni::Class;
diff --git a/implementation/ref_storage.h b/implementation/ref_storage.h
index a23d6ed4..62cde92c 100644
--- a/implementation/ref_storage.h
+++ b/implementation/ref_storage.h
@@ -22,8 +22,8 @@
 #include <functional>
 #include <vector>
 
-#include "metaprogramming/double_locked_value.h"
-#include "metaprogramming/lambda_string.h"
+#include "bind_lang/metaprogramming/double_locked_value.h"
+#include "bind_lang/metaprogramming/lambda_string.h"
 
 namespace jni {
 
diff --git a/implementation/selector_static_info.h b/implementation/selector_static_info.h
index be2275ce..6262a668 100644
--- a/implementation/selector_static_info.h
+++ b/implementation/selector_static_info.h
@@ -20,14 +20,14 @@
 #include <cstddef>
 #include <string_view>
 
+#include "bind_lang/metaprogramming/name_constants.h"
+#include "bind_lang/metaprogramming/repeat_string.h"
+#include "bind_lang/metaprogramming/string_concatenate.h"
 #include "implementation/id_type.h"
 #include "implementation/jni_helper/jni_typename_to_string.h"
 #include "implementation/object.h"
 #include "implementation/self.h"
 #include "implementation/void.h"
-#include "metaprogramming/name_constants.h"
-#include "metaprogramming/repeat_string.h"
-#include "metaprogramming/string_concatenate.h"
 
 namespace jni {
 
diff --git a/implementation/signature.h b/implementation/signature.h
index 4e9aa972..9ac63648 100644
--- a/implementation/signature.h
+++ b/implementation/signature.h
@@ -23,11 +23,11 @@
 #include <string_view>
 #include <utility>
 
+#include "bind_lang/metaprogramming/name_constants.h"
 #include "implementation/forward_declarations.h"
 #include "implementation/id_type.h"
 #include "implementation/no_idx.h"
 #include "implementation/selector_static_info.h"
-#include "metaprogramming/name_constants.h"
 
 namespace jni {
 
diff --git a/implementation/static.h b/implementation/static.h
index bea9428a..c2b87fb9 100644
--- a/implementation/static.h
+++ b/implementation/static.h
@@ -21,9 +21,9 @@
 
 #include <tuple>
 
+#include "bind_lang/metaprogramming/base_filter.h"
 #include "implementation/field.h"
 #include "implementation/method.h"
-#include "metaprogramming/base_filter.h"
 
 namespace jni {
 
diff --git a/implementation/static_ref.h b/implementation/static_ref.h
index 0b78ec3f..c610654c 100644
--- a/implementation/static_ref.h
+++ b/implementation/static_ref.h
@@ -21,6 +21,11 @@
 
 #include <cstddef>
 
+#include "bind_lang/metaprogramming/invocable_map.h"
+#include "bind_lang/metaprogramming/invocable_map_20.h"
+#include "bind_lang/metaprogramming/queryable_map.h"
+#include "bind_lang/metaprogramming/queryable_map_20.h"
+#include "bind_lang/metaprogramming/string_literal.h"
 #include "implementation/class_ref.h"
 #include "implementation/default_class_loader.h"
 #include "implementation/field_ref.h"
@@ -31,11 +36,6 @@
 #include "implementation/method_selection.h"
 #include "implementation/no_idx.h"
 #include "jni_dep.h"
-#include "metaprogramming/invocable_map.h"
-#include "metaprogramming/invocable_map_20.h"
-#include "metaprogramming/queryable_map.h"
-#include "metaprogramming/queryable_map_20.h"
-#include "metaprogramming/string_literal.h"
 
 namespace jni {
 
diff --git a/implementation/thread_guard.h b/implementation/thread_guard.h
index 4fd1fe6c..6a8626c0 100644
--- a/implementation/thread_guard.h
+++ b/implementation/thread_guard.h
@@ -19,10 +19,10 @@
 
 // IWYU pragma: private, include "third_party/jni_wrapper/jni_bind.h"
 
+#include "bind_lang/metaprogramming/function_traits.h"
 #include "implementation/forward_declarations.h"
 #include "implementation/jvm_ref_base.h"
 #include "jni_dep.h"
-#include "metaprogramming/function_traits.h"
 
 namespace jni {
 
diff --git a/javatests/com/jnibind/test/BUILD b/javatests/com/jnibind/test/BUILD
index d19b0c99..f9d71d39 100644
--- a/javatests/com/jnibind/test/BUILD
+++ b/javatests/com/jnibind/test/BUILD
@@ -17,7 +17,7 @@ cc_library(
         ":array_test_helpers_native",
         ":object_test_helper_jni",
         "//:jni_bind",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
     alwayslink = True,
 )
@@ -55,8 +55,7 @@ cc_library(
         ":modulo",
         ":object_test_helper_jni",
         "//:jni_bind",
-        "//metaprogramming:lambda_string",
-        "//metaprogramming:string_literal",
+        "//bind_lang/metaprogramming:string_literal",
     ],
     alwayslink = True,
 )
@@ -121,7 +120,7 @@ cc_library(
         ":array_test_helpers_native",
         ":object_test_helper_jni",
         "//:jni_bind",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
     alwayslink = True,
 )
@@ -162,8 +161,8 @@ cc_library(
         ":modulo",
         ":object_test_helper_jni",
         "//:jni_bind",
-        "//metaprogramming:lambda_string",
-        "//metaprogramming:string_literal",
+        "//bind_lang/metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:string_literal",
     ],
     alwayslink = True,
 )
@@ -201,7 +200,7 @@ cc_library(
     deps = [
         ":object_test_helper_jni",
         "//:jni_bind",
-        "//metaprogramming:lambda_string",
+        "//bind_lang/metaprogramming:lambda_string",
     ],
     alwayslink = True,
 )
diff --git a/javatests/com/jnibind/test/array_test_field_rank_1_jni.cc b/javatests/com/jnibind/test/array_test_field_rank_1_jni.cc
index 7d88f6e3..ccaf4a57 100644
--- a/javatests/com/jnibind/test/array_test_field_rank_1_jni.cc
+++ b/javatests/com/jnibind/test/array_test_field_rank_1_jni.cc
@@ -20,10 +20,10 @@
 #include <memory>
 #include <string>
 
+#include "bind_lang/metaprogramming/lambda_string.h"
 #include "javatests/com/jnibind/test/array_test_helpers_native.h"
 #include "javatests/com/jnibind/test/object_test_helper_jni.h"
 #include "jni_bind.h"
-#include "metaprogramming/lambda_string.h"
 
 using ::jni::Array;
 using ::jni::ArrayView;
diff --git a/javatests/com/jnibind/test/array_test_field_rank_2_jni.cc b/javatests/com/jnibind/test/array_test_field_rank_2_jni.cc
index 1d6e748a..714ec89d 100644
--- a/javatests/com/jnibind/test/array_test_field_rank_2_jni.cc
+++ b/javatests/com/jnibind/test/array_test_field_rank_2_jni.cc
@@ -18,12 +18,11 @@
 #include <limits>
 #include <memory>
 
+#include "bind_lang/metaprogramming/string_literal.h"
 #include "javatests/com/jnibind/test/array_test_helpers_native.h"
 #include "javatests/com/jnibind/test/modulo.h"
 #include "javatests/com/jnibind/test/object_test_helper_jni.h"
 #include "jni_bind.h"
-#include "metaprogramming/lambda_string.h"
-#include "metaprogramming/string_literal.h"
 
 using ::jni::Array;
 using ::jni::ArrayView;
diff --git a/javatests/com/jnibind/test/modulo.h b/javatests/com/jnibind/test/modulo.h
index c2f5e90e..1ddadcd2 100644
--- a/javatests/com/jnibind/test/modulo.h
+++ b/javatests/com/jnibind/test/modulo.h
@@ -1,5 +1,5 @@
-#ifndef JNI_BIND_METAPROGRAMMING_MODULO_H_
-#define JNI_BIND_METAPROGRAMMING_MODULO_H_
+#ifndef JNI_BIND_JAVATESTS_COM_JNIBIND_TEST_MODULO_H_
+#define JNI_BIND_JAVATESTS_COM_JNIBIND_TEST_MODULO_H_
 
 #include <cstddef>
 #include <limits>
@@ -25,4 +25,4 @@ T Modulo(std::size_t increment_count, T val = T{0},
 
 }  // namespace jni
 
-#endif  // JNI_BIND_METAPROGRAMMING_MODULO_H_
+#endif  // JNI_BIND_JAVATESTS_COM_JNIBIND_TEST_MODULO_H_
diff --git a/jni_bind.h b/jni_bind.h
index 18de9b20..e5abe00e 100644
--- a/jni_bind.h
+++ b/jni_bind.h
@@ -40,18 +40,18 @@ static constexpr Configuration kConfig{
 ////////////////////////////////////////////////////////////////////////////////
 
 // JNI Corpus.
-#include "metaprogramming/corpus.h"
-#include "metaprogramming/corpus_tag.h"
+#include "bind_lang/metaprogramming/corpus.h"
+#include "bind_lang/metaprogramming/corpus_tag.h"
 
 // JNI Porcelain Helpers.
+#include "bind_lang/metaprogramming/singleton.h"
+#include "bind_lang/metaprogramming/string_literal.h"
 #include "implementation/jni_helper/field_value.h"
 #include "implementation/jni_helper/invoke_static.h"
 #include "implementation/jni_helper/jni_env.h"
 #include "implementation/jni_helper/jni_helper.h"
 #include "implementation/jni_helper/lifecycle.h"
 #include "implementation/jni_helper/static_field_value.h"
-#include "metaprogramming/singleton.h"
-#include "metaprogramming/string_literal.h"
 
 // Headers for static definitions.
 #include "implementation/array.h"