diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index bb1fcc84a0..727948dfe9 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -46,7 +46,7 @@ local Charon = {
   },
   Tag = { "planet_solarSystem", "planet_terrestrial" },
   GUI = {
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Charon"
   }
 }
 
@@ -70,7 +70,7 @@ local CharonLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Charon Label",
-    Path = "/Solar System/Dwarf Planets/Pluto/Moons",
+    Path = "/Solar System/Dwarf Planets/Pluto/Charon",
     Description = "Label for Pluto's moon Charon"
   }
 }
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
index 9e1a0107f1..0ca149cd4f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
@@ -24,7 +24,7 @@ local CharonTrailBarycentric = {
   },
   GUI = {
     Name = "Charon Barycentric Trail",
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Charon"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
index f78c88fe79..4e94b18a53 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
@@ -22,7 +22,7 @@ local Hydra = {
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
   GUI = {
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Hydra"
   }
 }
 
@@ -48,7 +48,7 @@ local HydraTrail = {
   },
   GUI = {
     Name = "Hydra Trail",
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Hydra"
   }
 }
 
@@ -71,8 +71,8 @@ local HydraLabel = {
   },
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
-    Name = "Cheron Label",
-    Path = "/Solar System/Dwarf Planets/Pluto/Moons",
+    Name = "Hydra Label",
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Hydra",
     Description = "Label for Pluto's moon Hydra"
   }
 }
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
index b10d3575c3..f26d363595 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
@@ -21,7 +21,7 @@ local Kerberos = {
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
   GUI = {
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos"
   }
 }
 
@@ -47,7 +47,7 @@ local KerberosTrail = {
   },
   GUI = {
     Name = "Kerberos Trail",
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos"
   }
 }
 
@@ -70,8 +70,8 @@ local KerberosLabel = {
   },
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
-    Name = "Cheron Label",
-    Path = "/Solar System/Dwarf Planets/Pluto/Moons",
+    Name = "Kerberos Label",
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos",
     Description = "Label for Pluto's moon Kerberos"
   }
 }
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
index 928ae5b498..f4d1a8b0d0 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
@@ -21,7 +21,7 @@ local Nix = {
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
   GUI = {
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix"
   }
 }
 
@@ -47,7 +47,7 @@ local NixTrail = {
   },
   GUI = {
     Name = "Nix Trail",
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix"
   }
 }
 
@@ -70,8 +70,8 @@ local NixLabel = {
   },
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
-    Name = "Cheron Label",
-    Path = "/Solar System/Dwarf Planets/Pluto/Moons",
+    Name = "Nix Label",
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix",
     Description = "Label for Pluto's moon Nix"
   }
 }
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
index 0e7f122c95..d10613d750 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
@@ -20,7 +20,7 @@ local Styx = {
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
   GUI = {
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx"
   }
 }
 
@@ -46,7 +46,7 @@ local StyxTrail = {
   },
   GUI = {
     Name = "Styx Trail",
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx"
   }
 }
 
@@ -69,8 +69,8 @@ local StyxLabel = {
   },
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
-    Name = "Cheron Label",
-    Path = "/Solar System/Dwarf Planets/Pluto/Moons",
+    Name = "Styx Label",
+    Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx",
     Description = "Label for Pluto's moon Styx"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index f74a81f97c..6c354348de 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -48,7 +48,7 @@ local Callisto = {
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
   GUI = {
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Callisto"
   }
 }
 
@@ -72,7 +72,7 @@ local CallistoLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Callisto Label",
-    Path = "/Solar System/Planets/Jupiter/Moons",
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Callisto",
     Description = "Label for Jupiter's moon Callisto"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
index 0576249c34..dbba932af1 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
@@ -22,7 +22,7 @@ local CallistoTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
   GUI = {
     Name = "Callisto Trail",
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Callisto"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index b81150b745..f47038289c 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -47,7 +47,7 @@ local Europa = {
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
   GUI = {
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Europa"
   }
 }
 
@@ -71,7 +71,7 @@ local EuropaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Europa Label",
-    Path = "/Solar System/Planets/Jupiter/Moons",
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Europa",
     Description = "Label for Jupiter's moon Europa"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
index 7854fc5514..5daef40938 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
@@ -20,7 +20,7 @@ local EuropaTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
   GUI = {
     Name = "Europa Trail",
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Europa"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index d5aa371cd1..363f8f1bf3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -47,7 +47,7 @@ local Ganymede = {
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
   GUI = {
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Ganymede"
   }
 }
 
@@ -71,7 +71,7 @@ local GanymedeLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Ganymede Label",
-    Path = "/Solar System/Planets/Jupiter/Moons",
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Ganymede",
     Description = "Label for Jupiter's moon Ganymede"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
index 48d08b3b2f..157e3e479c 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
@@ -22,7 +22,7 @@ local GanymedeTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
   GUI = {
     Name = "Ganymede Trail",
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Ganymede"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index b06f55b355..c4dd10983e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -47,7 +47,7 @@ local Io = {
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
   GUI = {
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Io"
   }
 }
 
@@ -72,7 +72,7 @@ local IoLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Io Label",
-    Path = "/Solar System/Planets/Jupiter/Moons",
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Io",
     Description = "Label for Jupiter's moon Io"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
