review
changed api to use new template structure
changed to use new template structure
fixed tests
removed unused files