updated template file organization