index 4b75ba1f8d..393df45663 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
@@ -22,7 +22,7 @@ local IoTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
   GUI = {
     Name = "Io Trail",
-    Path = "/Solar System/Planets/Jupiter/Moons"
+    Path = "/Solar System/Planets/Jupiter/Major Moons/Io"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index f77e5c80e6..3b49833302 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -30,7 +30,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2010 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2010J2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 588.36,
@@ -47,7 +47,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Thelxinoe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 597.61,
@@ -64,7 +64,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Euanthe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 598.09,
@@ -81,7 +81,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Iocaste"
     },
     TrailColor = trailColor,
     OrbitPeriod = 609.43,
@@ -99,7 +99,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 16",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2003J16"
     },
     TrailColor = trailColor,
     OrbitPeriod = 610.36,
@@ -116,7 +116,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Praxidike"
     },
     TrailColor = trailColor,
     OrbitPeriod = 613.90,
@@ -133,7 +133,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Harpalyke"
     },
     TrailColor = trailColor,
     OrbitPeriod = 624.54,
@@ -150,7 +150,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Mneme"
     },
     TrailColor = trailColor,
     OrbitPeriod = 627.48,
@@ -167,7 +167,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Hermippe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 629.81,
@@ -184,7 +184,7 @@ local anankeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Thyone"
     },
     TrailColor = trailColor,
     OrbitPeriod = 639.80,
@@ -201,7 +201,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     Tags = tags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Ananke"
     },
     TrailColor = trailColor,
     OrbitPeriod = 640.38,
@@ -219,7 +219,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2021 J 1",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2021J1"
     },
     TrailColor = trailColor,
     OrbitPeriod = 606.99,
@@ -237,7 +237,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2021 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2021J2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 627.96,
@@ -255,7 +255,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2021 J 3",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2021J3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 643.85,
@@ -273,7 +273,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2022 J 3",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2022J3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 617.82,
@@ -291,7 +291,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 3",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2017J3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 606.3,
@@ -309,7 +309,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 7",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2017J7"
     },
     TrailColor = trailColor,
     OrbitPeriod = 602.6,
@@ -327,7 +327,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 9",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2017J9"
     },
     TrailColor = trailColor,
     OrbitPeriod = 639.2,
@@ -345,7 +345,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2003J2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 602.02,
@@ -363,7 +363,7 @@ local anankeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 12",
-      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2003J12"
     },
     TrailColor = trailColor,
     OrbitPeriod = 646.64,
@@ -396,7 +396,7 @@ for i, moon in ipairs(anankeGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/" .. moon.Identifier,
       Description = "Label for Jupiter's moon " .. moonName .. " (Ananke group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
index 90763e4a77..a474a35d4a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -29,7 +29,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Herse"
     },
     TrailColor = trailColor,
     OrbitPeriod = 672.75,
@@ -46,7 +46,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Aitne"
     },
     TrailColor = trailColor,
     OrbitPeriod = 679.64,
@@ -63,7 +63,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Kale"
     },
     TrailColor = trailColor,
     OrbitPeriod = 685.32,
@@ -80,7 +80,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Taygete"
     },
     TrailColor = trailColor,
     OrbitPeriod = 686.67,
@@ -97,7 +97,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Chaldene"
     },
     TrailColor = trailColor,
     OrbitPeriod = 699.33,
@@ -114,7 +114,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Erinome"
     },
     TrailColor = trailColor,
     OrbitPeriod = 711.96,
@@ -131,7 +131,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Kallichore"
     },
     TrailColor = trailColor,
     OrbitPeriod = 717.81,
@@ -148,7 +148,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Kalyke"
     },
     TrailColor = trailColor,
     OrbitPeriod = 721.02,
@@ -165,7 +165,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Pasithee"
     },
     TrailColor = trailColor,
     OrbitPeriod = 726.93,
@@ -183,7 +183,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2010 J 1",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2010J1"
     },
     TrailColor = trailColor,
     OrbitPeriod = 722.83,
@@ -200,7 +200,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Eukelade"
     },
     TrailColor = trailColor,
     OrbitPeriod = 735.20,
@@ -217,7 +217,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Arche"
     },
     TrailColor = trailColor,
     OrbitPeriod = 746.19,
@@ -234,7 +234,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Isonoe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 750.13,
@@ -251,7 +251,7 @@ local carmeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Carme"
     },
     TrailColor = trailColor,
     OrbitPeriod = 763.95,
@@ -269,7 +269,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 5",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2003J5"
     },
     TrailColor = trailColor,
     OrbitPeriod = 758.34,
@@ -287,7 +287,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2018 J 3",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2018J3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 704.56,
@@ -305,7 +305,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2021 J 4",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2021J4"
     },
     TrailColor = trailColor,
     OrbitPeriod = 710.13,
@@ -323,7 +323,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2021 J 5",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2021J5"
     },
     TrailColor = trailColor,
     OrbitPeriod = 704.80,
@@ -341,7 +341,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2021 J 6",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2021J6"
     },
     TrailColor = trailColor,
     OrbitPeriod = 732.55,
@@ -359,7 +359,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2016 J 3",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2016J3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 676.37,
@@ -377,7 +377,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2022 J 1",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2022J1"
     },
     TrailColor = trailColor,
     OrbitPeriod = 667.34,
@@ -395,7 +395,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2022 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2022J2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 685.51,
@@ -413,7 +413,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2017J2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 723.1,
@@ -431,7 +431,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 5",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2017J5"
     },
     TrailColor = trailColor,
     OrbitPeriod = 719.5,
@@ -449,7 +449,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 8",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2017J8"
     },
     TrailColor = trailColor,
     OrbitPeriod = 719.6,
@@ -467,7 +467,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2011 J 1",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2011J1"
     },
     TrailColor = trailColor,
     OrbitPeriod = 686.6,
