diff --git a/local/recipes/core/ext4d/source/Cargo.toml b/local/recipes/core/ext4d/source/Cargo.toml
index 2b41765d94..b12ad93c42 100644
--- a/local/recipes/core/ext4d/source/Cargo.toml
+++ b/local/recipes/core/ext4d/source/Cargo.toml
@@ -13,15 +13,15 @@ license = "MIT"
 
 [workspace.dependencies]
 rsext4 = "0.3"
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
 redox-path = "0.3.0"
 log = "0.4"
 env_logger = "0.11"
 libc = "0.2"
 
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/core/ext4d/source/ext4-blockdev/Cargo.toml b/local/recipes/core/ext4d/source/ext4-blockdev/Cargo.toml
index 1b106019bf..fc825d81b6 100644
--- a/local/recipes/core/ext4d/source/ext4-blockdev/Cargo.toml
+++ b/local/recipes/core/ext4d/source/ext4-blockdev/Cargo.toml
@@ -7,8 +7,8 @@ license.workspace = true
 
 [dependencies]
 rsext4.workspace = true
-redox_syscall = { path = "../../../../../../local/sources/syscall", workspace = true, optional = true }
-libredox = { path = "../../../../../../local/sources/libredox", workspace = true, optional = true }
+redox_syscall = { path = "../../../../../../recipes/core/base/syscall", workspace = true, optional = true }
+libredox = { path = "../../../../../../recipes/core/base/libredox", workspace = true, optional = true }
 log.workspace = true
 
 [features]
diff --git a/local/recipes/core/ext4d/source/ext4d/Cargo.toml b/local/recipes/core/ext4d/source/ext4d/Cargo.toml
index 2212c92e24..cd01761484 100644
--- a/local/recipes/core/ext4d/source/ext4d/Cargo.toml
+++ b/local/recipes/core/ext4d/source/ext4d/Cargo.toml
@@ -14,7 +14,7 @@ ext4-blockdev = { path = "../ext4-blockdev" }
 rsext4.workspace = true
 redox_syscall.workspace = true
 redox-scheme.workspace = true
-libredox = { path = "../../../../../../local/sources/libredox", workspace = true, optional = true }
+libredox = { path = "../../../../../../recipes/core/base/libredox", workspace = true, optional = true }
 redox-path = { workspace = true, optional = true }
 log.workspace = true
 env_logger = { workspace = true, optional = true }
diff --git a/local/recipes/core/fatd/source/Cargo.toml b/local/recipes/core/fatd/source/Cargo.toml
index 651551a794..5349fc1db8 100644
--- a/local/recipes/core/fatd/source/Cargo.toml
+++ b/local/recipes/core/fatd/source/Cargo.toml
@@ -16,15 +16,15 @@ license = "MIT"
 [workspace.dependencies]
 fatfs = "0.3.6"
 fscommon = "0.1.1"
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
 redox-path = "0.3.0"
 log = "0.4"
 env_logger = "0.11"
 libc = "0.2"
 
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/core/fatd/source/fatd/Cargo.toml b/local/recipes/core/fatd/source/fatd/Cargo.toml
index d1f68a28d7..54e0214aab 100644
--- a/local/recipes/core/fatd/source/fatd/Cargo.toml
+++ b/local/recipes/core/fatd/source/fatd/Cargo.toml
@@ -15,7 +15,7 @@ fatfs.workspace = true
 fscommon.workspace = true
 redox_syscall.workspace = true
 redox-scheme.workspace = true
-libredox = { path = "../../../../../../local/sources/libredox", workspace = true, optional = true }
+libredox = { path = "../../../../../../recipes/core/base/libredox", workspace = true, optional = true }
 redox-path = { workspace = true, optional = true }
 log.workspace = true
 env_logger = { workspace = true, optional = true }
diff --git a/local/recipes/drivers/ehcid/Cargo.toml b/local/recipes/drivers/ehcid/Cargo.toml
index 0767dd7a56..f44cee4944 100644
--- a/local/recipes/drivers/ehcid/Cargo.toml
+++ b/local/recipes/drivers/ehcid/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/main.rs"
 
 [dependencies]
 usb-core = { path = "../../usb-core/source" }
-redox_syscall = { path = "../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../recipes/core/base/syscall" }
 log = "0.4"
