5 files changed, 244 insertions, 242 deletions
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 85bbeed088..55b10268ba 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -950,6 +950,28 @@ src/core/lib/compression/stream_compression_identity.h \
 src/core/lib/debug/stats.h \
 src/core/lib/debug/stats_data.h \
 src/core/lib/debug/trace.h \
+src/core/lib/gpr++/abstract.h \
+src/core/lib/gpr++/atomic.h \
+src/core/lib/gpr++/atomic_with_atm.h \
+src/core/lib/gpr++/atomic_with_std.h \
+src/core/lib/gpr++/debug_location.h \
+src/core/lib/gpr++/inlined_vector.h \
+src/core/lib/gpr++/manual_constructor.h \
+src/core/lib/gpr++/memory.h \
+src/core/lib/gpr++/orphanable.h \
+src/core/lib/gpr++/ref_counted.h \
+src/core/lib/gpr++/ref_counted_ptr.h \
+src/core/lib/gpr/arena.h \
+src/core/lib/gpr/env.h \
+src/core/lib/gpr/fork.h \
+src/core/lib/gpr/mpscq.h \
+src/core/lib/gpr/murmur_hash.h \
+src/core/lib/gpr/spinlock.h \
+src/core/lib/gpr/string.h \
+src/core/lib/gpr/string_windows.h \
+src/core/lib/gpr/thd_internal.h \
+src/core/lib/gpr/time_precise.h \
+src/core/lib/gpr/tmpfile.h \
 src/core/lib/http/format_request.h \
 src/core/lib/http/httpcli.h \
 src/core/lib/http/parser.h \
@@ -1026,28 +1048,6 @@ src/core/lib/slice/percent_encoding.h \
 src/core/lib/slice/slice_hash_table.h \
 src/core/lib/slice/slice_internal.h \
 src/core/lib/slice/slice_string_helpers.h \
-src/core/lib/support/abstract.h \
-src/core/lib/support/arena.h \
-src/core/lib/support/atomic.h \
-src/core/lib/support/atomic_with_atm.h \
-src/core/lib/support/atomic_with_std.h \
-src/core/lib/support/debug_location.h \
-src/core/lib/support/env.h \
-src/core/lib/support/fork.h \
-src/core/lib/support/manual_constructor.h \
-src/core/lib/support/memory.h \
-src/core/lib/support/mpscq.h \
-src/core/lib/support/murmur_hash.h \
-src/core/lib/support/orphanable.h \
-src/core/lib/support/ref_counted.h \
-src/core/lib/support/ref_counted_ptr.h \
-src/core/lib/support/spinlock.h \
-src/core/lib/support/string.h \
-src/core/lib/support/string_windows.h \
-src/core/lib/support/thd_internal.h \
-src/core/lib/support/time_precise.h \
-src/core/lib/support/tmpfile.h \
-src/core/lib/support/vector.h \
 src/core/lib/surface/alarm_internal.h \
 src/core/lib/surface/api_trace.h \
 src/core/lib/surface/call.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 4bf0fc74d1..7857ec72fd 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1064,6 +1064,72 @@ src/core/lib/debug/stats_data.cc \
 src/core/lib/debug/stats_data.h \
 src/core/lib/debug/trace.cc \
 src/core/lib/debug/trace.h \