@@ -485,7 +485,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 9",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2003J9"
     },
     TrailColor = trailColor,
     OrbitPeriod = 767.6,
@@ -503,7 +503,7 @@ local carmeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 10",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2003J10"
     },
     TrailColor = trailColor,
     OrbitPeriod = 705.96,
@@ -537,7 +537,7 @@ for i, moon in ipairs(carmeGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/" .. moon.Identifier,
       Description = "Label for Jupiter's moon " .. moonName .. " (Carme group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
index f6f721bd4a..d983501048 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -29,7 +29,7 @@ local carpoGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Carpo Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/Carpo"
     },
     TrailColor = trailColor,
     OrbitPeriod = 458.62,
@@ -47,7 +47,7 @@ local carpoGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2018 J 4",
-      Path = "/Solar System/Planets/Jupiter/Moons/Carpo Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/S2018J4"
     },
     TrailColor = trailColor,
     OrbitPeriod = 427.631,
@@ -80,7 +80,7 @@ for i, moon in ipairs(carpoGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/" .. moon.Identifier,
       Description = "Label for Jupiter's moon " .. moonName .. " (Carpo group)"
     }
   }
@@ -107,7 +107,7 @@ for i, moon in ipairs(carpoGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label (Near)",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/" .. moon.Identifier,
       Description = "Transitional Label for close-range viewing of " .. moonName .. " (Carpo group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
index 906bbd179d..1ea550d8f7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -29,7 +29,7 @@ local himaliaGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Leda"
     },
     TrailColor = trailColor,
     OrbitPeriod = 240.82,
@@ -46,7 +46,7 @@ local himaliaGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Himalia"
     },
     TrailColor = trailColor,
     OrbitPeriod = 250.23,
@@ -63,7 +63,7 @@ local himaliaGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Lysithea"
     },
     TrailColor = trailColor,
     OrbitPeriod = 259.89,
@@ -80,7 +80,7 @@ local himaliaGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Elara"
     },
     TrailColor = trailColor,
     OrbitPeriod = 257.62,
@@ -97,7 +97,7 @@ local himaliaGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Dia"
     },
     TrailColor = trailColor,
     OrbitPeriod = 287.93,
@@ -115,7 +115,7 @@ local himaliaGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2011 J 3",
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/S2011J3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 261.77,
@@ -133,7 +133,7 @@ local himaliaGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2018 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/S2018J2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 250.88,
@@ -150,7 +150,7 @@ local himaliaGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Pandia"
     },
     TrailColor = trailColor,
     OrbitPeriod = 251.911,
@@ -167,7 +167,7 @@ local himaliaGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Ersa"
     },
     TrailColor = trailColor,
     OrbitPeriod = 249.229,
@@ -200,7 +200,7 @@ for i, moon in ipairs(himaliaGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/" .. moon.Identifier,
       Description = "Label for Jupiter's moon " .. moonName .. " (Himalia group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
index 17524a2be7..1a887a8de7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -28,7 +28,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Metis"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.117912037,
@@ -45,7 +45,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Adrastea"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.2982638889,
@@ -62,7 +62,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Amalthea"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.4981828704,
@@ -79,7 +79,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Thebe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.6745023148,
@@ -112,7 +112,7 @@ for i, moon in ipairs(innerMoons) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/" .. moon.Identifier,
       Description = "Label for Jupiter's moon " .. moonName .. " (inner group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
index 75f6a0e8ce..1d630c7c85 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -29,7 +29,7 @@ local otherGroups = {
     TrailTags = trailTags,
     GUI = {
       Name = "Eupheme",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Other Groups/Eupheme"
     },
     TrailColor = trailColor,
     OrbitPeriod = 628.06,
@@ -47,7 +47,7 @@ local otherGroups = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 19",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Other Groups/S2003J19"
     },
     TrailColor = trailColor,
     OrbitPeriod = 699.12,
@@ -65,7 +65,7 @@ local otherGroups = {
     TrailTags = trailTags,
     GUI = {
       Name = "Valetudo",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Other Groups/Valetudo"
     },
     TrailColor = trailColor,
     OrbitPeriod = 527.41,
@@ -98,7 +98,7 @@ for i, moon in ipairs(otherGroups) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Other Groups/" .. moon.Identifier,
       Description = "Label for Jupiter's moon " .. moonName .. " (other groups)"
     }
   }
@@ -136,7 +136,7 @@ asset.meta = {
   Name = "Jupiter Pasiphae Other Moons",
   Version = "1.0",
   Description = [[Procedural Globe asset containing Jupiter's Other Group moons: S2003J12,
-    S/2003J3, S2011J1, S2003J19, S2003J10, S2003J23, S2003J9, and S2003J2. Blank globes
+    S/2003J3, S2011J1, S2003J19, S2003J10, S2003J9, and S2003J2. Blank globes
     and SPICE trails are generated for each moon]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index 95f6a304ea..ee3fa4c5e0 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -28,7 +28,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Euporie"
     },
     TrailColor = trailColor,
     OrbitPeriod = 538.78,
@@ -46,7 +46,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 18",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J18"
     },
     TrailColor = trailColor,
     OrbitPeriod = 587.38,
@@ -63,7 +63,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Helike"
     },
     TrailColor = trailColor,
     OrbitPeriod = 601.40,
@@ -80,7 +80,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Orthosie"
     },
     TrailColor = trailColor,
     OrbitPeriod = 602.62,
@@ -98,7 +98,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2016 J 1",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2016J1"
     },
     TrailColor = trailColor,
     OrbitPeriod = 603.83,
