merged files
removed buggy templates