+src/core/lib/gpr++/README.md \
+src/core/lib/gpr++/abstract.h \
+src/core/lib/gpr++/atomic.h \
+src/core/lib/gpr++/atomic_with_atm.h \
+src/core/lib/gpr++/atomic_with_std.h \
+src/core/lib/gpr++/debug_location.h \
+src/core/lib/gpr++/inlined_vector.h \
+src/core/lib/gpr++/manual_constructor.h \
+src/core/lib/gpr++/memory.h \
+src/core/lib/gpr++/orphanable.h \
+src/core/lib/gpr++/ref_counted.h \
+src/core/lib/gpr++/ref_counted_ptr.h \
+src/core/lib/gpr/README.md \
+src/core/lib/gpr/alloc.cc \
+src/core/lib/gpr/arena.cc \
+src/core/lib/gpr/arena.h \
+src/core/lib/gpr/atm.cc \
+src/core/lib/gpr/avl.cc \
+src/core/lib/gpr/cmdline.cc \
+src/core/lib/gpr/cpu_iphone.cc \
+src/core/lib/gpr/cpu_linux.cc \
+src/core/lib/gpr/cpu_posix.cc \
+src/core/lib/gpr/cpu_windows.cc \
+src/core/lib/gpr/env.h \
+src/core/lib/gpr/env_linux.cc \
+src/core/lib/gpr/env_posix.cc \
+src/core/lib/gpr/env_windows.cc \
+src/core/lib/gpr/fork.cc \
+src/core/lib/gpr/fork.h \
+src/core/lib/gpr/host_port.cc \
+src/core/lib/gpr/log.cc \
+src/core/lib/gpr/log_android.cc \
+src/core/lib/gpr/log_linux.cc \
+src/core/lib/gpr/log_posix.cc \
+src/core/lib/gpr/log_windows.cc \
+src/core/lib/gpr/mpscq.cc \
+src/core/lib/gpr/mpscq.h \
+src/core/lib/gpr/murmur_hash.cc \
+src/core/lib/gpr/murmur_hash.h \
+src/core/lib/gpr/spinlock.h \
+src/core/lib/gpr/string.cc \
+src/core/lib/gpr/string.h \
+src/core/lib/gpr/string_posix.cc \
+src/core/lib/gpr/string_util_windows.cc \
+src/core/lib/gpr/string_windows.cc \
+src/core/lib/gpr/string_windows.h \
+src/core/lib/gpr/subprocess_posix.cc \
+src/core/lib/gpr/subprocess_windows.cc \
+src/core/lib/gpr/sync.cc \
+src/core/lib/gpr/sync_posix.cc \
+src/core/lib/gpr/sync_windows.cc \
+src/core/lib/gpr/thd.cc \
+src/core/lib/gpr/thd_internal.h \
+src/core/lib/gpr/thd_posix.cc \
+src/core/lib/gpr/thd_windows.cc \
+src/core/lib/gpr/time.cc \
+src/core/lib/gpr/time_posix.cc \
+src/core/lib/gpr/time_precise.cc \
+src/core/lib/gpr/time_precise.h \
+src/core/lib/gpr/time_windows.cc \
+src/core/lib/gpr/tls_pthread.cc \
+src/core/lib/gpr/tmpfile.h \
+src/core/lib/gpr/tmpfile_msys.cc \
+src/core/lib/gpr/tmpfile_posix.cc \
+src/core/lib/gpr/tmpfile_windows.cc \
+src/core/lib/gpr/wrap_memcpy.cc \
 src/core/lib/http/format_request.cc \
 src/core/lib/http/format_request.h \
 src/core/lib/http/httpcli.cc \
@@ -1271,70 +1337,6 @@ src/core/lib/slice/slice_intern.cc \
 src/core/lib/slice/slice_internal.h \
 src/core/lib/slice/slice_string_helpers.cc \
 src/core/lib/slice/slice_string_helpers.h \
