From fa2748d9b2aa9ad6e83b798921851bfae35310d0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 3 Feb 2009 21:35:57 +0100
Subject: [PATCH] Reorganize the templates directory for possible future
 changes.

Now every template uses its own directory. Patches, prepost* files
and other related stuff are stored there.

--HG--
extra : convert_revision : bbc529ef161d9a59fe13a1d54ac058f77ea05845
---
 shutils/binpkg.sh                                   |   8 ++++----
 shutils/builddep_funcs.sh                           |   8 ++++----
 shutils/chroot.sh                                   |   2 +-
 shutils/patch_funcs.sh                              |   6 +++---
 shutils/pkgtarget_funcs.sh                          |   6 +++---
 shutils/stow_funcs.sh                               |   6 +++---
 shutils/tmpl_funcs.sh                               |   4 ++--
 templates/{MesaLib.tmpl => MesaLib/template}        |   0
 templates/{atk.tmpl => atk/template}                |   0
 templates/{autoconf.tmpl => autoconf/template}      |   0
 templates/{automake.tmpl => automake/template}      |   0
 templates/{babl.tmpl => babl/template}              |   0
 templates/{bash.tmpl => bash/template}              |   0
 templates/{bdftopcf.tmpl => bdftopcf/template}      |   0
 .../{bigreqsproto.tmpl => bigreqsproto/template}    |   0
 templates/{binutils.tmpl => binutils/template}      |   0
 templates/{bison.tmpl => bison/template}            |   0
 .../dotconfig}                                      |   0
 .../template}                                       |   2 +-
 templates/{ => bzip2}/bzip2-fix-install.diff        |   0
 templates/{bzip2.tmpl => bzip2/template}            |   0
 .../{ => cairo}/cairo-doc-public-Makefile-in.diff   |   0
 templates/{cairo.tmpl => cairo/template}            |   0
 templates/{cmake.tmpl => cmake/template}            |   0
 .../template}                                       |   0
 templates/{coreutils.tmpl => coreutils/template}    |   0
 templates/{ => cpio}/cpio-fix-build.diff            |   0
 templates/{cpio.tmpl => cpio/template}              |   0
 .../template}                                       |   0
 templates/{cracklib.tmpl => cracklib/template}      |   0
 templates/{curl.tmpl => curl/template}              |   0
 .../{damageproto.tmpl => damageproto/template}      |   0
 templates/{dash.tmpl => dash/template}              |   0
 templates/{dbus.tmpl => dbus/template}              |   0
 .../template}                                       |   0
 templates/{diffutils.tmpl => diffutils/template}    |   0
 templates/{dmxproto.tmpl => dmxproto/template}      |   0
 templates/{e2fsprogs.tmpl => e2fsprogs/template}    |   0
 templates/{eject.tmpl => eject/template}            |   0
 templates/{encodings.tmpl => encodings/template}    |   0
 templates/{epdfview.tmpl => epdfview/template}      |   0
 templates/{evieext.tmpl => evieext/template}        |   0
 templates/{expat.tmpl => expat/template}            |   0
 templates/{fakeroot.tmpl => fakeroot/template}      |   0
 templates/{file.tmpl => file/template}              |   0
 templates/{findutils.tmpl => findutils/template}    |   0
 templates/{firefox.tmpl => firefox/template}        |   0
 templates/{fixesproto.tmpl => fixesproto/template}  |   0
 templates/{flex.tmpl => flex/template}              |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 templates/{font-alias.tmpl => font-alias/template}  |   0
 .../template}                                       |   0
 .../{font-bh-75dpi.tmpl => font-bh-75dpi/template}  |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../{font-bh-ttf.tmpl => font-bh-ttf/template}      |   0
 .../{font-bh-type1.tmpl => font-bh-type1/template}  |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 templates/{font-util.tmpl => font-util/template}    |   0
 .../template}                                       |   0
 .../fontconfig-Makefile-fc-cache.diff               |   0
 templates/{fontconfig.tmpl => fontconfig/template}  |   0
 templates/{fontsproto.tmpl => fontsproto/template}  |   0
 .../{ => freeglut}/freeglut-src-Makefile-in.diff    |   0
 templates/{freeglut.tmpl => freeglut/template}      |   0
 templates/{freetype2.tmpl => freetype2/template}    |   0
 templates/{gawk.tmpl => gawk/template}              |   0
 .../{gcc-multilib.tmpl => gcc-multilib/template}    |   0
 templates/{ => gcc}/gcc-fix-amd64.diff              |   0
 templates/{gcc.tmpl => gcc/template}                |   0
 templates/{ => gdbm}/gdbm-fix-install.diff          |   0
 templates/{gdbm.tmpl => gdbm/template}              |   0
 templates/{gegl.tmpl => gegl/template}              |   0
 templates/{gettext.tmpl => gettext/template}        |   0
 templates/{gimp.tmpl => gimp/template}              |   0
 templates/{git.tmpl => git/template}                |   0
 templates/{ => gkrellm}/gkrellm-fix-sensors.diff    |   0
 templates/{gkrellm.tmpl => gkrellm/template}        |   0
 templates/{glib.tmpl => glib/template}              |   0
 templates/{glibc.tmpl => glibc/template}            |   0
 templates/{glibc32.tmpl => glibc32/template}        |   0
 templates/{glitz.tmpl => glitz/template}            |   0
 templates/{glproto.tmpl => glproto/template}        |   0
 templates/{gmp.tmpl => gmp/template}                |   0
 templates/{grep.tmpl => grep/template}              |   0
 templates/{groff.tmpl => groff/template}            |   0
 templates/{ => grub}/grub-0.97-256byte_inode-1.diff |   0
 templates/{ => grub}/grub-0.97-disk_geometry-1.diff |   0
 templates/{grub.tmpl => grub/template}              |   0
 templates/{gstreamer.tmpl => gstreamer/template}    |   0
 templates/{ => gtk+}/gtk+-tests-Makefile-in.diff    |   0
 templates/{gtk+.tmpl => gtk+/template}              |   0
 templates/{gtk-sharp.tmpl => gtk-sharp/template}    |   0
 templates/{ => gzip}/gzip-fix-build.diff            |   0
 templates/{gzip.tmpl => gzip/template}              |   0
 .../template}                                       |   0
 templates/{iana-etc.tmpl => iana-etc/template}      |   0
 templates/{icu.tmpl => icu/template}                |   0
 templates/{imlib2.tmpl => imlib2/template}          |   0
 .../prepost-inst}                                   |   0
 .../{initng-ifiles.tmpl => initng-ifiles/template}  |   0
 templates/{initng.tmpl => initng/template}          |   0
 .../{ => initramfs-tools}/initramfs-tools-xbps.diff |   0
 .../template}                                       |   0
 templates/{inputproto.tmpl => inputproto/template}  |   0
 templates/{intltool.tmpl => intltool/template}      |   0
 templates/{irssi.tmpl => irssi/template}            |   0
 .../{ => iso-codes}/iso-codes-fix-pkgconfig.diff    |   0
 templates/{iso-codes.tmpl => iso-codes/template}    |   0
 templates/{jasper.tmpl => jasper/template}          |   0
 templates/{ => jpeg}/jpeg-makefile-cfg.diff         |   0
 templates/{jpeg.tmpl => jpeg/template}              |   0
 templates/{ => kbd}/kbd-fix-build.diff              |   0
 templates/{kbd.tmpl => kbd/template}                |   0
 templates/{kbproto.tmpl => kbproto/template}        |   0
 .../template}                                       |   2 +-
 .../template}                                       |   0
 .../i386-dotconfig}                                 |   0
 .../{kernel.prepost-inst => kernel/prepost-inst}    |   0
 templates/{ => kernel}/squashfs-3.4.diff.bz2        | Bin
 templates/{kernel.tmpl => kernel/template}          |   5 +++--
 .../unionfs-2.5.1_for_2.6.28.1.diff.bz2             | Bin
 .../x86_64-dotconfig}                               |   0
 templates/{klibc.tmpl => klibc/template}            |   0
 templates/{lcms.tmpl => lcms/template}              |   0
 templates/{less.tmpl => less/template}              |   0
 templates/{libICE.tmpl => libICE/template}          |   0
 templates/{libIDL.tmpl => libIDL/template}          |   0
 templates/{libSM.tmpl => libSM/template}            |   0
 templates/{libX11.tmpl => libX11/template}          |   0
 templates/{libXau.tmpl => libXau/template}          |   0
 templates/{libXaw.tmpl => libXaw/template}          |   0
 templates/{libXcursor.tmpl => libXcursor/template}  |   0
 templates/{libXdamage.tmpl => libXdamage/template}  |   0
 templates/{libXdmcp.tmpl => libXdmcp/template}      |   0
 templates/{libXext.tmpl => libXext/template}        |   0
 templates/{libXfixes.tmpl => libXfixes/template}    |   0
 templates/{libXfont.tmpl => libXfont/template}      |   0
 templates/{libXft.tmpl => libXft/template}          |   0
 templates/{libXi.tmpl => libXi/template}            |   0
 .../{libXinerama.tmpl => libXinerama/template}      |   0
 templates/{libXmu.tmpl => libXmu/template}          |   0
 templates/{libXp.tmpl => libXp/template}            |   0
 templates/{libXpm.tmpl => libXpm/template}          |   0
 templates/{libXrandr.tmpl => libXrandr/template}    |   0
 templates/{libXrender.tmpl => libXrender/template}  |   0
 templates/{libXt.tmpl => libXt/template}            |   0
 templates/{libXv.tmpl => libXv/template}            |   0
 templates/{libXvMC.tmpl => libXvMC/template}        |   0
 .../{libXxf86misc.tmpl => libXxf86misc/template}    |   0
 templates/{libXxf86vm.tmpl => libXxf86vm/template}  |   0
 templates/{libarchive.tmpl => libarchive/template}  |   0
 templates/{libart.tmpl => libart/template}          |   0
 templates/{libdrm.tmpl => libdrm/template}          |   0
 templates/{libexif.tmpl => libexif/template}        |   0
 templates/{libfontenc.tmpl => libfontenc/template}  |   0
 templates/{libgcrypt.tmpl => libgcrypt/template}    |   0
 templates/{libglade.tmpl => libglade/template}      |   0
 .../{libgpg-error.tmpl => libgpg-error/template}    |   0
 templates/{libidn.tmpl => libidn/template}          |   0
 .../{libpciaccess.tmpl => libpciaccess/template}    |   0
 templates/{libpng.tmpl => libpng/template}          |   0
 templates/{libtool.tmpl => libtool/template}        |   0
 templates/{libungif.tmpl => libungif/template}      |   0
 templates/{libwmf.tmpl => libwmf/template}          |   0
 templates/{libxkbfile.tmpl => libxkbfile/template}  |   0
 templates/{libxkbui.tmpl => libxkbui/template}      |   0
 templates/{libxml2.tmpl => libxml2/template}        |   0
 templates/{libxslt.tmpl => libxslt/template}        |   0
 templates/{linux-pam.tmpl => linux-pam/template}    |   0
 templates/{lzma-utils.tmpl => lzma-utils/template}  |   0
 templates/{m4.tmpl => m4/template}                  |   0
 templates/{make.tmpl => make/template}              |   0
 templates/{man-db.tmpl => man-db/template}          |   0
 templates/{man-pages.tmpl => man-pages/template}    |   0
 templates/{mc.tmpl => mc/template}                  |   0
 templates/{mkfontdir.tmpl => mkfontdir/template}    |   0
 .../{mkfontscale.tmpl => mkfontscale/template}      |   0
 templates/{mng.tmpl => mng/template}                |   0
 .../template}                                       |   0
 .../{mono-addins.tmpl => mono-addins/template}      |   0
 templates/{ => mono}/mono-fix-build.diff            |   0
 templates/{mono.tmpl => mono/template}              |   0
 .../{monodevelop.tmpl => monodevelop/template}      |   0
 templates/{monodoc.tmpl => monodoc/template}        |   0
 templates/{mpfr.tmpl => mpfr/template}              |   0
 templates/{nasm.tmpl => nasm/template}              |   0
 templates/{ncurses.tmpl => ncurses/template}        |   0
 templates/{ => openssl}/openssl-fix-install.diff    |   0
 templates/{openssl.tmpl => openssl/template}        |   0
 templates/{ => pango}/pango-docs-Makefile-in.diff   |   0
 templates/{pango.tmpl => pango/template}            |   0
 templates/{patch.tmpl => patch/template}            |   0
 templates/{pcre.tmpl => pcre/template}              |   0
 templates/{pekwm.tmpl => pekwm/template}            |   0
 .../template}                                       |   0
 templates/{perl.tmpl => perl/template}              |   0
 templates/{pixman.tmpl => pixman/template}          |   0
 templates/{pkg-config.tmpl => pkg-config/template}  |   0
 templates/{poppler.tmpl => poppler/template}        |   0
 templates/{printproto.tmpl => printproto/template}  |   0
 templates/{ => procps}/procps-fix-install.diff      |   0
 templates/{procps.tmpl => procps/template}          |   0
 templates/{proplib.tmpl => proplib/template}        |   0
 templates/{python.tmpl => python/template}          |   0
 templates/{randrproto.tmpl => randrproto/template}  |   0
 templates/{readline.tmpl => readline/template}      |   0
 .../{recordproto.tmpl => recordproto/template}      |   0
 .../{renderproto.tmpl => renderproto/template}      |   0
 .../{resourceproto.tmpl => resourceproto/template}  |   0
 templates/{ruby.tmpl => ruby/template}              |   0
 .../template}                                       |   0
 templates/{sed.tmpl => sed/template}                |   0
 .../{shadow.prepost-inst => shadow/prepost-inst}    |   0
 templates/{ => shadow}/shadow-enable-pam.diff       |   0
 templates/{shadow.tmpl => shadow/template}          |   0
 .../shared-mime-info-fix-pkgconfig.diff             |   0
 .../template}                                       |   0
 templates/{sqlite.tmpl => sqlite/template}          |   0
 .../template}                                       |   0
 templates/{sudo.tmpl => sudo/template}              |   0
 .../{ => sylpheed}/sylpheed-fix-latest-gtk.diff     |   0
 templates/{sylpheed.tmpl => sylpheed/template}      |   0
 templates/{ => sysklogd}/sysklogd-fix-install.diff  |   0
 templates/{sysklogd.tmpl => sysklogd/template}      |   0
 templates/{syslinux.tmpl => syslinux/template}      |   0
 templates/{tar.tmpl => tar/template}                |   0
 templates/{texinfo.tmpl => texinfo/template}        |   0
 templates/{tiff.tmpl => tiff/template}              |   0
 templates/{trapproto.tmpl => trapproto/template}    |   0
 templates/{tzdata.tmpl => tzdata/template}          |   0
 templates/{ => tzdata}/tzdata-fix-build.diff        |   0
 templates/{udev.tmpl => udev/template}              |   0
 templates/{unzip.tmpl => unzip/template}            |   0
 templates/{ => unzip}/unzip-fix-unzipsfx.diff       |   0
 templates/{upstart.tmpl => upstart/template}        |   0
 .../{util-linux-ng.tmpl => util-linux-ng/template}  |   0
 templates/{util-linux.tmpl => util-linux/template}  |   0
 .../{ => util-linux}/util-linux-fix-build.diff      |   0
 .../{util-macros.tmpl => util-macros/template}      |   0
 templates/{videoproto.tmpl => videoproto/template}  |   0
 templates/{vim.tmpl => vim/template}                |   0
 templates/{wget.tmpl => wget/template}              |   0
 templates/{xauth.tmpl => xauth/template}            |   0
 templates/{xbitmaps.tmpl => xbitmaps/template}      |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../{xcmiscproto.tmpl => xcmiscproto/template}      |   0
 templates/{xextproto.tmpl => xextproto/template}    |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../template}                                       |   0
 .../{xf86dgaproto.tmpl => xf86dgaproto/template}    |   0
 .../{xf86driproto.tmpl => xf86driproto/template}    |   0
 .../{xf86miscproto.tmpl => xf86miscproto/template}  |   0
 .../template}                                       |   0
 .../{xineramaproto.tmpl => xineramaproto/template}  |   0
 templates/{xinit.tmpl => xinit/template}            |   0
 templates/{xkbcomp.tmpl => xkbcomp/template}        |   0
 .../template}                                       |   0
 templates/{xmlcatmgr.tmpl => xmlcatmgr/template}    |   0
 templates/{xorg-fonts.tmpl => xorg-fonts/template}  |   0
 .../{xorg-server.tmpl => xorg-server/template}      |   0
 templates/{xprop.tmpl => xprop/template}            |   0
 templates/{xproto.tmpl => xproto/template}          |   0
 templates/{xrandr.tmpl => xrandr/template}          |   0
 templates/{xset.tmpl => xset/template}              |   0
 templates/{xsetroot.tmpl => xsetroot/template}      |   0
 templates/{xstow.tmpl => xstow/template}            |   0
 templates/{xterm.tmpl => xterm/template}            |   0
 templates/{xtrans.tmpl => xtrans/template}          |   0
 templates/{zip.tmpl => zip/template}                |   0
 .../{zisofs-tools.tmpl => zisofs-tools/template}    |   0
 templates/{zlib.tmpl => zlib/template}              |   0
 templates/{ => zlib}/zlib-fix-build.diff            |   0
 291 files changed, 25 insertions(+), 24 deletions(-)
 rename templates/{MesaLib.tmpl => MesaLib/template} (100%)
 rename templates/{atk.tmpl => atk/template} (100%)
 rename templates/{autoconf.tmpl => autoconf/template} (100%)
 rename templates/{automake.tmpl => automake/template} (100%)
 rename templates/{babl.tmpl => babl/template} (100%)
 rename templates/{bash.tmpl => bash/template} (100%)
 rename templates/{bdftopcf.tmpl => bdftopcf/template} (100%)
 rename templates/{bigreqsproto.tmpl => bigreqsproto/template} (100%)
 rename templates/{binutils.tmpl => binutils/template} (100%)
 rename templates/{bison.tmpl => bison/template} (100%)
 rename templates/{busybox-initramfs.config => busybox-initramfs/dotconfig} (100%)
 rename templates/{busybox-initramfs.tmpl => busybox-initramfs/template} (94%)
 rename templates/{ => bzip2}/bzip2-fix-install.diff (100%)
 rename templates/{bzip2.tmpl => bzip2/template} (100%)
 rename templates/{ => cairo}/cairo-doc-public-Makefile-in.diff (100%)
 rename templates/{cairo.tmpl => cairo/template} (100%)
 rename templates/{cmake.tmpl => cmake/template} (100%)
 rename templates/{compositeproto.tmpl => compositeproto/template} (100%)
 rename templates/{coreutils.tmpl => coreutils/template} (100%)
 rename templates/{ => cpio}/cpio-fix-build.diff (100%)
 rename templates/{cpio.tmpl => cpio/template} (100%)
 rename templates/{cracklib-words.tmpl => cracklib-words/template} (100%)
 rename templates/{cracklib.tmpl => cracklib/template} (100%)
 rename templates/{curl.tmpl => curl/template} (100%)
 rename templates/{damageproto.tmpl => damageproto/template} (100%)
 rename templates/{dash.tmpl => dash/template} (100%)
 rename templates/{dbus.tmpl => dbus/template} (100%)
 rename templates/{desktop-file-utils.tmpl => desktop-file-utils/template} (100%)
 rename templates/{diffutils.tmpl => diffutils/template} (100%)
 rename templates/{dmxproto.tmpl => dmxproto/template} (100%)
 rename templates/{e2fsprogs.tmpl => e2fsprogs/template} (100%)
 rename templates/{eject.tmpl => eject/template} (100%)
 rename templates/{encodings.tmpl => encodings/template} (100%)
 rename templates/{epdfview.tmpl => epdfview/template} (100%)
 rename templates/{evieext.tmpl => evieext/template} (100%)
 rename templates/{expat.tmpl => expat/template} (100%)
 rename templates/{fakeroot.tmpl => fakeroot/template} (100%)
 rename templates/{file.tmpl => file/template} (100%)
 rename templates/{findutils.tmpl => findutils/template} (100%)
 rename templates/{firefox.tmpl => firefox/template} (100%)
 rename templates/{fixesproto.tmpl => fixesproto/template} (100%)
 rename templates/{flex.tmpl => flex/template} (100%)
 rename templates/{font-adobe-100dpi.tmpl => font-adobe-100dpi/template} (100%)
 rename templates/{font-adobe-75dpi.tmpl => font-adobe-75dpi/template} (100%)
 rename templates/{font-adobe-utopia-100dpi.tmpl => font-adobe-utopia-100dpi/template} (100%)
 rename templates/{font-adobe-utopia-75dpi.tmpl => font-adobe-utopia-75dpi/template} (100%)
 rename templates/{font-adobe-utopia-type1.tmpl => font-adobe-utopia-type1/template} (100%)
 rename templates/{font-alias.tmpl => font-alias/template} (100%)
 rename templates/{font-bh-100dpi.tmpl => font-bh-100dpi/template} (100%)
 rename templates/{font-bh-75dpi.tmpl => font-bh-75dpi/template} (100%)
 rename templates/{font-bh-lucidatypewriter-100dpi.tmpl => font-bh-lucidatypewriter-100dpi/template} (100%)
 rename templates/{font-bh-lucidatypewriter-75dpi.tmpl => font-bh-lucidatypewriter-75dpi/template} (100%)
 rename templates/{font-bh-ttf.tmpl => font-bh-ttf/template} (100%)
 rename templates/{font-bh-type1.tmpl => font-bh-type1/template} (100%)
 rename templates/{font-bitstream-100dpi.tmpl => font-bitstream-100dpi/template} (100%)
 rename templates/{font-bitstream-75dpi.tmpl => font-bitstream-75dpi/template} (100%)
 rename templates/{font-bitstream-speedo.tmpl => font-bitstream-speedo/template} (100%)
 rename templates/{font-bitstream-type1.tmpl => font-bitstream-type1/template} (100%)
 rename templates/{font-cursor-misc.tmpl => font-cursor-misc/template} (100%)
 rename templates/{font-misc-misc.tmpl => font-misc-misc/template} (100%)
 rename templates/{font-util.tmpl => font-util/template} (100%)
 rename templates/{fontcacheproto.tmpl => fontcacheproto/template} (100%)
 rename templates/{ => fontconfig}/fontconfig-Makefile-fc-cache.diff (100%)
 rename templates/{fontconfig.tmpl => fontconfig/template} (100%)
 rename templates/{fontsproto.tmpl => fontsproto/template} (100%)
 rename templates/{ => freeglut}/freeglut-src-Makefile-in.diff (100%)
 rename templates/{freeglut.tmpl => freeglut/template} (100%)
 rename templates/{freetype2.tmpl => freetype2/template} (100%)
 rename templates/{gawk.tmpl => gawk/template} (100%)
 rename templates/{gcc-multilib.tmpl => gcc-multilib/template} (100%)
 rename templates/{ => gcc}/gcc-fix-amd64.diff (100%)
 rename templates/{gcc.tmpl => gcc/template} (100%)
 rename templates/{ => gdbm}/gdbm-fix-install.diff (100%)
 rename templates/{gdbm.tmpl => gdbm/template} (100%)
 rename templates/{gegl.tmpl => gegl/template} (100%)
 rename templates/{gettext.tmpl => gettext/template} (100%)
 rename templates/{gimp.tmpl => gimp/template} (100%)
 rename templates/{git.tmpl => git/template} (100%)
 rename templates/{ => gkrellm}/gkrellm-fix-sensors.diff (100%)
 rename templates/{gkrellm.tmpl => gkrellm/template} (100%)
 rename templates/{glib.tmpl => glib/template} (100%)
 rename templates/{glibc.tmpl => glibc/template} (100%)
 rename templates/{glibc32.tmpl => glibc32/template} (100%)
 rename templates/{glitz.tmpl => glitz/template} (100%)
 rename templates/{glproto.tmpl => glproto/template} (100%)
 rename templates/{gmp.tmpl => gmp/template} (100%)
 rename templates/{grep.tmpl => grep/template} (100%)
 rename templates/{groff.tmpl => groff/template} (100%)
 rename templates/{ => grub}/grub-0.97-256byte_inode-1.diff (100%)
 rename templates/{ => grub}/grub-0.97-disk_geometry-1.diff (100%)
 rename templates/{grub.tmpl => grub/template} (100%)
 rename templates/{gstreamer.tmpl => gstreamer/template} (100%)
 rename templates/{ => gtk+}/gtk+-tests-Makefile-in.diff (100%)
 rename templates/{gtk+.tmpl => gtk+/template} (100%)
 rename templates/{gtk-sharp.tmpl => gtk-sharp/template} (100%)
 rename templates/{ => gzip}/gzip-fix-build.diff (100%)
 rename templates/{gzip.tmpl => gzip/template} (100%)
 rename templates/{hicolor-icon-theme.tmpl => hicolor-icon-theme/template} (100%)
 rename templates/{iana-etc.tmpl => iana-etc/template} (100%)
 rename templates/{icu.tmpl => icu/template} (100%)
 rename templates/{imlib2.tmpl => imlib2/template} (100%)
 rename templates/{initng-ifiles.prepost-inst => initng-ifiles/prepost-inst} (100%)
 rename templates/{initng-ifiles.tmpl => initng-ifiles/template} (100%)
 rename templates/{initng.tmpl => initng/template} (100%)
 rename templates/{ => initramfs-tools}/initramfs-tools-xbps.diff (100%)
 rename templates/{initramfs-tools.tmpl => initramfs-tools/template} (100%)
 rename templates/{inputproto.tmpl => inputproto/template} (100%)
 rename templates/{intltool.tmpl => intltool/template} (100%)
 rename templates/{irssi.tmpl => irssi/template} (100%)
 rename templates/{ => iso-codes}/iso-codes-fix-pkgconfig.diff (100%)
 rename templates/{iso-codes.tmpl => iso-codes/template} (100%)
 rename templates/{jasper.tmpl => jasper/template} (100%)
 rename templates/{ => jpeg}/jpeg-makefile-cfg.diff (100%)
 rename templates/{jpeg.tmpl => jpeg/template} (100%)
 rename templates/{ => kbd}/kbd-fix-build.diff (100%)
 rename templates/{kbd.tmpl => kbd/template} (100%)
 rename templates/{kbproto.tmpl => kbproto/template} (100%)
 rename templates/{kernel-headers.tmpl => kernel-headers/template} (96%)
 rename templates/{kernel-libc-headers.tmpl => kernel-libc-headers/template} (100%)
 rename templates/{kernel-i386-dotconfig => kernel/i386-dotconfig} (100%)
 rename templates/{kernel.prepost-inst => kernel/prepost-inst} (100%)
 rename templates/{ => kernel}/squashfs-3.4.diff.bz2 (100%)
 rename templates/{kernel.tmpl => kernel/template} (92%)
 rename templates/{ => kernel}/unionfs-2.5.1_for_2.6.28.1.diff.bz2 (100%)
 rename templates/{kernel-x86_64-dotconfig => kernel/x86_64-dotconfig} (100%)
 rename templates/{klibc.tmpl => klibc/template} (100%)
 rename templates/{lcms.tmpl => lcms/template} (100%)
 rename templates/{less.tmpl => less/template} (100%)
 rename templates/{libICE.tmpl => libICE/template} (100%)
 rename templates/{libIDL.tmpl => libIDL/template} (100%)
 rename templates/{libSM.tmpl => libSM/template} (100%)
 rename templates/{libX11.tmpl => libX11/template} (100%)
 rename templates/{libXau.tmpl => libXau/template} (100%)
 rename templates/{libXaw.tmpl => libXaw/template} (100%)
 rename templates/{libXcursor.tmpl => libXcursor/template} (100%)
 rename templates/{libXdamage.tmpl => libXdamage/template} (100%)
 rename templates/{libXdmcp.tmpl => libXdmcp/template} (100%)
 rename templates/{libXext.tmpl => libXext/template} (100%)
 rename templates/{libXfixes.tmpl => libXfixes/template} (100%)
 rename templates/{libXfont.tmpl => libXfont/template} (100%)
 rename templates/{libXft.tmpl => libXft/template} (100%)
 rename templates/{libXi.tmpl => libXi/template} (100%)
 rename templates/{libXinerama.tmpl => libXinerama/template} (100%)
 rename templates/{libXmu.tmpl => libXmu/template} (100%)
 rename templates/{libXp.tmpl => libXp/template} (100%)
 rename templates/{libXpm.tmpl => libXpm/template} (100%)
 rename templates/{libXrandr.tmpl => libXrandr/template} (100%)
 rename templates/{libXrender.tmpl => libXrender/template} (100%)
 rename templates/{libXt.tmpl => libXt/template} (100%)
 rename templates/{libXv.tmpl => libXv/template} (100%)
 rename templates/{libXvMC.tmpl => libXvMC/template} (100%)
 rename templates/{libXxf86misc.tmpl => libXxf86misc/template} (100%)
 rename templates/{libXxf86vm.tmpl => libXxf86vm/template} (100%)
 rename templates/{libarchive.tmpl => libarchive/template} (100%)
 rename templates/{libart.tmpl => libart/template} (100%)
 rename templates/{libdrm.tmpl => libdrm/template} (100%)
 rename templates/{libexif.tmpl => libexif/template} (100%)
 rename templates/{libfontenc.tmpl => libfontenc/template} (100%)
 rename templates/{libgcrypt.tmpl => libgcrypt/template} (100%)
 rename templates/{libglade.tmpl => libglade/template} (100%)
 rename templates/{libgpg-error.tmpl => libgpg-error/template} (100%)
 rename templates/{libidn.tmpl => libidn/template} (100%)
 rename templates/{libpciaccess.tmpl => libpciaccess/template} (100%)
 rename templates/{libpng.tmpl => libpng/template} (100%)
 rename templates/{libtool.tmpl => libtool/template} (100%)
 rename templates/{libungif.tmpl => libungif/template} (100%)
 rename templates/{libwmf.tmpl => libwmf/template} (100%)
 rename templates/{libxkbfile.tmpl => libxkbfile/template} (100%)
 rename templates/{libxkbui.tmpl => libxkbui/template} (100%)
 rename templates/{libxml2.tmpl => libxml2/template} (100%)
 rename templates/{libxslt.tmpl => libxslt/template} (100%)
 rename templates/{linux-pam.tmpl => linux-pam/template} (100%)
 rename templates/{lzma-utils.tmpl => lzma-utils/template} (100%)
 rename templates/{m4.tmpl => m4/template} (100%)
 rename templates/{make.tmpl => make/template} (100%)
 rename templates/{man-db.tmpl => man-db/template} (100%)
 rename templates/{man-pages.tmpl => man-pages/template} (100%)
 rename templates/{mc.tmpl => mc/template} (100%)
 rename templates/{mkfontdir.tmpl => mkfontdir/template} (100%)
 rename templates/{mkfontscale.tmpl => mkfontscale/template} (100%)
 rename templates/{mng.tmpl => mng/template} (100%)
 rename templates/{module-init-tools.tmpl => module-init-tools/template} (100%)
 rename templates/{mono-addins.tmpl => mono-addins/template} (100%)
 rename templates/{ => mono}/mono-fix-build.diff (100%)
 rename templates/{mono.tmpl => mono/template} (100%)
 rename templates/{monodevelop.tmpl => monodevelop/template} (100%)
 rename templates/{monodoc.tmpl => monodoc/template} (100%)
 rename templates/{mpfr.tmpl => mpfr/template} (100%)
 rename templates/{nasm.tmpl => nasm/template} (100%)
 rename templates/{ncurses.tmpl => ncurses/template} (100%)
 rename templates/{ => openssl}/openssl-fix-install.diff (100%)
 rename templates/{openssl.tmpl => openssl/template} (100%)
 rename templates/{ => pango}/pango-docs-Makefile-in.diff (100%)
 rename templates/{pango.tmpl => pango/template} (100%)
 rename templates/{patch.tmpl => patch/template} (100%)
 rename templates/{pcre.tmpl => pcre/template} (100%)
 rename templates/{pekwm.tmpl => pekwm/template} (100%)
 rename templates/{perl-XML-Parser.tmpl => perl-XML-Parser/template} (100%)
 rename templates/{perl.tmpl => perl/template} (100%)
 rename templates/{pixman.tmpl => pixman/template} (100%)
 rename templates/{pkg-config.tmpl => pkg-config/template} (100%)
 rename templates/{poppler.tmpl => poppler/template} (100%)
 rename templates/{printproto.tmpl => printproto/template} (100%)
 rename templates/{ => procps}/procps-fix-install.diff (100%)
 rename templates/{procps.tmpl => procps/template} (100%)
 rename templates/{proplib.tmpl => proplib/template} (100%)
 rename templates/{python.tmpl => python/template} (100%)
 rename templates/{randrproto.tmpl => randrproto/template} (100%)
 rename templates/{readline.tmpl => readline/template} (100%)
 rename templates/{recordproto.tmpl => recordproto/template} (100%)
 rename templates/{renderproto.tmpl => renderproto/template} (100%)
 rename templates/{resourceproto.tmpl => resourceproto/template} (100%)
 rename templates/{ruby.tmpl => ruby/template} (100%)
 rename templates/{scrnsaverproto.tmpl => scrnsaverproto/template} (100%)
 rename templates/{sed.tmpl => sed/template} (100%)
 rename templates/{shadow.prepost-inst => shadow/prepost-inst} (100%)
 rename templates/{ => shadow}/shadow-enable-pam.diff (100%)
 rename templates/{shadow.tmpl => shadow/template} (100%)
 rename templates/{ => shared-mime-info}/shared-mime-info-fix-pkgconfig.diff (100%)
 rename templates/{shared-mime-info.tmpl => shared-mime-info/template} (100%)
 rename templates/{sqlite.tmpl => sqlite/template} (100%)
 rename templates/{squashfs-tools.tmpl => squashfs-tools/template} (100%)
 rename templates/{sudo.tmpl => sudo/template} (100%)
 rename templates/{ => sylpheed}/sylpheed-fix-latest-gtk.diff (100%)
 rename templates/{sylpheed.tmpl => sylpheed/template} (100%)
 rename templates/{ => sysklogd}/sysklogd-fix-install.diff (100%)
 rename templates/{sysklogd.tmpl => sysklogd/template} (100%)
 rename templates/{syslinux.tmpl => syslinux/template} (100%)
 rename templates/{tar.tmpl => tar/template} (100%)
 rename templates/{texinfo.tmpl => texinfo/template} (100%)
 rename templates/{tiff.tmpl => tiff/template} (100%)
 rename templates/{trapproto.tmpl => trapproto/template} (100%)
 rename templates/{tzdata.tmpl => tzdata/template} (100%)
 rename templates/{ => tzdata}/tzdata-fix-build.diff (100%)
 rename templates/{udev.tmpl => udev/template} (100%)
 rename templates/{unzip.tmpl => unzip/template} (100%)
 rename templates/{ => unzip}/unzip-fix-unzipsfx.diff (100%)
 rename templates/{upstart.tmpl => upstart/template} (100%)
 rename templates/{util-linux-ng.tmpl => util-linux-ng/template} (100%)
 rename templates/{util-linux.tmpl => util-linux/template} (100%)
 rename templates/{ => util-linux}/util-linux-fix-build.diff (100%)
 rename templates/{util-macros.tmpl => util-macros/template} (100%)
 rename templates/{videoproto.tmpl => videoproto/template} (100%)
 rename templates/{vim.tmpl => vim/template} (100%)
 rename templates/{wget.tmpl => wget/template} (100%)
 rename templates/{xauth.tmpl => xauth/template} (100%)
 rename templates/{xbitmaps.tmpl => xbitmaps/template} (100%)
 rename templates/{xbps-base-chroot.tmpl => xbps-base-chroot/template} (100%)
 rename templates/{xbps-base-dirs.tmpl => xbps-base-dirs/template} (100%)
 rename templates/{xbps-base-system.tmpl => xbps-base-system/template} (100%)
 rename templates/{xcmiscproto.tmpl => xcmiscproto/template} (100%)
 rename templates/{xextproto.tmpl => xextproto/template} (100%)
 rename templates/{xf86-input-joystick.tmpl => xf86-input-joystick/template} (100%)
 rename templates/{xf86-input-keyboard.tmpl => xf86-input-keyboard/template} (100%)
 rename templates/{xf86-input-mouse.tmpl => xf86-input-mouse/template} (100%)
 rename templates/{xf86-input-vmmouse.tmpl => xf86-input-vmmouse/template} (100%)
 rename templates/{xf86-video-ati.tmpl => xf86-video-ati/template} (100%)
 rename templates/{xf86-video-intel.tmpl => xf86-video-intel/template} (100%)
 rename templates/{xf86-video-radeonhd.tmpl => xf86-video-radeonhd/template} (100%)
 rename templates/{xf86-video-vmware.tmpl => xf86-video-vmware/template} (100%)
 rename templates/{xf86bigfontproto.tmpl => xf86bigfontproto/template} (100%)
 rename templates/{xf86dgaproto.tmpl => xf86dgaproto/template} (100%)
 rename templates/{xf86driproto.tmpl => xf86driproto/template} (100%)
 rename templates/{xf86miscproto.tmpl => xf86miscproto/template} (100%)
 rename templates/{xf86vidmodeproto.tmpl => xf86vidmodeproto/template} (100%)
 rename templates/{xineramaproto.tmpl => xineramaproto/template} (100%)
 rename templates/{xinit.tmpl => xinit/template} (100%)
 rename templates/{xkbcomp.tmpl => xkbcomp/template} (100%)
 rename templates/{xkeyboard-config.tmpl => xkeyboard-config/template} (100%)
 rename templates/{xmlcatmgr.tmpl => xmlcatmgr/template} (100%)
 rename templates/{xorg-fonts.tmpl => xorg-fonts/template} (100%)
 rename templates/{xorg-server.tmpl => xorg-server/template} (100%)
 rename templates/{xprop.tmpl => xprop/template} (100%)
 rename templates/{xproto.tmpl => xproto/template} (100%)
 rename templates/{xrandr.tmpl => xrandr/template} (100%)
 rename templates/{xset.tmpl => xset/template} (100%)
 rename templates/{xsetroot.tmpl => xsetroot/template} (100%)
 rename templates/{xstow.tmpl => xstow/template} (100%)
 rename templates/{xterm.tmpl => xterm/template} (100%)
 rename templates/{xtrans.tmpl => xtrans/template} (100%)
 rename templates/{zip.tmpl => zip/template} (100%)
 rename templates/{zisofs-tools.tmpl => zisofs-tools/template} (100%)
 rename templates/{zlib.tmpl => zlib/template} (100%)
 rename templates/{ => zlib}/zlib-fix-build.diff (100%)

