[reorg] move server code to src/core/server (#36475)

Closes #36475 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36475 from markdroth:reorg_server 30edc04c0f PiperOrigin-RevId: 629776917
7 months ago · 1e5fc3df8b
parent 6f09d2ab00
commit 1e5fc3df8b
67 changed files with 446 additions and 235 deletions
--- a/4
+++ b/4
@ -1862,10 +1862,10 @@ grpc_cc_library(
 grpc_cc_library(
    name = "server",
    srcs = [
-        "//src/core:lib/surface/server.cc",
+        "//src/core:server/server.cc",
    ],
    hdrs = [
-        "//src/core:lib/surface/server.h",
+        "//src/core:server/server.h",
    ],
    external_deps = [
        "absl/base:core_headers",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1540,6 +1540,7 @@ if(gRPC_BUILD_TESTS)
  add_dependencies(buildtests_cxx xds_audit_logger_registry_test)
  add_dependencies(buildtests_cxx xds_bootstrap_test)
  add_dependencies(buildtests_cxx xds_certificate_provider_test)
+  add_dependencies(buildtests_cxx xds_channel_stack_modifier_test)
  add_dependencies(buildtests_cxx xds_client_test)
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
    add_dependencies(buildtests_cxx xds_cluster_end2end_test)
@ -1857,7 +1858,6 @@ add_library(grpc
  src/core/ext/filters/message_size/message_size_filter.cc
  src/core/ext/filters/rbac/rbac_filter.cc
  src/core/ext/filters/rbac/rbac_service_config_parser.cc
-  src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
  src/core/ext/filters/stateful_session/stateful_session_filter.cc
  src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
  src/core/ext/gcp/metadata_query.cc
@ -2220,7 +2220,6 @@ add_library(grpc
  src/core/ext/xds/xds_bootstrap.cc
  src/core/ext/xds/xds_bootstrap_grpc.cc
  src/core/ext/xds/xds_certificate_provider.cc
-  src/core/ext/xds/xds_channel_stack_modifier.cc
  src/core/ext/xds/xds_client.cc
  src/core/ext/xds/xds_client_grpc.cc
  src/core/ext/xds/xds_client_stats.cc
@ -2237,7 +2236,6 @@ add_library(grpc
  src/core/ext/xds/xds_listener.cc
  src/core/ext/xds/xds_route_config.cc
  src/core/ext/xds/xds_routing.cc
-  src/core/ext/xds/xds_server_config_fetcher.cc
  src/core/ext/xds/xds_transport_grpc.cc
  src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
  src/core/handshaker/handshaker.cc
@ -2263,7 +2261,6 @@ add_library(grpc
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/metrics.cc
  src/core/lib/channel/promise_based_filter.cc
-  src/core/lib/channel/server_call_tracer_filter.cc
  src/core/lib/channel/status_util.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
@ -2517,7 +2514,6 @@ add_library(grpc
  src/core/lib/surface/lame_client.cc
  src/core/lib/surface/legacy_channel.cc
  src/core/lib/surface/metadata_array.cc
-  src/core/lib/surface/server.cc
  src/core/lib/surface/validate_metadata.cc
  src/core/lib/surface/version.cc
  src/core/lib/surface/wait_for_cq_end_op.cc
@ -2589,6 +2585,11 @@ add_library(grpc
  src/core/resolver/xds/xds_dependency_manager.cc
  src/core/resolver/xds/xds_resolver.cc
  src/core/resolver/xds/xds_resolver_trace.cc
+  src/core/server/server.cc
+  src/core/server/server_call_tracer_filter.cc
+  src/core/server/server_config_selector_filter.cc
+  src/core/server/xds_channel_stack_modifier.cc
+  src/core/server/xds_server_config_fetcher.cc
  src/core/service_config/service_config_channel_arg_filter.cc
  src/core/service_config/service_config_impl.cc
  src/core/service_config/service_config_parser.cc
@ -3027,7 +3028,6 @@ add_library(grpc_unsecure
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/metrics.cc
  src/core/lib/channel/promise_based_filter.cc
-  src/core/lib/channel/server_call_tracer_filter.cc
  src/core/lib/channel/status_util.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
@ -3242,7 +3242,6 @@ add_library(grpc_unsecure
  src/core/lib/surface/lame_client.cc
  src/core/lib/surface/legacy_channel.cc
  src/core/lib/surface/metadata_array.cc
-  src/core/lib/surface/server.cc
  src/core/lib/surface/validate_metadata.cc
  src/core/lib/surface/version.cc
  src/core/lib/surface/wait_for_cq_end_op.cc
@ -3304,6 +3303,8 @@ add_library(grpc_unsecure
  src/core/resolver/resolver.cc
  src/core/resolver/resolver_registry.cc
  src/core/resolver/sockaddr/sockaddr_resolver.cc
+  src/core/server/server.cc
+  src/core/server/server_call_tracer_filter.cc
  src/core/service_config/service_config_channel_arg_filter.cc
  src/core/service_config/service_config_impl.cc
  src/core/service_config/service_config_parser.cc
@ -27040,7 +27041,7 @@ endif()
 if(gRPC_BUILD_TESTS)

 add_executable(server_config_selector_test
-  test/core/server_config_selector/server_config_selector_test.cc
+  test/core/server/server_config_selector_test.cc
 )
 if(WIN32 AND MSVC)
  if(BUILD_SHARED_LIBS)
@ -33190,6 +33191,105 @@ target_link_libraries(xds_certificate_provider_test
 )


+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(xds_channel_stack_modifier_test
+  src/core/ext/filters/logging/logging_filter.cc
+  src/cpp/client/call_credentials.cc
+  src/cpp/client/channel_cc.cc
+  src/cpp/client/channel_credentials.cc
+  src/cpp/client/client_callback.cc
+  src/cpp/client/client_context.cc
+  src/cpp/client/client_interceptor.cc
+  src/cpp/client/client_stats_interceptor.cc
+  src/cpp/client/create_channel.cc
+  src/cpp/client/create_channel_internal.cc
+  src/cpp/client/create_channel_posix.cc
+  src/cpp/client/insecure_credentials.cc
+  src/cpp/client/secure_credentials.cc
+  src/cpp/common/alarm.cc
+  src/cpp/common/auth_property_iterator.cc
+  src/cpp/common/channel_arguments.cc
+  src/cpp/common/completion_queue_cc.cc
+  src/cpp/common/resource_quota_cc.cc
+  src/cpp/common/rpc_method.cc
+  src/cpp/common/secure_auth_context.cc
+  src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_certificate_provider.cc
+  src/cpp/common/tls_certificate_verifier.cc
+  src/cpp/common/tls_credentials_options.cc
+  src/cpp/common/validate_service_config.cc
+  src/cpp/common/version_cc.cc
+  src/cpp/ext/filters/census/client_filter.cc
+  src/cpp/ext/filters/census/context.cc
+  src/cpp/ext/filters/census/grpc_plugin.cc
+  src/cpp/ext/filters/census/measures.cc
+  src/cpp/ext/filters/census/rpc_encoding.cc
+  src/cpp/ext/filters/census/server_call_tracer.cc
+  src/cpp/ext/filters/census/views.cc
+  src/cpp/server/async_generic_service.cc
+  src/cpp/server/backend_metric_recorder.cc
+  src/cpp/server/channel_argument_option.cc
+  src/cpp/server/create_default_thread_pool.cc
+  src/cpp/server/external_connection_acceptor_impl.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
+  src/cpp/server/insecure_server_credentials.cc
+  src/cpp/server/secure_server_credentials.cc
+  src/cpp/server/server_builder.cc
+  src/cpp/server/server_callback.cc
+  src/cpp/server/server_cc.cc
+  src/cpp/server/server_context.cc
+  src/cpp/server/server_credentials.cc
+  src/cpp/server/server_posix.cc
+  src/cpp/thread_manager/thread_manager.cc
+  src/cpp/util/byte_buffer_cc.cc
+  src/cpp/util/status.cc
+  src/cpp/util/string_ref.cc
+  src/cpp/util/time_cc.cc
+  test/core/server/xds_channel_stack_modifier_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(xds_channel_stack_modifier_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(xds_channel_stack_modifier_test PUBLIC cxx_std_14)
+target_include_directories(xds_channel_stack_modifier_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(xds_channel_stack_modifier_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::endian
+  absl::int128
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)

--- a/10
+++ b/10
@ -699,7 +699,6 @@ LIBGRPC_SRC = \
    src/core/ext/filters/message_size/message_size_filter.cc \
    src/core/ext/filters/rbac/rbac_filter.cc \
    src/core/ext/filters/rbac/rbac_service_config_parser.cc \
-    src/core/ext/filters/server_config_selector/server_config_selector_filter.cc \
    src/core/ext/filters/stateful_session/stateful_session_filter.cc \
    src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
    src/core/ext/gcp/metadata_query.cc \
@ -1062,7 +1061,6 @@ LIBGRPC_SRC = \
    src/core/ext/xds/xds_bootstrap.cc \
    src/core/ext/xds/xds_bootstrap_grpc.cc \
    src/core/ext/xds/xds_certificate_provider.cc \
-    src/core/ext/xds/xds_channel_stack_modifier.cc \
    src/core/ext/xds/xds_client.cc \
    src/core/ext/xds/xds_client_grpc.cc \
    src/core/ext/xds/xds_client_stats.cc \
@ -1079,7 +1077,6 @@ LIBGRPC_SRC = \
    src/core/ext/xds/xds_listener.cc \
    src/core/ext/xds/xds_route_config.cc \
    src/core/ext/xds/xds_routing.cc \
-    src/core/ext/xds/xds_server_config_fetcher.cc \
    src/core/ext/xds/xds_transport_grpc.cc \
    src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
    src/core/handshaker/handshaker.cc \
@ -1105,7 +1102,6 @@ LIBGRPC_SRC = \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/metrics.cc \
    src/core/lib/channel/promise_based_filter.cc \
-    src/core/lib/channel/server_call_tracer_filter.cc \
    src/core/lib/channel/status_util.cc \
    src/core/lib/compression/compression.cc \
    src/core/lib/compression/compression_internal.cc \
@ -1404,7 +1400,6 @@ LIBGRPC_SRC = \
    src/core/lib/surface/lame_client.cc \
    src/core/lib/surface/legacy_channel.cc \
    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
    src/core/lib/surface/validate_metadata.cc \
    src/core/lib/surface/version.cc \
    src/core/lib/surface/wait_for_cq_end_op.cc \
@ -1476,6 +1471,11 @@ LIBGRPC_SRC = \
    src/core/resolver/xds/xds_dependency_manager.cc \
    src/core/resolver/xds/xds_resolver.cc \
    src/core/resolver/xds/xds_resolver_trace.cc \
+    src/core/server/server.cc \
+    src/core/server/server_call_tracer_filter.cc \
+    src/core/server/server_config_selector_filter.cc \
+    src/core/server/xds_channel_stack_modifier.cc \
+    src/core/server/xds_server_config_fetcher.cc \
    src/core/service_config/service_config_channel_arg_filter.cc \
    src/core/service_config/service_config_impl.cc \
    src/core/service_config/service_config_parser.cc \
--- a/Package.swift
+++ b/Package.swift
@ -184,9 +184,6 @@ let package = Package(
        "src/core/ext/filters/rbac/rbac_filter.h",
        "src/core/ext/filters/rbac/rbac_service_config_parser.cc",
        "src/core/ext/filters/rbac/rbac_service_config_parser.h",
-        "src/core/ext/filters/server_config_selector/server_config_selector.h",
-        "src/core/ext/filters/server_config_selector/server_config_selector_filter.cc",
-        "src/core/ext/filters/server_config_selector/server_config_selector_filter.h",
        "src/core/ext/filters/stateful_session/stateful_session_filter.cc",
        "src/core/ext/filters/stateful_session/stateful_session_filter.h",
        "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc",
@ -1078,8 +1075,6 @@ let package = Package(
        "src/core/ext/xds/xds_certificate_provider.cc",
        "src/core/ext/xds/xds_certificate_provider.h",
        "src/core/ext/xds/xds_channel_args.h",
-        "src/core/ext/xds/xds_channel_stack_modifier.cc",
-        "src/core/ext/xds/xds_channel_stack_modifier.h",
        "src/core/ext/xds/xds_client.cc",
        "src/core/ext/xds/xds_client.h",
        "src/core/ext/xds/xds_client_grpc.cc",
@ -1115,7 +1110,6 @@ let package = Package(
        "src/core/ext/xds/xds_route_config.h",
        "src/core/ext/xds/xds_routing.cc",
        "src/core/ext/xds/xds_routing.h",
-        "src/core/ext/xds/xds_server_config_fetcher.cc",
        "src/core/ext/xds/xds_transport.h",
        "src/core/ext/xds/xds_transport_grpc.cc",
        "src/core/ext/xds/xds_transport_grpc.h",
@ -1173,8 +1167,6 @@ let package = Package(
        "src/core/lib/channel/metrics.h",
        "src/core/lib/channel/promise_based_filter.cc",
        "src/core/lib/channel/promise_based_filter.h",
-        "src/core/lib/channel/server_call_tracer_filter.cc",
-        "src/core/lib/channel/server_call_tracer_filter.h",
        "src/core/lib/channel/status_util.cc",
        "src/core/lib/channel/status_util.h",
        "src/core/lib/channel/tcp_tracer.h",
@ -1800,9 +1792,6 @@ let package = Package(
        "src/core/lib/surface/legacy_channel.cc",
        "src/core/lib/surface/legacy_channel.h",
        "src/core/lib/surface/metadata_array.cc",
-        "src/core/lib/surface/server.cc",
-        "src/core/lib/surface/server.h",
-        "src/core/lib/surface/server_interface.h",
        "src/core/lib/surface/validate_metadata.cc",
        "src/core/lib/surface/validate_metadata.h",
        "src/core/lib/surface/version.cc",
@ -1942,6 +1931,17 @@ let package = Package(
        "src/core/resolver/xds/xds_resolver_attributes.h",
        "src/core/resolver/xds/xds_resolver_trace.cc",
        "src/core/resolver/xds/xds_resolver_trace.h",
+        "src/core/server/server.cc",
+        "src/core/server/server.h",
+        "src/core/server/server_call_tracer_filter.cc",
+        "src/core/server/server_call_tracer_filter.h",
+        "src/core/server/server_config_selector.h",
+        "src/core/server/server_config_selector_filter.cc",
+        "src/core/server/server_config_selector_filter.h",
+        "src/core/server/server_interface.h",
+        "src/core/server/xds_channel_stack_modifier.cc",
+        "src/core/server/xds_channel_stack_modifier.h",
+        "src/core/server/xds_server_config_fetcher.cc",
        "src/core/service_config/service_config.h",
        "src/core/service_config/service_config_call_data.h",
        "src/core/service_config/service_config_channel_arg_filter.cc",
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -256,8 +256,6 @@ libs:
  - src/core/ext/filters/message_size/message_size_filter.h
  - src/core/ext/filters/rbac/rbac_filter.h
  - src/core/ext/filters/rbac/rbac_service_config_parser.h
-  - src/core/ext/filters/server_config_selector/server_config_selector.h
-  - src/core/ext/filters/server_config_selector/server_config_selector_filter.h
  - src/core/ext/filters/stateful_session/stateful_session_filter.h
  - src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
  - src/core/ext/gcp/metadata_query.h
@ -787,7 +785,6 @@ libs:
  - src/core/ext/xds/xds_bootstrap_grpc.h
  - src/core/ext/xds/xds_certificate_provider.h
  - src/core/ext/xds/xds_channel_args.h
-  - src/core/ext/xds/xds_channel_stack_modifier.h
  - src/core/ext/xds/xds_client.h
  - src/core/ext/xds/xds_client_grpc.h
  - src/core/ext/xds/xds_client_stats.h
@ -839,7 +836,6 @@ libs:
  - src/core/lib/channel/context.h
  - src/core/lib/channel/metrics.h
  - src/core/lib/channel/promise_based_filter.h
-  - src/core/lib/channel/server_call_tracer_filter.h
  - src/core/lib/channel/status_util.h
  - src/core/lib/channel/tcp_tracer.h
  - src/core/lib/compression/compression_internal.h
@ -1138,8 +1134,6 @@ libs:
  - src/core/lib/surface/init_internally.h
  - src/core/lib/surface/lame_client.h
  - src/core/lib/surface/legacy_channel.h
-  - src/core/lib/surface/server.h
-  - src/core/lib/surface/server_interface.h
  - src/core/lib/surface/validate_metadata.h
  - src/core/lib/surface/wait_for_cq_end_op.h
  - src/core/lib/transport/batch_builder.h
@ -1208,6 +1202,12 @@ libs:
  - src/core/resolver/xds/xds_dependency_manager.h
  - src/core/resolver/xds/xds_resolver_attributes.h
  - src/core/resolver/xds/xds_resolver_trace.h
+  - src/core/server/server.h
+  - src/core/server/server_call_tracer_filter.h
+  - src/core/server/server_config_selector.h
+  - src/core/server/server_config_selector_filter.h
+  - src/core/server/server_interface.h
+  - src/core/server/xds_channel_stack_modifier.h
  - src/core/service_config/service_config.h
  - src/core/service_config/service_config_call_data.h
  - src/core/service_config/service_config_impl.h
@ -1277,7 +1277,6 @@ libs:
  - src/core/ext/filters/message_size/message_size_filter.cc
  - src/core/ext/filters/rbac/rbac_filter.cc
  - src/core/ext/filters/rbac/rbac_service_config_parser.cc
-  - src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
  - src/core/ext/filters/stateful_session/stateful_session_filter.cc
  - src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
  - src/core/ext/gcp/metadata_query.cc
@ -1640,7 +1639,6 @@ libs:
  - src/core/ext/xds/xds_bootstrap.cc
  - src/core/ext/xds/xds_bootstrap_grpc.cc
  - src/core/ext/xds/xds_certificate_provider.cc
-  - src/core/ext/xds/xds_channel_stack_modifier.cc
  - src/core/ext/xds/xds_client.cc
  - src/core/ext/xds/xds_client_grpc.cc
  - src/core/ext/xds/xds_client_stats.cc
@ -1657,7 +1655,6 @@ libs:
  - src/core/ext/xds/xds_listener.cc
  - src/core/ext/xds/xds_route_config.cc
  - src/core/ext/xds/xds_routing.cc
-  - src/core/ext/xds/xds_server_config_fetcher.cc
  - src/core/ext/xds/xds_transport_grpc.cc
  - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
  - src/core/handshaker/handshaker.cc
@ -1683,7 +1680,6 @@ libs:
  - src/core/lib/channel/connected_channel.cc
  - src/core/lib/channel/metrics.cc
  - src/core/lib/channel/promise_based_filter.cc
-  - src/core/lib/channel/server_call_tracer_filter.cc
  - src/core/lib/channel/status_util.cc
  - src/core/lib/compression/compression.cc
  - src/core/lib/compression/compression_internal.cc
@ -1937,7 +1933,6 @@ libs:
  - src/core/lib/surface/lame_client.cc
  - src/core/lib/surface/legacy_channel.cc
  - src/core/lib/surface/metadata_array.cc
-  - src/core/lib/surface/server.cc
  - src/core/lib/surface/validate_metadata.cc
  - src/core/lib/surface/version.cc
  - src/core/lib/surface/wait_for_cq_end_op.cc
@ -2009,6 +2004,11 @@ libs:
  - src/core/resolver/xds/xds_dependency_manager.cc
  - src/core/resolver/xds/xds_resolver.cc
  - src/core/resolver/xds/xds_resolver_trace.cc
+  - src/core/server/server.cc
+  - src/core/server/server_call_tracer_filter.cc
+  - src/core/server/server_config_selector_filter.cc
+  - src/core/server/xds_channel_stack_modifier.cc
+  - src/core/server/xds_server_config_fetcher.cc
  - src/core/service_config/service_config_channel_arg_filter.cc
  - src/core/service_config/service_config_impl.cc
  - src/core/service_config/service_config_parser.cc
@ -2340,7 +2340,6 @@ libs:
  - src/core/lib/channel/context.h
  - src/core/lib/channel/metrics.h
  - src/core/lib/channel/promise_based_filter.h
-  - src/core/lib/channel/server_call_tracer_filter.h
  - src/core/lib/channel/status_util.h
  - src/core/lib/channel/tcp_tracer.h
  - src/core/lib/compression/compression_internal.h
@ -2603,8 +2602,6 @@ libs:
  - src/core/lib/surface/init_internally.h
  - src/core/lib/surface/lame_client.h
  - src/core/lib/surface/legacy_channel.h
-  - src/core/lib/surface/server.h
-  - src/core/lib/surface/server_interface.h
  - src/core/lib/surface/validate_metadata.h
  - src/core/lib/surface/wait_for_cq_end_op.h
  - src/core/lib/transport/batch_builder.h
@ -2667,6 +2664,9 @@ libs:
  - src/core/resolver/resolver_factory.h
  - src/core/resolver/resolver_registry.h
  - src/core/resolver/server_address.h
+  - src/core/server/server.h
+  - src/core/server/server_call_tracer_filter.h
+  - src/core/server/server_interface.h
  - src/core/service_config/service_config.h
  - src/core/service_config/service_config_call_data.h
  - src/core/service_config/service_config_impl.h
@ -2805,7 +2805,6 @@ libs:
  - src/core/lib/channel/connected_channel.cc
  - src/core/lib/channel/metrics.cc
  - src/core/lib/channel/promise_based_filter.cc
-  - src/core/lib/channel/server_call_tracer_filter.cc
  - src/core/lib/channel/status_util.cc
  - src/core/lib/compression/compression.cc
  - src/core/lib/compression/compression_internal.cc
@ -3020,7 +3019,6 @@ libs:
  - src/core/lib/surface/lame_client.cc
  - src/core/lib/surface/legacy_channel.cc
  - src/core/lib/surface/metadata_array.cc
-  - src/core/lib/surface/server.cc
  - src/core/lib/surface/validate_metadata.cc
  - src/core/lib/surface/version.cc
  - src/core/lib/surface/wait_for_cq_end_op.cc
@ -3082,6 +3080,8 @@ libs:
  - src/core/resolver/resolver.cc
  - src/core/resolver/resolver_registry.cc
  - src/core/resolver/sockaddr/sockaddr_resolver.cc
+  - src/core/server/server.cc
+  - src/core/server/server_call_tracer_filter.cc
  - src/core/service_config/service_config_channel_arg_filter.cc
  - src/core/service_config/service_config_impl.cc
  - src/core/service_config/service_config_parser.cc
@ -4679,7 +4679,6 @@ libs:
  - src/core/lib/surface/init.h
  - src/core/lib/surface/init_internally.h
  - src/core/lib/surface/lame_client.h
-  - src/core/lib/surface/server_interface.h
  - src/core/lib/surface/validate_metadata.h
  - src/core/lib/surface/wait_for_cq_end_op.h
  - src/core/lib/transport/batch_builder.h
@ -4712,6 +4711,7 @@ libs:
  - src/core/resolver/resolver_factory.h
  - src/core/resolver/resolver_registry.h
  - src/core/resolver/server_address.h
+  - src/core/server/server_interface.h
  - src/core/service_config/service_config.h
  - src/core/service_config/service_config_call_data.h
  - src/core/service_config/service_config_parser.h
@ -11834,7 +11834,6 @@ targets:
  - src/core/lib/surface/init.h
  - src/core/lib/surface/init_internally.h
  - src/core/lib/surface/lame_client.h
-  - src/core/lib/surface/server_interface.h
  - src/core/lib/surface/validate_metadata.h
  - src/core/lib/surface/wait_for_cq_end_op.h
  - src/core/lib/transport/batch_builder.h
@ -11869,6 +11868,7 @@ targets:
  - src/core/resolver/resolver_factory.h
  - src/core/resolver/resolver_registry.h
  - src/core/resolver/server_address.h
+  - src/core/server/server_interface.h
  - src/core/service_config/service_config.h
  - src/core/service_config/service_config_call_data.h
  - src/core/service_config/service_config_parser.h
@ -17938,7 +17938,7 @@ targets:
  language: c++
  headers: []
  src:
-  - test/core/server_config_selector/server_config_selector_test.cc
+  - test/core/server/server_config_selector_test.cc
  deps:
  - gtest
  - grpc_test_util
@ -20950,6 +20950,94 @@ targets:
  - gtest
  - grpc_test_util
  uses_polling: false
+- name: xds_channel_stack_modifier_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/filters/logging/logging_filter.h
+  - src/core/ext/filters/logging/logging_sink.h
+  - src/cpp/client/client_stats_interceptor.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/client/secure_credentials.h
+  - src/cpp/common/secure_auth_context.h
+  - src/cpp/ext/filters/census/client_filter.h
+  - src/cpp/ext/filters/census/context.h
+  - src/cpp/ext/filters/census/grpc_plugin.h
+  - src/cpp/ext/filters/census/measures.h
+  - src/cpp/ext/filters/census/open_census_call_tracer.h
+  - src/cpp/ext/filters/census/rpc_encoding.h
+  - src/cpp/ext/filters/census/server_call_tracer.h
+  - src/cpp/server/backend_metric_recorder.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/secure_server_credentials.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
+  src:
+  - src/core/ext/filters/logging/logging_filter.cc
+  - src/cpp/client/call_credentials.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/channel_credentials.cc
+  - src/cpp/client/client_callback.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/client_stats_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/insecure_credentials.cc
+  - src/cpp/client/secure_credentials.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/secure_auth_context.cc
+  - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
+  - src/cpp/common/tls_certificate_verifier.cc
+  - src/cpp/common/tls_credentials_options.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/ext/filters/census/client_filter.cc
+  - src/cpp/ext/filters/census/context.cc
+  - src/cpp/ext/filters/census/grpc_plugin.cc
+  - src/cpp/ext/filters/census/measures.cc
+  - src/cpp/ext/filters/census/rpc_encoding.cc
+  - src/cpp/ext/filters/census/server_call_tracer.cc
+  - src/cpp/ext/filters/census/views.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/backend_metric_recorder.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/insecure_server_credentials.cc
+  - src/cpp/server/secure_server_credentials.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_callback.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
+  - test/core/server/xds_channel_stack_modifier_test.cc
+  deps:
+  - gtest
+  - absl/base:endian
+  - absl/numeric:int128
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
 - name: xds_client_test
  gtest: true
  build: test
--- a/config.m4
+++ b/config.m4
@ -74,7 +74,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/message_size/message_size_filter.cc \
    src/core/ext/filters/rbac/rbac_filter.cc \
    src/core/ext/filters/rbac/rbac_service_config_parser.cc \
-    src/core/ext/filters/server_config_selector/server_config_selector_filter.cc \
    src/core/ext/filters/stateful_session/stateful_session_filter.cc \
    src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
    src/core/ext/gcp/metadata_query.cc \
@ -437,7 +436,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/xds/xds_bootstrap.cc \
    src/core/ext/xds/xds_bootstrap_grpc.cc \
    src/core/ext/xds/xds_certificate_provider.cc \
-    src/core/ext/xds/xds_channel_stack_modifier.cc \
    src/core/ext/xds/xds_client.cc \
    src/core/ext/xds/xds_client_grpc.cc \
    src/core/ext/xds/xds_client_stats.cc \
@ -454,7 +452,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/xds/xds_listener.cc \
    src/core/ext/xds/xds_route_config.cc \
    src/core/ext/xds/xds_routing.cc \
-    src/core/ext/xds/xds_server_config_fetcher.cc \
    src/core/ext/xds/xds_transport_grpc.cc \
    src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
    src/core/handshaker/handshaker.cc \
@ -480,7 +477,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/metrics.cc \
    src/core/lib/channel/promise_based_filter.cc \
-    src/core/lib/channel/server_call_tracer_filter.cc \
    src/core/lib/channel/status_util.cc \
    src/core/lib/compression/compression.cc \
    src/core/lib/compression/compression_internal.cc \
@ -779,7 +775,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/surface/lame_client.cc \
    src/core/lib/surface/legacy_channel.cc \
    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
    src/core/lib/surface/validate_metadata.cc \
    src/core/lib/surface/version.cc \
    src/core/lib/surface/wait_for_cq_end_op.cc \
@ -851,6 +846,11 @@ if test "$PHP_GRPC" != "no"; then
    src/core/resolver/xds/xds_dependency_manager.cc \
    src/core/resolver/xds/xds_resolver.cc \
    src/core/resolver/xds/xds_resolver_trace.cc \
+    src/core/server/server.cc \
+    src/core/server/server_call_tracer_filter.cc \
+    src/core/server/server_config_selector_filter.cc \
+    src/core/server/xds_channel_stack_modifier.cc \
+    src/core/server/xds_server_config_fetcher.cc \
    src/core/service_config/service_config_channel_arg_filter.cc \
    src/core/service_config/service_config_impl.cc \
    src/core/service_config/service_config_parser.cc \
@ -1397,7 +1397,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/server)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/message_size)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/rbac)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/server_config_selector)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/stateful_session)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/gcp)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/alpn)
@ -1598,6 +1597,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/google_c2p)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/sockaddr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/xds)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/server)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/service_config)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt)
--- a/config.w32
+++ b/config.w32
@ -39,7 +39,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\message_size\\message_size_filter.cc " +
    "src\\core\\ext\\filters\\rbac\\rbac_filter.cc " +
    "src\\core\\ext\\filters\\rbac\\rbac_service_config_parser.cc " +
-    "src\\core\\ext\\filters\\server_config_selector\\server_config_selector_filter.cc " +
    "src\\core\\ext\\filters\\stateful_session\\stateful_session_filter.cc " +
    "src\\core\\ext\\filters\\stateful_session\\stateful_session_service_config_parser.cc " +
    "src\\core\\ext\\gcp\\metadata_query.cc " +
@ -402,7 +401,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\xds\\xds_bootstrap.cc " +
    "src\\core\\ext\\xds\\xds_bootstrap_grpc.cc " +
    "src\\core\\ext\\xds\\xds_certificate_provider.cc " +
-    "src\\core\\ext\\xds\\xds_channel_stack_modifier.cc " +
    "src\\core\\ext\\xds\\xds_client.cc " +
    "src\\core\\ext\\xds\\xds_client_grpc.cc " +
    "src\\core\\ext\\xds\\xds_client_stats.cc " +
@ -419,7 +417,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\xds\\xds_listener.cc " +
    "src\\core\\ext\\xds\\xds_route_config.cc " +
    "src\\core\\ext\\xds\\xds_routing.cc " +
-    "src\\core\\ext\\xds\\xds_server_config_fetcher.cc " +
    "src\\core\\ext\\xds\\xds_transport_grpc.cc " +
    "src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " +
    "src\\core\\handshaker\\handshaker.cc " +
@ -445,7 +442,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\channel\\connected_channel.cc " +
    "src\\core\\lib\\channel\\metrics.cc " +
    "src\\core\\lib\\channel\\promise_based_filter.cc " +
-    "src\\core\\lib\\channel\\server_call_tracer_filter.cc " +
    "src\\core\\lib\\channel\\status_util.cc " +
    "src\\core\\lib\\compression\\compression.cc " +
    "src\\core\\lib\\compression\\compression_internal.cc " +
@ -744,7 +740,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\surface\\lame_client.cc " +
    "src\\core\\lib\\surface\\legacy_channel.cc " +
    "src\\core\\lib\\surface\\metadata_array.cc " +
-    "src\\core\\lib\\surface\\server.cc " +
    "src\\core\\lib\\surface\\validate_metadata.cc " +
    "src\\core\\lib\\surface\\version.cc " +
    "src\\core\\lib\\surface\\wait_for_cq_end_op.cc " +
@ -816,6 +811,11 @@ if (PHP_GRPC != "no") {
    "src\\core\\resolver\\xds\\xds_dependency_manager.cc " +
    "src\\core\\resolver\\xds\\xds_resolver.cc " +
    "src\\core\\resolver\\xds\\xds_resolver_trace.cc " +
+    "src\\core\\server\\server.cc " +
+    "src\\core\\server\\server_call_tracer_filter.cc " +
+    "src\\core\\server\\server_config_selector_filter.cc " +
+    "src\\core\\server\\xds_channel_stack_modifier.cc " +
+    "src\\core\\server\\xds_server_config_fetcher.cc " +
    "src\\core\\service_config\\service_config_channel_arg_filter.cc " +
    "src\\core\\service_config\\service_config_impl.cc " +
    "src\\core\\service_config\\service_config_parser.cc " +
@ -1391,7 +1391,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http\\server");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\message_size");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\rbac");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\server_config_selector");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\stateful_session");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\gcp");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport");
@ -1736,6 +1735,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\google_c2p");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\sockaddr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\xds");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\server");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\service_config");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts");
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -295,8 +295,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/message_size/message_size_filter.h',
                      'src/core/ext/filters/rbac/rbac_filter.h',
                      'src/core/ext/filters/rbac/rbac_service_config_parser.h',
-                      'src/core/ext/filters/server_config_selector/server_config_selector.h',
-                      'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
                      'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                      'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
                      'src/core/ext/gcp/metadata_query.h',
@ -864,7 +862,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/xds/xds_bootstrap_grpc.h',
                      'src/core/ext/xds/xds_certificate_provider.h',
                      'src/core/ext/xds/xds_channel_args.h',
-                      'src/core/ext/xds/xds_channel_stack_modifier.h',
                      'src/core/ext/xds/xds_client.h',
                      'src/core/ext/xds/xds_client_grpc.h',
                      'src/core/ext/xds/xds_client_stats.h',
@ -917,7 +914,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/channel/context.h',
                      'src/core/lib/channel/metrics.h',
                      'src/core/lib/channel/promise_based_filter.h',
-                      'src/core/lib/channel/server_call_tracer_filter.h',
                      'src/core/lib/channel/status_util.h',
                      'src/core/lib/channel/tcp_tracer.h',
                      'src/core/lib/compression/compression_internal.h',
@ -1241,8 +1237,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/surface/init_internally.h',
                      'src/core/lib/surface/lame_client.h',
                      'src/core/lib/surface/legacy_channel.h',
-                      'src/core/lib/surface/server.h',
-                      'src/core/lib/surface/server_interface.h',
                      'src/core/lib/surface/validate_metadata.h',
                      'src/core/lib/surface/wait_for_cq_end_op.h',
                      'src/core/lib/transport/batch_builder.h',
@ -1311,6 +1305,12 @@ Pod::Spec.new do |s|
                      'src/core/resolver/xds/xds_dependency_manager.h',
                      'src/core/resolver/xds/xds_resolver_attributes.h',
                      'src/core/resolver/xds/xds_resolver_trace.h',
+                      'src/core/server/server.h',
+                      'src/core/server/server_call_tracer_filter.h',
+                      'src/core/server/server_config_selector.h',
+                      'src/core/server/server_config_selector_filter.h',
+                      'src/core/server/server_interface.h',
+                      'src/core/server/xds_channel_stack_modifier.h',
                      'src/core/service_config/service_config.h',
                      'src/core/service_config/service_config_call_data.h',
                      'src/core/service_config/service_config_impl.h',
@ -1583,8 +1583,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/message_size/message_size_filter.h',
                              'src/core/ext/filters/rbac/rbac_filter.h',
                              'src/core/ext/filters/rbac/rbac_service_config_parser.h',
-                              'src/core/ext/filters/server_config_selector/server_config_selector.h',
-                              'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
                              'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                              'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
                              'src/core/ext/gcp/metadata_query.h',
@ -2134,7 +2132,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/xds/xds_bootstrap_grpc.h',
                              'src/core/ext/xds/xds_certificate_provider.h',
                              'src/core/ext/xds/xds_channel_args.h',
-                              'src/core/ext/xds/xds_channel_stack_modifier.h',
                              'src/core/ext/xds/xds_client.h',
                              'src/core/ext/xds/xds_client_grpc.h',
                              'src/core/ext/xds/xds_client_stats.h',
@ -2187,7 +2184,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/channel/context.h',
                              'src/core/lib/channel/metrics.h',
                              'src/core/lib/channel/promise_based_filter.h',
-                              'src/core/lib/channel/server_call_tracer_filter.h',
                              'src/core/lib/channel/status_util.h',
                              'src/core/lib/channel/tcp_tracer.h',
                              'src/core/lib/compression/compression_internal.h',
@ -2511,8 +2507,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/surface/init_internally.h',
                              'src/core/lib/surface/lame_client.h',
                              'src/core/lib/surface/legacy_channel.h',
-                              'src/core/lib/surface/server.h',
-                              'src/core/lib/surface/server_interface.h',
                              'src/core/lib/surface/validate_metadata.h',
                              'src/core/lib/surface/wait_for_cq_end_op.h',
                              'src/core/lib/transport/batch_builder.h',
@ -2581,6 +2575,12 @@ Pod::Spec.new do |s|
                              'src/core/resolver/xds/xds_dependency_manager.h',
                              'src/core/resolver/xds/xds_resolver_attributes.h',
                              'src/core/resolver/xds/xds_resolver_trace.h',
+                              'src/core/server/server.h',
+                              'src/core/server/server_call_tracer_filter.h',
+                              'src/core/server/server_config_selector.h',
+                              'src/core/server/server_config_selector_filter.h',
+                              'src/core/server/server_interface.h',
+                              'src/core/server/xds_channel_stack_modifier.h',
                              'src/core/service_config/service_config.h',
                              'src/core/service_config/service_config_call_data.h',
                              'src/core/service_config/service_config_impl.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -301,9 +301,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/rbac/rbac_filter.h',
                      'src/core/ext/filters/rbac/rbac_service_config_parser.cc',
                      'src/core/ext/filters/rbac/rbac_service_config_parser.h',
-                      'src/core/ext/filters/server_config_selector/server_config_selector.h',
-                      'src/core/ext/filters/server_config_selector/server_config_selector_filter.cc',
-                      'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
                      'src/core/ext/filters/stateful_session/stateful_session_filter.cc',
                      'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                      'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc',
@ -1195,8 +1192,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/xds/xds_certificate_provider.cc',
                      'src/core/ext/xds/xds_certificate_provider.h',
                      'src/core/ext/xds/xds_channel_args.h',
-                      'src/core/ext/xds/xds_channel_stack_modifier.cc',
-                      'src/core/ext/xds/xds_channel_stack_modifier.h',
                      'src/core/ext/xds/xds_client.cc',
                      'src/core/ext/xds/xds_client.h',
                      'src/core/ext/xds/xds_client_grpc.cc',
@ -1232,7 +1227,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/xds/xds_route_config.h',
                      'src/core/ext/xds/xds_routing.cc',
                      'src/core/ext/xds/xds_routing.h',
-                      'src/core/ext/xds/xds_server_config_fetcher.cc',
                      'src/core/ext/xds/xds_transport.h',
                      'src/core/ext/xds/xds_transport_grpc.cc',
                      'src/core/ext/xds/xds_transport_grpc.h',
@ -1290,8 +1284,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/channel/metrics.h',
                      'src/core/lib/channel/promise_based_filter.cc',
                      'src/core/lib/channel/promise_based_filter.h',
-                      'src/core/lib/channel/server_call_tracer_filter.cc',
-                      'src/core/lib/channel/server_call_tracer_filter.h',
                      'src/core/lib/channel/status_util.cc',
                      'src/core/lib/channel/status_util.h',
                      'src/core/lib/channel/tcp_tracer.h',
@ -1913,9 +1905,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/surface/legacy_channel.cc',
                      'src/core/lib/surface/legacy_channel.h',
                      'src/core/lib/surface/metadata_array.cc',
-                      'src/core/lib/surface/server.cc',
-                      'src/core/lib/surface/server.h',
-                      'src/core/lib/surface/server_interface.h',
                      'src/core/lib/surface/validate_metadata.cc',
                      'src/core/lib/surface/validate_metadata.h',
                      'src/core/lib/surface/version.cc',
@ -2055,6 +2044,17 @@ Pod::Spec.new do |s|
                      'src/core/resolver/xds/xds_resolver_attributes.h',
                      'src/core/resolver/xds/xds_resolver_trace.cc',
                      'src/core/resolver/xds/xds_resolver_trace.h',
+                      'src/core/server/server.cc',
+                      'src/core/server/server.h',
+                      'src/core/server/server_call_tracer_filter.cc',
+                      'src/core/server/server_call_tracer_filter.h',
+                      'src/core/server/server_config_selector.h',
+                      'src/core/server/server_config_selector_filter.cc',
+                      'src/core/server/server_config_selector_filter.h',
+                      'src/core/server/server_interface.h',
+                      'src/core/server/xds_channel_stack_modifier.cc',
+                      'src/core/server/xds_channel_stack_modifier.h',
+                      'src/core/server/xds_server_config_fetcher.cc',
                      'src/core/service_config/service_config.h',
                      'src/core/service_config/service_config_call_data.h',
                      'src/core/service_config/service_config_channel_arg_filter.cc',
@ -2382,8 +2382,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/message_size/message_size_filter.h',
                              'src/core/ext/filters/rbac/rbac_filter.h',
                              'src/core/ext/filters/rbac/rbac_service_config_parser.h',
-                              'src/core/ext/filters/server_config_selector/server_config_selector.h',
-                              'src/core/ext/filters/server_config_selector/server_config_selector_filter.h',
                              'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                              'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
                              'src/core/ext/gcp/metadata_query.h',
@ -2913,7 +2911,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/xds/xds_bootstrap_grpc.h',
                              'src/core/ext/xds/xds_certificate_provider.h',
                              'src/core/ext/xds/xds_channel_args.h',
-                              'src/core/ext/xds/xds_channel_stack_modifier.h',
                              'src/core/ext/xds/xds_client.h',
                              'src/core/ext/xds/xds_client_grpc.h',
                              'src/core/ext/xds/xds_client_stats.h',
@ -2965,7 +2962,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/channel/context.h',
                              'src/core/lib/channel/metrics.h',
                              'src/core/lib/channel/promise_based_filter.h',
-                              'src/core/lib/channel/server_call_tracer_filter.h',
                              'src/core/lib/channel/status_util.h',
                              'src/core/lib/channel/tcp_tracer.h',
                              'src/core/lib/compression/compression_internal.h',
@ -3289,8 +3285,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/surface/init_internally.h',
                              'src/core/lib/surface/lame_client.h',
                              'src/core/lib/surface/legacy_channel.h',
-                              'src/core/lib/surface/server.h',
-                              'src/core/lib/surface/server_interface.h',
                              'src/core/lib/surface/validate_metadata.h',
                              'src/core/lib/surface/wait_for_cq_end_op.h',
                              'src/core/lib/transport/batch_builder.h',
@ -3359,6 +3353,12 @@ Pod::Spec.new do |s|
                              'src/core/resolver/xds/xds_dependency_manager.h',
                              'src/core/resolver/xds/xds_resolver_attributes.h',
                              'src/core/resolver/xds/xds_resolver_trace.h',
+                              'src/core/server/server.h',
+                              'src/core/server/server_call_tracer_filter.h',
+                              'src/core/server/server_config_selector.h',
+                              'src/core/server/server_config_selector_filter.h',
+                              'src/core/server/server_interface.h',
+                              'src/core/server/xds_channel_stack_modifier.h',
                              'src/core/service_config/service_config.h',
                              'src/core/service_config/service_config_call_data.h',
                              'src/core/service_config/service_config_impl.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -190,9 +190,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/rbac/rbac_filter.h )
  s.files += %w( src/core/ext/filters/rbac/rbac_service_config_parser.cc )
  s.files += %w( src/core/ext/filters/rbac/rbac_service_config_parser.h )
-  s.files += %w( src/core/ext/filters/server_config_selector/server_config_selector.h )
-  s.files += %w( src/core/ext/filters/server_config_selector/server_config_selector_filter.cc )
-  s.files += %w( src/core/ext/filters/server_config_selector/server_config_selector_filter.h )
  s.files += %w( src/core/ext/filters/stateful_session/stateful_session_filter.cc )
  s.files += %w( src/core/ext/filters/stateful_session/stateful_session_filter.h )
  s.files += %w( src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc )
@ -1084,8 +1081,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/xds/xds_certificate_provider.cc )
  s.files += %w( src/core/ext/xds/xds_certificate_provider.h )
  s.files += %w( src/core/ext/xds/xds_channel_args.h )
-  s.files += %w( src/core/ext/xds/xds_channel_stack_modifier.cc )
-  s.files += %w( src/core/ext/xds/xds_channel_stack_modifier.h )
  s.files += %w( src/core/ext/xds/xds_client.cc )
  s.files += %w( src/core/ext/xds/xds_client.h )
  s.files += %w( src/core/ext/xds/xds_client_grpc.cc )
@ -1121,7 +1116,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/xds/xds_route_config.h )
  s.files += %w( src/core/ext/xds/xds_routing.cc )
  s.files += %w( src/core/ext/xds/xds_routing.h )
-  s.files += %w( src/core/ext/xds/xds_server_config_fetcher.cc )
  s.files += %w( src/core/ext/xds/xds_transport.h )
  s.files += %w( src/core/ext/xds/xds_transport_grpc.cc )
  s.files += %w( src/core/ext/xds/xds_transport_grpc.h )
@ -1179,8 +1173,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/channel/metrics.h )
  s.files += %w( src/core/lib/channel/promise_based_filter.cc )
  s.files += %w( src/core/lib/channel/promise_based_filter.h )
-  s.files += %w( src/core/lib/channel/server_call_tracer_filter.cc )
-  s.files += %w( src/core/lib/channel/server_call_tracer_filter.h )
  s.files += %w( src/core/lib/channel/status_util.cc )
  s.files += %w( src/core/lib/channel/status_util.h )
  s.files += %w( src/core/lib/channel/tcp_tracer.h )
@ -1802,9 +1794,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/surface/legacy_channel.cc )
  s.files += %w( src/core/lib/surface/legacy_channel.h )
  s.files += %w( src/core/lib/surface/metadata_array.cc )
-  s.files += %w( src/core/lib/surface/server.cc )
-  s.files += %w( src/core/lib/surface/server.h )
-  s.files += %w( src/core/lib/surface/server_interface.h )
  s.files += %w( src/core/lib/surface/validate_metadata.cc )
  s.files += %w( src/core/lib/surface/validate_metadata.h )
  s.files += %w( src/core/lib/surface/version.cc )
@ -1944,6 +1933,17 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/resolver/xds/xds_resolver_attributes.h )
  s.files += %w( src/core/resolver/xds/xds_resolver_trace.cc )
  s.files += %w( src/core/resolver/xds/xds_resolver_trace.h )
+  s.files += %w( src/core/server/server.cc )
+  s.files += %w( src/core/server/server.h )
+  s.files += %w( src/core/server/server_call_tracer_filter.cc )
+  s.files += %w( src/core/server/server_call_tracer_filter.h )
+  s.files += %w( src/core/server/server_config_selector.h )
+  s.files += %w( src/core/server/server_config_selector_filter.cc )
+  s.files += %w( src/core/server/server_config_selector_filter.h )
+  s.files += %w( src/core/server/server_interface.h )
+  s.files += %w( src/core/server/xds_channel_stack_modifier.cc )
+  s.files += %w( src/core/server/xds_channel_stack_modifier.h )
+  s.files += %w( src/core/server/xds_server_config_fetcher.cc )
  s.files += %w( src/core/service_config/service_config.h )
  s.files += %w( src/core/service_config/service_config_call_data.h )
  s.files += %w( src/core/service_config/service_config_channel_arg_filter.cc )
--- a/package.xml
+++ b/package.xml
@ -172,9 +172,6 @@
    <file baseinstalldir="/" name="src/core/ext/filters/rbac/rbac_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/rbac/rbac_service_config_parser.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/rbac/rbac_service_config_parser.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/server_config_selector/server_config_selector.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/server_config_selector/server_config_selector_filter.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/server_config_selector/server_config_selector_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/stateful_session/stateful_session_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/stateful_session/stateful_session_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc" role="src" />
@ -1066,8 +1063,6 @@
    <file baseinstalldir="/" name="src/core/ext/xds/xds_certificate_provider.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_certificate_provider.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_channel_args.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/xds/xds_channel_stack_modifier.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/xds/xds_channel_stack_modifier.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_client.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_client.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_client_grpc.cc" role="src" />
@ -1103,7 +1098,6 @@
    <file baseinstalldir="/" name="src/core/ext/xds/xds_route_config.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_routing.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_routing.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/xds/xds_server_config_fetcher.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_transport.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_transport_grpc.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/xds_transport_grpc.h" role="src" />
@ -1161,8 +1155,6 @@
    <file baseinstalldir="/" name="src/core/lib/channel/metrics.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/promise_based_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/promise_based_filter.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/server_call_tracer_filter.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/server_call_tracer_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/status_util.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/status_util.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/tcp_tracer.h" role="src" />
@ -1784,9 +1776,6 @@
    <file baseinstalldir="/" name="src/core/lib/surface/legacy_channel.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/legacy_channel.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/metadata_array.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/surface/server.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/surface/server.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/surface/server_interface.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/validate_metadata.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/validate_metadata.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/version.cc" role="src" />
@ -1926,6 +1915,17 @@
    <file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver_attributes.h" role="src" />
    <file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver_trace.cc" role="src" />
    <file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver_trace.h" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server.h" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server_call_tracer_filter.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server_call_tracer_filter.h" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server_config_selector.h" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server_config_selector_filter.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server_config_selector_filter.h" role="src" />
+    <file baseinstalldir="/" name="src/core/server/server_interface.h" role="src" />
+    <file baseinstalldir="/" name="src/core/server/xds_channel_stack_modifier.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/server/xds_channel_stack_modifier.h" role="src" />
+    <file baseinstalldir="/" name="src/core/server/xds_server_config_fetcher.cc" role="src" />
    <file baseinstalldir="/" name="src/core/service_config/service_config.h" role="src" />
    <file baseinstalldir="/" name="src/core/service_config/service_config_call_data.h" role="src" />
    <file baseinstalldir="/" name="src/core/service_config/service_config_channel_arg_filter.cc" role="src" />
--- a/src/core/BUILD
+++ b/src/core/BUILD
@ -119,10 +119,10 @@ grpc_cc_library(
 grpc_cc_library(
    name = "server_call_tracer_filter",
    srcs = [
-        "lib/channel/server_call_tracer_filter.cc",
+        "server/server_call_tracer_filter.cc",
    ],
    hdrs = [
-        "lib/channel/server_call_tracer_filter.h",
+        "server/server_call_tracer_filter.h",
    ],
    external_deps = [
        "absl/status",
@ -3066,7 +3066,7 @@ grpc_cc_library(
 grpc_cc_library(
    name = "server_interface",
    hdrs = [
-        "lib/surface/server_interface.h",
+        "server/server_interface.h",
    ],
    language = "c++",
    deps = [
@ -3617,7 +3617,7 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_server_config_selector",
    hdrs = [
-        "ext/filters/server_config_selector/server_config_selector.h",
+        "server/server_config_selector.h",
    ],
    external_deps = [
        "absl/status:statusor",
@ -3640,10 +3640,10 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_server_config_selector_filter",
    srcs = [
-        "ext/filters/server_config_selector/server_config_selector_filter.cc",
+        "server/server_config_selector_filter.cc",
    ],
    hdrs = [
-        "ext/filters/server_config_selector/server_config_selector_filter.h",
+        "server/server_config_selector_filter.h",
    ],
    external_deps = [
        "absl/base:core_headers",
@ -5199,10 +5199,10 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_xds_channel_stack_modifier",
    srcs = [
-        "ext/xds/xds_channel_stack_modifier.cc",
+        "server/xds_channel_stack_modifier.cc",
    ],
    hdrs = [
-        "ext/xds/xds_channel_stack_modifier.h",
+        "server/xds_channel_stack_modifier.h",
    ],
    external_deps = ["absl/strings"],
    language = "c++",
@ -5224,7 +5224,7 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_xds_server_config_fetcher",
    srcs = [
-        "ext/xds/xds_server_config_fetcher.cc",
+        "server/xds_server_config_fetcher.cc",
    ],
    external_deps = [
        "absl/base:core_headers",
--- a/src/core/ext/transport/binder/server/binder_server.cc
+++ b/src/core/ext/transport/binder/server/binder_server.cc
@ -30,8 +30,8 @@
 #include "src/core/ext/transport/binder/utils/ndk_binder.h"
 #include "src/core/ext/transport/binder/wire_format/binder_android.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/server/server.h"

 #ifdef GPR_SUPPORT_BINDER_TRANSPORT

--- a/src/core/ext/transport/binder/server/binder_server.h
+++ b/src/core/ext/transport/binder/server/binder_server.h
@ -26,8 +26,8 @@
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/server/server.h"

 // TODO(waynetu): This is part of the public API and should be moved to the
 // include/ folder.
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
@ -62,11 +62,11 @@
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/promise_endpoint.h"
+#include "src/core/server/server.h"

 namespace grpc_core {
 namespace chaotic_good {
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
@ -44,8 +44,8 @@
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/slice/slice.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/promise_endpoint.h"
+#include "src/core/server/server.h"

 namespace grpc_core {
 namespace chaotic_good {
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@ -80,10 +80,10 @@
 #include "src/core/lib/security/credentials/insecure/insecure_credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/surface/api_trace.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/server/server.h"

 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
 #include "src/core/lib/iomgr/ev_posix.h"
--- a/src/core/ext/transport/chttp2/server/chttp2_server.h
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.h
@ -25,7 +25,7 @@

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"

 namespace grpc_core {

--- a/src/core/ext/transport/inproc/inproc_transport.cc
+++ b/src/core/ext/transport/inproc/inproc_transport.cc
@ -27,8 +27,8 @@
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/surface/channel_create.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server.h"

 namespace grpc_core {

--- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc
+++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc
@ -62,10 +62,10 @@
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_create.h"
 #include "src/core/lib/surface/channel_stack_type.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server.h"

 #define INPROC_LOG(...)                               \
  do {                                                \
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@ -98,13 +98,13 @@
 #include "src/core/lib/surface/call_test_only.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server_interface.h"
 #include "src/core/lib/surface/validate_metadata.h"
 #include "src/core/lib/surface/wait_for_cq_end_op.h"
 #include "src/core/lib/transport/batch_builder.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server_interface.h"

 grpc_core::TraceFlag grpc_call_error_trace(false, "call_error");
 grpc_core::TraceFlag grpc_compression_trace(false, "compression");
--- a/src/core/lib/surface/call.h
+++ b/src/core/lib/surface/call.h
@ -49,8 +49,8 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/server_interface.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server_interface.h"

 typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success,
                                           void* user_data);
--- a/src/core/plugin_registry/grpc_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_plugin_registry.cc
@ -22,11 +22,11 @@
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
-#include "src/core/lib/channel/server_call_tracer_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/lame_client.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
+#include "src/core/server/server_call_tracer_filter.h"

 namespace grpc_event_engine {
 namespace experimental {
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@ -14,7 +14,7 @@
 // limitations under the License.
 //

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"

 #include <inttypes.h>
 #include <stdlib.h>
--- a/src/core/lib/surface/server.h
+++ b/src/core/lib/surface/server.h
@ -14,8 +14,8 @@
 // limitations under the License.
 //

-#ifndef GRPC_SRC_CORE_LIB_SURFACE_SERVER_H
-#define GRPC_SRC_CORE_LIB_SURFACE_SERVER_H
+#ifndef GRPC_SRC_CORE_SERVER_SERVER_H
+#define GRPC_SRC_CORE_SERVER_SERVER_H

 #include <stddef.h>
 #include <stdint.h>
@ -65,9 +65,9 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server_interface.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server_interface.h"

 #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS "grpc.server.max_pending_requests"
 #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS_HARD_LIMIT \
@ -551,4 +551,4 @@ inline void Server::set_config_fetcher(

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_LIB_SURFACE_SERVER_H
+#endif  // GRPC_SRC_CORE_SERVER_SERVER_H
--- a/src/core/lib/channel/server_call_tracer_filter.cc
+++ b/src/core/lib/channel/server_call_tracer_filter.cc
@ -14,7 +14,7 @@
 // limitations under the License.
 //

-#include "src/core/lib/channel/server_call_tracer_filter.h"
+#include "src/core/server/server_call_tracer_filter.h"

 #include <functional>
 #include <memory>
--- a/src/core/lib/channel/server_call_tracer_filter.h
+++ b/src/core/lib/channel/server_call_tracer_filter.h
@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#ifndef GRPC_SRC_CORE_LIB_CHANNEL_SERVER_CALL_TRACER_FILTER_H
-#define GRPC_SRC_CORE_LIB_CHANNEL_SERVER_CALL_TRACER_FILTER_H
+#ifndef GRPC_SRC_CORE_SERVER_SERVER_CALL_TRACER_FILTER_H
+#define GRPC_SRC_CORE_SERVER_SERVER_CALL_TRACER_FILTER_H

 #include <grpc/support/port_platform.h>

@ -25,4 +25,4 @@ void RegisterServerCallTracerFilter(CoreConfiguration::Builder* builder);

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_LIB_CHANNEL_SERVER_CALL_TRACER_FILTER_H
+#endif  // GRPC_SRC_CORE_SERVER_SERVER_CALL_TRACER_FILTER_H
--- a/src/core/ext/filters/server_config_selector/server_config_selector.h
+++ b/src/core/ext/filters/server_config_selector/server_config_selector.h
@ -14,16 +14,16 @@
 // limitations under the License.
 //

-#ifndef GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
-#define GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H
+#define GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H

 #include <memory>

 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/dual_ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted.h"
@ -80,4 +80,4 @@ class ServerConfigSelectorProvider

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
+#endif  // GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H
--- a/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
+++ b/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/filters/server_config_selector/server_config_selector_filter.h"
+#include "src/core/server/server_config_selector_filter.h"

 #include <functional>
 #include <memory>
@ -26,8 +24,8 @@
 #include "absl/types/optional.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/server_config_selector/server_config_selector.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/channel/promise_based_filter.h"
@ -41,6 +39,7 @@
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server_config_selector.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_call_data.h"

--- a/src/core/ext/filters/server_config_selector/server_config_selector_filter.h
+++ b/src/core/ext/filters/server_config_selector/server_config_selector_filter.h
@ -16,8 +16,8 @@
 //
 //

-#ifndef GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
+#ifndef GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_FILTER_H
+#define GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_FILTER_H

 #include <grpc/support/port_platform.h>

@ -30,4 +30,4 @@ extern const grpc_channel_filter kServerConfigSelectorFilter;

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
+#endif  // GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_FILTER_H
--- a/src/core/lib/surface/server_interface.h
+++ b/src/core/lib/surface/server_interface.h
@ -14,8 +14,8 @@
 // limitations under the License.
 //

-#ifndef GRPC_SRC_CORE_LIB_SURFACE_SERVER_INTERFACE_H
-#define GRPC_SRC_CORE_LIB_SURFACE_SERVER_INTERFACE_H
+#ifndef GRPC_SRC_CORE_SERVER_SERVER_INTERFACE_H
+#define GRPC_SRC_CORE_SERVER_SERVER_INTERFACE_H

 #include <grpc/support/port_platform.h>

@ -40,4 +40,4 @@ class ServerInterface {

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_LIB_SURFACE_SERVER_INTERFACE_H
+#endif  // GRPC_SRC_CORE_SERVER_SERVER_INTERFACE_H
--- a/src/core/ext/xds/xds_channel_stack_modifier.cc
+++ b/src/core/ext/xds/xds_channel_stack_modifier.cc
@ -16,7 +16,7 @@
 //
 //

-#include "src/core/ext/xds/xds_channel_stack_modifier.h"
+#include "src/core/server/xds_channel_stack_modifier.h"

 #include <algorithm>
 #include <initializer_list>
--- a/src/core/ext/xds/xds_channel_stack_modifier.h
+++ b/src/core/ext/xds/xds_channel_stack_modifier.h
@ -16,8 +16,8 @@
 //
 //

-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H
+#ifndef GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H
+#define GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H

 #include <utility>
 #include <vector>
@ -60,4 +60,4 @@ class XdsChannelStackModifier final

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H
+#endif  // GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H
--- a/src/core/ext/xds/xds_server_config_fetcher.cc
+++ b/src/core/ext/xds/xds_server_config_fetcher.cc
@ -47,12 +47,9 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/server_config_selector/server_config_selector.h"
-#include "src/core/ext/filters/server_config_selector/server_config_selector_filter.h"
 #include "src/core/ext/xds/certificate_provider_store.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/ext/xds/xds_certificate_provider.h"
-#include "src/core/ext/xds/xds_channel_stack_modifier.h"
 #include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/ext/xds/xds_common_types.h"
@ -84,9 +81,12 @@
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/lib/security/credentials/xds/xds_credentials.h"
 #include "src/core/lib/surface/api_trace.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/server/server.h"
+#include "src/core/server/server_config_selector.h"
+#include "src/core/server/server_config_selector_filter.h"
+#include "src/core/server/xds_channel_stack_modifier.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"

--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@ -73,7 +73,7 @@
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/resource_quota/api.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "src/cpp/client/create_channel_internal.h"
 #include "src/cpp/server/external_connection_acceptor_impl.h"
 #include "src/cpp/server/health/default_health_check_service.h"
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -48,7 +48,6 @@ CORE_SOURCE_FILES = [
    'src/core/ext/filters/message_size/message_size_filter.cc',
    'src/core/ext/filters/rbac/rbac_filter.cc',
    'src/core/ext/filters/rbac/rbac_service_config_parser.cc',
-    'src/core/ext/filters/server_config_selector/server_config_selector_filter.cc',
    'src/core/ext/filters/stateful_session/stateful_session_filter.cc',
    'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc',
    'src/core/ext/gcp/metadata_query.cc',
@ -411,7 +410,6 @@ CORE_SOURCE_FILES = [
    'src/core/ext/xds/xds_bootstrap.cc',
    'src/core/ext/xds/xds_bootstrap_grpc.cc',
    'src/core/ext/xds/xds_certificate_provider.cc',
-    'src/core/ext/xds/xds_channel_stack_modifier.cc',
    'src/core/ext/xds/xds_client.cc',
    'src/core/ext/xds/xds_client_grpc.cc',
    'src/core/ext/xds/xds_client_stats.cc',
@ -428,7 +426,6 @@ CORE_SOURCE_FILES = [
    'src/core/ext/xds/xds_listener.cc',
    'src/core/ext/xds/xds_route_config.cc',
    'src/core/ext/xds/xds_routing.cc',
-    'src/core/ext/xds/xds_server_config_fetcher.cc',
    'src/core/ext/xds/xds_transport_grpc.cc',
    'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc',
    'src/core/handshaker/handshaker.cc',
@ -454,7 +451,6 @@ CORE_SOURCE_FILES = [
    'src/core/lib/channel/connected_channel.cc',
    'src/core/lib/channel/metrics.cc',
    'src/core/lib/channel/promise_based_filter.cc',
-    'src/core/lib/channel/server_call_tracer_filter.cc',
    'src/core/lib/channel/status_util.cc',
    'src/core/lib/compression/compression.cc',
    'src/core/lib/compression/compression_internal.cc',
@ -753,7 +749,6 @@ CORE_SOURCE_FILES = [
    'src/core/lib/surface/lame_client.cc',
    'src/core/lib/surface/legacy_channel.cc',
    'src/core/lib/surface/metadata_array.cc',
-    'src/core/lib/surface/server.cc',
    'src/core/lib/surface/validate_metadata.cc',
    'src/core/lib/surface/version.cc',
    'src/core/lib/surface/wait_for_cq_end_op.cc',
@ -825,6 +820,11 @@ CORE_SOURCE_FILES = [
    'src/core/resolver/xds/xds_dependency_manager.cc',
    'src/core/resolver/xds/xds_resolver.cc',
    'src/core/resolver/xds/xds_resolver_trace.cc',
+    'src/core/server/server.cc',
+    'src/core/server/server_call_tracer_filter.cc',
+    'src/core/server/server_config_selector_filter.cc',
+    'src/core/server/xds_channel_stack_modifier.cc',
+    'src/core/server/xds_server_config_fetcher.cc',
    'src/core/service_config/service_config_channel_arg_filter.cc',
    'src/core/service_config/service_config_impl.cc',
    'src/core/service_config/service_config_parser.cc',
--- a/test/core/bad_client/bad_client.cc
+++ b/test/core/bad_client/bad_client.cc
@ -43,8 +43,8 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_client/tests/bad_streaming_id.cc
+++ b/test/core/bad_client/tests/bad_streaming_id.cc
@ -25,7 +25,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_client/tests/badreq.cc
+++ b/test/core/bad_client/tests/badreq.cc
@ -21,7 +21,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_client/tests/connection_prefix.cc
+++ b/test/core/bad_client/tests/connection_prefix.cc
@ -21,7 +21,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_client/tests/headers.cc
+++ b/test/core/bad_client/tests/headers.cc
@ -20,7 +20,7 @@

 #include <grpc/grpc.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_client/tests/initial_settings_frame.cc
+++ b/test/core/bad_client/tests/initial_settings_frame.cc
@ -23,7 +23,7 @@
 #include <grpc/slice.h>

 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/test_config.h"
--- a/test/core/bad_client/tests/out_of_bounds.cc
+++ b/test/core/bad_client/tests/out_of_bounds.cc
@ -25,7 +25,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_client/tests/server_registered_method.cc
+++ b/test/core/bad_client/tests/server_registered_method.cc
@ -23,7 +23,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/test_config.h"
--- a/test/core/bad_client/tests/simple_request.cc
+++ b/test/core/bad_client/tests/simple_request.cc
@ -18,7 +18,7 @@
 #include <grpc/slice.h>
 #include <grpc/support/log.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/test_config.h"
--- a/test/core/bad_client/tests/unknown_frame.cc
+++ b/test/core/bad_client/tests/unknown_frame.cc
@ -25,7 +25,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_client/tests/window_overflow.cc
+++ b/test/core/bad_client/tests/window_overflow.cc
@ -23,7 +23,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>

-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/bad_connection/close_fd_test.cc
+++ b/test/core/bad_connection/close_fd_test.cc
@ -60,7 +60,7 @@
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/test_util/test_config.h"

 static void* tag(intptr_t t) { return reinterpret_cast<void*>(t); }
--- a/test/core/channelz/channelz_test.cc
+++ b/test/core/channelz/channelz_test.cc
@ -48,7 +48,7 @@
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/event_engine/event_engine_test_utils.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/util/channel_trace_proto_helper.h"
--- a/test/core/end2end/fixtures/sockpair_fixture.h
+++ b/test/core/end2end/fixtures/sockpair_fixture.h
@ -42,8 +42,8 @@
 #include "src/core/lib/surface/channel_create.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/server/server.h"
 #include "test/core/end2end/end2end_tests.h"

 namespace grpc_core {
--- a/test/core/end2end/tests/channelz.cc
+++ b/test/core/end2end/tests/channelz.cc
@ -29,7 +29,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/end2end/end2end_tests.h"

 using testing::HasSubstr;
--- a/test/core/server_config_selector/BUILD
+++ b/test/core/server_config_selector/BUILD
@ -16,7 +16,7 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package")

 licenses(["notice"])

-grpc_package(name = "test/core/server_config_selector")
+grpc_package(name = "test/core/server")

 grpc_cc_test(
    name = "server_config_selector_test",
@ -35,3 +35,22 @@ grpc_cc_test(
        "//test/core/test_util:grpc_test_util",
    ],
 )
+
+grpc_cc_test(
+    name = "xds_channel_stack_modifier_test",
+    srcs = ["xds_channel_stack_modifier_test.cc"],
+    external_deps = ["gtest"],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:gpr",
+        "//:grpc",
+        "//:grpc_base",
+        "//:grpc_opencensus_plugin",
+        "//src/core:channel_args",
+        "//src/core:grpc_xds_channel_stack_modifier",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
--- a/test/core/server_config_selector/server_config_selector_test.cc
+++ b/test/core/server_config_selector/server_config_selector_test.cc
@ -16,7 +16,7 @@
 //
 //

-#include "src/core/ext/filters/server_config_selector/server_config_selector.h"
+#include "src/core/server/server_config_selector.h"

 #include "absl/status/status.h"
 #include "gtest/gtest.h"
--- a/test/core/server/xds_channel_stack_modifier_test.cc
+++ b/test/core/server/xds_channel_stack_modifier_test.cc
@ -16,7 +16,7 @@
 //
 //

-#include "src/core/ext/xds/xds_channel_stack_modifier.h"
+#include "src/core/server/xds_channel_stack_modifier.h"

 #include <algorithm>
 #include <string>
--- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
+++ b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
@ -20,7 +20,7 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "src/libfuzzer/libfuzzer_macro.h"
 #include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h"
 #include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h"
--- a/test/core/transport/binder/end2end/testing_channel_create.h
+++ b/test/core/transport/binder/end2end/testing_channel_create.h
@ -20,7 +20,7 @@
 #include <grpcpp/grpcpp.h>

 #include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/transport/binder/end2end/fake_binder.h"

 namespace grpc_binder {
--- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc
+++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc
@ -36,8 +36,8 @@
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/gprpp/notification.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/server/server.h"
 #include "test/core/event_engine/event_engine_test_utils.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
--- a/test/core/transport/chttp2/graceful_shutdown_test.cc
+++ b/test/core/transport/chttp2/graceful_shutdown_test.cc
@ -61,7 +61,7 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/test_config.h"

--- a/test/core/xds/BUILD
+++ b/test/core/xds/BUILD
@ -72,25 +72,6 @@ grpc_cc_test(
    ],
 )

-grpc_cc_test(
-    name = "xds_channel_stack_modifier_test",
-    srcs = ["xds_channel_stack_modifier_test.cc"],
-    external_deps = ["gtest"],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        "//:gpr",
-        "//:grpc",
-        "//:grpc_base",
-        "//:grpc_opencensus_plugin",
-        "//src/core:channel_args",
-        "//src/core:grpc_xds_channel_stack_modifier",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
 grpc_cc_test(
    name = "xds_certificate_provider_test",
    srcs = ["xds_certificate_provider_test.cc"],
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@ -65,10 +65,10 @@
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
-#include "src/core/lib/surface/server.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/resolver/fake/fake_resolver.h"
+#include "src/core/server/server.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
 #include "src/cpp/server/secure_server_credentials.h"
--- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc
@ -41,7 +41,7 @@
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/lib/gpr/tmpfile.h"
 #include "src/core/lib/gprpp/env.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h"
 #include "test/core/test_util/resolve_localhost_ip46.h"
 #include "test/core/test_util/tls_utils.h"
--- a/test/cpp/end2end/xds/xds_utils.cc
+++ b/test/cpp/end2end/xds/xds_utils.cc
@ -38,7 +38,7 @@
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/lib/gpr/tmpfile.h"
 #include "src/core/lib/gprpp/env.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h"
 #include "test/core/test_util/resolve_localhost_ip46.h"
--- a/test/cpp/microbenchmarks/fullstack_fixtures.h
+++ b/test/cpp/microbenchmarks/fullstack_fixtures.h
@ -42,7 +42,7 @@
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_create.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "src/cpp/client/create_channel_internal.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
--- a/test/cpp/performance/writes_per_rpc_test.cc
+++ b/test/cpp/performance/writes_per_rpc_test.cc
@ -44,7 +44,7 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_create.h"
-#include "src/core/lib/surface/server.h"
+#include "src/core/server/server.h"
 #include "src/cpp/client/create_channel_internal.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1150,9 +1150,6 @@ src/core/ext/filters/rbac/rbac_filter.cc \
 src/core/ext/filters/rbac/rbac_filter.h \
 src/core/ext/filters/rbac/rbac_service_config_parser.cc \
 src/core/ext/filters/rbac/rbac_service_config_parser.h \
-src/core/ext/filters/server_config_selector/server_config_selector.h \
-src/core/ext/filters/server_config_selector/server_config_selector_filter.cc \
-src/core/ext/filters/server_config_selector/server_config_selector_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_filter.cc \
 src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
@ -2082,8 +2079,6 @@ src/core/ext/xds/xds_bootstrap_grpc.h \
 src/core/ext/xds/xds_certificate_provider.cc \
 src/core/ext/xds/xds_certificate_provider.h \
 src/core/ext/xds/xds_channel_args.h \
-src/core/ext/xds/xds_channel_stack_modifier.cc \
-src/core/ext/xds/xds_channel_stack_modifier.h \
 src/core/ext/xds/xds_client.cc \
 src/core/ext/xds/xds_client.h \
 src/core/ext/xds/xds_client_grpc.cc \
@ -2120,7 +2115,6 @@ src/core/ext/xds/xds_route_config.cc \
 src/core/ext/xds/xds_route_config.h \
 src/core/ext/xds/xds_routing.cc \
 src/core/ext/xds/xds_routing.h \
-src/core/ext/xds/xds_server_config_fetcher.cc \
 src/core/ext/xds/xds_transport.h \
 src/core/ext/xds/xds_transport_grpc.cc \
 src/core/ext/xds/xds_transport_grpc.h \
@ -2178,8 +2172,6 @@ src/core/lib/channel/metrics.cc \
 src/core/lib/channel/metrics.h \
 src/core/lib/channel/promise_based_filter.cc \
 src/core/lib/channel/promise_based_filter.h \
-src/core/lib/channel/server_call_tracer_filter.cc \
-src/core/lib/channel/server_call_tracer_filter.h \
 src/core/lib/channel/status_util.cc \
 src/core/lib/channel/status_util.h \
 src/core/lib/channel/tcp_tracer.h \
@ -2801,9 +2793,6 @@ src/core/lib/surface/lame_client.h \
 src/core/lib/surface/legacy_channel.cc \
 src/core/lib/surface/legacy_channel.h \
 src/core/lib/surface/metadata_array.cc \
-src/core/lib/surface/server.cc \
-src/core/lib/surface/server.h \
-src/core/lib/surface/server_interface.h \
 src/core/lib/surface/validate_metadata.cc \
 src/core/lib/surface/validate_metadata.h \
 src/core/lib/surface/version.cc \
@ -2943,6 +2932,17 @@ src/core/resolver/xds/xds_resolver.cc \
 src/core/resolver/xds/xds_resolver_attributes.h \
 src/core/resolver/xds/xds_resolver_trace.cc \
 src/core/resolver/xds/xds_resolver_trace.h \
+src/core/server/server.cc \
+src/core/server/server.h \
+src/core/server/server_call_tracer_filter.cc \
+src/core/server/server_call_tracer_filter.h \
+src/core/server/server_config_selector.h \
+src/core/server/server_config_selector_filter.cc \
+src/core/server/server_config_selector_filter.h \
+src/core/server/server_interface.h \
+src/core/server/xds_channel_stack_modifier.cc \
+src/core/server/xds_channel_stack_modifier.h \
+src/core/server/xds_server_config_fetcher.cc \
 src/core/service_config/service_config.h \
 src/core/service_config/service_config_call_data.h \
 src/core/service_config/service_config_channel_arg_filter.cc \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -955,9 +955,6 @@ src/core/ext/filters/rbac/rbac_filter.cc \
 src/core/ext/filters/rbac/rbac_filter.h \
 src/core/ext/filters/rbac/rbac_service_config_parser.cc \
 src/core/ext/filters/rbac/rbac_service_config_parser.h \
-src/core/ext/filters/server_config_selector/server_config_selector.h \
-src/core/ext/filters/server_config_selector/server_config_selector_filter.cc \
-src/core/ext/filters/server_config_selector/server_config_selector_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_filter.cc \
 src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
@ -1853,8 +1850,6 @@ src/core/ext/xds/xds_bootstrap_grpc.h \
 src/core/ext/xds/xds_certificate_provider.cc \
 src/core/ext/xds/xds_certificate_provider.h \
 src/core/ext/xds/xds_channel_args.h \
-src/core/ext/xds/xds_channel_stack_modifier.cc \
-src/core/ext/xds/xds_channel_stack_modifier.h \
 src/core/ext/xds/xds_client.cc \
 src/core/ext/xds/xds_client.h \
 src/core/ext/xds/xds_client_grpc.cc \
@ -1890,7 +1885,6 @@ src/core/ext/xds/xds_route_config.cc \
 src/core/ext/xds/xds_route_config.h \
 src/core/ext/xds/xds_routing.cc \
 src/core/ext/xds/xds_routing.h \
-src/core/ext/xds/xds_server_config_fetcher.cc \
 src/core/ext/xds/xds_transport.h \
 src/core/ext/xds/xds_transport_grpc.cc \
 src/core/ext/xds/xds_transport_grpc.h \
@ -1950,8 +1944,6 @@ src/core/lib/channel/metrics.cc \
 src/core/lib/channel/metrics.h \
 src/core/lib/channel/promise_based_filter.cc \
 src/core/lib/channel/promise_based_filter.h \
-src/core/lib/channel/server_call_tracer_filter.cc \
-src/core/lib/channel/server_call_tracer_filter.h \
 src/core/lib/channel/status_util.cc \
 src/core/lib/channel/status_util.h \
 src/core/lib/channel/tcp_tracer.h \
@ -2577,9 +2569,6 @@ src/core/lib/surface/lame_client.h \
 src/core/lib/surface/legacy_channel.cc \
 src/core/lib/surface/legacy_channel.h \
 src/core/lib/surface/metadata_array.cc \
-src/core/lib/surface/server.cc \
-src/core/lib/surface/server.h \
-src/core/lib/surface/server_interface.h \
 src/core/lib/surface/validate_metadata.cc \
 src/core/lib/surface/validate_metadata.h \
 src/core/lib/surface/version.cc \
@ -2724,6 +2713,17 @@ src/core/resolver/xds/xds_resolver.cc \
 src/core/resolver/xds/xds_resolver_attributes.h \
 src/core/resolver/xds/xds_resolver_trace.cc \
 src/core/resolver/xds/xds_resolver_trace.h \
+src/core/server/server.cc \
+src/core/server/server.h \
+src/core/server/server_call_tracer_filter.cc \
+src/core/server/server_call_tracer_filter.h \
+src/core/server/server_config_selector.h \
+src/core/server/server_config_selector_filter.cc \
+src/core/server/server_config_selector_filter.h \
+src/core/server/server_interface.h \
+src/core/server/xds_channel_stack_modifier.cc \
+src/core/server/xds_channel_stack_modifier.h \
+src/core/server/xds_server_config_fetcher.cc \
 src/core/service_config/service_config.h \
 src/core/service_config/service_config_call_data.h \
 src/core/service_config/service_config_channel_arg_filter.cc \
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@ -11765,6 +11765,30 @@
    ],
    "uses_polling": false
  },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "xds_channel_stack_modifier_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
  {
    "args": [],
    "benchmark": false,