-src/core/lib/support/abstract.h \
-src/core/lib/support/alloc.cc \
-src/core/lib/support/arena.cc \
-src/core/lib/support/arena.h \
-src/core/lib/support/atm.cc \
-src/core/lib/support/atomic.h \
-src/core/lib/support/atomic_with_atm.h \
-src/core/lib/support/atomic_with_std.h \
-src/core/lib/support/avl.cc \
-src/core/lib/support/cmdline.cc \
-src/core/lib/support/cpu_iphone.cc \
-src/core/lib/support/cpu_linux.cc \
-src/core/lib/support/cpu_posix.cc \
-src/core/lib/support/cpu_windows.cc \
-src/core/lib/support/debug_location.h \
-src/core/lib/support/env.h \
-src/core/lib/support/env_linux.cc \
-src/core/lib/support/env_posix.cc \
-src/core/lib/support/env_windows.cc \
-src/core/lib/support/fork.cc \
-src/core/lib/support/fork.h \
-src/core/lib/support/host_port.cc \
-src/core/lib/support/log.cc \
-src/core/lib/support/log_android.cc \
-src/core/lib/support/log_linux.cc \
-src/core/lib/support/log_posix.cc \
-src/core/lib/support/log_windows.cc \
-src/core/lib/support/manual_constructor.h \
-src/core/lib/support/memory.h \
-src/core/lib/support/mpscq.cc \
-src/core/lib/support/mpscq.h \
-src/core/lib/support/murmur_hash.cc \
-src/core/lib/support/murmur_hash.h \
-src/core/lib/support/orphanable.h \
-src/core/lib/support/ref_counted.h \
-src/core/lib/support/ref_counted_ptr.h \
-src/core/lib/support/spinlock.h \
-src/core/lib/support/string.cc \
-src/core/lib/support/string.h \
-src/core/lib/support/string_posix.cc \
-src/core/lib/support/string_util_windows.cc \
-src/core/lib/support/string_windows.cc \
-src/core/lib/support/string_windows.h \
-src/core/lib/support/subprocess_posix.cc \
-src/core/lib/support/subprocess_windows.cc \
-src/core/lib/support/sync.cc \
-src/core/lib/support/sync_posix.cc \
-src/core/lib/support/sync_windows.cc \
-src/core/lib/support/thd.cc \
-src/core/lib/support/thd_internal.h \
-src/core/lib/support/thd_posix.cc \
-src/core/lib/support/thd_windows.cc \
-src/core/lib/support/time.cc \
-src/core/lib/support/time_posix.cc \
-src/core/lib/support/time_precise.cc \
-src/core/lib/support/time_precise.h \
-src/core/lib/support/time_windows.cc \
-src/core/lib/support/tls_pthread.cc \
-src/core/lib/support/tmpfile.h \
-src/core/lib/support/tmpfile_msys.cc \
-src/core/lib/support/tmpfile_posix.cc \
-src/core/lib/support/tmpfile_windows.cc \
-src/core/lib/support/vector.h \
-src/core/lib/support/wrap_memcpy.cc \
 src/core/lib/surface/README.md \
 src/core/lib/surface/alarm.cc \
 src/core/lib/surface/alarm_internal.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index df45489d5e..982d9ef649 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -45,7 +45,7 @@
     "language": "c", 
     "name": "alloc_test", 
     "src": [
-      "test/core/support/alloc_test.cc"
+      "test/core/gpr/alloc_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -94,7 +94,7 @@
     "language": "c", 
     "name": "arena_test", 
     "src": [
-      "test/core/support/arena_test.cc"
+      "test/core/gpr/arena_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -597,7 +597,7 @@
     "language": "c", 
     "name": "gpr_avl_test", 
     "src": [
-      "test/core/support/avl_test.cc"
+      "test/core/gpr/avl_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -612,7 +612,7 @@
     "language": "c", 
     "name": "gpr_cmdline_test", 
     "src": [
-      "test/core/support/cmdline_test.cc"
+      "test/core/gpr/cmdline_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -627,7 +627,7 @@
     "language": "c", 
     "name": "gpr_cpu_test", 
     "src": [
-      "test/core/support/cpu_test.cc"
+      "test/core/gpr/cpu_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -642,7 +642,7 @@
     "language": "c", 
     "name": "gpr_env_test", 
     "src": [
-      "test/core/support/env_test.cc"
+      "test/core/gpr/env_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -657,7 +657,7 @@
     "language": "c", 
     "name": "gpr_host_port_test", 
     "src": [
-      "test/core/support/host_port_test.cc"
+      "test/core/gpr/host_port_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -672,7 +672,7 @@
     "language": "c", 
     "name": "gpr_log_test", 
     "src": [
-      "test/core/support/log_test.cc"
+      "test/core/gpr/log_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -687,7 +687,7 @@
     "language": "c", 
     "name": "gpr_manual_constructor_test", 
     "src": [
-      "test/core/support/manual_constructor_test.cc"
+      "test/core/gpr++/manual_constructor_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -702,7 +702,7 @@
     "language": "c", 
     "name": "gpr_mpscq_test", 
     "src": [
-      "test/core/support/mpscq_test.cc"
+      "test/core/gpr/mpscq_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -717,7 +717,7 @@
     "language": "c", 
     "name": "gpr_spinlock_test", 
     "src": [
-      "test/core/support/spinlock_test.cc"
+      "test/core/gpr/spinlock_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -732,7 +732,7 @@
     "language": "c", 
     "name": "gpr_string_test", 
     "src": [
-      "test/core/support/string_test.cc"
+      "test/core/gpr/string_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -747,7 +747,7 @@
     "language": "c", 
     "name": "gpr_sync_test", 
     "src": [
-      "test/core/support/sync_test.cc"
+      "test/core/gpr/sync_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -762,7 +762,7 @@
     "language": "c", 
     "name": "gpr_thd_test", 
     "src": [
-      "test/core/support/thd_test.cc"
+      "test/core/gpr/thd_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -777,7 +777,7 @@
     "language": "c", 
     "name": "gpr_time_test", 
     "src": [
-      "test/core/support/time_test.cc"
+      "test/core/gpr/time_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -792,7 +792,7 @@
     "language": "c", 
     "name": "gpr_tls_test", 
     "src": [
-      "test/core/support/tls_test.cc"
+      "test/core/gpr/tls_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -807,7 +807,7 @@
     "language": "c", 
     "name": "gpr_useful_test", 
     "src": [
-      "test/core/support/useful_test.cc"
+      "test/core/gpr/useful_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -1636,7 +1636,7 @@
     "language": "c", 
     "name": "murmur_hash_test", 
     "src": [
-      "test/core/support/murmur_hash_test.cc"
+      "test/core/gpr/murmur_hash_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3534,6 +3534,25 @@
       "gpr_test_util", 
       "grpc", 
       "grpc++", 
+      "grpc++_test", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "inlined_vector_test", 
+    "src": [
+      "test/core/gpr++/inlined_vector_test.cc"
+    ], 
+    "third_party": false, 
+    "type": "target"
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc++", 
       "grpc++_core_stats", 
       "grpc++_test_config", 
       "grpc++_test_util", 
@@ -3643,7 +3662,7 @@
     "language": "c++", 
     "name": "memory_test", 
     "src": [
-      "test/core/support/memory_test.cc"
+      "test/core/gpr++/memory_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3721,7 +3740,7 @@
     "language": "c++", 
     "name": "orphanable_test", 
     "src": [
-      "test/core/support/orphanable_test.cc"
+      "test/core/gpr++/orphanable_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3932,7 +3951,7 @@
     "language": "c++", 
     "name": "ref_counted_ptr_test", 
     "src": [
-      "test/core/support/ref_counted_ptr_test.cc"
+      "test/core/gpr++/ref_counted_ptr_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3951,7 +3970,7 @@
     "language": "c++", 
     "name": "ref_counted_test", 
     "src": [
-      "test/core/support/ref_counted_test.cc"
+      "test/core/gpr++/ref_counted_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -4306,25 +4325,6 @@
       "gpr_test_util", 
       "grpc", 
       "grpc++", 
-      "grpc++_test", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "is_filegroup": false, 
-    "language": "c++", 
-    "name": "vector_test", 
-    "src": [
-      "test/core/support/vector_test.cc"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
-  {
-    "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc++", 
       "grpc++_test_util", 
       "grpc_test_util"
     ], 
@@ -7827,50 +7827,50 @@
     "language": "c", 
     "name": "gpr_base", 
     "src": [
+      "src/core/lib/gpr/alloc.cc", 
+      "src/core/lib/gpr/arena.cc", 
+      "src/core/lib/gpr/atm.cc", 
+      "src/core/lib/gpr/avl.cc", 
+      "src/core/lib/gpr/cmdline.cc", 
+      "src/core/lib/gpr/cpu_iphone.cc", 
+      "src/core/lib/gpr/cpu_linux.cc", 
+      "src/core/lib/gpr/cpu_posix.cc", 
+      "src/core/lib/gpr/cpu_windows.cc", 
+      "src/core/lib/gpr/env_linux.cc", 
+      "src/core/lib/gpr/env_posix.cc", 
+      "src/core/lib/gpr/env_windows.cc", 
+      "src/core/lib/gpr/fork.cc", 
+      "src/core/lib/gpr/host_port.cc", 
+      "src/core/lib/gpr/log.cc", 
+      "src/core/lib/gpr/log_android.cc", 
+      "src/core/lib/gpr/log_linux.cc", 
+      "src/core/lib/gpr/log_posix.cc", 
+      "src/core/lib/gpr/log_windows.cc", 
+      "src/core/lib/gpr/mpscq.cc", 
+      "src/core/lib/gpr/murmur_hash.cc", 
+      "src/core/lib/gpr/string.cc", 
+      "src/core/lib/gpr/string_posix.cc", 
+      "src/core/lib/gpr/string_util_windows.cc", 
+      "src/core/lib/gpr/string_windows.cc", 
+      "src/core/lib/gpr/subprocess_posix.cc", 
+      "src/core/lib/gpr/subprocess_windows.cc", 
+      "src/core/lib/gpr/sync.cc", 
+      "src/core/lib/gpr/sync_posix.cc", 
+      "src/core/lib/gpr/sync_windows.cc", 
+      "src/core/lib/gpr/thd.cc", 
+      "src/core/lib/gpr/thd_posix.cc", 
+      "src/core/lib/gpr/thd_windows.cc", 
+      "src/core/lib/gpr/time.cc", 
+      "src/core/lib/gpr/time_posix.cc", 
+      "src/core/lib/gpr/time_precise.cc", 
+      "src/core/lib/gpr/time_windows.cc", 
+      "src/core/lib/gpr/tls_pthread.cc", 
+      "src/core/lib/gpr/tmpfile_msys.cc", 
+      "src/core/lib/gpr/tmpfile_posix.cc", 
+      "src/core/lib/gpr/tmpfile_windows.cc", 
+      "src/core/lib/gpr/wrap_memcpy.cc", 
       "src/core/lib/profiling/basic_timers.cc", 
-      "src/core/lib/profiling/stap_timers.cc", 
-      "src/core/lib/support/alloc.cc", 
-      "src/core/lib/support/arena.cc", 
-      "src/core/lib/support/atm.cc", 
-      "src/core/lib/support/avl.cc", 
-      "src/core/lib/support/cmdline.cc", 
-      "src/core/lib/support/cpu_iphone.cc", 
-      "src/core/lib/support/cpu_linux.cc", 
-      "src/core/lib/support/cpu_posix.cc", 
-      "src/core/lib/support/cpu_windows.cc", 
-      "src/core/lib/support/env_linux.cc", 
-      "src/core/lib/support/env_posix.cc", 
-      "src/core/lib/support/env_windows.cc", 
-      "src/core/lib/support/fork.cc", 
-      "src/core/lib/support/host_port.cc", 
-      "src/core/lib/support/log.cc", 
-      "src/core/lib/support/log_android.cc", 
-      "src/core/lib/support/log_linux.cc", 
-      "src/core/lib/support/log_posix.cc", 
-      "src/core/lib/support/log_windows.cc", 
-      "src/core/lib/support/mpscq.cc", 
-      "src/core/lib/support/murmur_hash.cc", 
-      "src/core/lib/support/string.cc", 
-      "src/core/lib/support/string_posix.cc", 
-      "src/core/lib/support/string_util_windows.cc", 
-      "src/core/lib/support/string_windows.cc", 
-      "src/core/lib/support/subprocess_posix.cc", 
-      "src/core/lib/support/subprocess_windows.cc", 
-      "src/core/lib/support/sync.cc", 
-      "src/core/lib/support/sync_posix.cc", 
-      "src/core/lib/support/sync_windows.cc", 
-      "src/core/lib/support/thd.cc", 
-      "src/core/lib/support/thd_posix.cc", 
-      "src/core/lib/support/thd_windows.cc", 
-      "src/core/lib/support/time.cc", 
-      "src/core/lib/support/time_posix.cc", 
-      "src/core/lib/support/time_precise.cc", 
-      "src/core/lib/support/time_windows.cc", 
-      "src/core/lib/support/tls_pthread.cc", 
-      "src/core/lib/support/tmpfile_msys.cc", 
-      "src/core/lib/support/tmpfile_posix.cc", 
-      "src/core/lib/support/tmpfile_windows.cc", 
-      "src/core/lib/support/wrap_memcpy.cc"
+      "src/core/lib/profiling/stap_timers.cc"
     ], 
     "third_party": false, 
     "type": "filegroup"
@@ -7906,24 +7906,24 @@
       "include/grpc/support/tls_msvc.h", 
       "include/grpc/support/tls_pthread.h", 
       "include/grpc/support/useful.h", 
-      "src/core/lib/profiling/timers.h", 
-      "src/core/lib/support/abstract.h", 
-      "src/core/lib/support/arena.h", 
-      "src/core/lib/support/atomic.h", 
-      "src/core/lib/support/atomic_with_atm.h", 
-      "src/core/lib/support/atomic_with_std.h", 
-      "src/core/lib/support/env.h", 
-      "src/core/lib/support/fork.h", 
-      "src/core/lib/support/manual_constructor.h", 
-      "src/core/lib/support/memory.h", 
-      "src/core/lib/support/mpscq.h", 
-      "src/core/lib/support/murmur_hash.h", 
-      "src/core/lib/support/spinlock.h", 
-      "src/core/lib/support/string.h", 
-      "src/core/lib/support/string_windows.h", 
-      "src/core/lib/support/thd_internal.h", 
-      "src/core/lib/support/time_precise.h", 
-      "src/core/lib/support/tmpfile.h"
+      "src/core/lib/gpr++/abstract.h", 
+      "src/core/lib/gpr++/atomic.h", 
+      "src/core/lib/gpr++/atomic_with_atm.h", 
+      "src/core/lib/gpr++/atomic_with_std.h", 
+      "src/core/lib/gpr++/manual_constructor.h", 
+      "src/core/lib/gpr++/memory.h", 
+      "src/core/lib/gpr/arena.h", 
+      "src/core/lib/gpr/env.h", 
+      "src/core/lib/gpr/fork.h", 
+      "src/core/lib/gpr/mpscq.h", 
+      "src/core/lib/gpr/murmur_hash.h", 
+      "src/core/lib/gpr/spinlock.h", 
+      "src/core/lib/gpr/string.h", 
+      "src/core/lib/gpr/string_windows.h", 
+      "src/core/lib/gpr/thd_internal.h", 
+      "src/core/lib/gpr/time_precise.h", 
+      "src/core/lib/gpr/tmpfile.h", 
+      "src/core/lib/profiling/timers.h"
     ], 
     "is_filegroup": true, 
     "language": "c", 
@@ -7955,24 +7955,24 @@
       "include/grpc/support/tls_msvc.h", 
       "include/grpc/support/tls_pthread.h", 
       "include/grpc/support/useful.h", 
-      "src/core/lib/profiling/timers.h", 
-      "src/core/lib/support/abstract.h", 
-      "src/core/lib/support/arena.h", 
-      "src/core/lib/support/atomic.h", 
-      "src/core/lib/support/atomic_with_atm.h", 
-      "src/core/lib/support/atomic_with_std.h", 
-      "src/core/lib/support/env.h", 
-      "src/core/lib/support/fork.h", 
-      "src/core/lib/support/manual_constructor.h", 
-      "src/core/lib/support/memory.h", 
-      "src/core/lib/support/mpscq.h", 
-      "src/core/lib/support/murmur_hash.h", 
-      "src/core/lib/support/spinlock.h", 
-      "src/core/lib/support/string.h", 
-      "src/core/lib/support/string_windows.h", 
-      "src/core/lib/support/thd_internal.h", 
-      "src/core/lib/support/time_precise.h", 
-      "src/core/lib/support/tmpfile.h"
+      "src/core/lib/gpr++/abstract.h", 
+      "src/core/lib/gpr++/atomic.h", 
+      "src/core/lib/gpr++/atomic_with_atm.h", 
+      "src/core/lib/gpr++/atomic_with_std.h", 
+      "src/core/lib/gpr++/manual_constructor.h", 
+      "src/core/lib/gpr++/memory.h", 
+      "src/core/lib/gpr/arena.h", 
+      "src/core/lib/gpr/env.h", 
+      "src/core/lib/gpr/fork.h", 
+      "src/core/lib/gpr/mpscq.h", 
+      "src/core/lib/gpr/murmur_hash.h", 
+      "src/core/lib/gpr/spinlock.h", 
+      "src/core/lib/gpr/string.h", 
+      "src/core/lib/gpr/string_windows.h", 
+      "src/core/lib/gpr/thd_internal.h", 
+      "src/core/lib/gpr/time_precise.h", 
+      "src/core/lib/gpr/tmpfile.h", 
+      "src/core/lib/profiling/timers.h"
     ], 
     "third_party": false, 
     "type": "filegroup"
@@ -8229,6 +8229,11 @@
       "src/core/lib/compression/stream_compression_identity.h", 
       "src/core/lib/debug/stats.h", 
       "src/core/lib/debug/stats_data.h", 
+      "src/core/lib/gpr++/debug_location.h", 
+      "src/core/lib/gpr++/inlined_vector.h", 
+      "src/core/lib/gpr++/orphanable.h", 
+      "src/core/lib/gpr++/ref_counted.h", 
+      "src/core/lib/gpr++/ref_counted_ptr.h", 
       "src/core/lib/http/format_request.h", 
       "src/core/lib/http/httpcli.h", 
       "src/core/lib/http/parser.h", 
@@ -8304,11 +8309,6 @@
       "src/core/lib/slice/slice_hash_table.h", 
       "src/core/lib/slice/slice_internal.h", 
       "src/core/lib/slice/slice_string_helpers.h", 
-      "src/core/lib/support/debug_location.h", 
-      "src/core/lib/support/orphanable.h", 
-      "src/core/lib/support/ref_counted.h", 
-      "src/core/lib/support/ref_counted_ptr.h", 
-      "src/core/lib/support/vector.h", 
       "src/core/lib/surface/alarm_internal.h", 
       "src/core/lib/surface/api_trace.h", 
       "src/core/lib/surface/call.h", 
@@ -8370,6 +8370,11 @@
       "src/core/lib/compression/stream_compression_identity.h", 
       "src/core/lib/debug/stats.h", 
       "src/core/lib/debug/stats_data.h", 
+      "src/core/lib/gpr++/debug_location.h", 
+      "src/core/lib/gpr++/inlined_vector.h", 
+      "src/core/lib/gpr++/orphanable.h", 
+      "src/core/lib/gpr++/ref_counted.h", 
+      "src/core/lib/gpr++/ref_counted_ptr.h", 
       "src/core/lib/http/format_request.h", 
       "src/core/lib/http/httpcli.h", 
       "src/core/lib/http/parser.h", 
@@ -8445,11 +8450,6 @@
       "src/core/lib/slice/slice_hash_table.h", 
       "src/core/lib/slice/slice_internal.h", 
       "src/core/lib/slice/slice_string_helpers.h", 
-      "src/core/lib/support/debug_location.h", 
-      "src/core/lib/support/orphanable.h", 
-      "src/core/lib/support/ref_counted.h", 
-      "src/core/lib/support/ref_counted_ptr.h", 
-      "src/core/lib/support/vector.h", 
       "src/core/lib/surface/alarm_internal.h", 
       "src/core/lib/surface/api_trace.h", 
       "src/core/lib/surface/call.h", 
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index dc2b39eb21..7b23cab506 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -3967,6 +3967,30 @@
     "ci_platforms": [
       "linux", 
       "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "cpu_cost": 1.0, 
+    "exclude_configs": [], 
+    "exclude_iomgrs": [], 
+    "flaky": false, 
+    "gtest": true, 
+    "language": "c++", 
+    "name": "inlined_vector_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "uses_polling": true
+  }, 
+  {
+    "args": [], 
+    "benchmark": false, 
+    "ci_platforms": [
+      "linux", 
+      "mac", 
       "posix"
     ], 
     "cpu_cost": 1.0, 
@@ -4558,30 +4582,6 @@
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": true, 
-    "language": "c++", 
-    "name": "vector_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "uses_polling": true
-  }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
       "posix"
     ], 
     "cpu_cost": 0.5, 
diff --git a/tools/run_tests/sanity/core_banned_functions.py b/tools/run_tests/sanity/core_banned_functions.py
index 9ee28964a5..989990542e 100755
--- a/tools/run_tests/sanity/core_banned_functions.py
+++ b/tools/run_tests/sanity/core_banned_functions.py
@@ -42,8 +42,8 @@ BANNED_EXCEPT = {
     'grpc_closure_run(': ['src/core/lib/iomgr/closure.c'],
     'grpc_closure_list_sched(': ['src/core/lib/iomgr/closure.c'],
     'gpr_getenv_silent(': [
-        'src/core/lib/support/log.c', 'src/core/lib/support/env_linux.c',
-        'src/core/lib/support/env_posix.c', 'src/core/lib/support/env_windows.c'
+        'src/core/lib/gpr/log.c', 'src/core/lib/gpr/env_linux.c',
+        'src/core/lib/gpr/env_posix.c', 'src/core/lib/gpr/env_windows.c'
     ],
 }