diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 9ce717f..69c3037 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -6,14 +6,10 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [ # Hardware-related
       ./hardware-configuration.nix
-
-      # Swap
-      ../../modules/nixos/swap.nix
-
-      # NVIDIA setup
-      ../../modules/nixos/nvidia.nix
+      ../../modules/nixos/hardware/swap.nix
+      ../../modules/nixos/hardware/nvidia.nix
 
       # Gnome customization
       ../../modules/nixos/gnome.nix
@@ -131,6 +127,9 @@
     FLAKE = "/home/shoi/etc/nixos";
   };
 
+  # Enable Mullvad
+  services.mullvad-vpn.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
diff --git a/modules/nixos/nvidia.nix b/modules/nixos/hardware/nvidia.nix
similarity index 100%
rename from modules/nixos/nvidia.nix
rename to modules/nixos/hardware/nvidia.nix
diff --git a/modules/nixos/swap.nix b/modules/nixos/hardware/swap.nix
similarity index 100%
rename from modules/nixos/swap.nix
rename to modules/nixos/hardware/swap.nix