@@ -116,7 +116,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 15",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J15"
     },
     TrailColor = trailColor,
     OrbitPeriod = 699.68,
@@ -133,7 +133,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Aoede"
     },
     TrailColor = trailColor,
     OrbitPeriod = 714.66,
@@ -150,7 +150,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Callirrhoe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 727.11,
@@ -167,7 +167,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Eurydome"
     },
     TrailColor = trailColor,
     OrbitPeriod = 723.36,
@@ -184,7 +184,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Kore"
     },
     TrailColor = trailColor,
     OrbitPeriod = 776.02,
@@ -201,7 +201,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Cyllene"
     },
     TrailColor = trailColor,
     OrbitPeriod = 731.10,
@@ -219,7 +219,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2011 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2011J2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 731.32,
@@ -237,7 +237,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 1",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2017J1"
     },
     TrailColor = trailColor,
     OrbitPeriod = 734.15,
@@ -255,7 +255,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 4",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J4"
     },
     TrailColor = trailColor,
     OrbitPeriod = 739.29,
@@ -272,7 +272,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Pasiphae"
     },
     TrailColor = trailColor,
     OrbitPeriod = 739.80,
@@ -289,7 +289,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Hegemone"
     },
     TrailColor = trailColor,
     OrbitPeriod = 745.50,
@@ -306,7 +306,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Sinope"
     },
     TrailColor = trailColor,
     OrbitPeriod = 739.33,
@@ -323,7 +323,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Sponde"
     },
     TrailColor = trailColor,
     OrbitPeriod = 771.60,
@@ -340,7 +340,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Autonoe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 772.17,
@@ -357,7 +357,7 @@ local pasiphaeGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Megaclite"
     },
     TrailColor = trailColor,
     OrbitPeriod = 792.44,
@@ -375,7 +375,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2016 J 4",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2016J4"
     },
     TrailColor = trailColor,
     OrbitPeriod = 743.69,
@@ -393,7 +393,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2017 J 6",
-      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2017J6"
     },
     TrailColor = trailColor,
     OrbitPeriod = 683.0,
@@ -411,7 +411,7 @@ local pasiphaeGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2003 J 23",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J23"
     },
     TrailColor = trailColor,
     OrbitPeriod = 792.00,
@@ -444,7 +444,7 @@ for i, moon in ipairs(pasiphaeGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/" .. moon.Identifier,
       Description = "Label for Jupiter's moon " .. moonName .. " (Pasiphae group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
index efa7f6b7f9..452780d933 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -27,7 +27,7 @@ local themistoGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Jupiter/Moons/Themisto Group"
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Themisto Group/Themisto"
     },
     TrailColor = trailColor,
     OrbitPeriod = 129.87,
@@ -60,7 +60,7 @@ for i, moon in ipairs(themistoGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Jupiter/Moons",
+      Path = "/Solar System/Planets/Jupiter/Minor Moons/Themisto Group/Themisto",
       Description = "Label for Jupiter's moon " .. moonName .. " (Themisto group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
index 7ef7f8f2ac..31eba3d7a0 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
@@ -50,7 +50,7 @@ local Deimos = {
   Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
   GUI = {
     Name = "Deimos",
-    Path = "/Solar System/Planets/Mars",
+    Path = "/Solar System/Planets/Mars/Moons/Deimos",
     Description = "One of two moons of Mars"
   }
 }
@@ -72,7 +72,7 @@ local DeimosTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" },
   GUI = {
     Name = "Deimos Trail",
-    Path = "/Solar System/Planets/Mars",
+    Path = "/Solar System/Planets/Mars/Moons/Deimos",
     Description = "Trail for Deimos"
   }
 }
@@ -98,7 +98,7 @@ local DeimosLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Deimos Label",
-    Path = "/Solar System/Planets/Mars/Moons",
+    Path = "/Solar System/Planets/Mars/Moons/Deimos",
     Description = "Label for Mars' moon Deimos"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
