diff --git a/.gitignore b/.gitignore
index e693e4c..b3bd1a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,5 @@
-packages-x86_64/*
-packages-any/*
-packages-extra/*
-workspace/*
+x86_64/*
+any/*
 
-!packages-x86_64/mlc.toml
-!packages-any/mlc.toml
-!packages-extra/mlc.toml
-!workspace/mlc.toml
\ No newline at end of file
+!x86_64/mlc.toml
+!any/mlc.toml
diff --git a/packages-any/mlc.toml b/any/mlc.toml
similarity index 79%
rename from packages-any/mlc.toml
rename to any/mlc.toml
index 63d2f35..228bd11 100644
--- a/packages-any/mlc.toml
+++ b/any/mlc.toml
@@ -12,10 +12,10 @@ on_gen = true
 
 [repositories]
 repos = [
-	"crs:crystal-keyring",
-	"crs:onyx",
-	"crs:wallpapers",
-	"crs:grub-theme",
+	"pkg:crystal-keyring",
+	"pkg:onyx",
+	"pkg:wallpapers",
+	"pkg:grub-theme",
 	"pkg:base",
 	"pkg:crystal-dev",
 	"pkg:filesystem",
@@ -28,6 +28,5 @@ repos = [
 ]
 
 [repositories.urls]
-crs = "https://github.com/crystal-linux/{}"
 pkg = "https://github.com/crystal-linux/pkgbuild.{}"
 aur = "https://aur.archlinux.org/{}"
diff --git a/packages-extra/mlc.toml b/packages-extra/mlc.toml
deleted file mode 100644
index c37f4c5..0000000
--- a/packages-extra/mlc.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[base]
-mode = "repository"
-smart_pull = true
-
-[mode.repository]
-name = "crystal-extra"
-build_on_update = true
-
-[mode.repository.signing]
-enabled = true
-on_gen = true
-
-[repositories]
-repos = [
-	"aur:brave-bin",
-	"aur:mullvad-vpn",
-	"aur:mullvad-vpn-beta",
-	"aur:mullvad-vpn-cli",
-	"aur:microsoft-edge-stable-bin",
-	"aur:microsoft-edge-beta-bin",
-	"aur:microsoft-edge-dev-bin",
-	"aur:google-chrome",
-	"aur:google-chrome-beta",
-	"aur:google-chrome-dev",
-	"aur:ungoogled-chromium",
-	"aur:jetbrains-toolbox",
-	"aur:visual-studio-code-bin",
-	"aur:polymc"
-]
-
-[repositories.urls]
-aur = "https://aur.archlinux.org/{}"
diff --git a/workspace/mlc.toml b/workspace/mlc.toml
deleted file mode 100644
index 93b3c2a..0000000
--- a/workspace/mlc.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[base]
-mode = "workspace"
-smart_pull = true
-
-[mode.workspace]
-git_info = true
-colorblind = false
-
-[repositories]
-repos = [
-	"crs:amethyst",
-	"crs:branding",
-	"crs:caveman",
-	"crs:crystal-keyring",
-	"crs:grub-theme",
-	"crs:iso", 
-	"crs:jade", 
-	"crs:jade-gui",
-	"crs:malachite",
-	"crs:onyx",
-	"crs:site",
-	"crs:wallpapers",
-	"crs:pkg-manager-warner",
-	"pkg:base", 
-	"pkg:filesystem",
-	"pkg:grub",
-	"pkg:lsb-release",
-]
-
-[repositories.urls]
-crs = "ssh://git@github.com/crystal-linux/{}"
-pkg = "ssh://git@github.com/crystal-linux/pkgbuild.{}"
diff --git a/packages-x86_64/mlc.toml b/x86_64/mlc.toml
similarity index 77%
rename from packages-x86_64/mlc.toml
rename to x86_64/mlc.toml
index 0ea3bea..60bbb45 100644
--- a/packages-x86_64/mlc.toml
+++ b/x86_64/mlc.toml
@@ -13,13 +13,12 @@ on_gen = true
 [repositories]
 repos = [
 	"pkg:amethyst",
-	"crs:jade",
-	"crs:jade-gui",
-	"crs:malachite",
+	"pkg:jade",
+	"pkg:jade-gui",
+	"pkg:malachite",
 	"pkg:grub",
 	"pkg:zramd",
 ]
 
 [repositories.urls]
-crs = "https://github.com/crystal-linux/{}"
 pkg = "https://github.com/crystal-linux/pkgbuild.{}"