Move templates into separate folder