diff --git a/flake.lock b/flake.lock
index 1088988..df7b62b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,64 +54,18 @@
         "type": "github"
       }
     },
-    "nix-software-center": {
-      "inputs": {
-        "nixos-appstream-data": "nixos-appstream-data",
-        "nixpkgs": "nixpkgs",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1730517716,
-        "narHash": "sha256-hq3jlW5lyT2RkWhJ2/Oo+dt9FXtJ47zDDBBk8A8abMo=",
-        "owner": "snowfallorg",
-        "repo": "nix-software-center",
-        "rev": "216eb549f1ec222c2877d2194f2987527954f2c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "snowfallorg",
-        "repo": "nix-software-center",
-        "type": "github"
-      }
-    },
-    "nixos-appstream-data": {
-      "inputs": {
-        "flake-utils": [
-          "nix-software-center",
-          "utils"
-        ],
-        "nixpkgs": [
-          "nix-software-center",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712858390,
-        "narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=",
-        "owner": "korfuri",
-        "repo": "nixos-appstream-data",
-        "rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "korfuri",
-        "ref": "flake",
-        "repo": "nixos-appstream-data",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692638711,
-        "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=",
-        "owner": "NixOS",
+        "lastModified": 1769089682,
+        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15",
+        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -147,64 +101,14 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1769089682,
-        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "import-tree": "import-tree",
-        "nix-software-center": "nix-software-center",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/modules/system/options/apps/git.nix b/modules/system/options/apps/git.nix
index 7e7b0ac..e9ba8ee 100644
--- a/modules/system/options/apps/git.nix
+++ b/modules/system/options/apps/git.nix
@@ -13,10 +13,6 @@ in
       enable = true;
       config = {
         init.defaultBranch = "main";
-        user = {
-          name = "Laurent Gueret";
-          email = "gueretlob@icloud.com";
-        };
       };
     };
 
diff --git a/modules/system/options/apps/gnome-apps.nix b/modules/system/options/apps/gnome/apps.nix
similarity index 100%
rename from modules/system/options/apps/gnome-apps.nix
rename to modules/system/options/apps/gnome/apps.nix
diff --git a/modules/system/options/apps/gnome-shell.nix b/modules/system/options/apps/gnome/shell.nix
similarity index 100%
rename from modules/system/options/apps/gnome-shell.nix
rename to modules/system/options/apps/gnome/shell.nix
diff --git a/modules/system/options/apps/docker.nix b/modules/system/options/apps/virtualisation/docker.nix
similarity index 74%
rename from modules/system/options/apps/docker.nix
rename to modules/system/options/apps/virtualisation/docker.nix
index 91dfd84..5b3f236 100644
--- a/modules/system/options/apps/docker.nix
+++ b/modules/system/options/apps/virtualisation/docker.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.os.shell.docker;
+  cfg = config.os.virtualisation.docker;
 in
 {
-  options.os.shell.docker = {
+  options.os.virtualisation.docker = {
     enable = mkEnableOption "System docker service";
   };
   config = mkIf cfg.enable {
@@ -13,5 +13,6 @@ in
       enable = true;
       daemon.settings.features.cdi = true;
     };
+
   };
 }
diff --git a/modules/system/options/apps/virtualisation/podman.nix b/modules/system/options/apps/virtualisation/podman.nix
new file mode 100644
index 0000000..29b4e74
--- /dev/null
+++ b/modules/system/options/apps/virtualisation/podman.nix
@@ -0,0 +1,35 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.os.virtualisation.podman;
+in
+{
+  options.os.virtualisation.podman = {
+    enable = mkEnableOption "System docker service";
+  };
+  config = mkIf cfg.enable {
+
+    virtualisation = {
+      containers.enable = true;
+      podman = {
+        enable = true;
+        dockerCompat = true;
+        dockerSocket.enable = true;
+        defaultNetwork.settings.dns_enabled = true; # Required for containers under podman-compose to be able to talk to each other.
+      };
+    };
+
+    environment = {
+      systemPackages = with pkgs; [
+        pods
+        podman-compose
+      ];
+    };
+
+  };
+}
diff --git a/modules/system/options/nixos/plymouth.nix b/modules/system/options/nixos/boot/plymouth.nix
similarity index 100%
rename from modules/system/options/nixos/plymouth.nix
rename to modules/system/options/nixos/boot/plymouth.nix
diff --git a/modules/system/options/nixos/systemd-boot.nix b/modules/system/options/nixos/boot/systemd-boot.nix
similarity index 100%
rename from modules/system/options/nixos/systemd-boot.nix
rename to modules/system/options/nixos/boot/systemd-boot.nix
diff --git a/modules/system/options/nixos/cuda.nix b/modules/system/options/nixos/graphics/cuda.nix
similarity index 100%
rename from modules/system/options/nixos/cuda.nix
rename to modules/system/options/nixos/graphics/cuda.nix
diff --git a/modules/system/options/nixos/nvidia.nix b/modules/system/options/nixos/graphics/nvidia.nix
similarity index 100%
rename from modules/system/options/nixos/nvidia.nix
rename to modules/system/options/nixos/graphics/nvidia.nix
diff --git a/modules/system/options/nixos/dns.nix b/modules/system/options/nixos/network/dns.nix
similarity index 100%
rename from modules/system/options/nixos/dns.nix
rename to modules/system/options/nixos/network/dns.nix
diff --git a/modules/system/options/nixos/manager.nix b/modules/system/options/nixos/network/manager.nix
similarity index 100%
rename from modules/system/options/nixos/manager.nix
rename to modules/system/options/nixos/network/manager.nix
diff --git a/modules/system/os.nix b/modules/system/os.nix
index 30fbfc8..ed6cdd9 100755
--- a/modules/system/os.nix
+++ b/modules/system/os.nix
@@ -24,8 +24,8 @@
   os.gnome.apps.enable = true;
 
   # Virtualisation Apps
-  os.shell.docker.enable = true;
   os.virtualisation.cuda.enable = true;
+  os.virtualisation.podman.enable = true;
 
   # System version
   system.stateVersion = "25.11";
diff --git a/modules/system/partials/users.nix b/modules/system/partials/users.nix
index d652bf6..5e2b378 100644
--- a/modules/system/partials/users.nix
+++ b/modules/system/partials/users.nix
@@ -6,7 +6,7 @@
       isNormalUser = true;
       extraGroups = [
         "wheel"
-        "docker"
+        "podman"
       ];
     };
   };
