diff --git a/module/Realtime.nix b/module/Realtime.nix
index 084d433..8fe5aff 100644
--- a/module/Realtime.nix
+++ b/module/Realtime.nix
@@ -3,7 +3,7 @@
 	cfg = config.module.desktop.realtime;
 in {
 	options = {
-		module.desktop.realtime.enable = mkEnableOption "Realtime access.";
+		module.realtime.enable = mkEnableOption "Realtime access.";
 	};
 
 	config = mkIf cfg.enable {
diff --git a/module/Bash.nix b/module/Shell.nix
similarity index 85%
rename from module/Bash.nix
rename to module/Shell.nix
index d7452c2..88db7e2 100644
--- a/module/Bash.nix
+++ b/module/Shell.nix
@@ -1,4 +1,4 @@
-{ lib, ... } @args: {
+{ lib, ... } : {
 	# Remove default aliases for `l`, `ll` etc as they break my function definitions.
 	environment.shellAliases = lib.mkForce {};
 }
diff --git a/module/Sway.nix b/module/Sway.nix
index 81cb18b..4214d26 100644
--- a/module/Sway.nix
+++ b/module/Sway.nix
@@ -8,13 +8,15 @@ in {
 	};
 
 	config = mkIf cfg.enable {
-		module.desktop = {
-			bluetooth.enable  = true;
-			brightness.enable = true;
-			portal.enable     = true;
-			realtime.enable   = true;
-			sound.enable      = true;
-			wayland.enable    = true;
+		module = {
+			desktop = {
+				bluetooth.enable  = true;
+				brightness.enable = true;
+				portal.enable     = true;
+				sound.enable      = true;
+				wayland.enable    = true;
+			};
+			realtime.enable = true;
 		};
 
 		services.gnome.gnome-keyring.enable       = mkForce false;
diff --git a/module/Swap.nix b/module/Zram.nix
similarity index 100%
rename from module/Swap.nix
rename to module/Zram.nix