updated terminology files to use %% rather than {{ ... }}; also, templates have been moved to their own dir