Removed a stray directory and refactored some templates.
Almost 80% done with task js template.