diff --git a/modules/users/home.nix b/modules/users/home.nix
index 6086280..1a2e4c0 100644
--- a/modules/users/home.nix
+++ b/modules/users/home.nix
@@ -19,7 +19,7 @@
       };
 
       os.ide.zed.enable = true;
-      os.ide.jetbrains.enable = false;
+      os.ide.jetbrains.enable = true;
 
       home.stateVersion = "25.11";
     };
diff --git a/modules/users/options/jetbrains.nix b/modules/users/options/ide/jetbrains/pycharm.nix
similarity index 100%
rename from modules/users/options/jetbrains.nix
rename to modules/users/options/ide/jetbrains/pycharm.nix
diff --git a/modules/users/options/zed.nix b/modules/users/options/ide/zed.nix
similarity index 100%
rename from modules/users/options/zed.nix
rename to modules/users/options/ide/zed.nix
diff --git a/modules/users/partials/gnome.nix b/modules/users/partials/gnome/dconf.nix
similarity index 100%
rename from modules/users/partials/gnome.nix
rename to modules/users/partials/gnome/dconf.nix
diff --git a/modules/users/partials/wallpapers/dark-gray.svg b/modules/users/partials/gnome/wallpapers/dark-gray.svg
similarity index 100%
rename from modules/users/partials/wallpapers/dark-gray.svg
rename to modules/users/partials/gnome/wallpapers/dark-gray.svg
diff --git a/modules/users/partials/wallpapers/frappe.svg b/modules/users/partials/gnome/wallpapers/frappe.svg
similarity index 100%
rename from modules/users/partials/wallpapers/frappe.svg
rename to modules/users/partials/gnome/wallpapers/frappe.svg
diff --git a/modules/users/partials/wallpapers/latte.svg b/modules/users/partials/gnome/wallpapers/latte.svg
similarity index 100%
rename from modules/users/partials/wallpapers/latte.svg
rename to modules/users/partials/gnome/wallpapers/latte.svg
diff --git a/modules/users/partials/wallpapers/macchiato.svg b/modules/users/partials/gnome/wallpapers/macchiato.svg
similarity index 100%
rename from modules/users/partials/wallpapers/macchiato.svg
rename to modules/users/partials/gnome/wallpapers/macchiato.svg
diff --git a/modules/users/partials/wallpapers/mocha.svg b/modules/users/partials/gnome/wallpapers/mocha.svg
similarity index 100%
rename from modules/users/partials/wallpapers/mocha.svg
rename to modules/users/partials/gnome/wallpapers/mocha.svg
diff --git a/modules/users/partials/wallpapers/solarized-light.svg b/modules/users/partials/gnome/wallpapers/solarized-light.svg
similarity index 100%
rename from modules/users/partials/wallpapers/solarized-light.svg
rename to modules/users/partials/gnome/wallpapers/solarized-light.svg
diff --git a/modules/users/partials/wallpapers/solarized.svg b/modules/users/partials/gnome/wallpapers/solarized.svg
similarity index 100%
rename from modules/users/partials/wallpapers/solarized.svg
rename to modules/users/partials/gnome/wallpapers/solarized.svg