diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template
index bb1c07600f2..2e0a557a4b4 100644
--- a/srcpkgs/cracklib/template
+++ b/srcpkgs/cracklib/template
@@ -50,6 +50,13 @@ cracklib-python_package() {
 	}
 }
 
+cracklib_package() {
+	pkg_install() {
+		vmove usr/share
+		vmove usr/sbin
+	}
+}
+
 libcracklib_package() {
 	short_desc="${short_desc} -- runtime library"
 	replaces="cracklib<2.8.22_2"
@@ -58,8 +65,3 @@ libcracklib_package() {
 	}
 }
 
-cracklib_package() {
-	pkg_install() {
-		vmove usr
-	}
-}
diff --git a/srcpkgs/expat/expat-devel.template b/srcpkgs/expat/expat-devel.template
deleted file mode 100644
index 87dcb264bcf..00000000000
--- a/srcpkgs/expat/expat-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'expat-devel'.
-#
-depends="expat>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index 307f95670bc..53ca4c9f2af 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -3,10 +3,33 @@ pkgname=expat
 version=2.1.0
 revision=3
 build_style=gnu-configure
-subpackages="xmlwf expat-devel"
 short_desc="XML parser library written in C"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="http://expat.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/expat/$pkgname-$version.tar.gz"
 checksum=823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
+
+expat-devel_package() {
+	depends="expat>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+expat_package() {
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+xmlwf_package() {
+	short_desc="${short_desc} -- xmlwf utility"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share
+	}
+}
diff --git a/srcpkgs/expat/xmlwf.template b/srcpkgs/expat/xmlwf.template
deleted file mode 100644
index 48f23a601ad..00000000000
--- a/srcpkgs/expat/xmlwf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'xmlwf'.
-#
-short_desc="${short_desc} -- xmlwf utility"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libffi/libffi-devel.template b/srcpkgs/libffi/libffi-devel.template
deleted file mode 100644
index e894937bf45..00000000000
--- a/srcpkgs/libffi/libffi-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libffi-devel'.
-#
-depends="glibc-devel libffi>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template
index f2439479736..6b71943660d 100644
--- a/srcpkgs/libffi/template
+++ b/srcpkgs/libffi/template
@@ -1,7 +1,7 @@
 # Template file for 'libffi'
 pkgname=libffi
 version=3.0.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--includedir=/usr/include --with-pic=yes"
 short_desc="Library supporting Foreign Function Interfaces"
@@ -10,7 +10,6 @@ homepage="http://sourceware.org/libffi"
 license="MIT"
 distfiles="ftp://sourceware.org/pub/$pkgname/$pkgname-$version.tar.gz"
 checksum=f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f
