diff --git a/modules/system/accounts/default.nix b/modules/system/accounts/default.nix
deleted file mode 100644
index dfbc9b1..0000000
--- a/modules/system/accounts/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./users
-    ./groups
-  ];
-}
diff --git a/modules/system/accounts/groups/default.nix b/modules/system/accounts/groups/default.nix
deleted file mode 100644
index 293cc0d..0000000
--- a/modules/system/accounts/groups/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ./nfsShare ];
-}
diff --git a/modules/system/accounts/groups/nfsShare/default.nix b/modules/system/accounts/groups/nfsShare/default.nix
deleted file mode 100644
index 362f176..0000000
--- a/modules/system/accounts/groups/nfsShare/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  users.groups.nfsShare.gid = 983;
-}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 527396d..e502dcd 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,12 +1,12 @@
 { lib, ... }:
 {
   imports = [
-    ./accounts
     ./devices
     ./programs
     ./secrets
     ./services
     ./settings
+    ./users
   ];
 
   options.system = with lib; {
diff --git a/modules/system/services/server/fileserver/nfs/default.nix b/modules/system/services/server/fileserver/nfs/default.nix
index a346ad0..f3127a5 100644
--- a/modules/system/services/server/fileserver/nfs/default.nix
+++ b/modules/system/services/server/fileserver/nfs/default.nix
@@ -1,5 +1,7 @@
 { config, ... }:
 {
+  imports = [ ./user ];
+
   services.nfs.server = {
     enable = config.system.fileserver.enable;
     exports = ''
diff --git a/modules/system/services/server/fileserver/nfs/user/default.nix b/modules/system/services/server/fileserver/nfs/user/default.nix
new file mode 100644
index 0000000..eac68f8
--- /dev/null
+++ b/modules/system/services/server/fileserver/nfs/user/default.nix
@@ -0,0 +1,4 @@
+{ config, lib, ... }:
+{
+  users.groups.nfsShare.gid = lib.mkIf config.services.nfs.server.enable 983;
+}
diff --git a/modules/system/services/server/socialserver/default.nix b/modules/system/services/server/socialserver/default.nix
index eadde80..c49e35f 100644
--- a/modules/system/services/server/socialserver/default.nix
+++ b/modules/system/services/server/socialserver/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ./mastodon
     ./owncast
-    ./spacebar
+    #./spacebar
   ];
 
   options.system.socialserver.enable = lib.mkEnableOption "Enable social media like services";
diff --git a/modules/system/services/server/socialserver/spacebar/default.nix b/modules/system/services/server/socialserver/spacebar/default.nix
index 95a8d71..ca0762b 100644
--- a/modules/system/services/server/socialserver/spacebar/default.nix
+++ b/modules/system/services/server/socialserver/spacebar/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, spacebar, ... }:
 {
   imports = [
-    #./nginx
+    ./nginx
     ./user
   ];
 
diff --git a/modules/system/services/server/socialserver/spacebar/user/default.nix b/modules/system/services/server/socialserver/spacebar/user/default.nix
index 16c28a0..7ac4875 100644
--- a/modules/system/services/server/socialserver/spacebar/user/default.nix
+++ b/modules/system/services/server/socialserver/spacebar/user/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  users = lib.mkIf config.system.socialserver.enable {
+  users = lib.mkIf config.systemd.services.spacebar-server.enable {
     users.spacebar = {
       group = "spacebar";
       isSystemUser = true;
diff --git a/modules/system/accounts/users/default.nix b/modules/system/users/default.nix
similarity index 100%
rename from modules/system/accounts/users/default.nix
rename to modules/system/users/default.nix
diff --git a/modules/system/accounts/users/main/default.nix b/modules/system/users/main/default.nix
similarity index 73%
rename from modules/system/accounts/users/main/default.nix
rename to modules/system/users/main/default.nix
index 350f082..69096b3 100644
--- a/modules/system/accounts/users/main/default.nix
+++ b/modules/system/users/main/default.nix
@@ -12,14 +12,14 @@
       isNormalUser = true;
       createHome = true;
       openssh.authorizedKeys.keyFiles = [
-        ../../../../../hosts/tower/id_ed25519.pub
+        ../../../../hosts/tower/id_ed25519.pub
 
-        ../../../../../hosts/envy/id_ed25519.pub
-        ../../../../../hosts/pear/id_ed25519.pub
-        ../../../../../hosts/redmond/id_ed25519.pub
+        ../../../../hosts/envy/id_ed25519.pub
+        ../../../../hosts/pear/id_ed25519.pub
+        ../../../../hosts/redmond/id_ed25519.pub
 
-        ../../../../../hosts/midas/id_ed25519.pub
-        ../../../../../hosts/prophet/id_ed25519.pub
+        ../../../../hosts/midas/id_ed25519.pub
+        ../../../../hosts/prophet/id_ed25519.pub
       ];
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
@@ -43,6 +43,6 @@
       shell = pkgs.zsh;
     };
 
-    home-manager.users."${config.sysusers.main}" = import ../../../../home;
+    home-manager.users."${config.sysusers.main}" = import ../../../home;
   };
 }