diff --git a/packages/server/src/express/Express.ts b/packages/server/src/express/Express.ts
new file mode 100644
index 0000000..62ae881
--- /dev/null
+++ b/packages/server/src/express/Express.ts
@@ -0,0 +1,6 @@
+import { Context, Layer } from "effect"
+import express from "express"
+
+
+export class Express extends Context.Tag("Express")<Express, ReturnType<typeof express>>() {}
+export const ExpressLive = Layer.sync(Express, () => express())
diff --git a/packages/server/src/express.ts b/packages/server/src/express/HTTPServer.ts
similarity index 55%
rename from packages/server/src/express.ts
rename to packages/server/src/express/HTTPServer.ts
index 14d94e4..a7a02e5 100644
--- a/packages/server/src/express.ts
+++ b/packages/server/src/express/HTTPServer.ts
@@ -1,12 +1,8 @@
-import { Config, Context, Effect, Layer } from "effect"
-import express from "express"
+import { Config, Effect, Layer } from "effect"
+import { Express, ExpressLive } from "./Express"
 
 
-export class Express extends Context.Tag("Express")<Express, ReturnType<typeof express>>() {}
-export const ExpressLive = Layer.sync(Express, () => express())
-
-
-export const ServerLive = Layer.scopedDiscard(Effect.gen(function*() {
+export const HTTPServerLive = Layer.scopedDiscard(Effect.gen(function*() {
     const app  = yield* Express
     const port = yield* Config.number("PORT").pipe(Config.withDefault(8080))