diff --git a/source/BUILD b/source/BUILD
index a3b2f74..e69de29 100644
--- a/source/BUILD
+++ b/source/BUILD
@@ -1,24 +0,0 @@
-cc_library(
-    name = "headers",
-    hdrs = [
-        "//include/parselink:server.h",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-cc_binary(
-    name = "parselinkd",
-    srcs = [
-        "main.cpp",
-        "server.cpp",
-    ],
-    deps = [
-        "headers",
-        "//include/parselink:msgpack",
-        "//include/parselink:utility",
-        "//source/logging",
-        "//source/proto",
-        "//source/server",
-        "@boost//:beast",
-    ],
-)
diff --git a/source/server/BUILD b/source/server/BUILD
index dca5fb5..27a1308 100644
--- a/source/server/BUILD
+++ b/source/server/BUILD
@@ -18,3 +18,27 @@ cc_library(
         "//visibility:public",
     ],
 )
+
+cc_library(
+    name = "headers",
+    hdrs = [
+        "//include/parselink:server.h",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_binary(
+    name = "parselinkd",
+    srcs = [
+        "main.cpp",
+        "monolithic_server.cpp",
+    ],
+    deps = [
+        "headers",
+        "//include/parselink:utility",
+        "//source/logging",
+        "//source/proto",
+        ":server",
+        "@boost//:beast",
+    ],
+)
diff --git a/source/main.cpp b/source/server/main.cpp
similarity index 100%
rename from source/main.cpp
rename to source/server/main.cpp
diff --git a/source/server.cpp b/source/server/monolithic_server.cpp
similarity index 100%
rename from source/server.cpp
rename to source/server/monolithic_server.cpp