diff --git a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
index 5889d48..1d63b52 100644
--- a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
+++ b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
@@ -5,6 +5,8 @@
 import zio.interop.catz.*
 import zio.interop.catz.implicits.{*, given}
 
+import cats.syntax.all.*
+
 import org.http4s.*
 import org.http4s.dsl.Http4sDsl
 import org.http4s.dsl.io.*
@@ -30,12 +32,13 @@
 ) extends HttpApplication:
   import dsl.*
 
-  val files = static.Routes(config)
+  val staticR = static.Routes(config)
+  val apiR = api.Routes()
 
   def httpApp(appPath: String): HttpRoutes[AppTask] =
     Router(
       security.route,
-      "/mdr" -> security.secure(files.routes)
+      "/mdr" -> security.secure(apiR.routes <+> staticR.routes)
     )
 
   override def routes(): UIO[HttpRoutes[AppTask]] =

diff --git a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
index 5889d48..1d63b52 100644
--- a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
+++ b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
@@ -5,6 +5,8 @@
 import zio.interop.catz.*
 import zio.interop.catz.implicits.{*, given}
 
+import cats.syntax.all.*
+
 import org.http4s.*
 import org.http4s.dsl.Http4sDsl
 import org.http4s.dsl.io.*
@@ -30,12 +32,13 @@
 ) extends HttpApplication:
   import dsl.*
 
-  val files = static.Routes(config)
+  val staticR = static.Routes(config)
+  val apiR = api.Routes()
 
   def httpApp(appPath: String): HttpRoutes[AppTask] =
     Router(
       security.route,
-      "/mdr" -> security.secure(files.routes)
+      "/mdr" -> security.secure(apiR.routes <+> staticR.routes)
     )
 
   override def routes(): UIO[HttpRoutes[AppTask]] =
diff --git a/server/src/main/scala/mdr/pdb/server/api/Routes.scala b/server/src/main/scala/mdr/pdb/server/api/Routes.scala
new file mode 100644
index 0000000..8cb5617
--- /dev/null
+++ b/server/src/main/scala/mdr/pdb/server/api/Routes.scala
@@ -0,0 +1,12 @@
+package mdr.pdb.server
+package api
+
+import org.http4s.AuthedRoutes
+
+class Routes():
+  import CustomTapir.*
+
+  val serverEndpoints: List[ZServerEndpoint[AppEnv, Any]] = Nil
+
+  val routes: AuthedRoutes[AppAuth, AppTask] =
+    CustomTapir.from(serverEndpoints).toRoutes.local(_.req)

diff --git a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
index 5889d48..1d63b52 100644
--- a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
+++ b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
@@ -5,6 +5,8 @@
 import zio.interop.catz.*
 import zio.interop.catz.implicits.{*, given}
 
+import cats.syntax.all.*
+
 import org.http4s.*
 import org.http4s.dsl.Http4sDsl
 import org.http4s.dsl.io.*
@@ -30,12 +32,13 @@
 ) extends HttpApplication:
   import dsl.*
 
-  val files = static.Routes(config)
+  val staticR = static.Routes(config)
+  val apiR = api.Routes()
 
   def httpApp(appPath: String): HttpRoutes[AppTask] =
     Router(
       security.route,
-      "/mdr" -> security.secure(files.routes)
+      "/mdr" -> security.secure(apiR.routes <+> staticR.routes)
     )
 
   override def routes(): UIO[HttpRoutes[AppTask]] =
diff --git a/server/src/main/scala/mdr/pdb/server/api/Routes.scala b/server/src/main/scala/mdr/pdb/server/api/Routes.scala
new file mode 100644
index 0000000..8cb5617
--- /dev/null
+++ b/server/src/main/scala/mdr/pdb/server/api/Routes.scala
@@ -0,0 +1,12 @@
+package mdr.pdb.server
+package api
+
+import org.http4s.AuthedRoutes
+
+class Routes():
+  import CustomTapir.*
+
+  val serverEndpoints: List[ZServerEndpoint[AppEnv, Any]] = Nil
+
+  val routes: AuthedRoutes[AppAuth, AppTask] =
+    CustomTapir.from(serverEndpoints).toRoutes.local(_.req)
diff --git a/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala b/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala
index cf8a89d..e766364 100644
--- a/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala
+++ b/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala
@@ -7,16 +7,13 @@
 import org.http4s.blaze.server.BlazeServerBuilder
 import org.http4s.HttpRoutes
 
