diff --git a/Cargo.toml b/Cargo.toml
index 963841e340..22815b9e80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
     "pageserver/ctl",
     "pageserver/client",
     "pageserver/pagebench",
-    "proxy",
+    "proxy/core",
     "safekeeper",
     "storage_broker",
     "storage_controller",
diff --git a/proxy/Cargo.toml b/proxy/core/Cargo.toml
similarity index 97%
rename from proxy/Cargo.toml
rename to proxy/core/Cargo.toml
index 21d92abb20..0f2a80ddc9 100644
--- a/proxy/Cargo.toml
+++ b/proxy/core/Cargo.toml
@@ -62,7 +62,7 @@ pq_proto.workspace = true
 prometheus.workspace = true
 rand.workspace = true
 regex.workspace = true
-remote_storage = { version = "0.1", path = "../libs/remote_storage/" }
+remote_storage = { version = "0.1", path = "../../libs/remote_storage/" }
 reqwest.workspace = true
 reqwest-middleware = { workspace = true, features = ["json"] }
 reqwest-retry.workspace = true
diff --git a/proxy/src/auth.rs b/proxy/core/src/auth.rs
similarity index 100%
rename from proxy/src/auth.rs
rename to proxy/core/src/auth.rs
diff --git a/proxy/src/auth/backend.rs b/proxy/core/src/auth/backend.rs
similarity index 100%
rename from proxy/src/auth/backend.rs
rename to proxy/core/src/auth/backend.rs
diff --git a/proxy/src/auth/backend/classic.rs b/proxy/core/src/auth/backend/classic.rs
similarity index 100%
rename from proxy/src/auth/backend/classic.rs
rename to proxy/core/src/auth/backend/classic.rs
diff --git a/proxy/src/auth/backend/hacks.rs b/proxy/core/src/auth/backend/hacks.rs
similarity index 100%
rename from proxy/src/auth/backend/hacks.rs
rename to proxy/core/src/auth/backend/hacks.rs
diff --git a/proxy/src/auth/backend/jwt.rs b/proxy/core/src/auth/backend/jwt.rs
similarity index 100%
rename from proxy/src/auth/backend/jwt.rs
rename to proxy/core/src/auth/backend/jwt.rs
diff --git a/proxy/src/auth/backend/link.rs b/proxy/core/src/auth/backend/link.rs
similarity index 100%
rename from proxy/src/auth/backend/link.rs
rename to proxy/core/src/auth/backend/link.rs
diff --git a/proxy/src/auth/credentials.rs b/proxy/core/src/auth/credentials.rs
similarity index 100%
rename from proxy/src/auth/credentials.rs
rename to proxy/core/src/auth/credentials.rs
diff --git a/proxy/src/auth/flow.rs b/proxy/core/src/auth/flow.rs
similarity index 100%
rename from proxy/src/auth/flow.rs
rename to proxy/core/src/auth/flow.rs
diff --git a/proxy/src/auth/password_hack.rs b/proxy/core/src/auth/password_hack.rs
similarity index 100%
rename from proxy/src/auth/password_hack.rs
rename to proxy/core/src/auth/password_hack.rs
diff --git a/proxy/src/bin/pg_sni_router.rs b/proxy/core/src/bin/pg_sni_router.rs
similarity index 100%
rename from proxy/src/bin/pg_sni_router.rs
rename to proxy/core/src/bin/pg_sni_router.rs
diff --git a/proxy/src/bin/proxy.rs b/proxy/core/src/bin/proxy.rs
similarity index 100%
rename from proxy/src/bin/proxy.rs
rename to proxy/core/src/bin/proxy.rs
diff --git a/proxy/src/cache.rs b/proxy/core/src/cache.rs
similarity index 100%
rename from proxy/src/cache.rs
rename to proxy/core/src/cache.rs
diff --git a/proxy/src/cache/common.rs b/proxy/core/src/cache/common.rs
similarity index 100%
rename from proxy/src/cache/common.rs
rename to proxy/core/src/cache/common.rs
diff --git a/proxy/src/cache/endpoints.rs b/proxy/core/src/cache/endpoints.rs
similarity index 100%
rename from proxy/src/cache/endpoints.rs
rename to proxy/core/src/cache/endpoints.rs
diff --git a/proxy/src/cache/project_info.rs b/proxy/core/src/cache/project_info.rs
similarity index 100%
rename from proxy/src/cache/project_info.rs
rename to proxy/core/src/cache/project_info.rs
diff --git a/proxy/src/cache/timed_lru.rs b/proxy/core/src/cache/timed_lru.rs
similarity index 100%
rename from proxy/src/cache/timed_lru.rs
rename to proxy/core/src/cache/timed_lru.rs
diff --git a/proxy/src/cancellation.rs b/proxy/core/src/cancellation.rs
similarity index 100%
rename from proxy/src/cancellation.rs
rename to proxy/core/src/cancellation.rs
diff --git a/proxy/src/compute.rs b/proxy/core/src/compute.rs
similarity index 100%
rename from proxy/src/compute.rs
rename to proxy/core/src/compute.rs
diff --git a/proxy/src/config.rs b/proxy/core/src/config.rs
similarity index 100%
rename from proxy/src/config.rs
rename to proxy/core/src/config.rs
diff --git a/proxy/src/console.rs b/proxy/core/src/console.rs
similarity index 100%
rename from proxy/src/console.rs
rename to proxy/core/src/console.rs
diff --git a/proxy/src/console/messages.rs b/proxy/core/src/console/messages.rs
similarity index 100%
rename from proxy/src/console/messages.rs
rename to proxy/core/src/console/messages.rs
diff --git a/proxy/src/console/mgmt.rs b/proxy/core/src/console/mgmt.rs
similarity index 100%
rename from proxy/src/console/mgmt.rs
rename to proxy/core/src/console/mgmt.rs
diff --git a/proxy/src/console/provider.rs b/proxy/core/src/console/provider.rs
similarity index 100%
rename from proxy/src/console/provider.rs
rename to proxy/core/src/console/provider.rs
diff --git a/proxy/src/console/provider/mock.rs b/proxy/core/src/console/provider/mock.rs
similarity index 100%
rename from proxy/src/console/provider/mock.rs
rename to proxy/core/src/console/provider/mock.rs
diff --git a/proxy/src/console/provider/neon.rs b/proxy/core/src/console/provider/neon.rs
similarity index 100%
rename from proxy/src/console/provider/neon.rs
rename to proxy/core/src/console/provider/neon.rs
diff --git a/proxy/src/context.rs b/proxy/core/src/context.rs
similarity index 100%
rename from proxy/src/context.rs
rename to proxy/core/src/context.rs
diff --git a/proxy/src/context/parquet.rs b/proxy/core/src/context/parquet.rs
similarity index 100%
rename from proxy/src/context/parquet.rs
rename to proxy/core/src/context/parquet.rs
diff --git a/proxy/src/error.rs b/proxy/core/src/error.rs
similarity index 100%
rename from proxy/src/error.rs
rename to proxy/core/src/error.rs
diff --git a/proxy/src/http.rs b/proxy/core/src/http.rs
similarity index 100%
rename from proxy/src/http.rs
rename to proxy/core/src/http.rs
diff --git a/proxy/src/http/health_server.rs b/proxy/core/src/http/health_server.rs
similarity index 100%
rename from proxy/src/http/health_server.rs
rename to proxy/core/src/http/health_server.rs
diff --git a/proxy/src/intern.rs b/proxy/core/src/intern.rs
similarity index 100%
rename from proxy/src/intern.rs
rename to proxy/core/src/intern.rs
diff --git a/proxy/src/jemalloc.rs b/proxy/core/src/jemalloc.rs
similarity index 100%
rename from proxy/src/jemalloc.rs
rename to proxy/core/src/jemalloc.rs
diff --git a/proxy/src/lib.rs b/proxy/core/src/lib.rs
similarity index 100%
rename from proxy/src/lib.rs
rename to proxy/core/src/lib.rs
diff --git a/proxy/src/logging.rs b/proxy/core/src/logging.rs
similarity index 100%
rename from proxy/src/logging.rs
rename to proxy/core/src/logging.rs
diff --git a/proxy/src/metrics.rs b/proxy/core/src/metrics.rs
similarity index 100%
rename from proxy/src/metrics.rs
rename to proxy/core/src/metrics.rs
diff --git a/proxy/src/parse.rs b/proxy/core/src/parse.rs
similarity index 100%
rename from proxy/src/parse.rs
rename to proxy/core/src/parse.rs
diff --git a/proxy/src/protocol2.rs b/proxy/core/src/protocol2.rs
similarity index 100%
rename from proxy/src/protocol2.rs
rename to proxy/core/src/protocol2.rs
diff --git a/proxy/src/proxy.rs b/proxy/core/src/proxy.rs
similarity index 100%
rename from proxy/src/proxy.rs
rename to proxy/core/src/proxy.rs
diff --git a/proxy/src/proxy/connect_compute.rs b/proxy/core/src/proxy/connect_compute.rs
similarity index 100%
rename from proxy/src/proxy/connect_compute.rs
rename to proxy/core/src/proxy/connect_compute.rs
diff --git a/proxy/src/proxy/copy_bidirectional.rs b/proxy/core/src/proxy/copy_bidirectional.rs
similarity index 100%
rename from proxy/src/proxy/copy_bidirectional.rs
rename to proxy/core/src/proxy/copy_bidirectional.rs
diff --git a/proxy/src/proxy/handshake.rs b/proxy/core/src/proxy/handshake.rs
similarity index 100%
rename from proxy/src/proxy/handshake.rs
rename to proxy/core/src/proxy/handshake.rs
diff --git a/proxy/src/proxy/passthrough.rs b/proxy/core/src/proxy/passthrough.rs
similarity index 100%
rename from proxy/src/proxy/passthrough.rs
rename to proxy/core/src/proxy/passthrough.rs
diff --git a/proxy/src/proxy/retry.rs b/proxy/core/src/proxy/retry.rs
similarity index 100%
rename from proxy/src/proxy/retry.rs
rename to proxy/core/src/proxy/retry.rs
diff --git a/proxy/src/proxy/tests.rs b/proxy/core/src/proxy/tests.rs
similarity index 100%
rename from proxy/src/proxy/tests.rs
rename to proxy/core/src/proxy/tests.rs
diff --git a/proxy/src/proxy/tests/mitm.rs b/proxy/core/src/proxy/tests/mitm.rs
similarity index 100%
rename from proxy/src/proxy/tests/mitm.rs
rename to proxy/core/src/proxy/tests/mitm.rs
diff --git a/proxy/src/proxy/wake_compute.rs b/proxy/core/src/proxy/wake_compute.rs
similarity index 100%
rename from proxy/src/proxy/wake_compute.rs
rename to proxy/core/src/proxy/wake_compute.rs
diff --git a/proxy/src/rate_limiter.rs b/proxy/core/src/rate_limiter.rs
similarity index 100%
rename from proxy/src/rate_limiter.rs
rename to proxy/core/src/rate_limiter.rs
diff --git a/proxy/src/rate_limiter/leaky_bucket.rs b/proxy/core/src/rate_limiter/leaky_bucket.rs
similarity index 100%
rename from proxy/src/rate_limiter/leaky_bucket.rs
rename to proxy/core/src/rate_limiter/leaky_bucket.rs
diff --git a/proxy/src/rate_limiter/limit_algorithm.rs b/proxy/core/src/rate_limiter/limit_algorithm.rs
similarity index 100%
rename from proxy/src/rate_limiter/limit_algorithm.rs
rename to proxy/core/src/rate_limiter/limit_algorithm.rs
diff --git a/proxy/src/rate_limiter/limit_algorithm/aimd.rs b/proxy/core/src/rate_limiter/limit_algorithm/aimd.rs
similarity index 100%
rename from proxy/src/rate_limiter/limit_algorithm/aimd.rs
rename to proxy/core/src/rate_limiter/limit_algorithm/aimd.rs
diff --git a/proxy/src/rate_limiter/limiter.rs b/proxy/core/src/rate_limiter/limiter.rs
similarity index 100%
rename from proxy/src/rate_limiter/limiter.rs
rename to proxy/core/src/rate_limiter/limiter.rs
diff --git a/proxy/src/redis.rs b/proxy/core/src/redis.rs
similarity index 100%
rename from proxy/src/redis.rs
rename to proxy/core/src/redis.rs
diff --git a/proxy/src/redis/cancellation_publisher.rs b/proxy/core/src/redis/cancellation_publisher.rs
similarity index 100%
rename from proxy/src/redis/cancellation_publisher.rs
rename to proxy/core/src/redis/cancellation_publisher.rs
diff --git a/proxy/src/redis/connection_with_credentials_provider.rs b/proxy/core/src/redis/connection_with_credentials_provider.rs
similarity index 100%
rename from proxy/src/redis/connection_with_credentials_provider.rs
rename to proxy/core/src/redis/connection_with_credentials_provider.rs
diff --git a/proxy/src/redis/elasticache.rs b/proxy/core/src/redis/elasticache.rs
similarity index 100%
rename from proxy/src/redis/elasticache.rs
rename to proxy/core/src/redis/elasticache.rs
diff --git a/proxy/src/redis/notifications.rs b/proxy/core/src/redis/notifications.rs
similarity index 100%
rename from proxy/src/redis/notifications.rs
rename to proxy/core/src/redis/notifications.rs
diff --git a/proxy/src/sasl.rs b/proxy/core/src/sasl.rs
similarity index 100%
rename from proxy/src/sasl.rs
rename to proxy/core/src/sasl.rs
diff --git a/proxy/src/sasl/channel_binding.rs b/proxy/core/src/sasl/channel_binding.rs
similarity index 100%
rename from proxy/src/sasl/channel_binding.rs
rename to proxy/core/src/sasl/channel_binding.rs
diff --git a/proxy/src/sasl/messages.rs b/proxy/core/src/sasl/messages.rs
similarity index 100%
rename from proxy/src/sasl/messages.rs
rename to proxy/core/src/sasl/messages.rs
diff --git a/proxy/src/sasl/stream.rs b/proxy/core/src/sasl/stream.rs
similarity index 100%
rename from proxy/src/sasl/stream.rs
rename to proxy/core/src/sasl/stream.rs
diff --git a/proxy/src/scram.rs b/proxy/core/src/scram.rs
similarity index 100%
rename from proxy/src/scram.rs
rename to proxy/core/src/scram.rs
diff --git a/proxy/src/scram/countmin.rs b/proxy/core/src/scram/countmin.rs
similarity index 100%
rename from proxy/src/scram/countmin.rs
rename to proxy/core/src/scram/countmin.rs
diff --git a/proxy/src/scram/exchange.rs b/proxy/core/src/scram/exchange.rs
similarity index 100%
rename from proxy/src/scram/exchange.rs
rename to proxy/core/src/scram/exchange.rs
diff --git a/proxy/src/scram/key.rs b/proxy/core/src/scram/key.rs
similarity index 100%
rename from proxy/src/scram/key.rs
rename to proxy/core/src/scram/key.rs
diff --git a/proxy/src/scram/messages.rs b/proxy/core/src/scram/messages.rs
similarity index 100%
rename from proxy/src/scram/messages.rs
rename to proxy/core/src/scram/messages.rs
diff --git a/proxy/src/scram/pbkdf2.rs b/proxy/core/src/scram/pbkdf2.rs
similarity index 100%
rename from proxy/src/scram/pbkdf2.rs
rename to proxy/core/src/scram/pbkdf2.rs
diff --git a/proxy/src/scram/secret.rs b/proxy/core/src/scram/secret.rs
similarity index 100%
rename from proxy/src/scram/secret.rs
rename to proxy/core/src/scram/secret.rs
diff --git a/proxy/src/scram/signature.rs b/proxy/core/src/scram/signature.rs
similarity index 100%
rename from proxy/src/scram/signature.rs
rename to proxy/core/src/scram/signature.rs
diff --git a/proxy/src/scram/threadpool.rs b/proxy/core/src/scram/threadpool.rs
similarity index 100%
rename from proxy/src/scram/threadpool.rs
rename to proxy/core/src/scram/threadpool.rs
diff --git a/proxy/src/serverless.rs b/proxy/core/src/serverless.rs
similarity index 100%
rename from proxy/src/serverless.rs
rename to proxy/core/src/serverless.rs
diff --git a/proxy/src/serverless/backend.rs b/proxy/core/src/serverless/backend.rs
similarity index 100%
rename from proxy/src/serverless/backend.rs
rename to proxy/core/src/serverless/backend.rs
diff --git a/proxy/src/serverless/cancel_set.rs b/proxy/core/src/serverless/cancel_set.rs
similarity index 100%
rename from proxy/src/serverless/cancel_set.rs
rename to proxy/core/src/serverless/cancel_set.rs
diff --git a/proxy/src/serverless/conn_pool.rs b/proxy/core/src/serverless/conn_pool.rs
similarity index 100%
rename from proxy/src/serverless/conn_pool.rs
rename to proxy/core/src/serverless/conn_pool.rs
diff --git a/proxy/src/serverless/http_util.rs b/proxy/core/src/serverless/http_util.rs
similarity index 100%
rename from proxy/src/serverless/http_util.rs
rename to proxy/core/src/serverless/http_util.rs
diff --git a/proxy/src/serverless/json.rs b/proxy/core/src/serverless/json.rs
similarity index 100%
rename from proxy/src/serverless/json.rs
rename to proxy/core/src/serverless/json.rs
diff --git a/proxy/src/serverless/sql_over_http.rs b/proxy/core/src/serverless/sql_over_http.rs
similarity index 100%
rename from proxy/src/serverless/sql_over_http.rs
rename to proxy/core/src/serverless/sql_over_http.rs
diff --git a/proxy/src/serverless/websocket.rs b/proxy/core/src/serverless/websocket.rs
similarity index 100%
rename from proxy/src/serverless/websocket.rs
rename to proxy/core/src/serverless/websocket.rs
diff --git a/proxy/src/stream.rs b/proxy/core/src/stream.rs
similarity index 100%
rename from proxy/src/stream.rs
rename to proxy/core/src/stream.rs
diff --git a/proxy/src/url.rs b/proxy/core/src/url.rs
similarity index 100%
rename from proxy/src/url.rs
rename to proxy/core/src/url.rs
diff --git a/proxy/src/usage_metrics.rs b/proxy/core/src/usage_metrics.rs
similarity index 100%
rename from proxy/src/usage_metrics.rs
rename to proxy/core/src/usage_metrics.rs
diff --git a/proxy/src/waiters.rs b/proxy/core/src/waiters.rs
similarity index 100%
rename from proxy/src/waiters.rs
rename to proxy/core/src/waiters.rs