diff --git a/proxy/src/main.rs b/proxy/src/main.rs
index 9b3595e..a4dca9b 100644
--- a/proxy/src/main.rs
+++ b/proxy/src/main.rs
@@ -1,37 +1,11 @@
 use clap::Parser;
-use rama::{
-    extensions::ExtensionsMut,
-    http::{
-        client::EasyHttpWebClient,
-        layer::{
-            remove_header::{RemoveRequestHeaderLayer, RemoveResponseHeaderLayer},
-            trace::TraceLayer,
-            upgrade::UpgradeLayer,
-        },
-        matcher::MethodMatcher,
-        server::HttpServer,
-        service::web::response::IntoResponse,
-        Request, Response, StatusCode,
-    },
-    layer::ConsumeErrLayer,
-    net::{http::RequestContext, proxy::ProxyTarget, stream::layer::http::BodyLimitLayer},
-    rt::Executor,
-    service::service_fn,
-    tcp::{client::service::Forwarder, server::TcpListener},
-    telemetry::tracing::{
-        self,
-        metadata::LevelFilter,
-        subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter},
-    },
-    Layer, Service,
+use rama::telemetry::tracing::{
+    self,
+    metadata::LevelFilter,
+    subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter},
 };
-use std::{convert::Infallible, time::Duration};
-
-#[derive(Parser, Debug)]
-struct Args {
-    #[arg(short, long, default_value_t = 0)]
-    port: u16,
-}
+mod server;
+use server::proxy::run_server;
 
 #[tokio::main]
 async fn main() {
@@ -52,85 +26,8 @@ fn setup_tracing() {
     tracing::info!("Tracing is set up");
 }
 
-async fn run_server(port: u16) {
-    let graceful = rama::graceful::Shutdown::default();
-
-    graceful.spawn_task_fn(move |guard| server_task(guard, port));
-
-    graceful
-        .shutdown_with_limit(Duration::from_secs(30))
-        .await
-        .expect("graceful shutdown");
-}
-
-async fn server_task(guard: rama::graceful::ShutdownGuard, port: u16) {
-    let tcp_address = format!("127.0.0.1:{}", port);
-
-    let tcp_service = TcpListener::build()
-        .bind(tcp_address)
-        .await
-        .expect("bind tcp proxy");
-
-    let local_address = tcp_service.local_addr().expect("tcp proxy assigned a port");
-    tracing::info!("Safe-chain proxy running on {local_address}");
-
-    let exec = Executor::graceful(guard.clone());
-
-    let http_service = HttpServer::auto(exec).service(
-        (
-            TraceLayer::new_for_http(),
-            ConsumeErrLayer::default(),
-            UpgradeLayer::new(
-                MethodMatcher::CONNECT,
-                service_fn(http_connect_accept),
-                ConsumeErrLayer::default().into_layer(Forwarder::ctx()),
-            ),
-            RemoveResponseHeaderLayer::hop_by_hop(),
-            RemoveRequestHeaderLayer::hop_by_hop(),
-        )
-            .into_layer(service_fn(http_plain_proxy)),
-    );
-
-    tcp_service
-        .serve_graceful(
-            guard,
-            (
-                // protect the http proxy from too large bodies, both from request and response end
-                BodyLimitLayer::symmetric(500 * 1024 * 1024),
-            )
-                .into_layer(http_service),
-        )
-        .await;
-}
-
-async fn http_connect_accept(mut req: Request) -> Result<(Response, Request), Response> {
-    match RequestContext::try_from(&req).map(|ctx| ctx.host_with_port()) {
-        Ok(authority) => {
-            tracing::info!(
-                server.address = %authority.host,
-                server.port = authority.port,
-                "accept CONNECT",
-            );
-            req.extensions_mut().insert(ProxyTarget(authority));
-        }
-        Err(err) => {
-            tracing::error!("error extracting authority: {err:?}");
-            return Err(StatusCode::BAD_REQUEST.into_response());
-        }
-    }
-
-    return Ok((StatusCode::OK.into_response(), req));
-}
-
-async fn http_plain_proxy(req: Request) -> Result<Response, Infallible> {
-    let client = EasyHttpWebClient::default();
-
-    return match client.serve(req).await {
-        Ok(resp) => Ok(resp),
-        Err(err) => {
-            tracing::error!("Error forwarding request: {err:?}");
-            let resp = StatusCode::BAD_GATEWAY.into_response();
-            Ok(resp)
-        }
-    };
+#[derive(Parser, Debug)]
+struct Args {
+    #[arg(short, long, default_value_t = 0)]
+    port: u16,
 }
diff --git a/proxy/src/server/mod.rs b/proxy/src/server/mod.rs
new file mode 100644
index 0000000..44dcc92
--- /dev/null
+++ b/proxy/src/server/mod.rs
@@ -0,0 +1 @@
+pub mod proxy;
diff --git a/proxy/src/server/proxy.rs b/proxy/src/server/proxy.rs
new file mode 100644
index 0000000..896adab
--- /dev/null
+++ b/proxy/src/server/proxy.rs
@@ -0,0 +1,106 @@
+use rama::{
+    extensions::ExtensionsMut,
+    http::{
+        client::EasyHttpWebClient,
+        layer::{
+            remove_header::{RemoveRequestHeaderLayer, RemoveResponseHeaderLayer},
+            trace::TraceLayer,
+            upgrade::UpgradeLayer,
+        },
+        matcher::MethodMatcher,
+        server::HttpServer,
+        service::web::response::IntoResponse,
+        Request, Response, StatusCode,
+    },
+    layer::ConsumeErrLayer,
+    net::{http::RequestContext, proxy::ProxyTarget, stream::layer::http::BodyLimitLayer},
+    rt::Executor,
+    service::service_fn,
+    tcp::{client::service::Forwarder, server::TcpListener},
+    telemetry::tracing::{self},
+    Layer, Service,
+};
+use std::{convert::Infallible, time::Duration};
+
+pub async fn run_server(port: u16) {
+    let graceful = rama::graceful::Shutdown::default();
+
+    graceful.spawn_task_fn(move |guard| server_task(guard, port));
+
+    graceful
+        .shutdown_with_limit(Duration::from_secs(30))
+        .await
+        .expect("graceful shutdown");
+}
+
+async fn server_task(guard: rama::graceful::ShutdownGuard, port: u16) {
+    let tcp_address = format!("127.0.0.1:{}", port);
+
+    let tcp_service = TcpListener::build()
+        .bind(tcp_address)
+        .await
+        .expect("bind tcp proxy");
+
+    let local_address = tcp_service.local_addr().expect("tcp proxy assigned a port");
+    tracing::info!("Safe-chain proxy running on {local_address}");
+
+    let exec = Executor::graceful(guard.clone());
+
+    let http_service = HttpServer::auto(exec).service(
+        (
+            TraceLayer::new_for_http(),
+            ConsumeErrLayer::default(),
+            UpgradeLayer::new(
+                MethodMatcher::CONNECT,
+                service_fn(http_connect_accept),
+                ConsumeErrLayer::default().into_layer(Forwarder::ctx()),
+            ),
+            RemoveResponseHeaderLayer::hop_by_hop(),
+            RemoveRequestHeaderLayer::hop_by_hop(),
+        )
+            .into_layer(service_fn(http_plain_proxy)),
+    );
+
+    tcp_service
+        .serve_graceful(
+            guard,
+            (
+                // protect the http proxy from too large bodies, both from request and response end
+                BodyLimitLayer::symmetric(500 * 1024 * 1024),
+            )
+                .into_layer(http_service),
+        )
+        .await;
+}
+
+async fn http_connect_accept(mut req: Request) -> Result<(Response, Request), Response> {
+    match RequestContext::try_from(&req).map(|ctx| ctx.host_with_port()) {
+        Ok(authority) => {
+            tracing::info!(
+                server.address = %authority.host,
+                server.port = authority.port,
+                "accept CONNECT",
+            );
+            req.extensions_mut().insert(ProxyTarget(authority));
+        }
+        Err(err) => {
+            tracing::error!("error extracting authority: {err:?}");
+            return Err(StatusCode::BAD_REQUEST.into_response());
+        }
+    }
+
+    return Ok((StatusCode::OK.into_response(), req));
+}
+
+async fn http_plain_proxy(req: Request) -> Result<Response, Infallible> {
+    let client = EasyHttpWebClient::default();
+
+    return match client.serve(req).await {
+        Ok(resp) => Ok(resp),
+        Err(err) => {
+            tracing::error!("Error forwarding request: {err:?}");
+            let resp = StatusCode::BAD_GATEWAY.into_response();
+            Ok(resp)
+        }
+    };
+}