diff --git a/.gitmodules b/.gitmodules
index 4fccbfc..6ba91bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,44 +1,44 @@
 [submodule "zfs-git"]
-	path = packages/git/zfs-git
+	path = packages/linux/zfs-git
 	url = ssh+git://aur@aur4.archlinux.org/zfs-git.git
 	branch = master
 [submodule "zfs-lts"]
-	path = packages/lts/zfs-lts
+	path = packages/linux-lts/zfs-lts
 	url = ssh+git://aur@aur4.archlinux.org/zfs-lts.git
 	branch = master
 [submodule "zfs-utils-lts"]
-	path = packages/lts/zfs-utils-lts
+	path = packages/linux-lts/zfs-utils-lts
 	url = ssh+git://aur@aur4.archlinux.org/zfs-utils-lts.git
 	branch = master
 [submodule "zfs-utils-git"]
-	path = packages/git/zfs-utils-git
+	path = packages/linux/zfs-utils-git
 	url = ssh+git://aur@aur4.archlinux.org/zfs-utils-git.git
 	branch = master
 [submodule "spl-git"]
-	path = packages/git/spl-git
+	path = packages/linux/spl-git
 	url = ssh+git://aur@aur4.archlinux.org/spl-git.git
 	branch = master
 [submodule "spl-utils-git"]
-	path = packages/git/spl-utils-git
+	path = packages/linux/spl-utils-git
 	url = ssh+git://aur@aur4.archlinux.org/spl-utils-git.git
 	branch = master
 [submodule "spl-utils-lts"]
-	path = packages/lts/spl-utils-lts
+	path = packages/linux-lts/spl-utils-lts
 	url = ssh+git://aur@aur4.archlinux.org/spl-utils-lts.git
 	branch = master
 [submodule "spl-lts"]
-	path = packages/lts/spl-lts
+	path = packages/linux-lts/spl-lts
 	url = ssh+git://aur@aur4.archlinux.org/spl-lts.git
 	branch = master
 [submodule "packages/std/zfs"]
-	path = packages/std/zfs
+	path = packages/linux/zfs
 	url = ssh+git://aur@aur4.archlinux.org/zfs.git
 [submodule "packages/std/zfs-utils"]
-	path = packages/std/zfs-utils
+	path = packages/linux/zfs-utils
 	url = ssh+git://aur@aur4.archlinux.org/zfs-utils.git
 [submodule "packages/std/spl-utils"]
-	path = packages/std/spl-utils
+	path = packages/linux/spl-utils
 	url = ssh+git://aur@aur4.archlinux.org/spl-utils.git
 [submodule "packages/std/spl"]
-	path = packages/std/spl
+	path = packages/linux/spl
 	url = ssh+git://aur@aur4.archlinux.org/spl.git
diff --git a/packages/lts/spl-lts b/packages/linux-lts/spl-lts
similarity index 100%
rename from packages/lts/spl-lts
rename to packages/linux-lts/spl-lts
diff --git a/packages/lts/spl-utils-lts b/packages/linux-lts/spl-utils-lts
similarity index 100%
rename from packages/lts/spl-utils-lts
rename to packages/linux-lts/spl-utils-lts
diff --git a/packages/lts/zfs-lts b/packages/linux-lts/zfs-lts
similarity index 100%
rename from packages/lts/zfs-lts
rename to packages/linux-lts/zfs-lts
diff --git a/packages/lts/zfs-utils-lts b/packages/linux-lts/zfs-utils-lts
similarity index 100%
rename from packages/lts/zfs-utils-lts
rename to packages/linux-lts/zfs-utils-lts
diff --git a/packages/std/spl b/packages/linux/spl
similarity index 100%
rename from packages/std/spl
rename to packages/linux/spl
diff --git a/packages/git/spl-git b/packages/linux/spl-git
similarity index 100%
rename from packages/git/spl-git
rename to packages/linux/spl-git
diff --git a/packages/std/spl-utils b/packages/linux/spl-utils
similarity index 100%
rename from packages/std/spl-utils
rename to packages/linux/spl-utils
diff --git a/packages/git/spl-utils-git b/packages/linux/spl-utils-git
similarity index 100%
rename from packages/git/spl-utils-git
rename to packages/linux/spl-utils-git
diff --git a/packages/std/zfs b/packages/linux/zfs
similarity index 100%
rename from packages/std/zfs
rename to packages/linux/zfs
diff --git a/packages/git/zfs-git b/packages/linux/zfs-git
similarity index 100%
rename from packages/git/zfs-git
rename to packages/linux/zfs-git
diff --git a/packages/std/zfs-utils b/packages/linux/zfs-utils
similarity index 100%
rename from packages/std/zfs-utils
rename to packages/linux/zfs-utils
diff --git a/packages/git/zfs-utils-git b/packages/linux/zfs-utils-git
similarity index 100%
rename from packages/git/zfs-utils-git
rename to packages/linux/zfs-utils-git