diff --git a/anda/tools/buildsys/anda/anda.hcl b/anda/buildsys/anda/anda.hcl
similarity index 100%
rename from anda/tools/buildsys/anda/anda.hcl
rename to anda/buildsys/anda/anda.hcl
diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/buildsys/anda/rust-anda.spec
similarity index 100%
rename from anda/tools/buildsys/anda/rust-anda.spec
rename to anda/buildsys/anda/rust-anda.spec
diff --git a/anda/tools/buildsys/anda/update.rhai b/anda/buildsys/anda/update.rhai
similarity index 100%
rename from anda/tools/buildsys/anda/update.rhai
rename to anda/buildsys/anda/update.rhai
diff --git a/anda/tools/buildsys/gradle/anda.hcl b/anda/buildsys/gradle/anda.hcl
similarity index 100%
rename from anda/tools/buildsys/gradle/anda.hcl
rename to anda/buildsys/gradle/anda.hcl
diff --git a/anda/tools/buildsys/gradle/ci_setup.rhai b/anda/buildsys/gradle/ci_setup.rhai
similarity index 100%
rename from anda/tools/buildsys/gradle/ci_setup.rhai
rename to anda/buildsys/gradle/ci_setup.rhai
diff --git a/anda/tools/buildsys/gradle/gradle.spec b/anda/buildsys/gradle/gradle.spec
similarity index 100%
rename from anda/tools/buildsys/gradle/gradle.spec
rename to anda/buildsys/gradle/gradle.spec
diff --git a/anda/tools/buildsys/gradle/update.rhai b/anda/buildsys/gradle/update.rhai
similarity index 100%
rename from anda/tools/buildsys/gradle/update.rhai
rename to anda/buildsys/gradle/update.rhai
diff --git a/anda/tools/buildsys/katsu/anda.hcl b/anda/buildsys/katsu/anda.hcl
similarity index 100%
rename from anda/tools/buildsys/katsu/anda.hcl
rename to anda/buildsys/katsu/anda.hcl
diff --git a/anda/tools/buildsys/katsu/katsu.spec b/anda/buildsys/katsu/katsu.spec
similarity index 100%
rename from anda/tools/buildsys/katsu/katsu.spec
rename to anda/buildsys/katsu/katsu.spec
diff --git a/anda/tools/buildsys/katsu/update.rhai b/anda/buildsys/katsu/update.rhai
similarity index 100%
rename from anda/tools/buildsys/katsu/update.rhai
rename to anda/buildsys/katsu/update.rhai
diff --git a/anda/tools/buildsys/mise/anda.hcl b/anda/buildsys/mise/anda.hcl
similarity index 100%
rename from anda/tools/buildsys/mise/anda.hcl
rename to anda/buildsys/mise/anda.hcl
diff --git a/anda/tools/buildsys/mise/mise-fix-metadata-auto.diff b/anda/buildsys/mise/mise-fix-metadata-auto.diff
similarity index 100%
rename from anda/tools/buildsys/mise/mise-fix-metadata-auto.diff
rename to anda/buildsys/mise/mise-fix-metadata-auto.diff
diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/buildsys/mise/rust-mise.spec
similarity index 100%
rename from anda/tools/buildsys/mise/rust-mise.spec
rename to anda/buildsys/mise/rust-mise.spec
diff --git a/anda/tools/buildsys/mise/update.rhai b/anda/buildsys/mise/update.rhai
similarity index 100%
rename from anda/tools/buildsys/mise/update.rhai
rename to anda/buildsys/mise/update.rhai
diff --git a/anda/tools/buildsys/muon/anda.hcl b/anda/buildsys/muon/anda.hcl
similarity index 56%
rename from anda/tools/buildsys/muon/anda.hcl
rename to anda/buildsys/muon/anda.hcl
index 0a22d891b8..fd3534d4f4 100644
--- a/anda/tools/buildsys/muon/anda.hcl
+++ b/anda/buildsys/muon/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
 	rpm {
 		spec = "muon.spec"
 	}
+	labels {
+    subrepo = "extras"
+	}
 }
