diff --git a/srcpkgs/i3/i3-devel.template b/srcpkgs/i3/i3-devel.template
deleted file mode 100644
index d2b9b1ef929..00000000000
--- a/srcpkgs/i3/i3-devel.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'i3-devel'.
-#
-noarch=yes
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-}
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index aba993a6335..3a87dff87b7 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,8 +1,7 @@
 # Template file for 'i3'
 pkgname=i3
 version=4.5.1
-revision=1
-subpackages="${pkgname}-devel"
+revision=2
 short_desc="Improved tiling window manager"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -15,16 +14,14 @@ long_desc="
  Source Software (FOSS) under the BSD license. i3 is primarily targeted at
  advanced users and developers."
 
-depends="i3status rxvt-unicode dmenu"
 makedepends="which perl pkg-config pcre-devel>=8.30 yajl-devel libxcb-devel
  libev-devel asciidoc xmlto libXcursor-devel pango-devel
  xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9
  startup-notification-devel>=0.12_3"
 
-conf_files="/etc/i3/config /etc/i3/config.keycodes"
-
 do_build() {
-	make ${makejobs} && make ${makejobs} -C man
+	make ${makejobs}
+	make ${makejobs} -C man
 }
 
 do_install() {
@@ -32,3 +29,19 @@ do_install() {
 	vmkdir usr/share/man/man1
 	install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1
 }
+
+i3-devel_package() {
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+i3_package() {
+	depends="i3status rxvt-unicode dmenu"
+	conf_files="/etc/i3/config /etc/i3/config.keycodes"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/i3lock/template b/srcpkgs/i3lock/template
index 331cfbd9ff2..e9aac089ba7 100644
--- a/srcpkgs/i3lock/template
+++ b/srcpkgs/i3lock/template
@@ -13,8 +13,6 @@ long_desc="
  a white screen (you can configure the color/an image). You can return to your
  screen by entering your password."
 
-conf_files="/etc/pam.d/i3lock"
-
 makedepends="which pkg-config libev-devel cairo-devel pam-devel
  xcb-util-image-devel xcb-util-keysyms-devel"
 
@@ -26,3 +24,11 @@ post_install() {
 	make DESTDIR=${DESTDIR} install
 	vinstall i3lock.1 644 usr/share/man/man1
 }
+
+i3lock_package() {
+	conf_files="/etc/pam.d/i3lock"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template
index 873fcdb26cc..872fe5ce3e2 100644
--- a/srcpkgs/i3status/template
+++ b/srcpkgs/i3status/template
@@ -3,9 +3,7 @@ pkgname=i3status
 version=2.7
 revision=1
 build_style=gnu-makefile
-depends="libcap-progs"
 makedepends="asciidoc yajl-devel confuse-devel wireless_tools-devel alsa-lib-devel"
-conf_files="/etc/i3status.conf"
 short_desc="Generates status bar to use with dzen2 or xmobar"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -18,3 +16,12 @@ post_install() {
 	sed -i -e "s#dhclient#dhcpcd#g" ${DESTDIR}/etc/i3status.conf
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }
+
+i3status_package() {
+	conf_files="/etc/i3status.conf"
+	depends="libcap-progs"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index 6b208cfea52..fc02a18c0c8 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -2,7 +2,6 @@
 pkgname=iana-etc
 version=2.30
 revision=2
-noarch=yes
 build_style=gnu-makefile
 make_build_args="STRIP=yes"
 short_desc="Unix /etc/services and /etc/protocols files"
@@ -14,3 +13,10 @@ checksum=b9a6874fb20012836efef75452ef2acae624022d680feeb1994d73facba3f20d
 long_desc="
  The iana-etc package provides the Unix/Linux /etc/services and
  /etc/protocols files."
+
+iana-etc_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove etc
+	}
+}
diff --git a/srcpkgs/ibus/ibus-devel.template b/srcpkgs/ibus/ibus-devel.template
deleted file mode 100644
index 12fb3467763..00000000000
--- a/srcpkgs/ibus/ibus-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'ibus-devel'.
-#
-noarch=yes
-depends="glib-devel ibus-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-	vmove usr/share/gir-1.0 usr/share
-	vmove usr/share/vala usr/share
-}
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 29b13693ca5..5ad5cf4e2b1 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,15 +1,14 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.0
-revision=1
-subpackages="ibus-devel"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ui --enable-gtk3 --disable-python
  --disable-schemas-compile --enable-memconf
  --disable-schemas-install --enable-dconf --disable-gconf"
 makedepends="pkg-config intltool dconf-devel>=0.13.90 librsvg-devel
- gobject-introspection gtk+-devel gtk+3-devel vala-devel"
-fulldepends="hicolor-icon-theme iso-codes dbus-x11 pyxdg"
+ gobject-introspection gtk+-devel gtk+3-devel vala-devel
+ hicolor-icon-theme iso-codes dbus-x11 pyxdg"
 short_desc="Intelligent Input Bus for Linux / Unix OS"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://ibus.googlecode.com"
@@ -20,4 +19,23 @@ long_desc="
  IBus means Intelligent Input Bus. It is an open source input framework
  for Linux/Unix OS."
 
-triggers="gtk-immodules gtk3-immodules"
+ibus-devel_package() {
+	depends="glib-devel ibus-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+	}
+}
+
+ibus_package() {
+	triggers="gtk-immodules gtk3-immodules"
+	depends="hicolor-icon-theme iso-codes dbus-x11 pyxdg"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iceauth/template b/srcpkgs/iceauth/template
index 5d09c1552ea..8cddff4fd83 100644
--- a/srcpkgs/iceauth/template
+++ b/srcpkgs/iceauth/template
@@ -1,14 +1,14 @@
 # Template build file for 'iceauth'.
 pkgname=iceauth
 version=1.0.4
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 makedepends="pkg-config xproto libICE-devel"
 short_desc="ICE protocol utility"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=0ee6fd4554f0131b1ed526ee00b9cf643e7dc97eb70fb51448848ef2f349938d
 long_desc="
  This package provides iceauth, a program to display and manipulate the
@@ -16,3 +16,8 @@ long_desc="
 
  This is from the modular X.org X11 project."
  
+iceauth_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 035a39945b7..325aea0b041 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -2,13 +2,14 @@
 pkgname=icecast
 version=2.3.2
 build_style=gnu-configure
-homepage="http://www.icecast.org/"
-distfiles="http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 revision=1
-makedepends="pkg-config openssl-devel libcurl-devel speex-devel libtheora-devel libvorbis-devel libogg-devel libxslt-devel libxml2-devel"
+makedepends="pkg-config openssl-devel libcurl-devel speex-devel
+ libtheora-devel libvorbis-devel libogg-devel libxslt-devel libxml2-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
+homepage="http://www.icecast.org/"
+distfiles="http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0
 long_desc="
  Icecast is a streaming media server which currently supports Ogg Vorbis and
@@ -17,5 +18,10 @@ long_desc="
  in that new formats can be added relatively easily and supports open
  standards for commuincation and interaction."
 
-conf_files="/etc/icecast.xml"
-
+icecast_package() {
+	conf_files="/etc/icecast.xml"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template
index 4b15a1c0175..a2dd6aae6b8 100644
--- a/srcpkgs/icon-naming-utils/template
+++ b/srcpkgs/icon-naming-utils/template
@@ -1,14 +1,14 @@
 # Template build file for 'icon-naming-utils'.
 pkgname=icon-naming-utils
 version=0.8.90
-distfiles="http://tango.freedesktop.org/releases/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-fulldepends="perl-XML-Simple"
-revision=2
+makedepends="perl-XML-Simple"
 short_desc="Adapts GNOME and KDE icon names to the Icon Naming Specification"
 homepage="http://tango.freedesktop.org/Standard_Icon_Naming_Specification"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://tango.freedesktop.org/releases/$pkgname-$version.tar.bz2"
 checksum=b1378679df4485b4459f609a3304238b3e92d91e43744c47b70abbe690d883d5
 long_desc="
  Icon Naming Utilities is a program that helps with the transition to the
@@ -16,10 +16,10 @@ long_desc="
  icon names used by the GNOME and KDE desktops to the icon names proposed
  in the Icon Naming Specification."
 
-noarch=yes
-
-post_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib/pkgconfig
+icon-naming-utils_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
 }
diff --git a/srcpkgs/icu/icu-devel.template b/srcpkgs/icu/icu-devel.template
deleted file mode 100644
index 1ddd3d2d70b..00000000000
--- a/srcpkgs/icu/icu-devel.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'icu-devel'.
-#
-noarch=yes
-depends="libstdc++-devel icu>=$version"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/icu usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/icu usr/share
-	vmove usr/bin/icu-config usr/bin
-	vmove "usr/share/man/man1/icu-config*" usr/share/man/man1
-}
diff --git a/srcpkgs/icu/icu-libs.template b/srcpkgs/icu/icu-libs.template
deleted file mode 100644
index 851bca86c22..00000000000
--- a/srcpkgs/icu/icu-libs.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'icu-libs'.
-#
-short_desc="${short_desc} -- shared libs"
-long_desc="${long_desc}
-
- This package contains the shared libraries."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 209c9b74ca0..77faf15af4c 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,10 +2,9 @@
 pkgname=icu
 version=49.1.2
 _distver="$(echo $version|sed -e 's|\.|_|g')"
-revision=2
+revision=3
 wrksrc=icu
 build_wrksrc=source
-subpackages="icu-devel icu-libs"
 short_desc="Robust and full-featured Unicode services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.icu-project.org/"
@@ -64,3 +63,29 @@ do_install() {
 
 	vinstall $wrksrc/license.html 644 usr/share/licenses/icu
 }
+
+icu-devel_package() {
+	depends="libstdc++-devel icu>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/icu
+		vmove usr/lib/pkgconfig
+		vmove usr/share/icu
+		vmove usr/bin/icu-config
+		vmove "usr/share/man/man1/icu-config*"
+	}
+}
+
+icu-libs_package() {
+	short_desc="${short_desc} -- shared libs"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+icu_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index e0ba72f087d..a9a46c2d6d9 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -3,11 +3,10 @@ pkgname=idjc
 version=0.8.7
 revision=1
 build_style=gnu-configure
-depends="pygtk"
 makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel
  libflac-devel libsndfile-devel libmad-devel ffmpeg-devel>=1.0.1
- speex-devel glib-devel pixman-devel lame-devel pygtk-devel"
-fulldepends="mutagen desktop-file-utils shared-mime-info"
+ speex-devel glib-devel pixman-devel lame-devel pygtk-devel
+ mutagen desktop-file-utils shared-mime-info"
 short_desc="Internet DJ Console"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -19,11 +18,17 @@ long_desc="
  yet easy to use source-client for individuals interested in streaming live
  radio shows over the Internet using Shoutcast or Icecast servers."
 
-pycompile_module="idjc"
-
 pre_configure() {
 	# ffmpeg-1.0 definitions.
 	sed -i -e "s|AV_METADATA_DONT_STRDUP_KEY|AV_DICT_DONT_STRDUP_KEY|g" \
 		-e "s|AV_METADATA_DONT_STRDUP_VAL|AV_DICT_DONT_STRDUP_VAL|g" \
 		-e "/avcodec_init();/d" c/avcodecdecode.c
 }
+
+idjc_package() {
+	pycompile_module="idjc"
+	depends="pygtk mutagen desktop-file-utils shared-mime-info"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template
index d5d0abe4511..483e1599d06 100644
--- a/srcpkgs/ifenslave/template
+++ b/srcpkgs/ifenslave/template
@@ -20,3 +20,9 @@ do_install() {
         vinstall ifenslave 755 usr/sbin
         vinstall ${FILESDIR}/ifenslave.8 755 usr/share/man/man8
 }
+
+ifenslave_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iftop/template b/srcpkgs/iftop/template
index 5fa31a838ba..df3d96e5166 100644
--- a/srcpkgs/iftop/template
+++ b/srcpkgs/iftop/template
@@ -10,3 +10,9 @@ license="GPL-2"
 homepage="http://www.ex-parrot.com/pdw/iftop/"
 distfiles="${homepage}/download/$pkgname-$version.tar.gz"
 checksum=d032547c708307159ff5fd0df23ebd3cfa7799c31536fa0aea1820318a8e0eac
+
+iftop_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/imlib2/imlib2-devel.template b/srcpkgs/imlib2/imlib2-devel.template
deleted file mode 100644
index f58d15901bc..00000000000
--- a/srcpkgs/imlib2/imlib2-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'imlib2-devel'.
-#
-noarch=yes
-depends="imlib2-${version}_${revision}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 1457e35540f..131287adedb 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,16 +1,32 @@
 # Template build file for 'imlib2'.
 pkgname=imlib2
 version=1.4.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2
  --enable-visibility-hiding"
 makedepends="pkg-config freetype-devel libjpeg-turbo-devel libpng-devel>=1.5.10
  tiff-devel libid3tag-devel giflib-devel>=5.0.1 libXext-devel"
-subpackages="imlib2-devel"
 short_desc="Image manipulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
 homepage="http://sourceforge.net/projects/enlightenment/"
 license="BSD"
 checksum=6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0
+
+imlib2-devel_package() {
+	depends="imlib2-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/share
+		vmove usr/lib/pkgconfig
+	}
+}
+
+imlib2_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index 93bf1ca6b37..7bdbf238ae7 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -33,3 +33,9 @@ post_install() {
 	mv ${DESTDIR}/usr/share/man/man1/hostname.1 \
 		${DESTDIR}/usr/share/man/man1/${pkgname}-hostname.1
 }
+
+inetutils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index f95c21a9ee0..53e6efbeeef 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -14,7 +14,13 @@ long_desc="
  Inkscape loads and saves a subset of the SVG (Scalable Vector Graphics)
  format, a standard maintained by the WWW consortium."
 
-depends="desktop-file-utils hicolor-icon-theme"
 makedepends="pkg-config intltool libpng-devel>=1.5.10 gsl-devel gc-devel
  gtkmm2-devel libxslt-devel boost-devel popt-devel lcms-devel
  libmagick-devel>=6.8.0"
+
+inkscape_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/inputproto/template b/srcpkgs/inputproto/template
index 7d502a77684..f599c23bbac 100644
--- a/srcpkgs/inputproto/template
+++ b/srcpkgs/inputproto/template
@@ -1,15 +1,20 @@
 # Template build for 'inputproto'.
 pkgname=inputproto
 version=2.2
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
 short_desc="Input extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=de7516ab25c299740da46c0f1af02f1831c5aa93b7283f512c0f35edaac2bcb0
 long_desc="
  This provides the input extension headers from modular X.org X11 project."
 
-noarch=yes
+inputproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index 0f2effc5b23..138cae2f687 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -10,7 +10,6 @@ distfiles="http://downloadmirror.intel.com/22508/eng/microcode-${version}.tgz"
 checksum=fd25bd9777fc3c3b11f01e9090a2d24f7650023c9ec74bbf9f43bffe1d9d01cc
 
 create_wrksrc=yes
-noarch=yes
 
 do_build() {
 	cp ${FILESDIR}/*.c .
@@ -23,3 +22,10 @@ do_install() {
 	vcopy "intel-ucode/*" usr/lib/firmware/intel-ucode
 	vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/${pkgname}
 }
+
+intel-ucode_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 8e5079fcd66..5834d899c09 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -2,13 +2,20 @@
 pkgname=iotop
 version=0.5
 revision=1
-noarch=yes
 build_style=python-module
-fulldepends="python>=2.7"
-pycompile_module="iotop"
+makedepends="python>=2.7"
 short_desc="View I/O usage of processes"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://guichaz.free.fr/iotop"
 distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
 checksum=761b7b34b88a6b4715927f5319cf0b775e15aa70f43c69dcb805b0e49da1a2e9
+
+iotop_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pycompile_module="iotop"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 854d5a255bd..6927a9b3055 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -11,14 +11,6 @@ license="GPL-2"
 distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
 checksum=579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f
 
-conf_files="
- /etc/iproute2/ematch_map
- /etc/iproute2/rt_dsfield
- /etc/iproute2/rt_protos
- /etc/iproute2/rt_realms
- /etc/iproute2/rt_scopes
- /etc/iproute2/rt_tables"
-
 do_configure() {
 	./configure
 }
@@ -44,3 +36,17 @@ do_install() {
 	# Remove devel manpages.
 	rm -rf ${DESTDIR}/usr/share/man/man3
 }
+
+iproute2_package() {
+	conf_files="
+		/etc/iproute2/ematch_map
+		/etc/iproute2/rt_dsfield
+		/etc/iproute2/rt_protos
+		/etc/iproute2/rt_realms
+		/etc/iproute2/rt_scopes
+		/etc/iproute2/rt_tables"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iptables/iptables-devel.template b/srcpkgs/iptables/iptables-devel.template
deleted file mode 100644
index f55226585ca..00000000000
--- a/srcpkgs/iptables/iptables-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'iptables-devel'.
-#
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index 96857231b7e..bfefd77b599 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -4,7 +4,6 @@ version=1.4.18
 revision=2
 build_style=gnu-configure
 configure_args="--enable-libipq --enable-shared --enable-static"
-subpackages="$pkgname-devel"
 short_desc="Linux IPv[46] packet filtering ruleset"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.netfilter.org/"
@@ -13,7 +12,7 @@ distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2"
 checksum=14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c
 
 if [ -n "$XBPS_CROSS_TRIPLET" ]; then
-	makedepends="automake gettext-devel pkg-config"
+	hostmakedepends="automake gettext-devel pkg-config"
 	pre_configure() {
 		autoreconf -fi
 	}
@@ -39,3 +38,22 @@ post_install() {
 			var/lib/iptables empty-${f}.rules
 	done
 }
+
+iptables-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+iptables_package() {
+	pkg_install() {
+		vmove etc
+		vmove usr
+		vmove var
+	}
+}
diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template
index eb8de046301..e5ec083af0b 100644
--- a/srcpkgs/iptraf-ng/template
+++ b/srcpkgs/iptraf-ng/template
@@ -1,14 +1,14 @@
 # Template file for 'iptraf-ng'
 pkgname=iptraf-ng
 version=1.1.1
-homepage="https://fedorahosted.org/iptraf-ng/"
-distfiles="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$version.tar.gz"
+revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
-revision=1
 short_desc="IP traffic monitor (iptraf-3.0.0 fork)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="https://fedorahosted.org/iptraf-ng/"
+distfiles="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$version.tar.gz"
 checksum=02aaf76d4f16e48224a534ef7d64d4b3a5ee0ede53b46cacd35842abb7b9a681
 long_desc="
  $pkgname is a fork of original iptraf-3.0.0.
@@ -29,4 +29,9 @@ long_desc="
  utilization of the built-in raw socket interface of the Linux kernel, so it
  can be used on a wide variety of supported network cards."
 
-make_dirs="/var/lock/$pkgname 0750 root root"
+iptraf-ng_package() {
+	make_dirs="/var/lock/iptraf-ng 0750 root root"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index b46b0b87408..05fbbc59b1d 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -5,7 +5,6 @@ revision=2
 patch_args="-Np1"
 wrksrc="${pkgname}-s${version}"
 makedepends="openssl-devel libcap-devel"
-depends="libcap-progs"
 short_desc="IP Configuration Utilities (and ping)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -36,3 +35,10 @@ do_install() {
 	ln -s tracepath.8 tracepath6.8
 
 }
+
+iputils_package() {
+	depends="libcap-progs"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ipw2100-firmware/template b/srcpkgs/ipw2100-firmware/template
index 580ea13f7b7..32666036439 100644
--- a/srcpkgs/ipw2100-firmware/template
+++ b/srcpkgs/ipw2100-firmware/template
@@ -2,10 +2,9 @@
 pkgname=ipw2100-firmware
 _distname=ipw2100-fw
 version=1.3
-noarch=yes
+revision=3
 wrksrc="${_distname}-${version}"
 create_wrksrc=yes
-revision=3
 short_desc="Firmware for the Intel PRO/Wireless 2100 wifi cards"
 homepage="http://ipw2100.sourceforge.net/"
 license="Custom"
@@ -22,3 +21,10 @@ do_install() {
 	install -m644 *.fw ${DESTDIR}/usr/lib/firmware
 	vinstall LICENSE 644 usr/share/licenses/$pkgname
 }
+
+ipw2100-firmware_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ipw2200-firmware/template b/srcpkgs/ipw2200-firmware/template
index f26d2bb1974..74317c96a41 100644
--- a/srcpkgs/ipw2200-firmware/template
+++ b/srcpkgs/ipw2200-firmware/template
@@ -2,7 +2,6 @@
 pkgname=ipw2200-firmware
 _distname=ipw2200-fw
 version=3.1
-noarch=yes
 revision=3
 wrksrc="${_distname}-${version}"
 short_desc="Firmware for the Intel PRO/Wireless 2200BG wifi cards"
@@ -22,3 +21,10 @@ do_install() {
 	install -m644 *.fw ${DESTDIR}/usr/lib/firmware
 	install -m644 LICENSE* ${DESTDIR}/usr/share/licenses/$pkgname
 }
+
+ipw2200-firmware_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ired/template b/srcpkgs/ired/template
index fb1a7171373..29ef1d1b547 100644
--- a/srcpkgs/ired/template
+++ b/srcpkgs/ired/template
@@ -16,3 +16,9 @@ do_build() {
 do_install() {
 	make install DESTDIR=${DESTDIR} PREFIX=/usr
 }
+
+ired_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/irqbalance/template b/srcpkgs/irqbalance/template
index 6f39ddd7935..2a34c561c8c 100644
--- a/srcpkgs/irqbalance/template
+++ b/srcpkgs/irqbalance/template
@@ -3,8 +3,8 @@ pkgname=irqbalance
 version=1.0.5
 revision=1
 build_style=gnu-configure
-systemd_services="${pkgname}.service on"
-makedepends="pkg-config glib-devel libcap-ng-devel libnuma-devel"
+hostmakedepends="pkg-config"
+makedepends="libglib-devel libcap-ng-devel libnuma-devel"
 short_desc="Handholding your interrupts for power and performance"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -26,3 +26,10 @@ long_desc="
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
 }
+
+irqbalance_package() {
+	systemd_services="irqbalance.service on"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/irssi/irssi-devel.template b/srcpkgs/irssi/irssi-devel.template
deleted file mode 100644
index 5210aaae663..00000000000
--- a/srcpkgs/irssi/irssi-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'irssi-devel'.
-#
-depends="perl>=5.16 glib-devel openssl-devel ncurses-devel"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-}
diff --git a/srcpkgs/irssi/irssi-perl.template b/srcpkgs/irssi/irssi-perl.template
deleted file mode 100644
index 8ec008c69af..00000000000
--- a/srcpkgs/irssi/irssi-perl.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'irssi-perl'.
-#
-depends="perl>=5.16 irssi>=$version"
-short_desc="${short_desc} -- perl support"
-
-do_install() {
-	vmove usr/lib/perl5 usr/lib
-	vmove "usr/lib/irssi/modules/*perl*" usr/lib/irssi/modules
-	vmove usr/share/irssi/scripts usr/share/irssi
-}
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 7ae6ddf7de1..e6881ce2585 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,13 +1,11 @@
 # Template build file for 'irssi'
 pkgname=irssi
 version=0.8.15
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --with-perl=module"
 hostmakedepends="pkg-config perl>=5.16"
 makedepends="libglib-devel openssl-devel ncurses-devel"
-conf_files="/etc/irssi.conf"
-subpackages="irssi-devel irssi-perl"
 homepage="http://www.irssi.org"
 short_desc="Secure and modular IRC client with text mode user interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -18,6 +16,36 @@ checksum=c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6
 if [ "$CROSS_BUILD" ]; then
 	# XXX perl module
 	hostmakedepends="pkg-config"
-	configure_args="${configure_args} --without-perl"
+	configure_args+=" --without-perl"
 	subpackages="irssi-devel"
 fi
+
+if [ -z "$CROSS_BUILD" ]; then
+
+irssi-perl_package() {
+	depends="perl>=5.16 irssi>=$version"
+	short_desc="${short_desc} -- perl support"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove "usr/lib/irssi/modules/*perl*"
+		vmove usr/share/irssi/scripts
+	}
+}
+
+fi # !CROSS_BUILD
+
+irssi-devel_package() {
+	depends="perl>=5.16 glib-devel openssl-devel ncurses-devel"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+irssi_package() {
+	conf_files="/etc/irssi.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template
index fbbfef383c7..603235b9331 100644
--- a/srcpkgs/iso-codes/template
+++ b/srcpkgs/iso-codes/template
@@ -1,10 +1,8 @@
 # Template build file for 'iso-codes'.
 pkgname=iso-codes
 version=3.41
-noarch=yes
+revision=2
 build_style=gnu-configure
-make_install_args="pkgconfigdir=/usr/lib/pkgconfig"
-revision=1
 short_desc="List of country, language and currency names"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -19,3 +17,10 @@ long_desc="
  The aim of iso-codes is to create a single gettext domain iso-639 which
  contains the translations of language names, and one iso-3166 listing the
  translations of country names."
+
+iso-codes_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/itstool/template b/srcpkgs/itstool/template
index f4975a5e1cd..157f1c5a436 100644
--- a/srcpkgs/itstool/template
+++ b/srcpkgs/itstool/template
@@ -2,9 +2,8 @@
 pkgname=itstool
 version=1.2.0
 revision=1
-noarch=yes
 build_style=gnu-configure
-depends="python>=0 libxml2-python>=0"
+makedepends="python libxml2-python"
 short_desc="ITS Tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -15,3 +14,11 @@ long_desc="
  ITS Tool allows you to translate your XML documents with PO files, using
  rules from the W3C Internationalization Tag Set (ITS) to determine what to
  translate and how to separate it into PO file messages."
+
+itstool_package() {
+	noarch="yes"
+	depends="python libxml2-python"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template
index 8d32ce15f13..dfd1ce2a2e9 100644
--- a/srcpkgs/iw/template
+++ b/srcpkgs/iw/template
@@ -11,3 +11,9 @@ license="GPL-2"
 homepage="http://wireless.kernel.org/en/users/Documentation/iw"
 distfiles="http://www.kernel.org/pub/software/network/iw/iw-${version}.tar.xz"
 checksum=50c07d5fcf38240b3912fb6950f6ec566b8d27c321cbdacc1de53fc3be96af9a
+
+iw_package() {
+	pkg_install() {
+		vmove usr
+	}
+}