index 3326506aad..2fcf4aad36 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
@@ -36,7 +36,7 @@ local DeimosGlobe = {
   Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
   GUI = {
     Name = "Deimos_Globe",
-    Path = "/Solar System/Planets/Mars",
+    Path = "/Solar System/Planets/Mars/Moons/Deimos",
     Description = "One of two moons of Mars"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
index 4189cc20ee..526dcd223b 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
@@ -51,7 +51,7 @@ local Phobos = {
   Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
   GUI = {
     Name = "Phobos",
-    Path = "/Solar System/Planets/Mars",
+    Path = "/Solar System/Planets/Mars/Moons/Phobos",
     Description = "One of two moons of Mars"
   }
 }
@@ -74,7 +74,7 @@ local PhobosTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" },
   GUI = {
     Name = "Phobos Trail",
-    Path = "/Solar System/Planets/Mars",
+    Path = "/Solar System/Planets/Mars/Moons/Phobos",
     Description = "Trail for Phobos"
   }
 }
@@ -99,7 +99,7 @@ local PhobosLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Phobos Label",
-    Path = "/Solar System/Planets/Mars/Moons",
+    Path = "/Solar System/Planets/Mars/Moons/Phobos",
     Description = "Label for Mars' moon Phobos"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
index a43e3d9077..5396f6a610 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
@@ -36,7 +36,7 @@ local PhobosGlobe = {
   Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
   GUI = {
     Name = "Phobos_Globe",
-    Path = "/Solar System/Planets/Mars",
+    Path = "/Solar System/Planets/Mars/Moons/Phobos",
     Description = "One of two moons of Mars"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
index 94c9ff4fa4..7361fe4443 100644
--- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
@@ -29,7 +29,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/Naiad"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.294,
@@ -46,7 +46,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/Thalassa"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.311,
@@ -63,7 +63,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/Despina"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.335,
@@ -80,7 +80,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/Galatea"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.429,
@@ -97,7 +97,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/Larissa"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.555,
@@ -115,7 +115,7 @@ local innerMoons = {
     TrailTags = trailTags,
     GUI = {
       Name = "Hippocamp",
-      Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/Hippocamp"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.936,
@@ -132,7 +132,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/Proteus"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.122,
@@ -166,7 +166,7 @@ for i, moon in ipairs(innerMoons) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Neptune/Moons",
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Inner Moons/" .. moon.Identifier,
       Description = "Label for Neptune's moon " .. moonName .. " (inner group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
index 98b4946e71..603ffa5116 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
@@ -28,7 +28,7 @@ local irregularProgradeMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Irregular Prograde Moons/Halimede"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1879.08,
@@ -45,7 +45,7 @@ local irregularProgradeMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Irregular Prograde Moons/Psamathe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 9074.3,
@@ -62,7 +62,7 @@ local irregularProgradeMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Irregular Prograde Moons/Sao"
     },
     TrailColor = trailColor,
     OrbitPeriod = 2912.72,
@@ -79,7 +79,7 @@ local irregularProgradeMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Irregular Prograde Moons/Laomedeia"
     },
     TrailColor = trailColor,
     OrbitPeriod = 3171.33,
@@ -96,7 +96,7 @@ local irregularProgradeMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Irregular Prograde Moons/Neso"
     },
     TrailColor = trailColor,
     OrbitPeriod = 9740.73,
@@ -130,7 +130,7 @@ for i, moon in ipairs(irregularProgradeMoons) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Neptune/Moons",
+      Path = "/Solar System/Planets/Neptune/Minor Moons/Irregular Prograde Moons/" .. moon.Identifier,
       Description = "Label for Neptune's moon " .. moonName .. " (Irregular prograde group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
index 21be217580..e1d8974183 100644
--- a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
@@ -14,7 +14,7 @@ local Nereid = {
   Tags = { "moon_solarSystem", "moon_giants", "moon_neptune" },
   TrailTags = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" },
   GUI = {
-    Path = "/Solar System/Planets/Neptune/Moons"
+    Path = "/Solar System/Planets/Neptune/Major Moons/Nereid"
   },
   TrailColor = { 0.2, 0.5, 0.75 },
   OrbitPeriod = 360.13,
@@ -47,7 +47,7 @@ for i, moon in ipairs({ Nereid }) do
     Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Neptune/Moons",
+      Path = "/Solar System/Planets/Neptune/Major Moons/" .. moon.Identifier,
       Description = "Label for Neptune's moon " .. moonName
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index ebbc644a2e..245f8587d4 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -15,7 +15,7 @@ local Triton = {
   Tags = { "moon_solarSystem", "moon_giants", "moon_neptune" },
   TrailTags = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" },
   GUI = {
-    Path = "/Solar System/Planets/Neptune/Moons"
+    Path = "/Solar System/Planets/Neptune/Major Moons/Triton"
   },
   TrailColor = { 0.2, 0.5, 0.75 },
   OrbitPeriod = 5.877,
@@ -48,7 +48,7 @@ for i, moon in ipairs({ Triton }) do
     Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Neptune/Moons",
+      Path = "/Solar System/Planets/Neptune/Major Moons/" .. moon.Identifier,
       Description = "Label for Neptune's moon " .. moonName
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index 447aca79ec..1754debbf4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -45,7 +45,7 @@ local Dione = {
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
-    Path = "/Solar System/Planets/Saturn/Moons"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Dione"
   }
 }
 
@@ -70,7 +70,7 @@ local DioneLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Dione Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Dione",
     Description = "Label for Saturn's moon Dione"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
index 076bfe9ea7..0e852a6eb3 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
@@ -21,7 +21,7 @@ local DioneTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Dione Trail",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Dione",
     Description = "Trail of Saturn's moon Dione as observed by Saturn",
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index dda8760dd0..f75e1192df 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -46,7 +46,7 @@ local Enceladus = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
     Name = "Enceladus",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Enceladus",
     Description = "Enceladus globe with labels"
   }
 }
@@ -72,7 +72,7 @@ local EnceladusLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Enceladus Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Enceladus",
     Description = "Label for Saturn's moon Enceladus"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
index 408ef6914b..7914e65008 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
@@ -21,7 +21,7 @@ local EnceladusTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Enceladus Trail",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Enceladus",
     Description = "Trail of Saturn's moon Enceladus as observed by Saturn",
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 72d6f82cbf..8b49eb11cf 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -46,7 +46,7 @@ local Hyperion = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
     Name = "Hyperion",
-    Path = "/Solar System/Planets/Saturn/Moons"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Hyperion"
   }
 }
 
@@ -71,7 +71,7 @@ local HyperionLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Hyperion Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Hyperion",
     Description = "Label for Saturn's moon Hyperion"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
index 4bc21d9acd..95f99af27d 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
@@ -21,7 +21,7 @@ local HyperionTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Hyperion Trail",
-    Path = "/Solar System/Planets/Saturn/Moons"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Hyperion"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index 3c57ea8c92..cf47a5d35b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -46,7 +46,7 @@ local Iapetus = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
     Name = "Iapetus",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus",
     Description = "Third largest moon of Saturn"
   }
 }
@@ -71,7 +71,7 @@ local IapetusLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Iapetus Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus",
     Description = "Label for Saturn's moon Iapetus"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
