refactoring to camelCase and dividing templates correctly