diff --git a/data.nix b/data.nix
deleted file mode 100644
index debcb01..0000000
--- a/data.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  # Age module definitions that is to be used by hosts to get secrets.
-  ageModules = {
-    secret1.file = ./secrets/secret1.age;
-  };
-age.secrets.secret1.file = ./secrets/secret1.age;
-
-}
\ No newline at end of file
diff --git a/modules/modules-list.nix b/modules/modules-list.nix
new file mode 100644
index 0000000..9fd72db
--- /dev/null
+++ b/modules/modules-list.nix
@@ -0,0 +1,6 @@
+[
+    ./gnome
+    ./home-manager
+    ./base.nix
+    ./ssh.nix
+]
diff --git a/secrets/secret1.age b/secrets/secret1.age
deleted file mode 100644
index 485bfc6..0000000
--- a/secrets/secret1.age
+++ /dev/null
@@ -1,15 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa 54tmtw
-t+UTY3Qh6jSy9pBIhaZLjWgpMiTD+x5rJ2+nD5tIuCWDL3U5h8Z4L99cVKOIsnMU
-8XMlaPdJnd6Y6A1RuCDzqzhnjCIcYXoWMBNSe6JgJ/dKi69q/fO8GNrt6LN1SNIg
-tAaMOIuF6mL0vXonaIkAU8zXIsJvDSlN7aKt3eIOYvq/0WdBMTC7pbkHJ6UcA2DF
-gVIAnZ2hMzDZ1VwklSywGYoCcVh7IQXY588loDb/X9vgpXyVfxmIldgx0BulnHHH
-fikV51VUT4xpIM0dPfLwM5EEfddUVCinHZGE4i1gM7t6bkmW6ePdAeSWpLgM/olJ
-jPmcMO7goV4WuGGmkliICA
--> ssh-ed25519 KLPP8w tOUeFUot+3c5/uCMmRf2+iEff44oH1+16LodxcZ8tRI
-Lh/DGBwAxreX1mikM1vXYmwTpTMQfzdk0OfAS9ZcWgg
--> ^>!"k-grease Oao
-HDL8eWp4pvf8tLucvncf6e8rdeL+Jx0wqc29gX3LiW1/39wDngd85ldEwJwTNpLm
-wsYQibvHluCFNeduW95Y41nvScAU1E+DdtbvkFQ9
---- Hs1+jKn3TiUMbCnplc713eslRXWB+wZNa671sCh/Fv0
-‘.¯Yö-"®N-ã9ðbtÓéŸ>CyJzç˜ÍÓÌÛ
À!)"x³ëaˆ
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
deleted file mode 100644
index ca3e467..0000000
--- a/secrets/secrets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-let
-  sstent = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+D4o3mL4BQsRr0UIhB1hn0brSTIJ9Lr0m2fMMVGF3tIuEihnmwGTeAX78q5/bmoo4gZy7G+CHal54S1lY8LY1KvmIDCpPJ8848HvLbTiTX3qZ7Mjaav+Ox9eHMwX+7zkPwdhfP8TDvmNe12j1GEKBhAm+FhdBQCbEV7cbm1SkX0+WBGoVvI2qbRm1RF0mOuTAmO3Lr2YeAcKJ21YxwNMv1Qrj7oxGYH9rLHLNwZ/0soIdTC9cikl4DHyvCs4HRYcVw36uuCVc/AyIT2GeETRapAQr8nzT89Haa1IThgZ9ztjSsSSOtrUhxatlMIfTIpVjl/gWq7GLfqd/ei/evTal sstent@StuPC";
-  users = [ sstent ];
-
-  HyperV = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPJDyIr/FSz1cJdcoW69R+NrWzwGK/+3gJpqD1t8L2zE";
-  systems = [ HyperV ];
-in
-{
-  "secret1.age".publicKeys = [ sstent HyperV ];
-  "secret2.age".publicKeys = users ++ systems;
-}
\ No newline at end of file