A better organization in templates