diff --git a/local/recipes/drivers/ehcid/source/Cargo.toml b/local/recipes/drivers/ehcid/source/Cargo.toml
index 2f3ef71d97..bcacabbc09 100644
--- a/local/recipes/drivers/ehcid/source/Cargo.toml
+++ b/local/recipes/drivers/ehcid/source/Cargo.toml
@@ -10,16 +10,16 @@ path = "src/main.rs"
 
 [dependencies]
 usb-core = { path = "../../usb-core/source" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
 redox-driver-sys = { path = "../../redox-driver-sys/source" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 
 [target.'cfg(target_os = "redox")'.dependencies]
 redox-driver-sys = { path = "../../redox-driver-sys/source", features = ["redox"] }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
diff --git a/local/recipes/drivers/ohcid/Cargo.toml b/local/recipes/drivers/ohcid/Cargo.toml
index 6efa793711..0e3209276e 100644
--- a/local/recipes/drivers/ohcid/Cargo.toml
+++ b/local/recipes/drivers/ohcid/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/main.rs"
 
 [dependencies]
 usb-core = { path = "../../usb-core/source" }
-redox_syscall = { path = "../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../recipes/core/base/syscall" }
 log = "0.4"
diff --git a/local/recipes/drivers/ohcid/source/Cargo.toml b/local/recipes/drivers/ohcid/source/Cargo.toml
index 253a2890aa..2647c2b01b 100644
--- a/local/recipes/drivers/ohcid/source/Cargo.toml
+++ b/local/recipes/drivers/ohcid/source/Cargo.toml
@@ -10,11 +10,11 @@ path = "src/main.rs"
 
 [dependencies]
 usb-core = { path = "../../usb-core/source" }
-syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
+syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 redox-driver-sys = { path = "../../redox-driver-sys/source" }
 log = "0.4"
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
diff --git a/local/recipes/drivers/redbear-btusb/source/Cargo.toml b/local/recipes/drivers/redbear-btusb/source/Cargo.toml
index 6cf56592bb..913a5625f9 100644
--- a/local/recipes/drivers/redbear-btusb/source/Cargo.toml
+++ b/local/recipes/drivers/redbear-btusb/source/Cargo.toml
@@ -9,12 +9,12 @@ path = "src/main.rs"
 
 [dependencies]
 libc = "0.2"
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
diff --git a/local/recipes/drivers/redox-driver-pci/Cargo.toml b/local/recipes/drivers/redox-driver-pci/Cargo.toml
index 5f4f6c9f19..b5255516fa 100644
--- a/local/recipes/drivers/redox-driver-pci/Cargo.toml
+++ b/local/recipes/drivers/redox-driver-pci/Cargo.toml
@@ -6,4 +6,4 @@ description = "PCI bus backend for redox-driver-core"
 
 [dependencies]
 redox-driver-core = { path = "../redox-driver-core" }
-redox_syscall = { path = "../../../../local/sources/syscall" }
\ No newline at end of file
+redox_syscall = { path = "../../../../recipes/core/base/syscall" }
\ No newline at end of file
diff --git a/local/recipes/drivers/redox-driver-pci/source/Cargo.toml b/local/recipes/drivers/redox-driver-pci/source/Cargo.toml
index deaa659e02..1d2ebac1a1 100644
--- a/local/recipes/drivers/redox-driver-pci/source/Cargo.toml
+++ b/local/recipes/drivers/redox-driver-pci/source/Cargo.toml
@@ -6,8 +6,8 @@ description = "PCI bus backend for redox-driver-core"
 
 [dependencies]
 redox-driver-core = { path = "../../redox-driver-core/source" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
diff --git a/local/recipes/drivers/uhcid/Cargo.toml b/local/recipes/drivers/uhcid/Cargo.toml
index 0ffe21a4f5..af7070eecf 100644
--- a/local/recipes/drivers/uhcid/Cargo.toml
+++ b/local/recipes/drivers/uhcid/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/main.rs"
 
 [dependencies]
 usb-core = { path = "../../usb-core/source" }
-redox_syscall = { path = "../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../recipes/core/base/syscall" }
 log = "0.4"
diff --git a/local/recipes/drivers/uhcid/source/Cargo.toml b/local/recipes/drivers/uhcid/source/Cargo.toml
index a3950e2456..bc54916775 100644
--- a/local/recipes/drivers/uhcid/source/Cargo.toml
+++ b/local/recipes/drivers/uhcid/source/Cargo.toml
@@ -10,12 +10,12 @@ path = "src/main.rs"
 
 [dependencies]
 usb-core = { path = "../../usb-core/source" }
-syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
+syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 redox-driver-sys = { path = "../../redox-driver-sys/source" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = "0.4"
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
diff --git a/local/recipes/drivers/virtio-inputd/source/Cargo.toml b/local/recipes/drivers/virtio-inputd/source/Cargo.toml
index 36cfdf60e5..55af585e0b 100644
--- a/local/recipes/drivers/virtio-inputd/source/Cargo.toml
+++ b/local/recipes/drivers/virtio-inputd/source/Cargo.toml
@@ -11,13 +11,13 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1"
 log = "0.4"
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
-redox_syscall = { path = "../../../../../local/sources/syscall", features = ["std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 redox-driver-sys = { path = "../../redox-driver-sys/source" }
-syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
+syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 inputd = { path = "../../../../sources/base/drivers/inputd" }
 common = { path = "../../../../sources/base/drivers/common" }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
diff --git a/local/recipes/kde/plasma-wayland-protocols/source.tar b/local/recipes/kde/plasma-wayland-protocols/source.tar
index 5970c6a6cd..e664411b93 100644
Binary files a/local/recipes/kde/plasma-wayland-protocols/source.tar and b/local/recipes/kde/plasma-wayland-protocols/source.tar differ
diff --git a/local/recipes/libs/libdrm/source.tar b/local/recipes/libs/libdrm/source.tar
index 1fdb727c18..9ae2fde461 100644
Binary files a/local/recipes/libs/libdrm/source.tar and b/local/recipes/libs/libdrm/source.tar differ
diff --git a/local/recipes/libs/libevdev/source.tar b/local/recipes/libs/libevdev/source.tar
index d82f03e4df..ab61523f7d 100644
Binary files a/local/recipes/libs/libevdev/source.tar and b/local/recipes/libs/libevdev/source.tar differ
diff --git a/local/recipes/system/coretempd/source/Cargo.toml b/local/recipes/system/coretempd/source/Cargo.toml
index aa6b4634a4..665f28dc96 100644
--- a/local/recipes/system/coretempd/source/Cargo.toml
+++ b/local/recipes/system/coretempd/source/Cargo.toml
@@ -9,11 +9,11 @@ path = "src/main.rs"
 
 [dependencies]
 libc = "0.2"
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/cpufreqd/Cargo.toml b/local/recipes/system/cpufreqd/Cargo.toml
index e50c61e067..a281c75cf0 100644
--- a/local/recipes/system/cpufreqd/Cargo.toml
+++ b/local/recipes/system/cpufreqd/Cargo.toml
@@ -8,5 +8,5 @@ name = "cpufreqd"
 path = "src/main.rs"
 
 [dependencies]
-redox_syscall = { path = "../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../recipes/core/base/syscall" }
 log = "0.4"
diff --git a/local/recipes/system/cpufreqd/source/Cargo.toml b/local/recipes/system/cpufreqd/source/Cargo.toml
index 61a30bc81f..2a5f8472c3 100644
--- a/local/recipes/system/cpufreqd/source/Cargo.toml
+++ b/local/recipes/system/cpufreqd/source/Cargo.toml
@@ -8,8 +8,8 @@ name = "cpufreqd"
 path = "src/main.rs"
 
 [dependencies]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
 log = "0.4"
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/devfsd/source/Cargo.toml b/local/recipes/system/devfsd/source/Cargo.toml
index c61b8e45e9..8d2e9119af 100644
--- a/local/recipes/system/devfsd/source/Cargo.toml
+++ b/local/recipes/system/devfsd/source/Cargo.toml
@@ -8,11 +8,11 @@ name = "devfsd"
 path = "src/main.rs"
 
 [dependencies]
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 log = "0.4"
 
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/diskd/source/Cargo.toml b/local/recipes/system/diskd/source/Cargo.toml
index 12b5d34b62..37b059e5fe 100644
--- a/local/recipes/system/diskd/source/Cargo.toml
+++ b/local/recipes/system/diskd/source/Cargo.toml
@@ -10,9 +10,9 @@ name = "diskd"
 path = "src/main.rs"
 
 [dependencies]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 log = "0.4"
 
 [profile.release]
@@ -20,5 +20,5 @@ opt-level = 3
 lto = true
 
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/driver-manager/Cargo.toml b/local/recipes/system/driver-manager/Cargo.toml
index 415b8b28a0..9353183b49 100644
--- a/local/recipes/system/driver-manager/Cargo.toml
+++ b/local/recipes/system/driver-manager/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/main.rs"
 redox-driver-core = { path = "../../drivers/redox-driver-core" }
 redox-driver-pci = { path = "../../drivers/redox-driver-pci" }
 pcid_interface = { path = "../../../../local/sources/base/drivers/pcid", package = "pcid" }
-redox_syscall = { path = "../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../recipes/core/base/syscall" }
 log = "0.4"
 toml = "0.8"
 serde = { version = "1", features = ["derive"] }
diff --git a/local/recipes/system/driver-manager/source/Cargo.toml b/local/recipes/system/driver-manager/source/Cargo.toml
index 34c6ad4ebf..2e43572532 100644
--- a/local/recipes/system/driver-manager/source/Cargo.toml
+++ b/local/recipes/system/driver-manager/source/Cargo.toml
@@ -12,13 +12,13 @@ path = "src/main.rs"
 redox-driver-core = { path = "../../../drivers/redox-driver-core/source" }
 redox-driver-pci = { path = "../../../drivers/redox-driver-pci/source" }
 pcid_interface = { path = "../../../../../local/sources/base/drivers/pcid", package = "pcid" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 log = "0.4"
 toml = "0.8"
 serde = { version = "1", features = ["derive"] }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
\ No newline at end of file
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
\ No newline at end of file
diff --git a/local/recipes/system/driver-params/Cargo.toml b/local/recipes/system/driver-params/Cargo.toml
index e596776120..0b131829c4 100644
--- a/local/recipes/system/driver-params/Cargo.toml
+++ b/local/recipes/system/driver-params/Cargo.toml
@@ -8,7 +8,7 @@ name = "driver-params"
 path = "src/main.rs"
 
 [dependencies]
-redox_syscall = { path = "../../../../local/sources/syscall" }
-redox-scheme = { path = "../../../../local/sources/redox-scheme" }
-libredox = { path = "../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../recipes/core/base/syscall" }
+redox-scheme = { path = "../../../../recipes/core/base/redox-scheme" }
+libredox = { path = "../../../../recipes/core/base/libredox" }
 log = "0.4"
diff --git a/local/recipes/system/driver-params/source/Cargo.toml b/local/recipes/system/driver-params/source/Cargo.toml
index 935516fedc..f64ce27081 100644
--- a/local/recipes/system/driver-params/source/Cargo.toml
+++ b/local/recipes/system/driver-params/source/Cargo.toml
@@ -8,12 +8,12 @@ name = "driver-params"
 path = "src/main.rs"
 
 [dependencies]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
 log = "0.4"
 
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/evdevd/source/Cargo.toml b/local/recipes/system/evdevd/source/Cargo.toml
index 065bbd4fdd..e9331b72a5 100644
--- a/local/recipes/system/evdevd/source/Cargo.toml
+++ b/local/recipes/system/evdevd/source/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.3.0"
 edition = "2021"
 
 [dependencies]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
 log = { version = "0.4", features = ["std"] }
 thiserror = "2"
 orbclient = { version = "0.3", default-features = false }
@@ -16,5 +16,5 @@ redox_event = "0.4"
 [workspace]
 
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/firmware-loader/source/Cargo.toml b/local/recipes/system/firmware-loader/source/Cargo.toml
index e839ea3ff6..1bd3745b26 100644
--- a/local/recipes/system/firmware-loader/source/Cargo.toml
+++ b/local/recipes/system/firmware-loader/source/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 
 [dependencies]
 libc = "0.2"
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
-redox_scheme = { path = "../../../../../local/sources/redox-scheme", package = "redox-scheme" }
-libredox = { path = "../../../../../local/sources/libredox" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
+redox_scheme = { path = "../../../../../recipes/core/base/redox-scheme", package = "redox-scheme" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
 log = { version = "0.4", features = ["std"] }
 sha2 = "0.10"
 thiserror = "2"
 toml = "0.8"
 
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/hwrngd/Cargo.toml b/local/recipes/system/hwrngd/Cargo.toml
index c733fb323c..27b1defb71 100644
--- a/local/recipes/system/hwrngd/Cargo.toml
+++ b/local/recipes/system/hwrngd/Cargo.toml
@@ -8,7 +8,7 @@ name = "hwrngd"
 path = "source/src/main.rs"
 
 [dependencies]
-libredox = { path = "../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
\ No newline at end of file
+redox-scheme = { path = "../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
\ No newline at end of file
diff --git a/local/recipes/system/hwrngd/source/Cargo.toml b/local/recipes/system/hwrngd/source/Cargo.toml
index a377f2bdfc..f74bdf70c2 100644
--- a/local/recipes/system/hwrngd/source/Cargo.toml
+++ b/local/recipes/system/hwrngd/source/Cargo.toml
@@ -8,10 +8,10 @@ name = "hwrngd"
 path = "src/main.rs"
 
 [dependencies]
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/iommu/source/Cargo.toml b/local/recipes/system/iommu/source/Cargo.toml
index dd055368cd..b421d421c8 100644
--- a/local/recipes/system/iommu/source/Cargo.toml
+++ b/local/recipes/system/iommu/source/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 
 [dependencies]
 redox-driver-sys = { version = "0.3", path = "../../../drivers/redox-driver-sys/source" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
 log = { version = "0.4", features = ["std"] }
 
 [patch.crates-io]
 redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-accessibility/source/Cargo.toml b/local/recipes/system/redbear-accessibility/source/Cargo.toml
index 6880fbc035..812dcf3192 100644
--- a/local/recipes/system/redbear-accessibility/source/Cargo.toml
+++ b/local/recipes/system/redbear-accessibility/source/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.3.0"
 edition = "2021"
 
 [dependencies]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-acmd/source/Cargo.toml b/local/recipes/system/redbear-acmd/source/Cargo.toml
index 52b6ffaa1d..08e585ecf3 100644
--- a/local/recipes/system/redbear-acmd/source/Cargo.toml
+++ b/local/recipes/system/redbear-acmd/source/Cargo.toml
@@ -9,12 +9,12 @@ path = "src/main.rs"
 
 [dependencies]
 log = "0.4"
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme", package = "redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme", package = "redox-scheme" }
 xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
 common = { path = "../../../../../local/sources/base/drivers/common" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
diff --git a/local/recipes/system/redbear-btctl/source/Cargo.toml b/local/recipes/system/redbear-btctl/source/Cargo.toml
index 212c546dbc..fd68d93d3d 100644
--- a/local/recipes/system/redbear-btctl/source/Cargo.toml
+++ b/local/recipes/system/redbear-btctl/source/Cargo.toml
@@ -9,10 +9,10 @@ path = "src/main.rs"
 
 [dependencies]
 libc = "0.2"
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-ecmd/source/Cargo.toml b/local/recipes/system/redbear-ecmd/source/Cargo.toml
index 6a848a1aa8..67fba609fa 100644
--- a/local/recipes/system/redbear-ecmd/source/Cargo.toml
+++ b/local/recipes/system/redbear-ecmd/source/Cargo.toml
@@ -9,14 +9,14 @@ path = "src/main.rs"
 
 [dependencies]
 log = "0.4"
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
 xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
 common = { path = "../../../../../local/sources/base/drivers/common" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
diff --git a/local/recipes/system/redbear-ftdi/source/Cargo.toml b/local/recipes/system/redbear-ftdi/source/Cargo.toml
index 774929d364..1c7efe59b0 100644
--- a/local/recipes/system/redbear-ftdi/source/Cargo.toml
+++ b/local/recipes/system/redbear-ftdi/source/Cargo.toml
@@ -9,14 +9,14 @@ path = "src/main.rs"
 
 [dependencies]
 log = "0.4"
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
 xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
 common = { path = "../../../../../local/sources/base/drivers/common" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
diff --git a/local/recipes/system/redbear-hwutils/source/Cargo.toml b/local/recipes/system/redbear-hwutils/source/Cargo.toml
index dcc3d6568b..a6658bc742 100644
--- a/local/recipes/system/redbear-hwutils/source/Cargo.toml
+++ b/local/recipes/system/redbear-hwutils/source/Cargo.toml
@@ -145,8 +145,8 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 orbclient = "0.3"
 redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source" }
-libredox = { path = "../../../../../local/sources/libredox" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-ime/source/Cargo.toml b/local/recipes/system/redbear-ime/source/Cargo.toml
index 19f7107f75..5532e7f04f 100644
--- a/local/recipes/system/redbear-ime/source/Cargo.toml
+++ b/local/recipes/system/redbear-ime/source/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.3.0"
 edition = "2021"
 
 [dependencies]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-keymapd/source/Cargo.toml b/local/recipes/system/redbear-keymapd/source/Cargo.toml
index 80306db029..04425a2238 100644
--- a/local/recipes/system/redbear-keymapd/source/Cargo.toml
+++ b/local/recipes/system/redbear-keymapd/source/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 [dependencies]
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
 [lib]
 name = "keymapd"
 path = "src/lib.rs"
@@ -17,5 +17,5 @@ name = "redbear-keymapd"
 path = "src/main.rs"
 
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-power/source/Cargo.toml b/local/recipes/system/redbear-power/source/Cargo.toml
index 79b6511b2f..7bd73d2993 100644
--- a/local/recipes/system/redbear-power/source/Cargo.toml
+++ b/local/recipes/system/redbear-power/source/Cargo.toml
@@ -23,8 +23,8 @@ opt-level = 3
 codegen-units = 1
 
 [target.'cfg(target_os = "redox")'.dependencies]
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "redox_syscall", "protocol"] }
-syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "redox_syscall", "protocol"] }
+syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "0.2"
diff --git a/local/recipes/system/redbear-sessiond/source/Cargo.toml b/local/recipes/system/redbear-sessiond/source/Cargo.toml
index 44d1a64560..43082109b0 100644
--- a/local/recipes/system/redbear-sessiond/source/Cargo.toml
+++ b/local/recipes/system/redbear-sessiond/source/Cargo.toml
@@ -12,8 +12,8 @@ zbus = { version = "5", default-features = false, features = ["tokio"] }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
 # Patch tokio to recover from transient EBADF/EINVAL on Redox's scheme:event
 # epoll. Without this, redbear-sessiond panics during early-boot scheme
 # churn. The patch lives at local/patches/tokio/P0-epoll-redox-recovery.patch
@@ -22,5 +22,5 @@ redox-syscall = { path = "../../../../../local/sources/syscall", package = "redo
 # epoll scheme is stabilized to never return EBADF/EINVAL under normal use).
 [patch.crates-io]
 tokio = { path = "../../../../../local/patches/tokio/vendored" }
-libredox = { path = "../../../../../local/sources/libredox" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-traceroute/source/Cargo.toml b/local/recipes/system/redbear-traceroute/source/Cargo.toml
index 9df8786a41..c586d37b6a 100644
--- a/local/recipes/system/redbear-traceroute/source/Cargo.toml
+++ b/local/recipes/system/redbear-traceroute/source/Cargo.toml
@@ -16,8 +16,8 @@ anyhow = "1"
 
 [target.'cfg(target_os = "redox")'.dependencies]
 libc = "0.2"
-libredox = { path = "../../../../../local/sources/libredox" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/redbear-usb-hotplugd/source/Cargo.toml b/local/recipes/system/redbear-usb-hotplugd/source/Cargo.toml
index de76d9ff86..dbb22154df 100644
--- a/local/recipes/system/redbear-usb-hotplugd/source/Cargo.toml
+++ b/local/recipes/system/redbear-usb-hotplugd/source/Cargo.toml
@@ -9,11 +9,11 @@ path = "src/main.rs"
 
 [dependencies]
 log = "0.4"
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
 common = { path = "../../../../../local/sources/base/drivers/common" }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
diff --git a/local/recipes/system/redbear-usbaudiod/source/Cargo.toml b/local/recipes/system/redbear-usbaudiod/source/Cargo.toml
index 60a9a7854e..66a045e111 100644
--- a/local/recipes/system/redbear-usbaudiod/source/Cargo.toml
+++ b/local/recipes/system/redbear-usbaudiod/source/Cargo.toml
@@ -9,14 +9,14 @@ path = "src/main.rs"
 
 [dependencies]
 log = "0.4"
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
 xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
 common = { path = "../../../../../local/sources/base/drivers/common" }
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
 
 [patch.crates-io]
-redox_syscall = { path = "../../../../../local/sources/syscall" }
-libredox = { path = "../../../../../local/sources/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
diff --git a/local/recipes/system/redbear-wifictl/source/Cargo.toml b/local/recipes/system/redbear-wifictl/source/Cargo.toml
index 36a4404956..00f8c4fa4c 100644
--- a/local/recipes/system/redbear-wifictl/source/Cargo.toml
+++ b/local/recipes/system/redbear-wifictl/source/Cargo.toml
@@ -13,10 +13,10 @@ dbus-nm = ["dep:zbus"]
 
 [dependencies]
 libc = "0.2"
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source" }
 zbus = { version = "5", default-features = false, features = ["tokio"], optional = true }
 
@@ -24,5 +24,5 @@ zbus = { version = "5", default-features = false, features = ["tokio"], optional
 redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source", features = ["redox"] }
 
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/thermald/Cargo.toml b/local/recipes/system/thermald/Cargo.toml
index 05fed5e8ab..29daf4c87e 100644
--- a/local/recipes/system/thermald/Cargo.toml
+++ b/local/recipes/system/thermald/Cargo.toml
@@ -9,7 +9,7 @@ path = "source/src/main.rs"
 
 [dependencies]
 libc = "0.2"
-libredox = { path = "../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
\ No newline at end of file
+redox-scheme = { path = "../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
\ No newline at end of file
diff --git a/local/recipes/system/thermald/source/Cargo.toml b/local/recipes/system/thermald/source/Cargo.toml
index 620ae7463c..affae48f47 100644
--- a/local/recipes/system/thermald/source/Cargo.toml
+++ b/local/recipes/system/thermald/source/Cargo.toml
@@ -9,10 +9,10 @@ path = "src/main.rs"
 
 [dependencies]
 libc = "0.2"
-libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
 log = { version = "0.4", features = ["std"] }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 [patch.crates-io]
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/system/udev-shim/source/Cargo.toml b/local/recipes/system/udev-shim/source/Cargo.toml
index 6ec50c72f1..546989b268 100644
--- a/local/recipes/system/udev-shim/source/Cargo.toml
+++ b/local/recipes/system/udev-shim/source/Cargo.toml
@@ -5,14 +5,14 @@ edition = "2021"
 
 [dependencies]
 libc = "0.2"
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
 log = { version = "0.4", features = ["std"] }
 thiserror = "2"
 redbear-hwutils = { path = "../../redbear-hwutils/source" }
 
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/tui/tlc/source/Cargo.toml b/local/recipes/tui/tlc/source/Cargo.toml
index 86d4a9b7e5..8b71240748 100644
--- a/local/recipes/tui/tlc/source/Cargo.toml
+++ b/local/recipes/tui/tlc/source/Cargo.toml
@@ -76,7 +76,7 @@ suppaftp = { version = "6", optional = true }
 tar = { version = "0.4", optional = true }
 zip = { version = "2", default-features = false, optional = true }
 
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
 
 # Syntax highlighting
 syntect = { version = "5", default-features = false, features = ["default-onig", "regex-onig"], optional = true }
@@ -148,9 +148,9 @@ assert_cmd = "2"
 serde_yaml = "0.9"
 
 [target.'cfg(target_os = "redox")'.dependencies]
-libredox = { path = "../../../../../local/sources/libredox" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
 redox_event = "0.4.6"
-redox_syscall = { path = "../../../../../local/sources/syscall", features = ["std"] }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall", features = ["std"] }
 redox_termios = "0.1.3"
 
 [profile.release]
@@ -164,5 +164,5 @@ panic = "abort"
 opt-level = 1
 
 [patch.crates-io]
-libredox = { path = "../../../../../local/sources/libredox" }
-redox_syscall = { path = "../../../../../local/sources/syscall" }
+libredox = { path = "../../../../../recipes/core/base/libredox" }
+redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
diff --git a/local/recipes/wayland/wayland-protocols/source.tar b/local/recipes/wayland/wayland-protocols/source.tar
index 70c89413b6..2517f3573d 100644
Binary files a/local/recipes/wayland/wayland-protocols/source.tar and b/local/recipes/wayland/wayland-protocols/source.tar differ