Reorganize templates into separate directory