removed templates in separate files