diff --git a/configuration.nix b/configuration.nix
index 7225d99..1ec8ed9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,122 +1,25 @@
-# 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, ... }:
 
 {
+  system.stateVersion = "25.05";
+
   imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+    [
+      ./modules/bootloader.nix
+      ./modules/hardware-configuration.nix # Include the results of the hardware scan.
+      ./modules/networking.nix
+      ./modules/users.nix
+      ./modules/audio.nix
+      ./modules/printing.nix
+      ./modules/localization.nix
+      ./modules/x.nix
     ];
 
-  # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.grub.useOSProber = true;
 
-  networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Brussels";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.h = {
-    isNormalUser = true;
-    description = "h";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-    #  thunderbird
-    ];
-  };
-
-  # Install git.
   programs.git.enable = true;
-
-  # Install firefox.
   programs.firefox.enable = true;
 
-  # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    neovim
-  #  wget
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # 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 = "25.05"; # Did you read the comment?
-
+  environment.systemPackages = with pkgs; [ neovim ];
 }
diff --git a/modules/audio.nix b/modules/audio.nix
new file mode 100644
index 0000000..54686a2
--- /dev/null
+++ b/modules/audio.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+}
diff --git a/modules/bootloader.nix b/modules/bootloader.nix
new file mode 100644
index 0000000..2faefdd
--- /dev/null
+++ b/modules/bootloader.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/vda";
+  boot.loader.grub.useOSProber = true;
+}
diff --git a/hardware-configuration.nix b/modules/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to modules/hardware-configuration.nix
diff --git a/modules/localization.nix b/modules/localization.nix
new file mode 100644
index 0000000..19b601d
--- /dev/null
+++ b/modules/localization.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  time.timeZone = "Europe/Brussels";
+  i18n.defaultLocale = "en_US.UTF-8";
+}
diff --git a/modules/networking.nix b/modules/networking.nix
new file mode 100644
index 0000000..86cddc1
--- /dev/null
+++ b/modules/networking.nix
@@ -0,0 +1,19 @@
+{ ... }:
+
+{
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+}
diff --git a/modules/printing.nix b/modules/printing.nix
new file mode 100644
index 0000000..b383077
--- /dev/null
+++ b/modules/printing.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{ 
+  services.printing.enable = true;
+}
diff --git a/modules/users.nix b/modules/users.nix
new file mode 100644
index 0000000..ef45ded
--- /dev/null
+++ b/modules/users.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  users.users.h = {
+    isNormalUser = true;
+    description = "h";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+    #  thunderbird
+    ];
+  };
+}
diff --git a/modules/x.nix b/modules/x.nix
new file mode 100644
index 0000000..89cf0f9
--- /dev/null
+++ b/modules/x.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  services.xserver = {
+    enable = true;
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+    xkb.layout = "us";
+    xkb.variant = "";
+  };
+}