diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts
index d38ba2a9..9cc99369 100644
--- a/src/bundle/Server.ts
+++ b/src/bundle/Server.ts
@@ -22,12 +22,12 @@ import cluster from "node:cluster";
import morgan from "morgan";
import express from "express";
import { green, bold } from "picocolors";
-import * as Api from "@spacebar/api";
+import { SpacebarServer } from "@spacebar/api";
import { CDNServer } from "@spacebar/cdn";
import { initDatabase } from "@spacebar/database";
-import * as Gateway from "@spacebar/gateway";
+import { GatewayServer } from "@spacebar/gateway";
import { Config } from "@spacebar/util";
-import * as Webrtc from "@spacebar/webrtc";
+import { WebrtcServer } from "@spacebar/webrtc";
import { ProcessLifecycle } from "../util/util/ProcessLifecycle";
import { Monitoring } from "../util/monitoring/Monitoring";
@@ -38,10 +38,10 @@ const wrtcWsPort = Number(process.env.WRTC_WS_PORT) || 3004;
const production = process.env.NODE_ENV == "development" ? false : true;
server.on("request", app);
-const api = new Api.SpacebarServer({ server, port, production, app });
+const api = new SpacebarServer({ server, port, production, app });
const cdn = new CDNServer({ server, port, production, app });
-const gateway = new Gateway.Server({ server, port, production });
-const webrtc = new Webrtc.Server({
+const gateway = new GatewayServer({ server, port, production });
+const webrtc = new WebrtcServer({
server: undefined,
port: wrtcWsPort,
production,
|