-subpackages="$pkgname-devel"
 
 post_install() {
 	# Fix includedir for pkg-config file.
@@ -18,3 +17,20 @@ post_install() {
 		${DESTDIR}/usr/lib/pkgconfig/libffi.pc
 	vinstall LICENSE 644 usr/share/licenses/libffi
 }
+
+libffi-devel_package() {
+	depends="libffi>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libffi_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/openssl/libssl.template b/srcpkgs/openssl/libssl.template
deleted file mode 100644
index fef9ad1d1f4..00000000000
--- a/srcpkgs/openssl/libssl.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libssl'.
-#
-short_desc="Secure Sockets Layer and Cryptographic library"
-
-do_install() {
-	vmove "usr/lib/lib*.so*" usr/lib
-}
diff --git a/srcpkgs/openssl/openssl-devel.template b/srcpkgs/openssl/openssl-devel.template
deleted file mode 100644
index 54b6d287bfa..00000000000
--- a/srcpkgs/openssl/openssl-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'openssl-devel'.
-#
-depends="zlib-devel libssl>=$version"
-short_desc="Secure Socket Layer and cryptographic library - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index ae3742a082b..06494633d37 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -3,10 +3,8 @@ pkgname=openssl
 _openssl_version=1.0.1
 version=${_openssl_version}e
 revision=3
-fulldepends="perl"
+hostmakedepends="perl"
 makedepends="zlib-devel"
-conf_files="/etc/ssl/openssl.cnf"
-subpackages="libssl openssl-devel"
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -14,10 +12,6 @@ homepage="http://www.openssl.org/"
 distfiles="https://www.openssl.org/source/$pkgname-$version.tar.gz"
 checksum=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
 
-make_dirs="
-/etc/ssl/certs 0755 root root
-/etc/ssl/private 0750 root root"
-
 do_configure() {
 	local _opts
 
@@ -74,3 +68,35 @@ do_install() {
 			${DESTDIR}/usr/share/man/man3/openssl-${f}.3
 	done
 }
+
+openssl-devel_package() {
+	depends="zlib-devel libssl>=$version"
+	short_desc="Secure Socket Layer and cryptographic library - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+openssl_package() {
+	depends="perl"
+	conf_files="/etc/ssl/openssl.cnf"
+	make_dirs="
+		/etc/ssl/certs 0755 root root
+		/etc/ssl/private 0750 root root"
+	pkg_install() {
+		vmove usr/lib/engines
+		vmove usr/bin
+		vmove etc
+		vmove usr/share/man/man1
+	}
+}
+
+libssl_package() {
+	short_desc="Secure Sockets Layer and Cryptographic library"
+	pkg_install() {
+		vmove "usr/lib/lib*.so*"
+	}
+}
diff --git a/srcpkgs/python/python-devel.template b/srcpkgs/python/python-devel.template
deleted file mode 100644
index 1e591646dd1..00000000000
--- a/srcpkgs/python/python-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-devel'.
-#
-depends="libffi-devel zlib-devel readline-devel bzip2-devel gdbm-devel
- openssl-devel expat-devel db-devel ncurses-devel sqlite-devel
- python>=${version}"
-short_desc="Python development files"
-
-do_install() {
-	vmove "usr/bin/python*-config" usr/bin
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/include/python2.7/*" usr/include/python2.7
-	mv ${DESTDIR}/usr/include/python2.7/pyconfig.h \
-		${SRCPKGDESTDIR}/usr/include/python2.7
-}
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 54be0b40dc8..bc09d58cc45 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -72,3 +72,26 @@ post_install() {
 	chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
 	install -Dm644 LICENSE ${DESTDIR}/usr/share/licenses/python/LICENSE
 }
+
+python_package() {
+        pkg_install() {
+                vmove usr
+        }
+}
+
+python-devel_package() {
+	depends="libffi-devel zlib-devel readline-devel bzip2-devel gdbm-devel                                   
+		openssl-devel expat-devel db-devel ncurses-devel sqlite-devel                                           
+		python>=${version}"
+        short_desc="Python development files"
+
+        pkg_install() {
+                vmove "usr/bin/python*-config"
+                vmove usr/lib/pkgconfig
+                for f in usr/include/python2.7/*; do
+                        if [ `basename "$f"` != "pyconfig.h" ]; then
+                                vmove $f
+                        fi
+                done
+        }
+}
diff --git a/srcpkgs/sqlite/sqlite-devel.template b/srcpkgs/sqlite/sqlite-devel.template
deleted file mode 100644
index 04e2cb6a1df..00000000000
--- a/srcpkgs/sqlite/sqlite-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'sqlite-devel'.
-#
-depends="tcl-devel readline-devel sqlite>=${version}"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/sqlite/sqlite-tcl.template b/srcpkgs/sqlite/sqlite-tcl.template
deleted file mode 100644
index 9f0179b1ade..00000000000
--- a/srcpkgs/sqlite/sqlite-tcl.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'sqlite-tcl'.
-#
-depends="sqlite>=$version tcl"
-short_desc="${short_desc} -- TCL bindings"
-
-do_install() {
-	vmove "usr/lib/sqlite*" usr/lib
-}
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 90ddfdaeb60..24f25c2d873 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,10 +1,9 @@
 # Template build file for 'sqlite'.
 pkgname=sqlite
 version=3.7.16
-revision=1
+revision=2
 wrksrc=sqlite
 create_wrksrc=yes
-subpackages="$pkgname-devel $pkgname-tcl"
 makedepends="readline-devel tcl-devel"
 short_desc="SQL Database Engine in a C Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -54,3 +53,26 @@ do_install() {
 
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
+
+sqlite-devel_package() {
+	depends="readline-devel sqlite>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+sqlite-tcl_package() {
+	depends="sqlite>=$version tcl"
+	short_desc="${short_desc} -- TCL bindings"
+	pkg_install() {
+		vmove "usr/lib/sqlite*"
+	}
+}
+
+sqlite_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/tcl/tcl-devel.template b/srcpkgs/tcl/tcl-devel.template
deleted file mode 100644
index 280c069dd36..00000000000
--- a/srcpkgs/tcl/tcl-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'tcl-devel'.
-#
-depends="tcl-${version}_${revision}"
-short_desc="${short_desc} - development files"
-noarch=yes
-
-do_install() {
-	vmove usr/lib/tclConfig.sh usr/lib
-	vmove usr/include usr
-	vmove usr/share/man/man3 usr/share/man
-	vmove usr/share/man/mann usr/share/man
-}
diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index 2810bf85912..7abd1ad5028 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -1,10 +1,9 @@
 # Template file for 'tcl'
 pkgname=tcl
 version=8.5.13
-revision=2
+revision=3
 wrksrc="tcl${version}"
 build_wrksrc=unix
-subpackages="tcl-devel"
 short_desc="The TCL scripting language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.tcl.tk"
@@ -34,3 +33,20 @@ do_install() {
 	# Set proper perms to shlibs.
 	chmod 755 ${DESTDIR}/usr/lib/*.so*
 }
+
+tcl-devel_package() {
+	depends="tcl>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/lib/tclConfig.sh
+		vmove usr/include
+		vmove usr/share/man/man3
+		vmove usr/share/man/mann
+	}
+}
+
+tcl_package() {
+	pkg_install() {
+		vmove usr
+	}
+}