diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d332b34..dfb60c8 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -10,7 +10,7 @@ serialize =
 search = VERSION "{current_version}"
 replace = VERSION "{new_version}"
 
-[bumpversion:file:PKGBUILD]
+[bumpversion:file:pkg/arch/PKGBUILD]
 search = pkgver={current_version}
 replace = pkgver={new_version}
 
diff --git a/.gitignore b/.gitignore
index 349bd00..bf1cd1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-/pkg/
-/src/ustreamer-*/
-/src/v*.tar.gz
-/v*.tar.gz
-/ustreamer-*.pkg.tar.xz
+/pkg/arch/pkg/
+/pkg/arch/src/
+/pkg/arch/v*.tar.gz
+/pkg/arch/ustreamer-*.pkg.tar.xz
 /vgcore.*
 /ustreamer
 /*.sock
diff --git a/Makefile b/Makefile
index ad116d9..69793c7 100644
--- a/Makefile
+++ b/Makefile
@@ -60,5 +60,5 @@ push:
 clean-all: clean
 clean:
 	find src -name '*.o' -exec rm '{}' \;
+	rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.xz
 	rm -f vgcore.* *.sock $(PROG)
-	rm -rf pkg src/$(PROG)-* src/v*.tar.gz v*.tar.gz $(PROG)-*.pkg.tar.xz
diff --git a/PKGBUILD b/pkg/arch/PKGBUILD
similarity index 100%
rename from PKGBUILD
rename to pkg/arch/PKGBUILD
diff --git a/ustreamer.ebuild b/pkg/gentoo/ustreamer-9999.ebuild
similarity index 100%
rename from ustreamer.ebuild
rename to pkg/gentoo/ustreamer-9999.ebuild