index db55d9ba5d..6096dba1b1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
@@ -21,7 +21,7 @@ local IapetusTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Iapetus Trail",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus",
     Description = "Trail of Saturn's moon Iapetus as observed by Saturn",
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index e806aed9c1..013073633f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -46,7 +46,7 @@ local Mimas = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
     Name = "Mimas",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Mimas",
     Description = "That's no moon..."
   }
 }
@@ -72,7 +72,7 @@ local MimasLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Mimas Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Mimas",
     Description = "Label for Saturn's moon Mimas"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
index 20fb844653..48455a538c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
@@ -21,7 +21,7 @@ local MimasTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Mimas Trail",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Mimas",
     Description = "Trail of Saturn's moon Mimas as observed by Saturn",
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index f82db16368..68a7d88e30 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -28,7 +28,7 @@ local gallicGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Albiorix"
     },
     TrailColor = trailColor,
     OrbitPeriod = 774.58,
@@ -45,7 +45,7 @@ local gallicGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Bebhionn"
     },
     TrailColor = trailColor,
     OrbitPeriod = 838.77,
@@ -62,7 +62,7 @@ local gallicGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Erriapus"
     },
     TrailColor = trailColor,
     OrbitPeriod = 844.89,
@@ -79,7 +79,7 @@ local gallicGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Tarvos"
     },
     TrailColor = trailColor,
     OrbitPeriod = 944.23,
@@ -112,7 +112,7 @@ for i, moon in ipairs(gallicGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Saturn/Moons",
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/" .. moon.Identifier,
       Description = "Label for Saturn's moon " .. moonName .. " (Gallic group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index 2ee155c0fe..4d4c091bb2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -28,7 +28,7 @@ local inuitGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Kiviuq"
     },
     TrailColor = trailColor,
     OrbitPeriod = 448.16,
@@ -45,7 +45,7 @@ local inuitGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Ijiraq"
     },
     TrailColor = trailColor,
     OrbitPeriod = 451.77,
@@ -62,7 +62,7 @@ local inuitGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Paaliaq"
     },
     TrailColor = trailColor,
     OrbitPeriod = 692.98,
@@ -79,7 +79,7 @@ local inuitGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Siarnaq"
     },
     TrailColor = trailColor,
     OrbitPeriod = 884.88,
@@ -96,7 +96,7 @@ local inuitGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Tarqeq"
     },
     TrailColor = trailColor,
     OrbitPeriod = 894.86,
@@ -114,7 +114,7 @@ local inuitGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 29",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S29"
     },
     TrailColor = trailColor,
     OrbitPeriod = 858.77,
@@ -132,7 +132,7 @@ local inuitGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 31",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S31"
     },
     TrailColor = trailColor,
     OrbitPeriod = 853.80,
@@ -150,7 +150,7 @@ local inuitGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2019 S 01",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2019S01"
     },
     TrailColor = trailColor,
     OrbitPeriod = 443.78,
@@ -183,7 +183,7 @@ for i, moon in ipairs(inuitGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Saturn/Moons",
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/" .. moon.Identifier,
       Description = "Label for Saturn's moon " .. moonName .. " (Inuit group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index 1400306681..ae6184405a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -30,7 +30,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Phoebe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 545.09,
@@ -47,7 +47,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skathi"
     },
     TrailColor = trailColor,
     OrbitPeriod = 732.52,
@@ -65,7 +65,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2007 S 2",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S2"
     },
     TrailColor = trailColor,
     OrbitPeriod = 792.96,
@@ -82,7 +82,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skoll"
     },
     TrailColor = trailColor,
     OrbitPeriod = 862.37,
@@ -100,7 +100,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 13",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S13"
     },
     TrailColor = trailColor,
     OrbitPeriod = 905.85,
@@ -117,7 +117,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Greip"
     },
     TrailColor = trailColor,
     OrbitPeriod = 906.56,
@@ -134,7 +134,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hyrrokkin"
     },
     TrailColor = trailColor,
     OrbitPeriod = 914.29,
@@ -151,7 +151,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Jarnsaxa"
     },
     TrailColor = trailColor,
     OrbitPeriod = 943.78,
@@ -168,7 +168,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Mundilfari"
     },
     TrailColor = trailColor,
     OrbitPeriod = 956.70,
@@ -186,7 +186,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2006 S 1",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S1"
     },
     TrailColor = trailColor,
     OrbitPeriod = 972.41,
@@ -204,7 +204,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 17",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S17"
     },
     TrailColor = trailColor,
     OrbitPeriod = 985.45,
@@ -221,7 +221,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bergelmir"
     },
     TrailColor = trailColor,
     OrbitPeriod = 985.83,
