diff --git a/pkgs/libnl-tiny/build.sh b/base/libnl-tiny/build.sh
similarity index 100%
rename from pkgs/libnl-tiny/build.sh
rename to base/libnl-tiny/build.sh
diff --git a/pkgs/libnl-tiny/cmake-no-extra-errs.patch b/base/libnl-tiny/cmake-no-extra-errs.patch
similarity index 100%
rename from pkgs/libnl-tiny/cmake-no-extra-errs.patch
rename to base/libnl-tiny/cmake-no-extra-errs.patch
diff --git a/base/pfetch/build.sh b/base/pfetch/build.sh
new file mode 100644
index 0000000..b9c1a0c
--- /dev/null
+++ b/base/pfetch/build.sh
@@ -0,0 +1,22 @@
+pkgname=pfetch
+pkgver=master
+
+fetch() {
+    curl -L "https://github.com/dylanaraps/pfetch/archive/refs/heads/$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
+	tar -xf $pkgname-$pkgver.tar.gz
+}
+
+build() {
+	cd $pkgname-$pkgver
+	echo "Nothing to do"
+}
+
+package() {
+	cd $pkgname-$pkgver
+	install -Dm755 pfetch $pkgdir/usr/bin/
+}
+
+license() {
+	cd $pkgname-$pkgver
+	cat LICENSE.md
+}
diff --git a/pkgs/wpa_supplicant/build.sh b/base/wpa_supplicant/build.sh
similarity index 100%
rename from pkgs/wpa_supplicant/build.sh
rename to base/wpa_supplicant/build.sh
diff --git a/pkgs/wpa_supplicant/config b/base/wpa_supplicant/config
similarity index 100%
rename from pkgs/wpa_supplicant/config
rename to base/wpa_supplicant/config
diff --git a/pkgs/zstd/build.sh b/base/zstd/build.sh
similarity index 100%
rename from pkgs/zstd/build.sh
rename to base/zstd/build.sh
diff --git a/pkgs/pfetch/build.sh b/pkgs/pfetch/build.sh
deleted file mode 100644
index 34eea74..0000000
--- a/pkgs/pfetch/build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=pfetch
-pkgver=0.6.0
-
-fetch() {
-	curl -L "https://github.com/dylanaraps/pfetch/archive/$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
-	tar -xf $pkgname-$pkgver.tar.xz
-}
-
-build() {
-	cd $pkgname-$pkgver
-	echo "Nothing to do"
-}
-
-package() {
-	cd $pkgname-$pkgver
-	install -Dm755 pfetch /usr/bin/
-}
-
-license() {
-	cd $pkgname-$pkgver
-	cat LICENSE.md
-}