diff --git a/include/common.sh b/include/common.sh
index a8f3435f..7ace6ec7 100644
--- a/include/common.sh
+++ b/include/common.sh
@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 . "include/lib.sh"
-. "include/init.sh"
-. "include/vendor.sh"
-. "include/mrc.sh"
-. "include/inject.sh"
-. "include/rom.sh"
-. "include/release.sh"
-. "include/get.sh"
+. "include/env/init.sh"
+. "include/fw/vendor.sh"
+. "include/fw/mrc.sh"
+. "include/fw/inject.sh"
+. "include/fw/rom.sh"
+. "include/mk/release.sh"
+. "include/env/get.sh"
 
 xbcommands=" \
 version \
diff --git a/include/get.sh b/include/env/get.sh
similarity index 100%
rename from include/get.sh
rename to include/env/get.sh
diff --git a/include/init.sh b/include/env/init.sh
similarity index 100%
rename from include/init.sh
rename to include/env/init.sh
diff --git a/include/inject.sh b/include/fw/inject.sh
similarity index 100%
rename from include/inject.sh
rename to include/fw/inject.sh
diff --git a/include/mrc.sh b/include/fw/mrc.sh
similarity index 100%
rename from include/mrc.sh
rename to include/fw/mrc.sh
diff --git a/include/rom.sh b/include/fw/rom.sh
similarity index 100%
rename from include/rom.sh
rename to include/fw/rom.sh
diff --git a/include/vendor.sh b/include/fw/vendor.sh
similarity index 100%
rename from include/vendor.sh
rename to include/fw/vendor.sh
diff --git a/include/release.sh b/include/mk/release.sh
similarity index 100%
rename from include/release.sh
rename to include/mk/release.sh
diff --git a/include/tree.sh b/include/mk/tree.sh
similarity index 100%
rename from include/tree.sh
rename to include/mk/tree.sh
diff --git a/mk b/mk
index cea6c943..099e7d84 100755
--- a/mk
+++ b/mk
@@ -32,7 +32,7 @@ if xeq main "${1-}" \
 	exit 0
 fi
 
-. "include/tree.sh"
+. "include/mk/tree.sh"
 
 trees "$@" || exit 0