diff --git a/flake.lock b/flake.lock
index 2d7d657..e37717a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,11 +78,11 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1711410101,
-        "narHash": "sha256-HEOyOUg+rRelnhsmXJ9ht0cUok94s2oCw6TtHhMPC+8=",
+        "lastModified": 1711485134,
+        "narHash": "sha256-lNT4pNAaQtS0n8Bj81ZFlqEADnGEuvckr6GjJMaFxyo=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "0d2b028bcf1a9c8d0d8bb987edec8d56a2075922",
+        "rev": "a99e06b889dcb9634dcf70382c9f1fd5b07c9e52",
         "type": "github"
       },
       "original": {
@@ -357,11 +357,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1711332928,
-        "narHash": "sha256-VSqMvQR22wn0ySB4mvDqNnrOl43cBJc4vkPAk9YEPoQ=",
+        "lastModified": 1711432844,
+        "narHash": "sha256-Vf9X0QXfgKpKSIinaCm79+hqkiu3aXUhcUdMJn335Gw=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "15ff7dfd4836d1d6d9fad0a91e06dea2b3dea58d",
+        "rev": "0481e67dfdb88f265174f27c359a545d144977ee",
         "type": "github"
       },
       "original": {
@@ -394,11 +394,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711266147,
-        "narHash": "sha256-oNAcVJ0oNwq0JTw9ZmopJREiT4NZ+1VMs5vY85eidnQ=",
+        "lastModified": 1711445737,
+        "narHash": "sha256-wdsdXc8WCIX5EmnUpIiH7LoQZrzOYco0LxVffkUX6/4=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "e5bd1113ba293bed1b80f04e8683d1aa847a5dc8",
+        "rev": "f5c97faf4aefc8366c3be7475dde5412a42dbc8f",
         "type": "github"
       },
       "original": {
@@ -468,11 +468,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711163522,
-        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
+        "lastModified": 1711333969,
+        "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+        "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
         "type": "github"
       },
       "original": {
@@ -576,11 +576,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710362637,
-        "narHash": "sha256-i5fTiwb4SvEIoEcJyPMLy0QYtlIuoJagpSMb+KDwLdQ=",
+        "lastModified": 1711472513,
+        "narHash": "sha256-M85pqfYnYeVPTZXKtjg/ks5LUl3u2onG9Nfn8Xs+BSA=",
         "ref": "refs/heads/main",
-        "rev": "4e6afa08fd8c9a302e3ad634c691fcd3fcf516d1",
-        "revCount": 27,
+        "rev": "144be992b1068f721b182aef82298eab29c5b3eb",
+        "revCount": 28,
         "type": "git",
         "url": "https://git.grimmauld.de/Grimmauld/swaymux"
       },
diff --git a/flake.nix b/flake.nix
index 84e4524..e20520c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,12 +35,11 @@
           chaotic.nixosModules.default
           inputs.nix-gaming.nixosModules.pipewireLowLatency
           ./load_common.nix
-          ./specific/grimm-nixos-laptop.nix
+          ./specific/grimm-nixos-laptop/configuration.nix
 
           ./configuration.nix
           ./modules/users.nix
 #          ./modules/tlp.nix
-          ./modules/screenshare_select.nix
           ./modules/spotify-tui.nix
           ./modules/xserver.nix
           ./modules/system-packages.nix
diff --git a/specific/grimm-nixos-laptop.nix b/specific/grimm-nixos-laptop/configuration.nix
similarity index 82%
rename from specific/grimm-nixos-laptop.nix
rename to specific/grimm-nixos-laptop/configuration.nix
index f1aa240..73a8cff 100644
--- a/specific/grimm-nixos-laptop.nix
+++ b/specific/grimm-nixos-laptop/configuration.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   imports = [ # Include the results of the hardware scan.
-      ./grimm-nixos-laptop-hardware.nix
+      ./hardware-configuration.nix
+      ./screenshare-select.nix
     ];
 
   age.identityPaths = [ "/home/grimmauld/.ssh/id_rsa" ];
diff --git a/specific/grimm-nixos-laptop-hardware.nix b/specific/grimm-nixos-laptop/hardware-configuration.nix
similarity index 100%
rename from specific/grimm-nixos-laptop-hardware.nix
rename to specific/grimm-nixos-laptop/hardware-configuration.nix
diff --git a/modules/screenshare_select.nix b/specific/grimm-nixos-laptop/screenshare-select.nix
similarity index 100%
rename from modules/screenshare_select.nix
rename to specific/grimm-nixos-laptop/screenshare-select.nix