diff --git a/configuration.nix b/configuration.nix
index 013844a..07e258e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,11 +6,11 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ./variables-module.nix
-    ./variables.nix
     ./users.nix
     ./generic/api/api.nix
     ./generic/api/api-module.nix
+    ./generic/modules/userdata.nix
+    ./generic/services/userdata.nix
     ./generic/systems/limits.nix
     ./generic/systems/tmpfiles.nix
     ./local/services/backup/restic.nix
diff --git a/variables-module.nix b/generic/modules/userdata.nix
similarity index 100%
rename from variables-module.nix
rename to generic/modules/userdata.nix
diff --git a/generic/services/userdata.nix b/generic/services/userdata.nix
new file mode 100644
index 0000000..e20b6dc
--- /dev/null
+++ b/generic/services/userdata.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  services = {
+    userdata = builtins.fromJSON (builtins.readFile ./../../local/profiles/users.json);
+  };
+}
diff --git a/variables.nix b/variables.nix
deleted file mode 100644
index e8be7c6..0000000
--- a/variables.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  services = {
-    userdata = builtins.fromJSON (builtins.readFile ./local/profiles/users.json);
-  };
-}