@@ -238,7 +238,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Narvi"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1008.45,
@@ -255,7 +255,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Suttungr"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1022.82,
@@ -272,7 +272,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hati"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1033.05,
@@ -290,7 +290,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 12",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S12"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1048.54,
@@ -307,7 +307,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Farbauti"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1054.78,
@@ -324,7 +324,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thrymr"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1078.09,
@@ -341,7 +341,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Aegir"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1094.46,
@@ -359,7 +359,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2007 S 3",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1100,
@@ -376,7 +376,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bestla"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1101.45,
@@ -394,7 +394,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 7",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S7"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1101.99,
@@ -412,14 +412,14 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2006 S 3",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S3"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1142.37,
     Kernels = kernel452
   },
   {
-    Identifier = "FENRIR",
+    Identifier = "Fenrir",
     Parent = {
       Identifier = parentIdentifier,
       Spice = parentSpice
@@ -429,7 +429,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fenrir"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1212.53,
@@ -445,7 +445,7 @@ local norseGroup = {
     Radii = { 6000, 6000, 6000 },
     Tags = tags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Surtur"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1297.7,
@@ -462,7 +462,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Kari"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1245.06,
@@ -479,7 +479,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Ymir"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1254.15,
@@ -496,7 +496,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Loge"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1300.95,
@@ -513,7 +513,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fornjot"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1432.16,
@@ -530,7 +530,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skadi"
     },
     TrailColor = trailColor,
     OrbitPeriod = 728.2,
@@ -547,7 +547,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gridr"
     },
     TrailColor = trailColor,
     OrbitPeriod = 990.23,
@@ -564,7 +564,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Angrboda"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1080.4,
@@ -581,7 +581,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skrymir"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1164.3,
@@ -598,7 +598,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gerd"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1095.0,
@@ -616,7 +616,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 26",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S26"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1624.2,
@@ -633,7 +633,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Eggther"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1033.0,
@@ -650,7 +650,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Beli"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1084.1,
@@ -667,7 +667,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gunnlod"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1175.3,
@@ -684,7 +684,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thiazzi"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1361.5,
@@ -702,7 +702,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 34",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S34"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1412.5,
@@ -719,7 +719,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Alvaldi"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1208.1,
@@ -736,7 +736,7 @@ local norseGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Geirrod"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1295.8,
@@ -754,7 +754,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 28",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S28"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1197.2,
@@ -772,7 +772,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 21",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S21"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1365.1,
@@ -790,7 +790,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 36",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S36"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1354.2,
@@ -808,7 +808,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 37",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S37"
     },
     TrailColor = trailColor,
     OrbitPeriod = 752.88,
@@ -826,7 +826,7 @@ local norseGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 39",
-      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S39"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1277.5,
@@ -859,7 +859,7 @@ for i, moon in ipairs(norseGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Saturn/Moons",
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/" .. moon.Identifier,
       Description = "Label for Saturn's moon " .. moonName .. " (Norse group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index af78ba6ad8..aaaffa5615 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -31,7 +31,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Aegaeon"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.80812,
@@ -48,7 +48,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Methone"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.00957,
@@ -65,7 +65,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Anthe"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.05089,
@@ -82,7 +82,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Pallene"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.370218,
@@ -99,7 +99,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Telesto"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.887802,
@@ -116,7 +116,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Calypso"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.887802,
@@ -133,7 +133,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Helene"
     },
     TrailColor = trailColor,
     OrbitPeriod = 2.736915,
@@ -150,7 +150,7 @@ local otherGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Polydeuces"
     },
     TrailColor = trailColor,
     OrbitPeriod = 2.736915,
