diff --git a/nodes/common/configuration.nix b/nodes/hosts/common/configuration.nix
similarity index 100%
rename from nodes/common/configuration.nix
rename to nodes/hosts/common/configuration.nix
diff --git a/nodes/hosts/group.nix b/nodes/hosts/group.nix
new file mode 100644
index 0000000..b794b06
--- /dev/null
+++ b/nodes/hosts/group.nix
@@ -0,0 +1,7 @@
+{
+  common = {
+    os = "nixos";
+    channel = "stable";
+  };
+  lappy = {};
+}
diff --git a/nodes/lappy/configuration.nix b/nodes/hosts/lappy/configuration.nix
similarity index 100%
rename from nodes/lappy/configuration.nix
rename to nodes/hosts/lappy/configuration.nix
diff --git a/nodes/lappy/disk-config.nix b/nodes/hosts/lappy/disk-config.nix
similarity index 100%
rename from nodes/lappy/disk-config.nix
rename to nodes/hosts/lappy/disk-config.nix
diff --git a/nodes/lappy/filesystems.nix b/nodes/hosts/lappy/filesystems.nix
similarity index 100%
rename from nodes/lappy/filesystems.nix
rename to nodes/hosts/lappy/filesystems.nix
diff --git a/nodes/lappy/hardware-configuration.nix b/nodes/hosts/lappy/hardware-configuration.nix
similarity index 100%
rename from nodes/lappy/hardware-configuration.nix
rename to nodes/hosts/lappy/hardware-configuration.nix
diff --git a/nodes/lappy/node.nix b/nodes/hosts/lappy/node.nix
similarity index 100%
rename from nodes/lappy/node.nix
rename to nodes/hosts/lappy/node.nix