diff --git a/anda/buildsys/muon/fix-tracy-header-placement-quirk.patch b/anda/buildsys/muon/fix-tracy-header-placement-quirk.patch
new file mode 100644
index 0000000000..66995d6f33
--- /dev/null
+++ b/anda/buildsys/muon/fix-tracy-header-placement-quirk.patch
@@ -0,0 +1,13 @@
+diff --git a/include/tracy.h b/include/tracy.h
+index 8bbc923f..ae58c877 100644
+--- a/include/tracy.h
++++ b/include/tracy.h
+@@ -4,7 +4,7 @@
+  */
+ 
+ #ifdef TRACY_ENABLE
+-#include "tracy/TracyC.h"
++#include "tracy/tracy/TracyC.h"
+ 
+ #define TracyCZoneAutoS TracyCZoneN(tctx_func, __func__, true)
+ #define TracyCZoneAutoE TracyCZoneEnd(tctx_func)
diff --git a/anda/buildsys/muon/muon.spec b/anda/buildsys/muon/muon.spec
new file mode 100644
index 0000000000..bb3ce4a092
--- /dev/null
+++ b/anda/buildsys/muon/muon.spec
@@ -0,0 +1,68 @@
+Name:           muon
+Version:        0.5.0
+Release:        1%?dist
+Summary:        A meson-compatible build system
+
+# https://git.sr.ht/~lattis/muon/tree/master/item/LICENSES
+License:        GPL-3.0-only AND Apache-2.0 AND Unlicense AND MIT AND Python-2.0
+URL:            https://muon.build/
+Source:         https://git.sr.ht/~lattis/muon/archive/%{version}.tar.gz
+Patch0:         fix-tracy-header-placement-quirk.patch
+# mdbook removed multilingual support, this patch can be removed when this package next bumps
+Patch1:         remove-multilingual-field.patch
+
+BuildRequires:  meson
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  cmake
+BuildRequires:  libcurl-devel
+BuildRequires:  libarchive-devel
+BuildRequires:  libpkgconf-devel
+BuildRequires:  scdoc
+BuildRequires:  git-core
+%if %{?fedora} < 44
+BuildRequires:  pkgconfig(tracy) %dnl Temporary fix while Tracy does not build for 44+
+%endif
+BuildRequires:  pkgconfig(libattr)
+BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(libb2)
+BuildRequires:  pkgconfig(liblz4)
+BuildRequires:  pkgconfig(libzstd)
+BuildRequires:  pkgconfig(liblzma)
+BuildRequires:  pkgconfig(lzo2)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libacl)
+BuildRequires:  python3-pyyaml
+BuildRequires:  mandoc
+BuildRequires:  mdbook
+
+BuildRequires:  tracy
+
+%description
+An implementation of the meson build system in c99 with minimal dependencies.
+
+%prep
+%autosetup -p1
+
+%conf
+%meson --wrap-mode=nofallback \
+
+%if %{?fedora} >= 44
+-Dtracy=disabled
+%endif
+
+%build
+%meson_build
+
+%install
+%meson_install
+
+%files
+%{_bindir}/muon
+%{_mandir}/man1/muon*
+%{_mandir}/man5/meson*
+%{_mandir}/man3/meson-reference.3.*
+
+%changelog
+* Mon Apr 20 2026 Owen Zimmerman <owen@fyralabs.com>
+- Update spec, add tracy patch
diff --git a/anda/buildsys/muon/remove-multilingual-field.patch b/anda/buildsys/muon/remove-multilingual-field.patch
new file mode 100644
index 0000000000..e0867fb189
--- /dev/null
+++ b/anda/buildsys/muon/remove-multilingual-field.patch
@@ -0,0 +1,25 @@
+From 776a9a30eded21206df1e643d888233472a2dbbf Mon Sep 17 00:00:00 2001
+From: Stone Tickle <lattis@mochiro.moe>
+Date: Thu, 27 Nov 2025 09:14:02 -0500
+Subject: [PATCH] remove multilingual field
+
+Signed-off-by: Owen-sz <owen@fyralabs.com>
+---
+ doc/book/book.toml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/book/book.toml b/doc/book/book.toml
+index f51e1836..b96e9792 100644
+--- a/doc/book/book.toml
++++ b/doc/book/book.toml
+@@ -1,7 +1,6 @@
+ [book]
+ authors = ["Stone Tickle"]
+ language = "en"
+-multilingual = false
+ src = "src"
+ title = "Muon Docs"
+ 
+-- 
+2.53.0
+
diff --git a/anda/tools/buildsys/muon/update.rhai b/anda/buildsys/muon/update.rhai
similarity index 100%
rename from anda/tools/buildsys/muon/update.rhai
rename to anda/buildsys/muon/update.rhai
diff --git a/anda/tools/buildsys/ops2deb/anda.hcl b/anda/buildsys/ops2deb/anda.hcl
similarity index 100%
rename from anda/tools/buildsys/ops2deb/anda.hcl
rename to anda/buildsys/ops2deb/anda.hcl
diff --git a/anda/tools/buildsys/ops2deb/ops2deb.spec b/anda/buildsys/ops2deb/ops2deb.spec
similarity index 100%
rename from anda/tools/buildsys/ops2deb/ops2deb.spec
rename to anda/buildsys/ops2deb/ops2deb.spec
diff --git a/anda/tools/buildsys/ops2deb/update.rhai b/anda/buildsys/ops2deb/update.rhai
similarity index 100%
rename from anda/tools/buildsys/ops2deb/update.rhai
rename to anda/buildsys/ops2deb/update.rhai
diff --git a/anda/tools/buildsys/subatomic/anda.hcl b/anda/buildsys/subatomic/anda.hcl
similarity index 100%
rename from anda/tools/buildsys/subatomic/anda.hcl
rename to anda/buildsys/subatomic/anda.hcl
diff --git a/anda/tools/buildsys/subatomic/subatomic.spec b/anda/buildsys/subatomic/subatomic.spec
similarity index 100%
rename from anda/tools/buildsys/subatomic/subatomic.spec
rename to anda/buildsys/subatomic/subatomic.spec
diff --git a/anda/tools/buildsys/subatomic/update.rhai b/anda/buildsys/subatomic/update.rhai
similarity index 100%
rename from anda/tools/buildsys/subatomic/update.rhai
rename to anda/buildsys/subatomic/update.rhai
diff --git a/anda/stardust/armillary/nightly/anda.hcl b/anda/desktops/stardust/armillary/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/armillary/nightly/anda.hcl
rename to anda/desktops/stardust/armillary/nightly/anda.hcl
diff --git a/anda/stardust/armillary/nightly/stardust-armillary-nightly.spec b/anda/desktops/stardust/armillary/nightly/stardust-armillary-nightly.spec
similarity index 100%
rename from anda/stardust/armillary/nightly/stardust-armillary-nightly.spec
rename to anda/desktops/stardust/armillary/nightly/stardust-armillary-nightly.spec
diff --git a/anda/stardust/armillary/nightly/update.rhai b/anda/desktops/stardust/armillary/nightly/update.rhai
similarity index 100%
rename from anda/stardust/armillary/nightly/update.rhai
rename to anda/desktops/stardust/armillary/nightly/update.rhai
diff --git a/anda/stardust/armillary/stable/anda.hcl b/anda/desktops/stardust/armillary/stable/anda.hcl
similarity index 100%
rename from anda/stardust/armillary/stable/anda.hcl
rename to anda/desktops/stardust/armillary/stable/anda.hcl
diff --git a/anda/stardust/armillary/stable/stardust-armillary.spec b/anda/desktops/stardust/armillary/stable/stardust-armillary.spec
similarity index 100%
rename from anda/stardust/armillary/stable/stardust-armillary.spec
rename to anda/desktops/stardust/armillary/stable/stardust-armillary.spec
diff --git a/anda/stardust/armillary/stable/update.rhai b/anda/desktops/stardust/armillary/stable/update.rhai
similarity index 100%
rename from anda/stardust/armillary/stable/update.rhai
rename to anda/desktops/stardust/armillary/stable/update.rhai
diff --git a/anda/stardust/atmosphere/nightly/anda.hcl b/anda/desktops/stardust/atmosphere/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/atmosphere/nightly/anda.hcl
rename to anda/desktops/stardust/atmosphere/nightly/anda.hcl
diff --git a/anda/stardust/atmosphere/nightly/stardust-atmosphere-nightly.spec b/anda/desktops/stardust/atmosphere/nightly/stardust-atmosphere-nightly.spec
similarity index 100%
rename from anda/stardust/atmosphere/nightly/stardust-atmosphere-nightly.spec
rename to anda/desktops/stardust/atmosphere/nightly/stardust-atmosphere-nightly.spec
diff --git a/anda/stardust/atmosphere/nightly/update.rhai b/anda/desktops/stardust/atmosphere/nightly/update.rhai
similarity index 100%
rename from anda/stardust/atmosphere/nightly/update.rhai
rename to anda/desktops/stardust/atmosphere/nightly/update.rhai
diff --git a/anda/stardust/atmosphere/stable/anda.hcl b/anda/desktops/stardust/atmosphere/stable/anda.hcl
similarity index 100%
rename from anda/stardust/atmosphere/stable/anda.hcl
rename to anda/desktops/stardust/atmosphere/stable/anda.hcl
diff --git a/anda/stardust/atmosphere/stable/stardust-atmosphere.spec b/anda/desktops/stardust/atmosphere/stable/stardust-atmosphere.spec
similarity index 100%
rename from anda/stardust/atmosphere/stable/stardust-atmosphere.spec
rename to anda/desktops/stardust/atmosphere/stable/stardust-atmosphere.spec
diff --git a/anda/stardust/atmosphere/stable/update.rhai b/anda/desktops/stardust/atmosphere/stable/update.rhai
similarity index 100%
rename from anda/stardust/atmosphere/stable/update.rhai
rename to anda/desktops/stardust/atmosphere/stable/update.rhai
diff --git a/anda/stardust/black-hole/nightly/anda.hcl b/anda/desktops/stardust/black-hole/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/black-hole/nightly/anda.hcl
rename to anda/desktops/stardust/black-hole/nightly/anda.hcl
diff --git a/anda/stardust/black-hole/nightly/stardust-black-hole-nightly.spec b/anda/desktops/stardust/black-hole/nightly/stardust-black-hole-nightly.spec
similarity index 100%
rename from anda/stardust/black-hole/nightly/stardust-black-hole-nightly.spec
rename to anda/desktops/stardust/black-hole/nightly/stardust-black-hole-nightly.spec
diff --git a/anda/stardust/black-hole/nightly/update.rhai b/anda/desktops/stardust/black-hole/nightly/update.rhai
similarity index 100%
rename from anda/stardust/black-hole/nightly/update.rhai
rename to anda/desktops/stardust/black-hole/nightly/update.rhai
diff --git a/anda/stardust/black-hole/stable/anda.hcl b/anda/desktops/stardust/black-hole/stable/anda.hcl
similarity index 100%
rename from anda/stardust/black-hole/stable/anda.hcl
rename to anda/desktops/stardust/black-hole/stable/anda.hcl
diff --git a/anda/stardust/black-hole/stable/stardust-black-hole.spec b/anda/desktops/stardust/black-hole/stable/stardust-black-hole.spec
similarity index 100%
rename from anda/stardust/black-hole/stable/stardust-black-hole.spec
rename to anda/desktops/stardust/black-hole/stable/stardust-black-hole.spec
diff --git a/anda/stardust/black-hole/stable/update.rhai b/anda/desktops/stardust/black-hole/stable/update.rhai
similarity index 100%
rename from anda/stardust/black-hole/stable/update.rhai
rename to anda/desktops/stardust/black-hole/stable/update.rhai
diff --git a/anda/stardust/comet/nightly/anda.hcl b/anda/desktops/stardust/comet/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/comet/nightly/anda.hcl
rename to anda/desktops/stardust/comet/nightly/anda.hcl
diff --git a/anda/stardust/comet/nightly/stardust-comet-nightly.spec b/anda/desktops/stardust/comet/nightly/stardust-comet-nightly.spec
similarity index 100%
rename from anda/stardust/comet/nightly/stardust-comet-nightly.spec
rename to anda/desktops/stardust/comet/nightly/stardust-comet-nightly.spec
diff --git a/anda/stardust/comet/nightly/update.rhai b/anda/desktops/stardust/comet/nightly/update.rhai
similarity index 100%
rename from anda/stardust/comet/nightly/update.rhai
rename to anda/desktops/stardust/comet/nightly/update.rhai
diff --git a/anda/stardust/comet/stable/anda.hcl b/anda/desktops/stardust/comet/stable/anda.hcl
similarity index 100%
rename from anda/stardust/comet/stable/anda.hcl
rename to anda/desktops/stardust/comet/stable/anda.hcl
diff --git a/anda/stardust/comet/stable/stardust-comet.spec b/anda/desktops/stardust/comet/stable/stardust-comet.spec
similarity index 100%
rename from anda/stardust/comet/stable/stardust-comet.spec
rename to anda/desktops/stardust/comet/stable/stardust-comet.spec
diff --git a/anda/stardust/comet/stable/update.rhai b/anda/desktops/stardust/comet/stable/update.rhai
similarity index 100%
rename from anda/stardust/comet/stable/update.rhai
rename to anda/desktops/stardust/comet/stable/update.rhai
diff --git a/anda/stardust/flatland/nightly/anda.hcl b/anda/desktops/stardust/flatland/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/flatland/nightly/anda.hcl
rename to anda/desktops/stardust/flatland/nightly/anda.hcl
diff --git a/anda/stardust/flatland/nightly/stardust-flatland-nightly.spec b/anda/desktops/stardust/flatland/nightly/stardust-flatland-nightly.spec
similarity index 100%
rename from anda/stardust/flatland/nightly/stardust-flatland-nightly.spec
rename to anda/desktops/stardust/flatland/nightly/stardust-flatland-nightly.spec
diff --git a/anda/stardust/flatland/nightly/update.rhai b/anda/desktops/stardust/flatland/nightly/update.rhai
similarity index 100%
rename from anda/stardust/flatland/nightly/update.rhai
rename to anda/desktops/stardust/flatland/nightly/update.rhai
diff --git a/anda/stardust/flatland/stable/anda.hcl b/anda/desktops/stardust/flatland/stable/anda.hcl
similarity index 100%
rename from anda/stardust/flatland/stable/anda.hcl
rename to anda/desktops/stardust/flatland/stable/anda.hcl
diff --git a/anda/stardust/flatland/stable/stardust-flatland.spec b/anda/desktops/stardust/flatland/stable/stardust-flatland.spec
similarity index 100%
rename from anda/stardust/flatland/stable/stardust-flatland.spec
rename to anda/desktops/stardust/flatland/stable/stardust-flatland.spec
diff --git a/anda/stardust/flatland/stable/update.rhai b/anda/desktops/stardust/flatland/stable/update.rhai
similarity index 100%
rename from anda/stardust/flatland/stable/update.rhai
rename to anda/desktops/stardust/flatland/stable/update.rhai
diff --git a/anda/stardust/gravity/nightly/anda.hcl b/anda/desktops/stardust/gravity/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/gravity/nightly/anda.hcl
rename to anda/desktops/stardust/gravity/nightly/anda.hcl
diff --git a/anda/stardust/gravity/nightly/stardust-gravity-nightly.spec b/anda/desktops/stardust/gravity/nightly/stardust-gravity-nightly.spec
similarity index 100%
rename from anda/stardust/gravity/nightly/stardust-gravity-nightly.spec
rename to anda/desktops/stardust/gravity/nightly/stardust-gravity-nightly.spec
diff --git a/anda/stardust/gravity/nightly/update.rhai b/anda/desktops/stardust/gravity/nightly/update.rhai
similarity index 100%
rename from anda/stardust/gravity/nightly/update.rhai
rename to anda/desktops/stardust/gravity/nightly/update.rhai
diff --git a/anda/stardust/gravity/stable/anda.hcl b/anda/desktops/stardust/gravity/stable/anda.hcl
similarity index 100%
rename from anda/stardust/gravity/stable/anda.hcl
rename to anda/desktops/stardust/gravity/stable/anda.hcl
diff --git a/anda/stardust/gravity/stable/stardust-gravity.spec b/anda/desktops/stardust/gravity/stable/stardust-gravity.spec
similarity index 100%
rename from anda/stardust/gravity/stable/stardust-gravity.spec
rename to anda/desktops/stardust/gravity/stable/stardust-gravity.spec
diff --git a/anda/stardust/gravity/stable/update.rhai b/anda/desktops/stardust/gravity/stable/update.rhai
similarity index 100%
rename from anda/stardust/gravity/stable/update.rhai
rename to anda/desktops/stardust/gravity/stable/update.rhai
diff --git a/anda/stardust/magnetar/anda.hcl b/anda/desktops/stardust/magnetar/anda.hcl
similarity index 100%
rename from anda/stardust/magnetar/anda.hcl
rename to anda/desktops/stardust/magnetar/anda.hcl
diff --git a/anda/stardust/magnetar/stardust-magnetar.spec b/anda/desktops/stardust/magnetar/stardust-magnetar.spec
similarity index 100%
rename from anda/stardust/magnetar/stardust-magnetar.spec
rename to anda/desktops/stardust/magnetar/stardust-magnetar.spec
diff --git a/anda/stardust/magnetar/update.rhai b/anda/desktops/stardust/magnetar/update.rhai
similarity index 100%
rename from anda/stardust/magnetar/update.rhai
rename to anda/desktops/stardust/magnetar/update.rhai
diff --git a/anda/stardust/non-spatial-input/nightly/anda.hcl b/anda/desktops/stardust/non-spatial-input/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/non-spatial-input/nightly/anda.hcl
rename to anda/desktops/stardust/non-spatial-input/nightly/anda.hcl
diff --git a/anda/stardust/non-spatial-input/nightly/stardust-non-spatial-input-nightly.spec b/anda/desktops/stardust/non-spatial-input/nightly/stardust-non-spatial-input-nightly.spec
similarity index 100%
rename from anda/stardust/non-spatial-input/nightly/stardust-non-spatial-input-nightly.spec
rename to anda/desktops/stardust/non-spatial-input/nightly/stardust-non-spatial-input-nightly.spec
diff --git a/anda/stardust/non-spatial-input/nightly/update.rhai b/anda/desktops/stardust/non-spatial-input/nightly/update.rhai
similarity index 100%
rename from anda/stardust/non-spatial-input/nightly/update.rhai
rename to anda/desktops/stardust/non-spatial-input/nightly/update.rhai
diff --git a/anda/stardust/non-spatial-input/stable/anda.hcl b/anda/desktops/stardust/non-spatial-input/stable/anda.hcl
similarity index 100%
rename from anda/stardust/non-spatial-input/stable/anda.hcl
rename to anda/desktops/stardust/non-spatial-input/stable/anda.hcl
diff --git a/anda/stardust/non-spatial-input/stable/stardust-non-spatial-input.spec b/anda/desktops/stardust/non-spatial-input/stable/stardust-non-spatial-input.spec
similarity index 100%
rename from anda/stardust/non-spatial-input/stable/stardust-non-spatial-input.spec
rename to anda/desktops/stardust/non-spatial-input/stable/stardust-non-spatial-input.spec
diff --git a/anda/stardust/non-spatial-input/stable/update.rhai b/anda/desktops/stardust/non-spatial-input/stable/update.rhai
similarity index 100%
rename from anda/stardust/non-spatial-input/stable/update.rhai
rename to anda/desktops/stardust/non-spatial-input/stable/update.rhai
diff --git a/anda/stardust/protostar/nightly/anda.hcl b/anda/desktops/stardust/protostar/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/protostar/nightly/anda.hcl
rename to anda/desktops/stardust/protostar/nightly/anda.hcl
diff --git a/anda/stardust/protostar/nightly/stardust-protostar-nightly.spec b/anda/desktops/stardust/protostar/nightly/stardust-protostar-nightly.spec
similarity index 100%
rename from anda/stardust/protostar/nightly/stardust-protostar-nightly.spec
rename to anda/desktops/stardust/protostar/nightly/stardust-protostar-nightly.spec
diff --git a/anda/stardust/protostar/nightly/update.rhai b/anda/desktops/stardust/protostar/nightly/update.rhai
similarity index 100%
rename from anda/stardust/protostar/nightly/update.rhai
rename to anda/desktops/stardust/protostar/nightly/update.rhai
diff --git a/anda/stardust/protostar/stable/anda.hcl b/anda/desktops/stardust/protostar/stable/anda.hcl
similarity index 100%
rename from anda/stardust/protostar/stable/anda.hcl
rename to anda/desktops/stardust/protostar/stable/anda.hcl
diff --git a/anda/stardust/protostar/stable/stardust-protostar.spec b/anda/desktops/stardust/protostar/stable/stardust-protostar.spec
similarity index 100%
rename from anda/stardust/protostar/stable/stardust-protostar.spec
rename to anda/desktops/stardust/protostar/stable/stardust-protostar.spec
diff --git a/anda/stardust/protostar/stable/update.rhai b/anda/desktops/stardust/protostar/stable/update.rhai
similarity index 100%
rename from anda/stardust/protostar/stable/update.rhai
rename to anda/desktops/stardust/protostar/stable/update.rhai
diff --git a/anda/stardust/server/nightly/anda.hcl b/anda/desktops/stardust/server/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/server/nightly/anda.hcl
rename to anda/desktops/stardust/server/nightly/anda.hcl
diff --git a/anda/stardust/server/nightly/stardust-server-nightly.spec b/anda/desktops/stardust/server/nightly/stardust-server-nightly.spec
similarity index 100%
rename from anda/stardust/server/nightly/stardust-server-nightly.spec
rename to anda/desktops/stardust/server/nightly/stardust-server-nightly.spec
diff --git a/anda/stardust/server/nightly/update.rhai b/anda/desktops/stardust/server/nightly/update.rhai
similarity index 100%
rename from anda/stardust/server/nightly/update.rhai
rename to anda/desktops/stardust/server/nightly/update.rhai
diff --git a/anda/stardust/server/stable/anda.hcl b/anda/desktops/stardust/server/stable/anda.hcl
similarity index 100%
rename from anda/stardust/server/stable/anda.hcl
rename to anda/desktops/stardust/server/stable/anda.hcl
diff --git a/anda/stardust/server/stable/stardust-server.spec b/anda/desktops/stardust/server/stable/stardust-server.spec
similarity index 100%
rename from anda/stardust/server/stable/stardust-server.spec
rename to anda/desktops/stardust/server/stable/stardust-server.spec
diff --git a/anda/stardust/server/stable/update.rhai b/anda/desktops/stardust/server/stable/update.rhai
similarity index 100%
rename from anda/stardust/server/stable/update.rhai
rename to anda/desktops/stardust/server/stable/update.rhai
diff --git a/anda/stardust/solar-sailer/nightly/anda.hcl b/anda/desktops/stardust/solar-sailer/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/solar-sailer/nightly/anda.hcl
rename to anda/desktops/stardust/solar-sailer/nightly/anda.hcl
diff --git a/anda/stardust/solar-sailer/nightly/stardust-solar-sailer-nightly.spec b/anda/desktops/stardust/solar-sailer/nightly/stardust-solar-sailer-nightly.spec
similarity index 100%
rename from anda/stardust/solar-sailer/nightly/stardust-solar-sailer-nightly.spec
rename to anda/desktops/stardust/solar-sailer/nightly/stardust-solar-sailer-nightly.spec
diff --git a/anda/stardust/solar-sailer/nightly/update.rhai b/anda/desktops/stardust/solar-sailer/nightly/update.rhai
similarity index 100%
rename from anda/stardust/solar-sailer/nightly/update.rhai
rename to anda/desktops/stardust/solar-sailer/nightly/update.rhai
diff --git a/anda/stardust/solar-sailer/stable/anda.hcl b/anda/desktops/stardust/solar-sailer/stable/anda.hcl
similarity index 100%
rename from anda/stardust/solar-sailer/stable/anda.hcl
rename to anda/desktops/stardust/solar-sailer/stable/anda.hcl
diff --git a/anda/stardust/solar-sailer/stable/stardust-solar-sailer.spec b/anda/desktops/stardust/solar-sailer/stable/stardust-solar-sailer.spec
similarity index 100%
rename from anda/stardust/solar-sailer/stable/stardust-solar-sailer.spec
rename to anda/desktops/stardust/solar-sailer/stable/stardust-solar-sailer.spec
diff --git a/anda/stardust/solar-sailer/stable/update.rhai b/anda/desktops/stardust/solar-sailer/stable/update.rhai
similarity index 100%
rename from anda/stardust/solar-sailer/stable/update.rhai
rename to anda/desktops/stardust/solar-sailer/stable/update.rhai
diff --git a/anda/stardust/telescope/nightly/anda.hcl b/anda/desktops/stardust/telescope/nightly/anda.hcl
similarity index 100%
rename from anda/stardust/telescope/nightly/anda.hcl
rename to anda/desktops/stardust/telescope/nightly/anda.hcl
diff --git a/anda/stardust/telescope/nightly/libexec.patch b/anda/desktops/stardust/telescope/nightly/libexec.patch
similarity index 100%
rename from anda/stardust/telescope/nightly/libexec.patch
rename to anda/desktops/stardust/telescope/nightly/libexec.patch
diff --git a/anda/stardust/telescope/nightly/stardust-telescope-nightly.spec b/anda/desktops/stardust/telescope/nightly/stardust-telescope-nightly.spec
similarity index 100%
rename from anda/stardust/telescope/nightly/stardust-telescope-nightly.spec
rename to anda/desktops/stardust/telescope/nightly/stardust-telescope-nightly.spec
diff --git a/anda/stardust/telescope/nightly/update.rhai b/anda/desktops/stardust/telescope/nightly/update.rhai
similarity index 100%
rename from anda/stardust/telescope/nightly/update.rhai
rename to anda/desktops/stardust/telescope/nightly/update.rhai
diff --git a/anda/stardust/telescope/stable/anda.hcl b/anda/desktops/stardust/telescope/stable/anda.hcl
similarity index 100%
rename from anda/stardust/telescope/stable/anda.hcl
rename to anda/desktops/stardust/telescope/stable/anda.hcl
diff --git a/anda/stardust/telescope/stable/libexec.patch b/anda/desktops/stardust/telescope/stable/libexec.patch
similarity index 100%
rename from anda/stardust/telescope/stable/libexec.patch
rename to anda/desktops/stardust/telescope/stable/libexec.patch
diff --git a/anda/stardust/telescope/stable/stardust-telescope.spec b/anda/desktops/stardust/telescope/stable/stardust-telescope.spec
similarity index 100%
rename from anda/stardust/telescope/stable/stardust-telescope.spec
rename to anda/desktops/stardust/telescope/stable/stardust-telescope.spec
diff --git a/anda/stardust/telescope/stable/update.rhai b/anda/desktops/stardust/telescope/stable/update.rhai
similarity index 100%
rename from anda/stardust/telescope/stable/update.rhai
rename to anda/desktops/stardust/telescope/stable/update.rhai
diff --git a/anda/misc/alsa-ucm-cros/alsa-ucm-cros.spec b/anda/system/alsa-ucm-cros/alsa-ucm-cros.spec
similarity index 100%
rename from anda/misc/alsa-ucm-cros/alsa-ucm-cros.spec
rename to anda/system/alsa-ucm-cros/alsa-ucm-cros.spec
diff --git a/anda/misc/alsa-ucm-cros/anda.hcl b/anda/system/alsa-ucm-cros/anda.hcl
similarity index 100%
rename from anda/misc/alsa-ucm-cros/anda.hcl
rename to anda/system/alsa-ucm-cros/anda.hcl
diff --git a/anda/misc/alsa-ucm-cros/update.rhai b/anda/system/alsa-ucm-cros/update.rhai
similarity index 100%
rename from anda/misc/alsa-ucm-cros/update.rhai
rename to anda/system/alsa-ucm-cros/update.rhai
diff --git a/anda/misc/system76-scheduler/anda.hcl b/anda/system/system76-scheduler/anda.hcl
similarity index 100%
rename from anda/misc/system76-scheduler/anda.hcl
rename to anda/system/system76-scheduler/anda.hcl
diff --git a/anda/misc/system76-scheduler/system76-scheduler.spec b/anda/system/system76-scheduler/system76-scheduler.spec
similarity index 100%
rename from anda/misc/system76-scheduler/system76-scheduler.spec
rename to anda/system/system76-scheduler/system76-scheduler.spec
diff --git a/anda/misc/system76-scheduler/update.rhai b/anda/system/system76-scheduler/update.rhai
similarity index 100%
rename from anda/misc/system76-scheduler/update.rhai
rename to anda/system/system76-scheduler/update.rhai
diff --git a/anda/tools/buildsys/sccache/anda.hcl b/anda/terra/sccache/anda.hcl
similarity index 100%
rename from anda/tools/buildsys/sccache/anda.hcl
rename to anda/terra/sccache/anda.hcl
diff --git a/anda/tools/buildsys/sccache/terra-sccache.spec b/anda/terra/sccache/terra-sccache.spec
similarity index 100%
rename from anda/tools/buildsys/sccache/terra-sccache.spec
rename to anda/terra/sccache/terra-sccache.spec
diff --git a/anda/tools/buildsys/sccache/update.rhai b/anda/terra/sccache/update.rhai
similarity index 100%
rename from anda/tools/buildsys/sccache/update.rhai
rename to anda/terra/sccache/update.rhai
diff --git a/anda/tools/buildsys/muon/muon.spec b/anda/tools/buildsys/muon/muon.spec
deleted file mode 100644
index 383d29ca4f..0000000000
--- a/anda/tools/buildsys/muon/muon.spec
+++ /dev/null
@@ -1,39 +0,0 @@
-Name:           muon
-Version:        0.5.0
-Release:        1%?dist
-Summary:        A meson-compatible build system
-
-# muon is licensed under the GPL version 3 (see LICENSE). Tests under tests/project were copied from the meson project tests and are licensed under Apache 2.0.
-License:        GPL-3.0 AND Apache-2.0
-URL:            https://muon.build/
-Source:         https://git.sr.ht/~lattis/muon/archive/%{version}.tar.gz
-
-BuildRequires:  meson
-BuildRequires:  gcc
-BuildRequires:  cmake
-BuildRequires:  libcurl-devel
-BuildRequires:  libarchive-devel
-BuildRequires:  libpkgconf-devel
-BuildRequires:  scdoc
-BuildRequires:  git-core
-
-%description
-An implementation of the meson build system in c99 with minimal dependencies.
-
-%prep
-%autosetup
-
-%build
-%meson -Dtracy=disabled
-%meson_build
-
-%install
-%meson_install
-
-%files
-/usr/bin/muon
-%{_mandir}/man1/muon*
-%{_mandir}/man5/meson*
-
-%changelog
-%autochangelog