diff --git a/shutils/binpkg.sh b/shutils/binpkg.sh
index e403ce13d1..da3cddd423 100644
--- a/shutils/binpkg.sh
+++ b/shutils/binpkg.sh
@@ -125,13 +125,13 @@ _EOF
 	chmod 644 $metadir/*
 	rm -f $TMPFLIST $TMPFPROPS
 
-	if [ -f "$XBPS_TEMPLATESDIR/$pkgname.prepost-inst" ]; then
-		cp -f $XBPS_TEMPLATESDIR/$pkgname.prepost-inst \
+	if [ -f "$XBPS_TEMPLATESDIR/$pkgname/prepost-inst" ]; then
+		cp -f $XBPS_TEMPLATESDIR/$pkgname/prepost-inst \
 			$destdir/XBPS_PREPOST_INSTALL
 		chmod +x $destdir/XBPS_PREPOST_INSTALL
 	fi
-	if [ -f "$XBPS_TEMPLATESDIR/$pkgname.prepost-rm" ]; then
-		cp -f $XBPS_TEMPLATESDIR/$pkgname.prepost-rm \
+	if [ -f "$XBPS_TEMPLATESDIR/$pkgname/prepost-rm" ]; then
+		cp -f $XBPS_TEMPLATESDIR/$pkgname/prepost-rm \
 			$metadir/prepost-rm
 		chmod +x $metadir/prepost-rm
 	fi
diff --git a/shutils/builddep_funcs.sh b/shutils/builddep_funcs.sh
index 8a3aa8bdc0..581e897401 100644
--- a/shutils/builddep_funcs.sh
+++ b/shutils/builddep_funcs.sh
@@ -39,7 +39,7 @@ add_dependency_tolist()
 
 	if [ "$pkgname" != "${curpkg%-[0-9]*.*}" ]; then
 		reset_tmpl_vars
-		. $XBPS_TEMPLATESDIR/${curpkg%-[0-9]*.*}.tmpl
+		. $XBPS_TEMPLATESDIR/${curpkg%-[0-9]*.*}/template
 	fi
 
 	for j in ${build_depends}; do
@@ -175,7 +175,7 @@ install_builddeps_required_pkg()
 	[ -z "$pkg" ] && return 1
 
 	if [ "$pkgname" != "${pkg%-[0-9]*.*}" ]; then
-		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}.tmpl
+		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}/template
 	fi
 
 	for dep in ${build_depends}; do
@@ -201,7 +201,7 @@ check_installed_pkg()
 
 	if [ "$pkgname" != "${pkg%-[0-9]*.*}" ]; then
 		reset_tmpl_vars
-		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}.tmpl
+		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}/template
 	fi
 
 	iver="$($XBPS_REGPKGDB_CMD version $pkgname)"
@@ -225,7 +225,7 @@ check_build_depends_pkg()
 
 	if [ "$pkgname" != "${pkg%-[0-9]*.*}" ]; then
 		reset_tmpl_vars
-		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}.tmpl
+		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}/template
 	fi
 
 	if [ -n "$build_depends" ]; then
diff --git a/shutils/chroot.sh b/shutils/chroot.sh
index 26ca874719..3a8b754362 100644
--- a/shutils/chroot.sh
+++ b/shutils/chroot.sh
@@ -239,7 +239,7 @@ if [ "$(id -u)" -ne 0 ]; then
 	if [ -n "$origin_tmpl" ]; then
 		. $XBPS_SHUTILSDIR/tmpl_funcs.sh
 		reset_tmpl_vars
-		run_file $XBPS_TEMPLATESDIR/$origin_tmpl.tmpl
+		run_file $XBPS_TEMPLATESDIR/$origin_tmpl/template
 	fi
 	echo "The '$pkgname' package requires to be installed in a chroot."
 	echo "You cannot do this as normal user, try again being root."
diff --git a/shutils/patch_funcs.sh b/shutils/patch_funcs.sh
index bae52e104e..d10b32bc18 100644
--- a/shutils/patch_funcs.sh
+++ b/shutils/patch_funcs.sh
@@ -32,10 +32,10 @@ apply_tmpl_patches()
 	local i=
 
 	# Apply some build/install patches automatically.
-	if [ -f $XBPS_TEMPLATESDIR/$pkgname-fix-build.diff ]; then
+	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname-fix-build.diff ]; then
 		patch_files="$pkgname-fix-build.diff $patch_files"
 	fi
-	if [ -f $XBPS_TEMPLATESDIR/$pkgname-fix-install.diff ]; then
+	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname-fix-install.diff ]; then
 		patch_files="$pkgname-fix-install.diff $patch_files"
 	fi
 
@@ -47,7 +47,7 @@ apply_tmpl_patches()
 	# apply them now.
 	#
 	for i in ${patch_files}; do
-		patch="$XBPS_TEMPLATESDIR/$i"
+		patch="$XBPS_TEMPLATESDIR/$pkgname/$i"
 		if [ ! -f "$patch" ]; then
 			msg_warn "unexistent patch: $i."
 			continue
diff --git a/shutils/pkgtarget_funcs.sh b/shutils/pkgtarget_funcs.sh
index 32aee2adaf..753e909fb7 100644
--- a/shutils/pkgtarget_funcs.sh
+++ b/shutils/pkgtarget_funcs.sh
@@ -31,7 +31,7 @@ install_pkg()
 	local pkg=
 	local curpkgn="$1"
 	local cdestdir=
-	local cur_tmpl="$XBPS_TEMPLATESDIR/$curpkgn.tmpl"
+	local cur_tmpl="$XBPS_TEMPLATESDIR/$curpkgn/template"
 
 	if [ -z $cur_tmpl -o ! -f $cur_tmpl ]; then
 		msg_error "cannot find $cur_tmpl template build file."
@@ -147,11 +147,11 @@ remove_pkg()
 
 	[ -z $pkg ] && msg_error "unexistent package, aborting."
 
-	if [ ! -f "$XBPS_TEMPLATESDIR/$pkg.tmpl" ]; then
+	if [ ! -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then
 		msg_error "cannot find template build file."
 	fi
 
-	. $XBPS_TEMPLATESDIR/$pkg.tmpl
+	. $XBPS_TEMPLATESDIR/$pkg/template
 
 	ver=$($XBPS_REGPKGDB_CMD version $pkg)
 	[ -z "$ver" ] && msg_error "$pkg is not installed."
diff --git a/shutils/stow_funcs.sh b/shutils/stow_funcs.sh
index 1081febd80..3d68e7dac3 100644
--- a/shutils/stow_funcs.sh
+++ b/shutils/stow_funcs.sh
@@ -44,7 +44,7 @@ stow_pkg()
 	fi
 
 	if [ -n "$stow_flag" ]; then
-		pkg=$XBPS_TEMPLATESDIR/$pkg.tmpl
+		pkg=$XBPS_TEMPLATESDIR/$pkg/template
 		if [ "$pkgname" != "$pkg" ]; then
 			. $pkg
 		fi
@@ -65,7 +65,7 @@ stow_pkg()
 	# Run template postinstall helpers if requested.
 	#
 	if [ "$pkgname" != "${pkg%%-$version}" ]; then
-		. $XBPS_TEMPLATESDIR/${pkg%%-$version}.tmpl
+		. $XBPS_TEMPLATESDIR/${pkg%%-$version}/template
 	fi
 
 	for i in ${postinstall_helpers}; do
@@ -92,7 +92,7 @@ unstow_pkg()
 	fi
 
 	if [ "$pkgname" != "$pkg" ]; then
-		. $XBPS_TEMPLATESDIR/$pkg.tmpl
+		. $XBPS_TEMPLATESDIR/$pkg/template
 	fi
 
 	ver=$($XBPS_REGPKGDB_CMD version $pkg)
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index ea6a4e53b0..3bfee5e87c 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -93,9 +93,9 @@ setup_tmpl()
 
 	. $XBPS_SHUTILSDIR/tmpl_vars.sh
 
-	if [ -f "$XBPS_TEMPLATESDIR/$pkg.tmpl" ]; then
+	if [ -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then
 		if [ "$pkgname" != "$pkg" ]; then
-			. $XBPS_TEMPLATESDIR/$pkg.tmpl
+			. $XBPS_TEMPLATESDIR/$pkg/template
 		fi
 		prepare_tmpl
 	else
diff --git a/templates/MesaLib.tmpl b/templates/MesaLib/template
similarity index 100%
rename from templates/MesaLib.tmpl
rename to templates/MesaLib/template
diff --git a/templates/atk.tmpl b/templates/atk/template
similarity index 100%
rename from templates/atk.tmpl
rename to templates/atk/template
diff --git a/templates/autoconf.tmpl b/templates/autoconf/template
similarity index 100%
rename from templates/autoconf.tmpl
rename to templates/autoconf/template
diff --git a/templates/automake.tmpl b/templates/automake/template
similarity index 100%
rename from templates/automake.tmpl
rename to templates/automake/template
diff --git a/templates/babl.tmpl b/templates/babl/template
similarity index 100%
rename from templates/babl.tmpl
rename to templates/babl/template
diff --git a/templates/bash.tmpl b/templates/bash/template
similarity index 100%
rename from templates/bash.tmpl
rename to templates/bash/template
diff --git a/templates/bdftopcf.tmpl b/templates/bdftopcf/template
similarity index 100%
rename from templates/bdftopcf.tmpl
rename to templates/bdftopcf/template
diff --git a/templates/bigreqsproto.tmpl b/templates/bigreqsproto/template
similarity index 100%
rename from templates/bigreqsproto.tmpl
rename to templates/bigreqsproto/template
diff --git a/templates/binutils.tmpl b/templates/binutils/template
similarity index 100%
rename from templates/binutils.tmpl
rename to templates/binutils/template
diff --git a/templates/bison.tmpl b/templates/bison/template
similarity index 100%
rename from templates/bison.tmpl
rename to templates/bison/template
diff --git a/templates/busybox-initramfs.config b/templates/busybox-initramfs/dotconfig
similarity index 100%
rename from templates/busybox-initramfs.config
rename to templates/busybox-initramfs/dotconfig
diff --git a/templates/busybox-initramfs.tmpl b/templates/busybox-initramfs/template
similarity index 94%
rename from templates/busybox-initramfs.tmpl
rename to templates/busybox-initramfs/template
index 848a86a91d..d8b58d32d3 100644
--- a/templates/busybox-initramfs.tmpl
+++ b/templates/busybox-initramfs/template
@@ -23,7 +23,7 @@ do_install()
 {
 	local bindir=$XBPS_DESTDIR/$pkgname-$version/usr/lib/initramfs-tools/bin
 
-	cp -v $XBPS_TEMPLATESDIR/$pkgname.config $wrksrc/.config
+	cp -v $XBPS_TEMPLATESDIR/$pkgname/dotconfig $wrksrc/.config
 	make || exit 1
 	install -v -d $bindir
 	install -v $wrksrc/busybox $bindir
diff --git a/templates/bzip2-fix-install.diff b/templates/bzip2/bzip2-fix-install.diff
similarity index 100%
rename from templates/bzip2-fix-install.diff
rename to templates/bzip2/bzip2-fix-install.diff
diff --git a/templates/bzip2.tmpl b/templates/bzip2/template
similarity index 100%
rename from templates/bzip2.tmpl
rename to templates/bzip2/template
diff --git a/templates/cairo-doc-public-Makefile-in.diff b/templates/cairo/cairo-doc-public-Makefile-in.diff
similarity index 100%
rename from templates/cairo-doc-public-Makefile-in.diff
rename to templates/cairo/cairo-doc-public-Makefile-in.diff
diff --git a/templates/cairo.tmpl b/templates/cairo/template
similarity index 100%
rename from templates/cairo.tmpl
rename to templates/cairo/template
diff --git a/templates/cmake.tmpl b/templates/cmake/template
similarity index 100%
rename from templates/cmake.tmpl
rename to templates/cmake/template
diff --git a/templates/compositeproto.tmpl b/templates/compositeproto/template
similarity index 100%
rename from templates/compositeproto.tmpl
rename to templates/compositeproto/template
diff --git a/templates/coreutils.tmpl b/templates/coreutils/template
similarity index 100%
rename from templates/coreutils.tmpl
rename to templates/coreutils/template
diff --git a/templates/cpio-fix-build.diff b/templates/cpio/cpio-fix-build.diff
similarity index 100%
rename from templates/cpio-fix-build.diff
rename to templates/cpio/cpio-fix-build.diff
diff --git a/templates/cpio.tmpl b/templates/cpio/template
similarity index 100%
rename from templates/cpio.tmpl
rename to templates/cpio/template
diff --git a/templates/cracklib-words.tmpl b/templates/cracklib-words/template
similarity index 100%
rename from templates/cracklib-words.tmpl
rename to templates/cracklib-words/template
diff --git a/templates/cracklib.tmpl b/templates/cracklib/template
similarity index 100%
rename from templates/cracklib.tmpl
rename to templates/cracklib/template
diff --git a/templates/curl.tmpl b/templates/curl/template
similarity index 100%
rename from templates/curl.tmpl
rename to templates/curl/template
diff --git a/templates/damageproto.tmpl b/templates/damageproto/template
similarity index 100%
rename from templates/damageproto.tmpl
rename to templates/damageproto/template
diff --git a/templates/dash.tmpl b/templates/dash/template
similarity index 100%
rename from templates/dash.tmpl
rename to templates/dash/template
diff --git a/templates/dbus.tmpl b/templates/dbus/template
similarity index 100%
rename from templates/dbus.tmpl
rename to templates/dbus/template
diff --git a/templates/desktop-file-utils.tmpl b/templates/desktop-file-utils/template
similarity index 100%
rename from templates/desktop-file-utils.tmpl
rename to templates/desktop-file-utils/template
diff --git a/templates/diffutils.tmpl b/templates/diffutils/template
similarity index 100%
rename from templates/diffutils.tmpl
rename to templates/diffutils/template
diff --git a/templates/dmxproto.tmpl b/templates/dmxproto/template
similarity index 100%
rename from templates/dmxproto.tmpl
rename to templates/dmxproto/template
diff --git a/templates/e2fsprogs.tmpl b/templates/e2fsprogs/template
similarity index 100%
rename from templates/e2fsprogs.tmpl
rename to templates/e2fsprogs/template
diff --git a/templates/eject.tmpl b/templates/eject/template
similarity index 100%
rename from templates/eject.tmpl
rename to templates/eject/template
diff --git a/templates/encodings.tmpl b/templates/encodings/template
similarity index 100%
rename from templates/encodings.tmpl
rename to templates/encodings/template
diff --git a/templates/epdfview.tmpl b/templates/epdfview/template
similarity index 100%
rename from templates/epdfview.tmpl
rename to templates/epdfview/template
diff --git a/templates/evieext.tmpl b/templates/evieext/template
similarity index 100%
rename from templates/evieext.tmpl
rename to templates/evieext/template
diff --git a/templates/expat.tmpl b/templates/expat/template
similarity index 100%
rename from templates/expat.tmpl
rename to templates/expat/template
diff --git a/templates/fakeroot.tmpl b/templates/fakeroot/template
similarity index 100%
rename from templates/fakeroot.tmpl
rename to templates/fakeroot/template
diff --git a/templates/file.tmpl b/templates/file/template
similarity index 100%
rename from templates/file.tmpl
rename to templates/file/template
diff --git a/templates/findutils.tmpl b/templates/findutils/template
similarity index 100%
rename from templates/findutils.tmpl
rename to templates/findutils/template
diff --git a/templates/firefox.tmpl b/templates/firefox/template
similarity index 100%
rename from templates/firefox.tmpl
rename to templates/firefox/template
diff --git a/templates/fixesproto.tmpl b/templates/fixesproto/template
similarity index 100%
rename from templates/fixesproto.tmpl
rename to templates/fixesproto/template
diff --git a/templates/flex.tmpl b/templates/flex/template
similarity index 100%
rename from templates/flex.tmpl
rename to templates/flex/template
diff --git a/templates/font-adobe-100dpi.tmpl b/templates/font-adobe-100dpi/template
similarity index 100%
rename from templates/font-adobe-100dpi.tmpl
rename to templates/font-adobe-100dpi/template
diff --git a/templates/font-adobe-75dpi.tmpl b/templates/font-adobe-75dpi/template
similarity index 100%
rename from templates/font-adobe-75dpi.tmpl
rename to templates/font-adobe-75dpi/template
diff --git a/templates/font-adobe-utopia-100dpi.tmpl b/templates/font-adobe-utopia-100dpi/template
similarity index 100%
rename from templates/font-adobe-utopia-100dpi.tmpl
rename to templates/font-adobe-utopia-100dpi/template
diff --git a/templates/font-adobe-utopia-75dpi.tmpl b/templates/font-adobe-utopia-75dpi/template
similarity index 100%
rename from templates/font-adobe-utopia-75dpi.tmpl
rename to templates/font-adobe-utopia-75dpi/template
diff --git a/templates/font-adobe-utopia-type1.tmpl b/templates/font-adobe-utopia-type1/template
similarity index 100%
rename from templates/font-adobe-utopia-type1.tmpl
rename to templates/font-adobe-utopia-type1/template
diff --git a/templates/font-alias.tmpl b/templates/font-alias/template
similarity index 100%
rename from templates/font-alias.tmpl
rename to templates/font-alias/template
diff --git a/templates/font-bh-100dpi.tmpl b/templates/font-bh-100dpi/template
similarity index 100%
rename from templates/font-bh-100dpi.tmpl
rename to templates/font-bh-100dpi/template
diff --git a/templates/font-bh-75dpi.tmpl b/templates/font-bh-75dpi/template
similarity index 100%
rename from templates/font-bh-75dpi.tmpl
rename to templates/font-bh-75dpi/template
diff --git a/templates/font-bh-lucidatypewriter-100dpi.tmpl b/templates/font-bh-lucidatypewriter-100dpi/template
similarity index 100%
rename from templates/font-bh-lucidatypewriter-100dpi.tmpl
rename to templates/font-bh-lucidatypewriter-100dpi/template
diff --git a/templates/font-bh-lucidatypewriter-75dpi.tmpl b/templates/font-bh-lucidatypewriter-75dpi/template
similarity index 100%
rename from templates/font-bh-lucidatypewriter-75dpi.tmpl
rename to templates/font-bh-lucidatypewriter-75dpi/template
diff --git a/templates/font-bh-ttf.tmpl b/templates/font-bh-ttf/template
similarity index 100%
rename from templates/font-bh-ttf.tmpl
rename to templates/font-bh-ttf/template
diff --git a/templates/font-bh-type1.tmpl b/templates/font-bh-type1/template
similarity index 100%
rename from templates/font-bh-type1.tmpl
rename to templates/font-bh-type1/template
diff --git a/templates/font-bitstream-100dpi.tmpl b/templates/font-bitstream-100dpi/template
similarity index 100%
rename from templates/font-bitstream-100dpi.tmpl
rename to templates/font-bitstream-100dpi/template
diff --git a/templates/font-bitstream-75dpi.tmpl b/templates/font-bitstream-75dpi/template
similarity index 100%
rename from templates/font-bitstream-75dpi.tmpl
rename to templates/font-bitstream-75dpi/template
diff --git a/templates/font-bitstream-speedo.tmpl b/templates/font-bitstream-speedo/template
similarity index 100%
rename from templates/font-bitstream-speedo.tmpl
rename to templates/font-bitstream-speedo/template
diff --git a/templates/font-bitstream-type1.tmpl b/templates/font-bitstream-type1/template
similarity index 100%
rename from templates/font-bitstream-type1.tmpl
rename to templates/font-bitstream-type1/template
diff --git a/templates/font-cursor-misc.tmpl b/templates/font-cursor-misc/template
similarity index 100%
rename from templates/font-cursor-misc.tmpl
rename to templates/font-cursor-misc/template
diff --git a/templates/font-misc-misc.tmpl b/templates/font-misc-misc/template
similarity index 100%
rename from templates/font-misc-misc.tmpl
rename to templates/font-misc-misc/template
diff --git a/templates/font-util.tmpl b/templates/font-util/template
similarity index 100%
rename from templates/font-util.tmpl
rename to templates/font-util/template
diff --git a/templates/fontcacheproto.tmpl b/templates/fontcacheproto/template
similarity index 100%
rename from templates/fontcacheproto.tmpl
rename to templates/fontcacheproto/template
diff --git a/templates/fontconfig-Makefile-fc-cache.diff b/templates/fontconfig/fontconfig-Makefile-fc-cache.diff
similarity index 100%
rename from templates/fontconfig-Makefile-fc-cache.diff
rename to templates/fontconfig/fontconfig-Makefile-fc-cache.diff
diff --git a/templates/fontconfig.tmpl b/templates/fontconfig/template
similarity index 100%
rename from templates/fontconfig.tmpl
rename to templates/fontconfig/template
diff --git a/templates/fontsproto.tmpl b/templates/fontsproto/template
similarity index 100%
rename from templates/fontsproto.tmpl
rename to templates/fontsproto/template
diff --git a/templates/freeglut-src-Makefile-in.diff b/templates/freeglut/freeglut-src-Makefile-in.diff
similarity index 100%
rename from templates/freeglut-src-Makefile-in.diff
rename to templates/freeglut/freeglut-src-Makefile-in.diff
diff --git a/templates/freeglut.tmpl b/templates/freeglut/template
similarity index 100%
rename from templates/freeglut.tmpl
rename to templates/freeglut/template
diff --git a/templates/freetype2.tmpl b/templates/freetype2/template
similarity index 100%
rename from templates/freetype2.tmpl
rename to templates/freetype2/template
diff --git a/templates/gawk.tmpl b/templates/gawk/template
similarity index 100%
rename from templates/gawk.tmpl
rename to templates/gawk/template
diff --git a/templates/gcc-multilib.tmpl b/templates/gcc-multilib/template
similarity index 100%
rename from templates/gcc-multilib.tmpl
rename to templates/gcc-multilib/template
diff --git a/templates/gcc-fix-amd64.diff b/templates/gcc/gcc-fix-amd64.diff
similarity index 100%
rename from templates/gcc-fix-amd64.diff
rename to templates/gcc/gcc-fix-amd64.diff
diff --git a/templates/gcc.tmpl b/templates/gcc/template
similarity index 100%
rename from templates/gcc.tmpl
rename to templates/gcc/template
diff --git a/templates/gdbm-fix-install.diff b/templates/gdbm/gdbm-fix-install.diff
similarity index 100%
rename from templates/gdbm-fix-install.diff
rename to templates/gdbm/gdbm-fix-install.diff
diff --git a/templates/gdbm.tmpl b/templates/gdbm/template
similarity index 100%
rename from templates/gdbm.tmpl
rename to templates/gdbm/template
diff --git a/templates/gegl.tmpl b/templates/gegl/template
similarity index 100%
rename from templates/gegl.tmpl
rename to templates/gegl/template
diff --git a/templates/gettext.tmpl b/templates/gettext/template
similarity index 100%
rename from templates/gettext.tmpl
rename to templates/gettext/template
diff --git a/templates/gimp.tmpl b/templates/gimp/template
similarity index 100%
rename from templates/gimp.tmpl
rename to templates/gimp/template
diff --git a/templates/git.tmpl b/templates/git/template
similarity index 100%
rename from templates/git.tmpl
rename to templates/git/template
diff --git a/templates/gkrellm-fix-sensors.diff b/templates/gkrellm/gkrellm-fix-sensors.diff
similarity index 100%
rename from templates/gkrellm-fix-sensors.diff
rename to templates/gkrellm/gkrellm-fix-sensors.diff
diff --git a/templates/gkrellm.tmpl b/templates/gkrellm/template
similarity index 100%
rename from templates/gkrellm.tmpl
rename to templates/gkrellm/template
diff --git a/templates/glib.tmpl b/templates/glib/template
similarity index 100%
rename from templates/glib.tmpl
rename to templates/glib/template
diff --git a/templates/glibc.tmpl b/templates/glibc/template
similarity index 100%
rename from templates/glibc.tmpl
rename to templates/glibc/template
diff --git a/templates/glibc32.tmpl b/templates/glibc32/template
similarity index 100%
rename from templates/glibc32.tmpl
rename to templates/glibc32/template
diff --git a/templates/glitz.tmpl b/templates/glitz/template
similarity index 100%
rename from templates/glitz.tmpl
rename to templates/glitz/template
diff --git a/templates/glproto.tmpl b/templates/glproto/template
similarity index 100%
rename from templates/glproto.tmpl
rename to templates/glproto/template
diff --git a/templates/gmp.tmpl b/templates/gmp/template
similarity index 100%
rename from templates/gmp.tmpl
rename to templates/gmp/template
diff --git a/templates/grep.tmpl b/templates/grep/template
similarity index 100%
rename from templates/grep.tmpl
rename to templates/grep/template
diff --git a/templates/groff.tmpl b/templates/groff/template
similarity index 100%
rename from templates/groff.tmpl
rename to templates/groff/template
diff --git a/templates/grub-0.97-256byte_inode-1.diff b/templates/grub/grub-0.97-256byte_inode-1.diff
similarity index 100%
rename from templates/grub-0.97-256byte_inode-1.diff
rename to templates/grub/grub-0.97-256byte_inode-1.diff
diff --git a/templates/grub-0.97-disk_geometry-1.diff b/templates/grub/grub-0.97-disk_geometry-1.diff
similarity index 100%
rename from templates/grub-0.97-disk_geometry-1.diff
rename to templates/grub/grub-0.97-disk_geometry-1.diff
diff --git a/templates/grub.tmpl b/templates/grub/template
similarity index 100%
rename from templates/grub.tmpl
rename to templates/grub/template
diff --git a/templates/gstreamer.tmpl b/templates/gstreamer/template
similarity index 100%
rename from templates/gstreamer.tmpl
rename to templates/gstreamer/template
diff --git a/templates/gtk+-tests-Makefile-in.diff b/templates/gtk+/gtk+-tests-Makefile-in.diff
similarity index 100%
rename from templates/gtk+-tests-Makefile-in.diff
rename to templates/gtk+/gtk+-tests-Makefile-in.diff
diff --git a/templates/gtk+.tmpl b/templates/gtk+/template
similarity index 100%
rename from templates/gtk+.tmpl
rename to templates/gtk+/template
diff --git a/templates/gtk-sharp.tmpl b/templates/gtk-sharp/template
similarity index 100%
rename from templates/gtk-sharp.tmpl
rename to templates/gtk-sharp/template
diff --git a/templates/gzip-fix-build.diff b/templates/gzip/gzip-fix-build.diff
similarity index 100%
rename from templates/gzip-fix-build.diff
rename to templates/gzip/gzip-fix-build.diff
diff --git a/templates/gzip.tmpl b/templates/gzip/template
similarity index 100%
rename from templates/gzip.tmpl
rename to templates/gzip/template
diff --git a/templates/hicolor-icon-theme.tmpl b/templates/hicolor-icon-theme/template
similarity index 100%
rename from templates/hicolor-icon-theme.tmpl
rename to templates/hicolor-icon-theme/template
diff --git a/templates/iana-etc.tmpl b/templates/iana-etc/template
similarity index 100%
rename from templates/iana-etc.tmpl
rename to templates/iana-etc/template
diff --git a/templates/icu.tmpl b/templates/icu/template
similarity index 100%
rename from templates/icu.tmpl
rename to templates/icu/template
diff --git a/templates/imlib2.tmpl b/templates/imlib2/template
similarity index 100%
rename from templates/imlib2.tmpl
rename to templates/imlib2/template
diff --git a/templates/initng-ifiles.prepost-inst b/templates/initng-ifiles/prepost-inst
similarity index 100%
rename from templates/initng-ifiles.prepost-inst
rename to templates/initng-ifiles/prepost-inst
diff --git a/templates/initng-ifiles.tmpl b/templates/initng-ifiles/template
similarity index 100%
rename from templates/initng-ifiles.tmpl
rename to templates/initng-ifiles/template
diff --git a/templates/initng.tmpl b/templates/initng/template
similarity index 100%
rename from templates/initng.tmpl
rename to templates/initng/template
diff --git a/templates/initramfs-tools-xbps.diff b/templates/initramfs-tools/initramfs-tools-xbps.diff
similarity index 100%
rename from templates/initramfs-tools-xbps.diff
rename to templates/initramfs-tools/initramfs-tools-xbps.diff
diff --git a/templates/initramfs-tools.tmpl b/templates/initramfs-tools/template
similarity index 100%
rename from templates/initramfs-tools.tmpl
rename to templates/initramfs-tools/template
diff --git a/templates/inputproto.tmpl b/templates/inputproto/template
similarity index 100%
rename from templates/inputproto.tmpl
rename to templates/inputproto/template
diff --git a/templates/intltool.tmpl b/templates/intltool/template
similarity index 100%
rename from templates/intltool.tmpl
rename to templates/intltool/template
diff --git a/templates/irssi.tmpl b/templates/irssi/template
similarity index 100%
rename from templates/irssi.tmpl
rename to templates/irssi/template
diff --git a/templates/iso-codes-fix-pkgconfig.diff b/templates/iso-codes/iso-codes-fix-pkgconfig.diff
similarity index 100%
rename from templates/iso-codes-fix-pkgconfig.diff
rename to templates/iso-codes/iso-codes-fix-pkgconfig.diff
diff --git a/templates/iso-codes.tmpl b/templates/iso-codes/template
similarity index 100%
rename from templates/iso-codes.tmpl
rename to templates/iso-codes/template
diff --git a/templates/jasper.tmpl b/templates/jasper/template
similarity index 100%
rename from templates/jasper.tmpl
rename to templates/jasper/template
diff --git a/templates/jpeg-makefile-cfg.diff b/templates/jpeg/jpeg-makefile-cfg.diff
similarity index 100%
rename from templates/jpeg-makefile-cfg.diff
rename to templates/jpeg/jpeg-makefile-cfg.diff
diff --git a/templates/jpeg.tmpl b/templates/jpeg/template
similarity index 100%
rename from templates/jpeg.tmpl
rename to templates/jpeg/template
diff --git a/templates/kbd-fix-build.diff b/templates/kbd/kbd-fix-build.diff
similarity index 100%
rename from templates/kbd-fix-build.diff
rename to templates/kbd/kbd-fix-build.diff
diff --git a/templates/kbd.tmpl b/templates/kbd/template
similarity index 100%
rename from templates/kbd.tmpl
rename to templates/kbd/template
diff --git a/templates/kbproto.tmpl b/templates/kbproto/template
similarity index 100%
rename from templates/kbproto.tmpl
rename to templates/kbproto/template
diff --git a/templates/kernel-headers.tmpl b/templates/kernel-headers/template
similarity index 96%
rename from templates/kernel-headers.tmpl
rename to templates/kernel-headers/template
index b4e3265984..a0074237e2 100644
--- a/templates/kernel-headers.tmpl
+++ b/templates/kernel-headers/template
@@ -35,7 +35,7 @@ do_install()
                 arch=x86_64
         fi
 
-	cp -f $XBPS_TEMPLATESDIR/kernel-$arch-dotconfig $wrksrc/.config
+	cp -f $XBPS_TEMPLATESDIR/kernel/$arch-dotconfig $wrksrc/.config
 	make oldconfig
 
 	install -D -m 644 Makefile $destdir/Makefile
diff --git a/templates/kernel-libc-headers.tmpl b/templates/kernel-libc-headers/template
similarity index 100%
rename from templates/kernel-libc-headers.tmpl
rename to templates/kernel-libc-headers/template
diff --git a/templates/kernel-i386-dotconfig b/templates/kernel/i386-dotconfig
similarity index 100%
rename from templates/kernel-i386-dotconfig
rename to templates/kernel/i386-dotconfig
diff --git a/templates/kernel.prepost-inst b/templates/kernel/prepost-inst
similarity index 100%
rename from templates/kernel.prepost-inst
rename to templates/kernel/prepost-inst
diff --git a/templates/squashfs-3.4.diff.bz2 b/templates/kernel/squashfs-3.4.diff.bz2
similarity index 100%
rename from templates/squashfs-3.4.diff.bz2
rename to templates/kernel/squashfs-3.4.diff.bz2
diff --git a/templates/kernel.tmpl b/templates/kernel/template
similarity index 92%
rename from templates/kernel.tmpl
rename to templates/kernel/template
index 125215b409..95a237a8e6 100644
--- a/templates/kernel.tmpl
+++ b/templates/kernel/template
@@ -33,9 +33,10 @@ pre_build()
 		arch=x86_64
 	fi
 
-	if [ -f $XBPS_TEMPLATESDIR/kernel-$arch-dotconfig ]; then
+	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$arch-dotconfig ]; then
 		msg_normal "Detected a .config file for your arch, using it."
-        	cp -f $XBPS_TEMPLATESDIR/kernel-$arch-dotconfig $wrksrc/.config
+		cp -f $XBPS_TEMPLATESDIR/$pkgname/$arch-dotconfig \
+			$wrksrc/.config
         	make oldconfig
 	else
         	make menuconfig
diff --git a/templates/unionfs-2.5.1_for_2.6.28.1.diff.bz2 b/templates/kernel/unionfs-2.5.1_for_2.6.28.1.diff.bz2
similarity index 100%
rename from templates/unionfs-2.5.1_for_2.6.28.1.diff.bz2
rename to templates/kernel/unionfs-2.5.1_for_2.6.28.1.diff.bz2
diff --git a/templates/kernel-x86_64-dotconfig b/templates/kernel/x86_64-dotconfig
similarity index 100%
rename from templates/kernel-x86_64-dotconfig
rename to templates/kernel/x86_64-dotconfig
diff --git a/templates/klibc.tmpl b/templates/klibc/template
similarity index 100%
rename from templates/klibc.tmpl
rename to templates/klibc/template
diff --git a/templates/lcms.tmpl b/templates/lcms/template
similarity index 100%
rename from templates/lcms.tmpl
rename to templates/lcms/template
diff --git a/templates/less.tmpl b/templates/less/template
similarity index 100%
rename from templates/less.tmpl
rename to templates/less/template
diff --git a/templates/libICE.tmpl b/templates/libICE/template
similarity index 100%
rename from templates/libICE.tmpl
rename to templates/libICE/template
diff --git a/templates/libIDL.tmpl b/templates/libIDL/template
similarity index 100%
rename from templates/libIDL.tmpl
rename to templates/libIDL/template
diff --git a/templates/libSM.tmpl b/templates/libSM/template
similarity index 100%
rename from templates/libSM.tmpl
rename to templates/libSM/template
diff --git a/templates/libX11.tmpl b/templates/libX11/template
similarity index 100%
rename from templates/libX11.tmpl
rename to templates/libX11/template
diff --git a/templates/libXau.tmpl b/templates/libXau/template
similarity index 100%
rename from templates/libXau.tmpl
rename to templates/libXau/template
diff --git a/templates/libXaw.tmpl b/templates/libXaw/template
similarity index 100%
rename from templates/libXaw.tmpl
rename to templates/libXaw/template
diff --git a/templates/libXcursor.tmpl b/templates/libXcursor/template
similarity index 100%
rename from templates/libXcursor.tmpl
rename to templates/libXcursor/template
diff --git a/templates/libXdamage.tmpl b/templates/libXdamage/template
similarity index 100%
rename from templates/libXdamage.tmpl
rename to templates/libXdamage/template
diff --git a/templates/libXdmcp.tmpl b/templates/libXdmcp/template
similarity index 100%
rename from templates/libXdmcp.tmpl
rename to templates/libXdmcp/template
diff --git a/templates/libXext.tmpl b/templates/libXext/template
similarity index 100%
rename from templates/libXext.tmpl
rename to templates/libXext/template
diff --git a/templates/libXfixes.tmpl b/templates/libXfixes/template
similarity index 100%
rename from templates/libXfixes.tmpl
rename to templates/libXfixes/template
diff --git a/templates/libXfont.tmpl b/templates/libXfont/template
similarity index 100%
rename from templates/libXfont.tmpl
rename to templates/libXfont/template
diff --git a/templates/libXft.tmpl b/templates/libXft/template
similarity index 100%
rename from templates/libXft.tmpl
rename to templates/libXft/template
diff --git a/templates/libXi.tmpl b/templates/libXi/template
similarity index 100%
rename from templates/libXi.tmpl
rename to templates/libXi/template
diff --git a/templates/libXinerama.tmpl b/templates/libXinerama/template
similarity index 100%
rename from templates/libXinerama.tmpl
rename to templates/libXinerama/template
diff --git a/templates/libXmu.tmpl b/templates/libXmu/template
similarity index 100%
rename from templates/libXmu.tmpl
rename to templates/libXmu/template
diff --git a/templates/libXp.tmpl b/templates/libXp/template
similarity index 100%
rename from templates/libXp.tmpl
rename to templates/libXp/template
diff --git a/templates/libXpm.tmpl b/templates/libXpm/template
similarity index 100%
rename from templates/libXpm.tmpl
rename to templates/libXpm/template
diff --git a/templates/libXrandr.tmpl b/templates/libXrandr/template
similarity index 100%
rename from templates/libXrandr.tmpl
rename to templates/libXrandr/template
diff --git a/templates/libXrender.tmpl b/templates/libXrender/template
similarity index 100%
rename from templates/libXrender.tmpl
rename to templates/libXrender/template
diff --git a/templates/libXt.tmpl b/templates/libXt/template
similarity index 100%
rename from templates/libXt.tmpl
rename to templates/libXt/template
diff --git a/templates/libXv.tmpl b/templates/libXv/template
similarity index 100%
rename from templates/libXv.tmpl
rename to templates/libXv/template
diff --git a/templates/libXvMC.tmpl b/templates/libXvMC/template
similarity index 100%
rename from templates/libXvMC.tmpl
rename to templates/libXvMC/template
diff --git a/templates/libXxf86misc.tmpl b/templates/libXxf86misc/template
similarity index 100%
rename from templates/libXxf86misc.tmpl
rename to templates/libXxf86misc/template
diff --git a/templates/libXxf86vm.tmpl b/templates/libXxf86vm/template
similarity index 100%
rename from templates/libXxf86vm.tmpl
rename to templates/libXxf86vm/template
diff --git a/templates/libarchive.tmpl b/templates/libarchive/template
similarity index 100%
rename from templates/libarchive.tmpl
rename to templates/libarchive/template
diff --git a/templates/libart.tmpl b/templates/libart/template
similarity index 100%
rename from templates/libart.tmpl
rename to templates/libart/template
diff --git a/templates/libdrm.tmpl b/templates/libdrm/template
similarity index 100%
rename from templates/libdrm.tmpl
rename to templates/libdrm/template
diff --git a/templates/libexif.tmpl b/templates/libexif/template
similarity index 100%
rename from templates/libexif.tmpl
rename to templates/libexif/template
diff --git a/templates/libfontenc.tmpl b/templates/libfontenc/template
similarity index 100%
rename from templates/libfontenc.tmpl
rename to templates/libfontenc/template
diff --git a/templates/libgcrypt.tmpl b/templates/libgcrypt/template
similarity index 100%
rename from templates/libgcrypt.tmpl
rename to templates/libgcrypt/template
diff --git a/templates/libglade.tmpl b/templates/libglade/template
similarity index 100%
rename from templates/libglade.tmpl
rename to templates/libglade/template
diff --git a/templates/libgpg-error.tmpl b/templates/libgpg-error/template
similarity index 100%
rename from templates/libgpg-error.tmpl
rename to templates/libgpg-error/template
diff --git a/templates/libidn.tmpl b/templates/libidn/template
similarity index 100%
rename from templates/libidn.tmpl
rename to templates/libidn/template
diff --git a/templates/libpciaccess.tmpl b/templates/libpciaccess/template
similarity index 100%
rename from templates/libpciaccess.tmpl
rename to templates/libpciaccess/template
diff --git a/templates/libpng.tmpl b/templates/libpng/template
similarity index 100%
rename from templates/libpng.tmpl
rename to templates/libpng/template
diff --git a/templates/libtool.tmpl b/templates/libtool/template
similarity index 100%
rename from templates/libtool.tmpl
rename to templates/libtool/template
diff --git a/templates/libungif.tmpl b/templates/libungif/template
similarity index 100%
rename from templates/libungif.tmpl
rename to templates/libungif/template
diff --git a/templates/libwmf.tmpl b/templates/libwmf/template
similarity index 100%
rename from templates/libwmf.tmpl
rename to templates/libwmf/template
diff --git a/templates/libxkbfile.tmpl b/templates/libxkbfile/template
similarity index 100%
rename from templates/libxkbfile.tmpl
rename to templates/libxkbfile/template
diff --git a/templates/libxkbui.tmpl b/templates/libxkbui/template
similarity index 100%
rename from templates/libxkbui.tmpl
rename to templates/libxkbui/template
diff --git a/templates/libxml2.tmpl b/templates/libxml2/template
similarity index 100%
rename from templates/libxml2.tmpl
rename to templates/libxml2/template
diff --git a/templates/libxslt.tmpl b/templates/libxslt/template
similarity index 100%
rename from templates/libxslt.tmpl
rename to templates/libxslt/template
diff --git a/templates/linux-pam.tmpl b/templates/linux-pam/template
similarity index 100%
rename from templates/linux-pam.tmpl
rename to templates/linux-pam/template
diff --git a/templates/lzma-utils.tmpl b/templates/lzma-utils/template
similarity index 100%
rename from templates/lzma-utils.tmpl
rename to templates/lzma-utils/template
diff --git a/templates/m4.tmpl b/templates/m4/template
similarity index 100%
rename from templates/m4.tmpl
rename to templates/m4/template
diff --git a/templates/make.tmpl b/templates/make/template
similarity index 100%
rename from templates/make.tmpl
rename to templates/make/template
diff --git a/templates/man-db.tmpl b/templates/man-db/template
similarity index 100%
rename from templates/man-db.tmpl
rename to templates/man-db/template
diff --git a/templates/man-pages.tmpl b/templates/man-pages/template
similarity index 100%
rename from templates/man-pages.tmpl
rename to templates/man-pages/template
diff --git a/templates/mc.tmpl b/templates/mc/template
similarity index 100%
rename from templates/mc.tmpl
rename to templates/mc/template
diff --git a/templates/mkfontdir.tmpl b/templates/mkfontdir/template
similarity index 100%
rename from templates/mkfontdir.tmpl
rename to templates/mkfontdir/template
diff --git a/templates/mkfontscale.tmpl b/templates/mkfontscale/template
similarity index 100%
rename from templates/mkfontscale.tmpl
rename to templates/mkfontscale/template
diff --git a/templates/mng.tmpl b/templates/mng/template
similarity index 100%
rename from templates/mng.tmpl
rename to templates/mng/template
diff --git a/templates/module-init-tools.tmpl b/templates/module-init-tools/template
similarity index 100%
rename from templates/module-init-tools.tmpl
rename to templates/module-init-tools/template
diff --git a/templates/mono-addins.tmpl b/templates/mono-addins/template
similarity index 100%
rename from templates/mono-addins.tmpl
rename to templates/mono-addins/template
diff --git a/templates/mono-fix-build.diff b/templates/mono/mono-fix-build.diff
similarity index 100%
rename from templates/mono-fix-build.diff
rename to templates/mono/mono-fix-build.diff
diff --git a/templates/mono.tmpl b/templates/mono/template
similarity index 100%
rename from templates/mono.tmpl
rename to templates/mono/template
diff --git a/templates/monodevelop.tmpl b/templates/monodevelop/template
similarity index 100%
rename from templates/monodevelop.tmpl
rename to templates/monodevelop/template
diff --git a/templates/monodoc.tmpl b/templates/monodoc/template
similarity index 100%
rename from templates/monodoc.tmpl
rename to templates/monodoc/template
diff --git a/templates/mpfr.tmpl b/templates/mpfr/template
similarity index 100%
rename from templates/mpfr.tmpl
rename to templates/mpfr/template
diff --git a/templates/nasm.tmpl b/templates/nasm/template
similarity index 100%
rename from templates/nasm.tmpl
rename to templates/nasm/template
diff --git a/templates/ncurses.tmpl b/templates/ncurses/template
similarity index 100%
rename from templates/ncurses.tmpl
rename to templates/ncurses/template
diff --git a/templates/openssl-fix-install.diff b/templates/openssl/openssl-fix-install.diff
similarity index 100%
rename from templates/openssl-fix-install.diff
rename to templates/openssl/openssl-fix-install.diff
diff --git a/templates/openssl.tmpl b/templates/openssl/template
similarity index 100%
rename from templates/openssl.tmpl
rename to templates/openssl/template
diff --git a/templates/pango-docs-Makefile-in.diff b/templates/pango/pango-docs-Makefile-in.diff
similarity index 100%
rename from templates/pango-docs-Makefile-in.diff
rename to templates/pango/pango-docs-Makefile-in.diff
diff --git a/templates/pango.tmpl b/templates/pango/template
similarity index 100%
rename from templates/pango.tmpl
rename to templates/pango/template
diff --git a/templates/patch.tmpl b/templates/patch/template
similarity index 100%
rename from templates/patch.tmpl
rename to templates/patch/template
diff --git a/templates/pcre.tmpl b/templates/pcre/template
similarity index 100%
rename from templates/pcre.tmpl
rename to templates/pcre/template
diff --git a/templates/pekwm.tmpl b/templates/pekwm/template
similarity index 100%
rename from templates/pekwm.tmpl
rename to templates/pekwm/template
diff --git a/templates/perl-XML-Parser.tmpl b/templates/perl-XML-Parser/template
similarity index 100%
rename from templates/perl-XML-Parser.tmpl
rename to templates/perl-XML-Parser/template
diff --git a/templates/perl.tmpl b/templates/perl/template
similarity index 100%
rename from templates/perl.tmpl
rename to templates/perl/template
diff --git a/templates/pixman.tmpl b/templates/pixman/template
similarity index 100%
rename from templates/pixman.tmpl
rename to templates/pixman/template
diff --git a/templates/pkg-config.tmpl b/templates/pkg-config/template
similarity index 100%
rename from templates/pkg-config.tmpl
rename to templates/pkg-config/template
diff --git a/templates/poppler.tmpl b/templates/poppler/template
similarity index 100%
rename from templates/poppler.tmpl
rename to templates/poppler/template
diff --git a/templates/printproto.tmpl b/templates/printproto/template
similarity index 100%
rename from templates/printproto.tmpl
rename to templates/printproto/template
diff --git a/templates/procps-fix-install.diff b/templates/procps/procps-fix-install.diff
similarity index 100%
rename from templates/procps-fix-install.diff
rename to templates/procps/procps-fix-install.diff
diff --git a/templates/procps.tmpl b/templates/procps/template
similarity index 100%
rename from templates/procps.tmpl
rename to templates/procps/template
diff --git a/templates/proplib.tmpl b/templates/proplib/template
similarity index 100%
rename from templates/proplib.tmpl
rename to templates/proplib/template
diff --git a/templates/python.tmpl b/templates/python/template
similarity index 100%
rename from templates/python.tmpl
rename to templates/python/template
diff --git a/templates/randrproto.tmpl b/templates/randrproto/template
similarity index 100%
rename from templates/randrproto.tmpl
rename to templates/randrproto/template
diff --git a/templates/readline.tmpl b/templates/readline/template
similarity index 100%
rename from templates/readline.tmpl
rename to templates/readline/template
diff --git a/templates/recordproto.tmpl b/templates/recordproto/template
similarity index 100%
rename from templates/recordproto.tmpl
rename to templates/recordproto/template
diff --git a/templates/renderproto.tmpl b/templates/renderproto/template
similarity index 100%
rename from templates/renderproto.tmpl
rename to templates/renderproto/template
diff --git a/templates/resourceproto.tmpl b/templates/resourceproto/template
similarity index 100%
rename from templates/resourceproto.tmpl
rename to templates/resourceproto/template
diff --git a/templates/ruby.tmpl b/templates/ruby/template
similarity index 100%
rename from templates/ruby.tmpl
rename to templates/ruby/template
diff --git a/templates/scrnsaverproto.tmpl b/templates/scrnsaverproto/template
similarity index 100%
rename from templates/scrnsaverproto.tmpl
rename to templates/scrnsaverproto/template
diff --git a/templates/sed.tmpl b/templates/sed/template
similarity index 100%
rename from templates/sed.tmpl
rename to templates/sed/template
diff --git a/templates/shadow.prepost-inst b/templates/shadow/prepost-inst
similarity index 100%
rename from templates/shadow.prepost-inst
rename to templates/shadow/prepost-inst
diff --git a/templates/shadow-enable-pam.diff b/templates/shadow/shadow-enable-pam.diff
similarity index 100%
rename from templates/shadow-enable-pam.diff
rename to templates/shadow/shadow-enable-pam.diff
diff --git a/templates/shadow.tmpl b/templates/shadow/template
similarity index 100%
rename from templates/shadow.tmpl
rename to templates/shadow/template
diff --git a/templates/shared-mime-info-fix-pkgconfig.diff b/templates/shared-mime-info/shared-mime-info-fix-pkgconfig.diff
similarity index 100%
rename from templates/shared-mime-info-fix-pkgconfig.diff
rename to templates/shared-mime-info/shared-mime-info-fix-pkgconfig.diff
diff --git a/templates/shared-mime-info.tmpl b/templates/shared-mime-info/template
similarity index 100%
rename from templates/shared-mime-info.tmpl
rename to templates/shared-mime-info/template
diff --git a/templates/sqlite.tmpl b/templates/sqlite/template
similarity index 100%
rename from templates/sqlite.tmpl
rename to templates/sqlite/template
diff --git a/templates/squashfs-tools.tmpl b/templates/squashfs-tools/template
similarity index 100%
rename from templates/squashfs-tools.tmpl
rename to templates/squashfs-tools/template
diff --git a/templates/sudo.tmpl b/templates/sudo/template
similarity index 100%
rename from templates/sudo.tmpl
rename to templates/sudo/template
diff --git a/templates/sylpheed-fix-latest-gtk.diff b/templates/sylpheed/sylpheed-fix-latest-gtk.diff
similarity index 100%
rename from templates/sylpheed-fix-latest-gtk.diff
rename to templates/sylpheed/sylpheed-fix-latest-gtk.diff
diff --git a/templates/sylpheed.tmpl b/templates/sylpheed/template
similarity index 100%
rename from templates/sylpheed.tmpl
rename to templates/sylpheed/template
diff --git a/templates/sysklogd-fix-install.diff b/templates/sysklogd/sysklogd-fix-install.diff
similarity index 100%
rename from templates/sysklogd-fix-install.diff
rename to templates/sysklogd/sysklogd-fix-install.diff
diff --git a/templates/sysklogd.tmpl b/templates/sysklogd/template
similarity index 100%
rename from templates/sysklogd.tmpl
rename to templates/sysklogd/template
diff --git a/templates/syslinux.tmpl b/templates/syslinux/template
similarity index 100%
rename from templates/syslinux.tmpl
rename to templates/syslinux/template
diff --git a/templates/tar.tmpl b/templates/tar/template
similarity index 100%
rename from templates/tar.tmpl
rename to templates/tar/template
diff --git a/templates/texinfo.tmpl b/templates/texinfo/template
similarity index 100%
rename from templates/texinfo.tmpl
rename to templates/texinfo/template
diff --git a/templates/tiff.tmpl b/templates/tiff/template
similarity index 100%
rename from templates/tiff.tmpl
rename to templates/tiff/template
diff --git a/templates/trapproto.tmpl b/templates/trapproto/template
similarity index 100%
rename from templates/trapproto.tmpl
rename to templates/trapproto/template
diff --git a/templates/tzdata.tmpl b/templates/tzdata/template
similarity index 100%
rename from templates/tzdata.tmpl
rename to templates/tzdata/template
diff --git a/templates/tzdata-fix-build.diff b/templates/tzdata/tzdata-fix-build.diff
similarity index 100%
rename from templates/tzdata-fix-build.diff
rename to templates/tzdata/tzdata-fix-build.diff
diff --git a/templates/udev.tmpl b/templates/udev/template
similarity index 100%
rename from templates/udev.tmpl
rename to templates/udev/template
diff --git a/templates/unzip.tmpl b/templates/unzip/template
similarity index 100%
rename from templates/unzip.tmpl
rename to templates/unzip/template
diff --git a/templates/unzip-fix-unzipsfx.diff b/templates/unzip/unzip-fix-unzipsfx.diff
similarity index 100%
rename from templates/unzip-fix-unzipsfx.diff
rename to templates/unzip/unzip-fix-unzipsfx.diff
diff --git a/templates/upstart.tmpl b/templates/upstart/template
similarity index 100%
rename from templates/upstart.tmpl
rename to templates/upstart/template
diff --git a/templates/util-linux-ng.tmpl b/templates/util-linux-ng/template
similarity index 100%
rename from templates/util-linux-ng.tmpl
rename to templates/util-linux-ng/template
diff --git a/templates/util-linux.tmpl b/templates/util-linux/template
similarity index 100%
rename from templates/util-linux.tmpl
rename to templates/util-linux/template
diff --git a/templates/util-linux-fix-build.diff b/templates/util-linux/util-linux-fix-build.diff
similarity index 100%
rename from templates/util-linux-fix-build.diff
rename to templates/util-linux/util-linux-fix-build.diff
diff --git a/templates/util-macros.tmpl b/templates/util-macros/template
similarity index 100%
rename from templates/util-macros.tmpl
rename to templates/util-macros/template
diff --git a/templates/videoproto.tmpl b/templates/videoproto/template
similarity index 100%
rename from templates/videoproto.tmpl
rename to templates/videoproto/template
diff --git a/templates/vim.tmpl b/templates/vim/template
similarity index 100%
rename from templates/vim.tmpl
rename to templates/vim/template
diff --git a/templates/wget.tmpl b/templates/wget/template
similarity index 100%
rename from templates/wget.tmpl
rename to templates/wget/template
diff --git a/templates/xauth.tmpl b/templates/xauth/template
similarity index 100%
rename from templates/xauth.tmpl
rename to templates/xauth/template
diff --git a/templates/xbitmaps.tmpl b/templates/xbitmaps/template
similarity index 100%
rename from templates/xbitmaps.tmpl
rename to templates/xbitmaps/template
diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot/template
similarity index 100%
rename from templates/xbps-base-chroot.tmpl
rename to templates/xbps-base-chroot/template
diff --git a/templates/xbps-base-dirs.tmpl b/templates/xbps-base-dirs/template
similarity index 100%
rename from templates/xbps-base-dirs.tmpl
rename to templates/xbps-base-dirs/template
diff --git a/templates/xbps-base-system.tmpl b/templates/xbps-base-system/template
similarity index 100%
rename from templates/xbps-base-system.tmpl
rename to templates/xbps-base-system/template
diff --git a/templates/xcmiscproto.tmpl b/templates/xcmiscproto/template
similarity index 100%
rename from templates/xcmiscproto.tmpl
rename to templates/xcmiscproto/template
diff --git a/templates/xextproto.tmpl b/templates/xextproto/template
similarity index 100%
rename from templates/xextproto.tmpl
rename to templates/xextproto/template
diff --git a/templates/xf86-input-joystick.tmpl b/templates/xf86-input-joystick/template
similarity index 100%
rename from templates/xf86-input-joystick.tmpl
rename to templates/xf86-input-joystick/template
diff --git a/templates/xf86-input-keyboard.tmpl b/templates/xf86-input-keyboard/template
similarity index 100%
rename from templates/xf86-input-keyboard.tmpl
rename to templates/xf86-input-keyboard/template
diff --git a/templates/xf86-input-mouse.tmpl b/templates/xf86-input-mouse/template
similarity index 100%
rename from templates/xf86-input-mouse.tmpl
rename to templates/xf86-input-mouse/template
diff --git a/templates/xf86-input-vmmouse.tmpl b/templates/xf86-input-vmmouse/template
similarity index 100%
rename from templates/xf86-input-vmmouse.tmpl
rename to templates/xf86-input-vmmouse/template
diff --git a/templates/xf86-video-ati.tmpl b/templates/xf86-video-ati/template
similarity index 100%
rename from templates/xf86-video-ati.tmpl
rename to templates/xf86-video-ati/template
diff --git a/templates/xf86-video-intel.tmpl b/templates/xf86-video-intel/template
similarity index 100%
rename from templates/xf86-video-intel.tmpl
rename to templates/xf86-video-intel/template
diff --git a/templates/xf86-video-radeonhd.tmpl b/templates/xf86-video-radeonhd/template
similarity index 100%
rename from templates/xf86-video-radeonhd.tmpl
rename to templates/xf86-video-radeonhd/template
diff --git a/templates/xf86-video-vmware.tmpl b/templates/xf86-video-vmware/template
similarity index 100%
rename from templates/xf86-video-vmware.tmpl
rename to templates/xf86-video-vmware/template
diff --git a/templates/xf86bigfontproto.tmpl b/templates/xf86bigfontproto/template
similarity index 100%
rename from templates/xf86bigfontproto.tmpl
rename to templates/xf86bigfontproto/template
diff --git a/templates/xf86dgaproto.tmpl b/templates/xf86dgaproto/template
similarity index 100%
rename from templates/xf86dgaproto.tmpl
rename to templates/xf86dgaproto/template
diff --git a/templates/xf86driproto.tmpl b/templates/xf86driproto/template
similarity index 100%
rename from templates/xf86driproto.tmpl
rename to templates/xf86driproto/template
diff --git a/templates/xf86miscproto.tmpl b/templates/xf86miscproto/template
similarity index 100%
rename from templates/xf86miscproto.tmpl
rename to templates/xf86miscproto/template
diff --git a/templates/xf86vidmodeproto.tmpl b/templates/xf86vidmodeproto/template
similarity index 100%
rename from templates/xf86vidmodeproto.tmpl
rename to templates/xf86vidmodeproto/template
diff --git a/templates/xineramaproto.tmpl b/templates/xineramaproto/template
similarity index 100%
rename from templates/xineramaproto.tmpl
rename to templates/xineramaproto/template
diff --git a/templates/xinit.tmpl b/templates/xinit/template
similarity index 100%
rename from templates/xinit.tmpl
rename to templates/xinit/template
diff --git a/templates/xkbcomp.tmpl b/templates/xkbcomp/template
similarity index 100%
rename from templates/xkbcomp.tmpl
rename to templates/xkbcomp/template
diff --git a/templates/xkeyboard-config.tmpl b/templates/xkeyboard-config/template
similarity index 100%
rename from templates/xkeyboard-config.tmpl
rename to templates/xkeyboard-config/template
diff --git a/templates/xmlcatmgr.tmpl b/templates/xmlcatmgr/template
similarity index 100%
rename from templates/xmlcatmgr.tmpl
rename to templates/xmlcatmgr/template
diff --git a/templates/xorg-fonts.tmpl b/templates/xorg-fonts/template
similarity index 100%
rename from templates/xorg-fonts.tmpl
rename to templates/xorg-fonts/template
diff --git a/templates/xorg-server.tmpl b/templates/xorg-server/template
similarity index 100%
rename from templates/xorg-server.tmpl
rename to templates/xorg-server/template
diff --git a/templates/xprop.tmpl b/templates/xprop/template
similarity index 100%
rename from templates/xprop.tmpl
rename to templates/xprop/template
diff --git a/templates/xproto.tmpl b/templates/xproto/template
similarity index 100%
rename from templates/xproto.tmpl
rename to templates/xproto/template
diff --git a/templates/xrandr.tmpl b/templates/xrandr/template
similarity index 100%
rename from templates/xrandr.tmpl
rename to templates/xrandr/template
diff --git a/templates/xset.tmpl b/templates/xset/template
similarity index 100%
rename from templates/xset.tmpl
rename to templates/xset/template
diff --git a/templates/xsetroot.tmpl b/templates/xsetroot/template
similarity index 100%
rename from templates/xsetroot.tmpl
rename to templates/xsetroot/template
diff --git a/templates/xstow.tmpl b/templates/xstow/template
similarity index 100%
rename from templates/xstow.tmpl
rename to templates/xstow/template
diff --git a/templates/xterm.tmpl b/templates/xterm/template
similarity index 100%
rename from templates/xterm.tmpl
rename to templates/xterm/template
diff --git a/templates/xtrans.tmpl b/templates/xtrans/template
similarity index 100%
rename from templates/xtrans.tmpl
rename to templates/xtrans/template
diff --git a/templates/zip.tmpl b/templates/zip/template
similarity index 100%
rename from templates/zip.tmpl
rename to templates/zip/template
diff --git a/templates/zisofs-tools.tmpl b/templates/zisofs-tools/template
similarity index 100%
rename from templates/zisofs-tools.tmpl
rename to templates/zisofs-tools/template
diff --git a/templates/zlib.tmpl b/templates/zlib/template
similarity index 100%
rename from templates/zlib.tmpl
rename to templates/zlib/template
diff --git a/templates/zlib-fix-build.diff b/templates/zlib/zlib-fix-build.diff
similarity index 100%
rename from templates/zlib-fix-build.diff
rename to templates/zlib/zlib-fix-build.diff