refactoring templates under one package