@@ -168,7 +168,7 @@ local otherGroup = {
     TrailTags = trailTags,
     GUI = {
       Name = "S/2004 S 24",
-      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/S2004S24"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1293.85,
@@ -201,7 +201,7 @@ for i, moon in ipairs(otherGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Saturn/Moons",
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/" .. moon.Identifier,
       Description = "Label for Saturn's moon " .. moonName .. " (other group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index 79715fa18a..d56f7afa5f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -15,7 +15,7 @@ local kernels = {
 
 local parentIdentifier = transforms.SaturnBarycenter.Identifier
 local parentSpice = "SATURN BARYCENTER"
-local guiPath = "/Solar System/Planets/Saturn/Moons/Shepherd Moons"
+local guiPath = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons"
 local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_shepherd", "moon_minor", "moon_minor_saturn" }
 local trailColor = { 0.5, 0.3, 0.3 }
 local trailTags = {
@@ -38,7 +38,7 @@ local shepherdGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = guiPath
+      Path = guiPath .. "/Prometheus"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.612990038,
@@ -55,7 +55,7 @@ local shepherdGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = guiPath
+      Path = guiPath .. "/Pandora"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.628504213,
@@ -72,7 +72,7 @@ local shepherdGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = guiPath
+      Path = guiPath .. "/Atlas"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.6016947883,
@@ -89,7 +89,7 @@ local shepherdGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = guiPath
+      Path = guiPath .. "/Janus"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.694660342,
@@ -106,7 +106,7 @@ local shepherdGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = guiPath
+      Path = guiPath .. "/Epimetheus"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.694333517,
@@ -123,7 +123,7 @@ local shepherdGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = guiPath
+      Path = guiPath .. "/Daphnis"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.5940798,
@@ -140,7 +140,7 @@ local shepherdGroup = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = guiPath
+      Path = guiPath .. "/Pan"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.575050718,
@@ -173,7 +173,7 @@ for i, moon in ipairs(shepherdGroup) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Saturn/Moons",
+      Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/" .. moon.Identifier,
       Description = "Label for Saturn's moon " .. moonName .. " (Shepherd group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index fed5a94335..63c8e9867e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -46,7 +46,7 @@ local Rhea = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
     Name = "Rhea",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Rhea",
     Description = "Second largest moon of Saturn"
   }
 }
@@ -72,7 +72,7 @@ local RheaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Rhea Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Rhea",
     Description = "Label for Saturn's moon Rhea"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
index 3cdc35e70d..d055d8ff4a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
@@ -21,7 +21,7 @@ local RheaTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Rhea Trail",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Rhea",
     Description = "Trail of Saturn's moon Rhea as observed by Saturn",
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 9e0a1faef7..d324560c8a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -45,7 +45,7 @@ local Tethys = {
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
-    Path = "/Solar System/Planets/Saturn/Moons"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Tethys"
   }
 }
 
@@ -70,7 +70,7 @@ local TethysLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Tethys Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Tethys",
     Description = "Label for Saturn's moon Tethys"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
index e3829c1a53..2f3462f218 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
@@ -21,7 +21,7 @@ local TethysTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Tethys Trail",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Tethys",
     Description = "Trail of Saturn's moon Tethys as observed by Saturn",
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset
index dad3403036..d7adc2e1de 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset
@@ -40,7 +40,7 @@ local Atmosphere = {
   },
   GUI = {
     Name = "Titan Atmosphere",
-    Path = "/Solar System/Planets/Saturn/Moons/Titan"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Titan"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index 3895ebe763..30c48a0e9e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -46,7 +46,7 @@ local Titan = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
   GUI = {
     Name = "Titan",
-    Path = "/Solar System/Planets/Saturn/Moons/Titan",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Titan",
     Description = "Largest moon of Saturn"
   }
 }
@@ -72,7 +72,7 @@ local TitanLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Titan Label",
-    Path = "/Solar System/Planets/Saturn/Moons",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Titan",
     Description = "Label for Saturn's moon Titan"
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
index 2c8699b07c..f6c7c6cc1b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
@@ -21,7 +21,7 @@ local TitanTrail = {
   Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
   GUI = {
     Name = "Titan Trail",
-    Path = "/Solar System/Planets/Saturn/Moons/Titan",
+    Path = "/Solar System/Planets/Saturn/Major Moons/Titan",
     Description = "Trail of Saturn's moon Titan as observed by Saturn",
   }
 }
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index 555acbede7..f874b08a0b 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -30,7 +30,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cordelia"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.335034,
@@ -47,7 +47,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Ophelia"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.376400,
@@ -64,7 +64,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Bianca"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.434579,
@@ -81,7 +81,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cressida"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.463570,
@@ -98,7 +98,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Desdemona"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.473650,
@@ -115,7 +115,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Juliet"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.493065,
@@ -132,7 +132,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Portia"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.513196,
@@ -149,7 +149,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Rosalind"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.558460,
@@ -166,7 +166,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cupid"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.618,
@@ -183,7 +183,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Belinda"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.623527,
@@ -200,7 +200,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Perdita"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.638,
@@ -217,7 +217,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Puck"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.761833,
@@ -234,7 +234,7 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Mab"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.923,
@@ -267,7 +267,7 @@ for i, moon in ipairs(innerMoons) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Uranus/Moons",
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/" .. moon.Identifier,
       Description = "Label for Uranus' moon " .. moonName .. " (inner group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
index bb4a759054..e4567e4691 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -28,7 +28,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Prograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Prograde Moons/Margaret"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1694.8,
@@ -61,7 +61,7 @@ for i, moon in ipairs(irregularMoons) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Uranus/Moons",
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Prograde Moons/" .. moon.Identifier,
       Description = "Label for Uranus' moon " .. moonName .. " (Irregular prograde group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
index 2d09fd78f7..8da9af4243 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -28,7 +28,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Francisco"
     },
     TrailColor = trailColor,
     OrbitPeriod = 266.56,
@@ -45,7 +45,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Caliban"
     },
     TrailColor = trailColor,
     OrbitPeriod = 579.50,
@@ -62,7 +62,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Stephano"
     },
     TrailColor = trailColor,
     OrbitPeriod = 676.50,
@@ -79,7 +79,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Trinculo"
     },
     TrailColor = trailColor,
     OrbitPeriod = 758.10,
@@ -96,7 +96,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Sycorax"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1283.4,
@@ -113,7 +113,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Prospero"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1992.8,
@@ -130,7 +130,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Setebos"
     },
     TrailColor = trailColor,
     OrbitPeriod = 2202.3,
@@ -147,7 +147,7 @@ local irregularMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Ferdinand"
     },
     TrailColor = trailColor,
     OrbitPeriod = 2823.4,
@@ -180,7 +180,7 @@ for i, moon in ipairs(irregularMoons) do
     Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Uranus/Moons",
+      Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/" .. moon.Identifier,
       Description = "Label for Uranus' moon " .. moonName .. " (Irregular retrograde group)"
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index cc39438f0a..0c0e6f9db0 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -23,7 +23,7 @@ local majorMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+      Path = "/Solar System/Planets/Uranus/Major Moons/Miranda"
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.413479,
@@ -40,7 +40,7 @@ local majorMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+      Path = "/Solar System/Planets/Uranus/Major Moons/Ariel"
     },
     TrailColor = trailColor,
     OrbitPeriod = 2.520379,
@@ -57,7 +57,7 @@ local majorMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+      Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel"
     },
     TrailColor = trailColor,
     OrbitPeriod = 4.144177,
@@ -74,7 +74,7 @@ local majorMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+      Path = "/Solar System/Planets/Uranus/Major Moons/Titania"
     },
     TrailColor = trailColor,
     OrbitPeriod = 8.705872,
@@ -91,7 +91,7 @@ local majorMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+      Path = "/Solar System/Planets/Uranus/Major Moons/Oberon"
     },
     TrailColor = trailColor,
     OrbitPeriod = 13.463239,
@@ -124,7 +124,7 @@ for i, moon in ipairs(majorMoons) do
     Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
     GUI = {
       Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Uranus/Moons",
+      Path = "/Solar System/Planets/Uranus/Major Moons/" .. moon.Identifier,
       Description = "Label for Uranus' moon " .. moonName .. " (Major moon)"
     }
   }