changes to structure and ember templates and routes