diff --git a/hosts/envy/filesystems/default.nix b/hosts/envy/filesystems/default.nix
index 9b6cecec..11d07d5f 100644
--- a/hosts/envy/filesystems/default.nix
+++ b/hosts/envy/filesystems/default.nix
@@ -15,7 +15,7 @@
 
     # Network mounts
     "/home/${config.sysusers.main}/Midas" = {
-      device = "10.100.0.1:/storage";
+      device = "10.100.0.1:/";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
     };
diff --git a/hosts/pear/filesystems/default.nix b/hosts/pear/filesystems/default.nix
index 9cd40cab..39ad5cc4 100644
--- a/hosts/pear/filesystems/default.nix
+++ b/hosts/pear/filesystems/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   fileSystems."/home/${config.sysusers.main}/Midas" = {
-    device = "10.100.0.1:/storage";
+    device = "10.100.0.1:/";
     fsType = "nfs4";
     options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
   };
diff --git a/hosts/redmond/filesystems/default.nix b/hosts/redmond/filesystems/default.nix
index 25ea2bb3..9b98001f 100644
--- a/hosts/redmond/filesystems/default.nix
+++ b/hosts/redmond/filesystems/default.nix
@@ -6,7 +6,7 @@
       options = [ "nosuid" "nodev" ];
     };
     "/home/${config.sysusers.main}/Midas" = {
-      device = "10.100.0.1:/storage";
+      device = "10.100.0.1:/";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
     };
diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix
index d90163ce..f3814c97 100644
--- a/hosts/tower/filesystems/default.nix
+++ b/hosts/tower/filesystems/default.nix
@@ -40,7 +40,7 @@
 
     # Network mounts
     "/home/${config.sysusers.main}/Midas" = {
-      device = "${config.ips.server}:/storage";
+      device = "${config.ips.server}:/";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
     };
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index 8fc590a1..d761c1ba 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -108,10 +108,10 @@
         n:/etc/nixos
 
         # Remote files
-        J:/home/${config.home.username}/Midas
-        K:/home/${config.home.username}/Midas/Files
-        V:/home/${config.home.username}/Midas/Media
-        M:/home/${config.home.username}/Midas/Music
+        H:/home/${config.home.username}/Midas
+        K:/home/${config.home.username}/Midas/storage/Files
+        V:/home/${config.home.username}/Midas/storage/Media
+        M:/home/${config.home.username}/Midas/storage/Music
       '';
     };
     packages = with pkgs; [
diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix
index 58e07b45..0a4649bb 100644
--- a/modules/home/services/mpd/default.nix
+++ b/modules/home/services/mpd/default.nix
@@ -3,8 +3,8 @@
   services.mpd = {
     enable = config.home.desktop.enable;
     network.startWhenNeeded = true;
-    musicDirectory = "/home/${config.home.username}/Midas/Music/NixBops";
-    playlistDirectory = "/home/${config.home.username}/Midas/Music/NixBops/Playlists";
+    musicDirectory = "/home/${config.home.username}/Midas/storage/Music/NixBops";
+    playlistDirectory = "/home/${config.home.username}/Midas/storage/Music/NixBops/Playlists";
     extraConfig = ''
       audio_output {
         type "pipewire"