diff --git a/src/webserver/listener.h b/src/webserver/listener.h
deleted file mode 100644
index 9406dd37..00000000
--- a/src/webserver/listener.h
+++ /dev/null
@@ -1,335 +0,0 @@
-#ifndef LISTENER_H
-#define LISTENER_H
-
-#include <boost/asio/dispatch.hpp>
-#include <boost/beast/core.hpp>
-#include <boost/beast/websocket.hpp>
-#include <webserver/HttpSession.h>
-#include <webserver/PlainWsSession.h>
-#include <webserver/SslHttpSession.h>
-#include <webserver/SslWsSession.h>
-#include <webserver/SubscriptionManager.h>
-
-#include <iostream>
-
-class SubscriptionManager;
-
-template <class PlainSession, class SslSession>
-class Detector
-    : public std::enable_shared_from_this<Detector<PlainSession, SslSession>>
-{
-    using std::enable_shared_from_this<
-        Detector<PlainSession, SslSession>>::shared_from_this;
-
-    boost::beast::tcp_stream stream_;
-    std::optional<std::reference_wrapper<ssl::context>> ctx_;
-    std::shared_ptr<BackendInterface> backend_;
-    std::shared_ptr<SubscriptionManager> subscriptions_;
-    std::shared_ptr<ETLLoadBalancer> balancer_;
-    DOSGuard& dosGuard_;
-    boost::beast::flat_buffer buffer_;
-
-public:
-    Detector(
-        tcp::socket&& socket,
-        std::optional<std::reference_wrapper<ssl::context>> ctx,
-        std::shared_ptr<BackendInterface> backend,
-        std::shared_ptr<SubscriptionManager> subscriptions,
-        std::shared_ptr<ETLLoadBalancer> balancer,
-        DOSGuard& dosGuard)
-        : stream_(std::move(socket))
-        , ctx_(ctx)
-        , backend_(backend)
-        , subscriptions_(subscriptions)
-        , balancer_(balancer)
-        , dosGuard_(dosGuard)
-    {
-    }
-
-    // Launch the detector
-    void
-    run()
-    {
-        // Set the timeout.
-        boost::beast::get_lowest_layer(stream_).expires_after(
-            std::chrono::seconds(30));
-        // Detect a TLS handshake
-        async_detect_ssl(
-            stream_,
-            buffer_,
-            boost::beast::bind_front_handler(
-                &Detector::on_detect, shared_from_this()));
-    }
-
-    void
-    on_detect(boost::beast::error_code ec, bool result)
-    {
-        if (ec)
-            return httpFail(ec, "detect");
-
-        if (result)
-        {
-            if (!ctx_)
-                return httpFail(ec, "ssl not supported by this server");
-            // Launch SSL session
-            std::make_shared<SslSession>(
-                stream_.release_socket(),
-                *ctx_,
-                backend_,
-                subscriptions_,
-                balancer_,
-                dosGuard_,
-                std::move(buffer_))
-                ->run();
-            return;
-        }
-
-        // Launch plain session
-        std::make_shared<PlainSession>(
-            stream_.release_socket(),
-            backend_,
-            subscriptions_,
-            balancer_,
-            dosGuard_,
-            std::move(buffer_))
-            ->run();
-    }
-};
-
-void
-make_websocket_session(
-    boost::beast::tcp_stream stream,
-    http::request<http::string_body> req,
-    boost::beast::flat_buffer buffer,
-    std::shared_ptr<BackendInterface> backend,
-    std::shared_ptr<SubscriptionManager> subscriptions,
-    std::shared_ptr<ETLLoadBalancer> balancer,
-    DOSGuard& dosGuard)
-{
-    std::make_shared<WsUpgrader>(
-        std::move(stream),
-        backend,
-        subscriptions,
-        balancer,
-        dosGuard,
-        std::move(buffer),
-        std::move(req))
-        ->run();
-}
-
-void
-make_websocket_session(
-    boost::beast::ssl_stream<boost::beast::tcp_stream> stream,
-    http::request<http::string_body> req,
-    boost::beast::flat_buffer buffer,
-    std::shared_ptr<BackendInterface> backend,
-    std::shared_ptr<SubscriptionManager> subscriptions,
-    std::shared_ptr<ETLLoadBalancer> balancer,
-    DOSGuard& dosGuard)
-{
-    std::make_shared<SslWsUpgrader>(
-        std::move(stream),
-        backend,
-        subscriptions,
-        balancer,
-        dosGuard,
-        std::move(buffer),
-        std::move(req))
-        ->run();
-}
-
-template <class PlainSession, class SslSession>
-class Listener
-    : public std::enable_shared_from_this<Listener<PlainSession, SslSession>>
-{
-    using std::enable_shared_from_this<
-        Listener<PlainSession, SslSession>>::shared_from_this;
-
-    net::io_context& ioc_;
-    std::optional<ssl::context> ctx_;
-    tcp::acceptor acceptor_;
-    std::shared_ptr<BackendInterface> backend_;
-    std::shared_ptr<SubscriptionManager> subscriptions_;
-    std::shared_ptr<ETLLoadBalancer> balancer_;
-    DOSGuard& dosGuard_;
-
-public:
-    Listener(
-        net::io_context& ioc,
-        std::optional<ssl::context>&& ctx,
-        tcp::endpoint endpoint,
-        std::shared_ptr<BackendInterface> backend,
-        std::shared_ptr<SubscriptionManager> subscriptions,
-        std::shared_ptr<ETLLoadBalancer> balancer,
-        DOSGuard& dosGuard)
-        : ioc_(ioc)
-        , ctx_(std::move(ctx))
-        , acceptor_(net::make_strand(ioc))
-        , backend_(backend)
-        , subscriptions_(subscriptions)
-        , balancer_(balancer)
-        , dosGuard_(dosGuard)
-    {
-        boost::beast::error_code ec;
-
-        // Open the acceptor
-        acceptor_.open(endpoint.protocol(), ec);
-        if (ec)
-        {
-            httpFail(ec, "open");
-            return;
-        }
-
-        // Allow address reuse
-        acceptor_.set_option(net::socket_base::reuse_address(true), ec);
-        if (ec)
-        {
-            httpFail(ec, "set_option");
-            return;
-        }
-
-        // Bind to the server address
-        acceptor_.bind(endpoint, ec);
-        if (ec)
-        {
-            httpFail(ec, "bind");
-            return;
-        }
-
-        // Start listening for connections
-        acceptor_.listen(net::socket_base::max_listen_connections, ec);
-        if (ec)
-        {
-            httpFail(ec, "listen");
-            return;
-        }
-    }
-
-    // Start accepting incoming connections
-    void
-    run()
-    {
-        do_accept();
-    }
-
-private:
-    void
-    do_accept()
-    {
-        // The new connection gets its own strand
-        acceptor_.async_accept(
-            net::make_strand(ioc_),
-            boost::beast::bind_front_handler(
-                &Listener::on_accept, shared_from_this()));
-    }
-
-    void
-    on_accept(boost::beast::error_code ec, tcp::socket socket)
-    {
-        if (ec)
-        {
-            httpFail(ec, "listener_accept");
-        }
-        else
-        {
-            auto ctxRef = ctx_
-                ? std::optional<
-                      std::reference_wrapper<ssl::context>>{ctx_.value()}
-                : std::nullopt;
-            // Create the detector session and run it
-            std::make_shared<Detector<PlainSession, SslSession>>(
-                std::move(socket),
-                ctxRef,
-                backend_,
-                subscriptions_,
-                balancer_,
-                dosGuard_)
-                ->run();
-        }
-
-        // Accept another connection
-        do_accept();
-    }
-};
-
-namespace Server {
-std::optional<ssl::context>
-parse_certs(const char* certFilename, const char* keyFilename)
-{
-    std::ifstream readCert(certFilename, std::ios::in | std::ios::binary);
-    if (!readCert)
-        return {};
-
-    std::stringstream contents;
-    contents << readCert.rdbuf();
-    readCert.close();
-    std::string cert = contents.str();
-
-    std::ifstream readKey(keyFilename, std::ios::in | std::ios::binary);
-    if (!readKey)
-        return {};
-
-    contents.str("");
-    contents << readKey.rdbuf();
-    readKey.close();
-    std::string key = contents.str();
-
-    ssl::context ctx{ssl::context::tlsv12};
-
-    ctx.set_options(
-        boost::asio::ssl::context::default_workarounds |
-        boost::asio::ssl::context::no_sslv2);
-
-    ctx.use_certificate_chain(boost::asio::buffer(cert.data(), cert.size()));
-
-    ctx.use_private_key(
-        boost::asio::buffer(key.data(), key.size()),
-        boost::asio::ssl::context::file_format::pem);
-
-    return ctx;
-}
-
-using HttpServer = Listener<HttpSession, SslHttpSession>;
-
-static std::shared_ptr<HttpServer>
-make_HttpServer(
-    boost::json::object const& config,
-    boost::asio::io_context& ioc,
-    std::shared_ptr<BackendInterface> backend,
-    std::shared_ptr<SubscriptionManager> subscriptions,
-    std::shared_ptr<ETLLoadBalancer> balancer,
-    DOSGuard& dosGuard)
-{
-    if (!config.contains("server"))
-        return nullptr;
-
-    auto const& serverConfig = config.at("server").as_object();
-    std::optional<ssl::context> sslCtx;
-    if (serverConfig.contains("ssl_cert_file") &&
-        serverConfig.contains("ssl_key_file"))
-    {
-        sslCtx = parse_certs(
-            serverConfig.at("ssl_cert_file").as_string().c_str(),
-            serverConfig.at("ssl_key_file").as_string().c_str());
-    }
-
-    auto const address = boost::asio::ip::make_address(
-        serverConfig.at("ip").as_string().c_str());
-    auto const port =
-        static_cast<unsigned short>(serverConfig.at("port").as_int64());
-
-    auto server = std::make_shared<HttpServer>(
-        ioc,
-        std::move(sslCtx),
-        boost::asio::ip::tcp::endpoint{address, port},
-        backend,
-        subscriptions,
-        balancer,
-        dosGuard);
-
-    server->run();
-    return server;
-}
-}  // namespace Server
-
-#endif  // LISTENER_H