organize template folder a bit