-object BlazeHttpServer {
+object BlazeHttpServer:
   val layer: URLayer[BlazeServerConfig & HttpApplication, HttpServer] =
     val routesLayer = ZLayer
       .environment[HttpApplication]
       .flatMap(a => ZLayer.fromZIO(a.get.routes()))
     val blazeLayer = (BlazeHttpServer(_, _)).toLayer[HttpServer]
     (ZLayer.environment[BlazeServerConfig] ++ routesLayer) >>> blazeLayer
-}
-
-import BlazeHttpServer.*
 
 case class BlazeHttpServer(
     config: BlazeServerConfig,

diff --git a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
index 5889d48..1d63b52 100644
--- a/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
+++ b/server/src/main/scala/mdr/pdb/server/HttpApplication.scala
@@ -5,6 +5,8 @@
 import zio.interop.catz.*
 import zio.interop.catz.implicits.{*, given}
 
+import cats.syntax.all.*
+
 import org.http4s.*
 import org.http4s.dsl.Http4sDsl
 import org.http4s.dsl.io.*
@@ -30,12 +32,13 @@
 ) extends HttpApplication:
   import dsl.*
 
-  val files = static.Routes(config)
+  val staticR = static.Routes(config)
+  val apiR = api.Routes()
 
   def httpApp(appPath: String): HttpRoutes[AppTask] =
     Router(
       security.route,
-      "/mdr" -> security.secure(files.routes)
+      "/mdr" -> security.secure(apiR.routes <+> staticR.routes)
     )
 
   override def routes(): UIO[HttpRoutes[AppTask]] =
diff --git a/server/src/main/scala/mdr/pdb/server/api/Routes.scala b/server/src/main/scala/mdr/pdb/server/api/Routes.scala
new file mode 100644
index 0000000..8cb5617
--- /dev/null
+++ b/server/src/main/scala/mdr/pdb/server/api/Routes.scala
@@ -0,0 +1,12 @@
+package mdr.pdb.server
+package api
+
+import org.http4s.AuthedRoutes
+
+class Routes():
+  import CustomTapir.*
+
+  val serverEndpoints: List[ZServerEndpoint[AppEnv, Any]] = Nil
+
+  val routes: AuthedRoutes[AppAuth, AppTask] =
+    CustomTapir.from(serverEndpoints).toRoutes.local(_.req)
diff --git a/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala b/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala
index cf8a89d..e766364 100644
--- a/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala
+++ b/server/src/main/scala/mdr/pdb/server/blaze/BlazeHttpServer.scala
@@ -7,16 +7,13 @@
 import org.http4s.blaze.server.BlazeServerBuilder
 import org.http4s.HttpRoutes
 
-object BlazeHttpServer {
+object BlazeHttpServer:
   val layer: URLayer[BlazeServerConfig & HttpApplication, HttpServer] =
     val routesLayer = ZLayer
       .environment[HttpApplication]
       .flatMap(a => ZLayer.fromZIO(a.get.routes()))
     val blazeLayer = (BlazeHttpServer(_, _)).toLayer[HttpServer]
     (ZLayer.environment[BlazeServerConfig] ++ routesLayer) >>> blazeLayer
-}
-
-import BlazeHttpServer.*
 
 case class BlazeHttpServer(
     config: BlazeServerConfig,
diff --git a/server/src/main/scala/mdr/pdb/server/static/Routes.scala b/server/src/main/scala/mdr/pdb/server/static/Routes.scala
index d056a04..f0d30e4 100644
--- a/server/src/main/scala/mdr/pdb/server/static/Routes.scala
+++ b/server/src/main/scala/mdr/pdb/server/static/Routes.scala
@@ -6,7 +6,7 @@
 class Routes(config: AppConfig):
   import CustomTapir.*
 
-  val endpoints: List[ZServerEndpoint[AppEnv, Any]] =
+  val serverEndpoints: List[ZServerEndpoint[AppEnv, Any]] =
     List(
       fileGetServerEndpoint("pdb" / "app")(
         s"${config.appPath}/index.html"
@@ -15,4 +15,4 @@
     )
 
   val routes: AuthedRoutes[AppAuth, AppTask] =
-    CustomTapir.from(endpoints).toRoutes.local(_.req)
+    CustomTapir.from(serverEndpoints).toRoutes.local(_.req)