diff --git a/module.nix b/module.nix
index a2766f4..5ab4f85 100644
--- a/module.nix
+++ b/module.nix
@@ -4,7 +4,7 @@ packages:
 
 with lib;
 let
-  suanni-server = packages."${pkgs.system}".nexus-client;
+  suanni-server = packages."${pkgs.system}".suanni-server;
   cfg = config.suanni.server;
 
 in {
diff --git a/src/suanni/cli.clj b/src/suanni/server/cli.clj
similarity index 99%
rename from src/suanni/cli.clj
rename to src/suanni/server/cli.clj
index c226bea..7418e07 100644
--- a/src/suanni/cli.clj
+++ b/src/suanni/server/cli.clj
@@ -1,4 +1,4 @@
-(ns suanni.cli
+(ns suanni.server.cli
   (:require [suanni.syno-client :as syno]
             [suanni.stoppable :refer [stop!]]
             [milquetoast.client :as mqtt]