clean up and organize templates
Merge pull request #245 from ORCID/dev-organizeWorkspaceAngularTemplates

clean up and organize templates