diff --git a/user-modules/default.nix b/user-modules/default.nix
index 877a133..5ced5bf 100644
--- a/user-modules/default.nix
+++ b/user-modules/default.nix
@@ -13,16 +13,8 @@
     ./discord/default.nix
     ./feishin/default.nix
     ./fontconfig/default.nix
-    ./games/modrinth.nix
+    ./gaming/default.nix
     ./git/default.nix
-    ./language/cpp.nix
-    ./language/haskell.nix
-    ./language/js.nix
-    ./language/jupyter.nix
-    ./language/nix.nix
-    ./language/python.nix
-    ./language/rust.nix
-    ./language/tex.nix
     ./mako/default.nix
     ./neovim/default.nix
     ./obsidian/default.nix
@@ -32,7 +24,6 @@
     ./shell/bash.nix
     ./shell/fish.nix
     ./spotify/default.nix
-    ./steam/default.nix
     ./terminal/default.nix
     ./terminal/foot/default.nix
     ./theming/default.nix
diff --git a/user-modules/development/default.nix b/user-modules/development/default.nix
index 44d2797..3a1c3ad 100644
--- a/user-modules/development/default.nix
+++ b/user-modules/development/default.nix
@@ -3,6 +3,14 @@
 {
   imports = [
     ./ide/matlab.nix
-    ./utilities/docker.nix
+    ./language/cpp.nix
+    ./language/haskell.nix
+    ./language/js.nix
+    ./language/jupyter.nix
+    ./language/nix.nix
+    ./language/python.nix
+    ./language/rust.nix
+    ./language/tex.nix
+    ./utility/docker.nix
   ];
 }
diff --git a/user-modules/language/cpp.nix b/user-modules/development/language/cpp.nix
similarity index 100%
rename from user-modules/language/cpp.nix
rename to user-modules/development/language/cpp.nix
diff --git a/user-modules/language/haskell.nix b/user-modules/development/language/haskell.nix
similarity index 100%
rename from user-modules/language/haskell.nix
rename to user-modules/development/language/haskell.nix
diff --git a/user-modules/language/js.nix b/user-modules/development/language/js.nix
similarity index 100%
rename from user-modules/language/js.nix
rename to user-modules/development/language/js.nix
diff --git a/user-modules/language/jupyter.nix b/user-modules/development/language/jupyter.nix
similarity index 100%
rename from user-modules/language/jupyter.nix
rename to user-modules/development/language/jupyter.nix
diff --git a/user-modules/language/nix.nix b/user-modules/development/language/nix.nix
similarity index 100%
rename from user-modules/language/nix.nix
rename to user-modules/development/language/nix.nix
diff --git a/user-modules/language/python.nix b/user-modules/development/language/python.nix
similarity index 100%
rename from user-modules/language/python.nix
rename to user-modules/development/language/python.nix
diff --git a/user-modules/language/rust.nix b/user-modules/development/language/rust.nix
similarity index 100%
rename from user-modules/language/rust.nix
rename to user-modules/development/language/rust.nix
diff --git a/user-modules/language/tex.nix b/user-modules/development/language/tex.nix
similarity index 100%
rename from user-modules/language/tex.nix
rename to user-modules/development/language/tex.nix
diff --git a/user-modules/development/utilities/docker.nix b/user-modules/development/utility/docker.nix
similarity index 100%
rename from user-modules/development/utilities/docker.nix
rename to user-modules/development/utility/docker.nix
diff --git a/user-modules/gaming/default.nix b/user-modules/gaming/default.nix
new file mode 100644
index 0000000..1b1d1e8
--- /dev/null
+++ b/user-modules/gaming/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./emulators/ryujinx.nix
+    ./launchers/modrinth.nix
+    ./launchers/steam.nix
+  ];
+}
diff --git a/user-modules/gaming/emulators/ryujinx.nix b/user-modules/gaming/emulators/ryujinx.nix
new file mode 100644
index 0000000..b7b321b
--- /dev/null
+++ b/user-modules/gaming/emulators/ryujinx.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.ryujinx;
+in
+{
+  options.modules.modrinth = {
+    enable = mkEnableOption "ryujinx";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      ryujinx
+    ];
+  };
+}
diff --git a/user-modules/games/modrinth.nix b/user-modules/gaming/launchers/modrinth.nix
similarity index 100%
rename from user-modules/games/modrinth.nix
rename to user-modules/gaming/launchers/modrinth.nix
diff --git a/user-modules/steam/default.nix b/user-modules/gaming/launchers/steam.nix
similarity index 66%
rename from user-modules/steam/default.nix
rename to user-modules/gaming/launchers/steam.nix
index 01f3021..4c50da1 100644
--- a/user-modules/steam/default.nix
+++ b/user-modules/gaming/launchers/steam.nix
@@ -10,4 +10,6 @@ with lib;
   options.modules.steam = {
     enable = mkEnableOption "steam";
   };
+
+  # The rest of the configuration is in a systemwide module
 }