diff --git a/flake.nix b/flake.nix
index 518fe3c..33f294b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,16 +5,17 @@
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
   };
 
-  outputs = { self, nixpkgs, ... }@inputs: {
-    nixosConfigurations.prismo = nixpkgs.lib.nixosSystem {
+  outputs = { self, nixpkgs, ... }@inputs: 
+    let
       system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
-      modules = [
-        ./configuration.nix
-        ./podman.nix
-        ./fonts.nix
-        ./users.nix
-      ];
-    };
+      user = "torjus";
+    in {
+      nixosConfigurations.prismo = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs self user; };
+        modules = [
+          ./hosts/prismo
+        ];
+      };
   };
 }
diff --git a/configuration.nix b/hosts/prismo/configuration.nix
similarity index 100%
rename from configuration.nix
rename to hosts/prismo/configuration.nix
diff --git a/hosts/prismo/default.nix b/hosts/prismo/default.nix
new file mode 100644
index 0000000..bbee440
--- /dev/null
+++ b/hosts/prismo/default.nix
@@ -0,0 +1,7 @@
+{ inputs, self, pks, ...}: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+    ../../system
+  ];
+}
diff --git a/hardware-configuration.nix b/hosts/prismo/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/prismo/hardware-configuration.nix
diff --git a/system/default.nix b/system/default.nix
new file mode 100644
index 0000000..9bfcda9
--- /dev/null
+++ b/system/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./podman.nix
+    ./fonts.nix
+    ./users.nix
+  ];
+}
diff --git a/fonts.nix b/system/fonts.nix
similarity index 100%
rename from fonts.nix
rename to system/fonts.nix
diff --git a/podman.nix b/system/podman.nix
similarity index 100%
rename from podman.nix
rename to system/podman.nix
diff --git a/users.nix b/system/users.nix
similarity index 100%
rename from users.nix
rename to system/users.nix