diff --git a/bibi.nix b/bibi.nix
deleted file mode 100644
index 565de78..0000000
--- a/bibi.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-}
diff --git a/configuration.nix b/configuration.nix
deleted file mode 100644
index 99a08a3..0000000
--- a/configuration.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ./hackens
-    ];
-
-  # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.efiSupport = true;
-  boot.loader.grub.efiInstallAsRemovable = true;
-  boot.loader.efi.efiSysMountPoint = "/boot";
-  boot.loader.grub.device = "nodev"; # or "nodev" for efi only
-  boot.loader.grub.configurationLimit = 2;
-
-  networking.hostName = "hackens-milieu"; # Define your hostname.
-
-
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = false;
-  networking.interfaces.enp2s0.useDHCP = true;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.09"; # Did you read the comment?
-}
-
diff --git a/configuration.nix b/configuration.nix
new file mode 120000
index 0000000..aec15df
--- /dev/null
+++ b/configuration.nix
@@ -0,0 +1 @@
+hosts/hackens-milieu.nix
\ No newline at end of file
diff --git a/hosts/hackens-milieu.nix b/hosts/hackens-milieu.nix
new file mode 100644
index 0000000..5e0b2fc
--- /dev/null
+++ b/hosts/hackens-milieu.nix
@@ -0,0 +1,40 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      ../profiles/hackens
+    ];
+
+  # Use the GRUB 2 boot loader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.efiSupport = true;
+  boot.loader.grub.efiInstallAsRemovable = true;
+  boot.loader.efi.efiSysMountPoint = "/boot";
+  boot.loader.grub.device = "nodev"; # or "nodev" for efi only
+  boot.loader.grub.configurationLimit = 2;
+
+  networking.hostName = "hackens-milieu"; # Define your hostname.
+
+
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
+  networking.useDHCP = false;
+  networking.interfaces.enp2s0.useDHCP = true;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "20.09"; # Did you read the comment?
+}
+
diff --git a/hardware-configuration.nix b/hosts/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/hardware-configuration.nix
diff --git a/hackens/aarch64.nix b/profiles/hackens/aarch64.nix
similarity index 100%
rename from hackens/aarch64.nix
rename to profiles/hackens/aarch64.nix
diff --git a/hackens/audio.nix b/profiles/hackens/audio.nix
similarity index 100%
rename from hackens/audio.nix
rename to profiles/hackens/audio.nix
diff --git a/hackens/backups.nix b/profiles/hackens/backups.nix
similarity index 100%
rename from hackens/backups.nix
rename to profiles/hackens/backups.nix
diff --git a/hackens/default.nix b/profiles/hackens/default.nix
similarity index 100%
rename from hackens/default.nix
rename to profiles/hackens/default.nix
diff --git a/hackens/dns.nix b/profiles/hackens/dns.nix
similarity index 100%
rename from hackens/dns.nix
rename to profiles/hackens/dns.nix
diff --git a/hackens/dns/forwarding.txt b/profiles/hackens/dns/forwarding.txt
similarity index 100%
rename from hackens/dns/forwarding.txt
rename to profiles/hackens/dns/forwarding.txt
diff --git a/hackens/graphics.nix b/profiles/hackens/graphics.nix
similarity index 100%
rename from hackens/graphics.nix
rename to profiles/hackens/graphics.nix
diff --git a/hackens/hosts.nix b/profiles/hackens/hosts.nix
similarity index 100%
rename from hackens/hosts.nix
rename to profiles/hackens/hosts.nix
diff --git a/hackens/i18n.nix b/profiles/hackens/i18n.nix
similarity index 100%
rename from hackens/i18n.nix
rename to profiles/hackens/i18n.nix
diff --git a/hackens/i3.nix b/profiles/hackens/i3.nix
similarity index 100%
rename from hackens/i3.nix
rename to profiles/hackens/i3.nix
diff --git a/hackens/kde.nix b/profiles/hackens/kde.nix
similarity index 100%
rename from hackens/kde.nix
rename to profiles/hackens/kde.nix
diff --git a/hackens/monitoring.nix b/profiles/hackens/monitoring.nix
similarity index 100%
rename from hackens/monitoring.nix
rename to profiles/hackens/monitoring.nix
diff --git a/hackens/netboot-server.nix b/profiles/hackens/netboot-server.nix
similarity index 100%
rename from hackens/netboot-server.nix
rename to profiles/hackens/netboot-server.nix
diff --git a/hackens/nightworker.nix b/profiles/hackens/nightworker.nix
similarity index 100%
rename from hackens/nightworker.nix
rename to profiles/hackens/nightworker.nix
diff --git a/hackens/programs.nix b/profiles/hackens/programs.nix
similarity index 100%
rename from hackens/programs.nix
rename to profiles/hackens/programs.nix
diff --git a/hackens/pubkeys/gdd.keys b/profiles/hackens/pubkeys/gdd.keys
similarity index 100%
rename from hackens/pubkeys/gdd.keys
rename to profiles/hackens/pubkeys/gdd.keys
diff --git a/hackens/pubkeys/raito.keys b/profiles/hackens/pubkeys/raito.keys
similarity index 100%
rename from hackens/pubkeys/raito.keys
rename to profiles/hackens/pubkeys/raito.keys
diff --git a/hackens/ssd.nix b/profiles/hackens/ssd.nix
similarity index 100%
rename from hackens/ssd.nix
rename to profiles/hackens/ssd.nix
diff --git a/hackens/syncthing.nix b/profiles/hackens/syncthing.nix
similarity index 100%
rename from hackens/syncthing.nix
rename to profiles/hackens/syncthing.nix
diff --git a/hackens/system.nix b/profiles/hackens/system.nix
similarity index 100%
rename from hackens/system.nix
rename to profiles/hackens/system.nix
diff --git a/hackens/users.nix b/profiles/hackens/users.nix
similarity index 100%
rename from hackens/users.nix
rename to profiles/hackens/users.nix
diff --git a/hackens/vim.nix b/profiles/hackens/vim.nix
similarity index 100%
rename from hackens/vim.nix
rename to profiles/hackens/vim.nix
diff --git a/hackens/vpn-network/default.nix b/profiles/hackens/vpn-network/default.nix
similarity index 100%
rename from hackens/vpn-network/default.nix
rename to profiles/hackens/vpn-network/default.nix
diff --git a/hackens/vpn-network/wg-peers.nix b/profiles/hackens/vpn-network/wg-peers.nix
similarity index 100%
rename from hackens/vpn-network/wg-peers.nix
rename to profiles/hackens/vpn-network/wg-peers.nix