diff --git a/configuration.nix b/configuration.nix
index 14fc87a..d759af9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -24,14 +24,6 @@
     vim
   ];
 
-  # File systems configuration for using the installer's partition layout
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-    };
-  };
-
   # !!! Adding a swap file is optional, but strongly recommended!
   swapDevices = [ { device = "/swapfile"; size = 1024; } ];
 
@@ -106,6 +98,7 @@
     ./modules/printing.nix
     ./modules/networking.nix
     ./modules/datasync.nix
+    ./modules/hardware-configuration.nix
   ];
 
 }
diff --git a/modules/datasync.nix b/modules/datasync.nix
index 697b603..309e8cf 100644
--- a/modules/datasync.nix
+++ b/modules/datasync.nix
@@ -1,4 +1,4 @@
-# syncthingthing and Radicale configuration
+# Syncthing and Radicale configuration
 { config, pkgs, lib, ... }:
 {
 
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