refactorings and documentations
rename template file