#660 - Reverted template domain object to fit naming convention.  Update Controller and Directive to create Template Block object using the newly created template domain objects with the right configuration.