- "view" renamed to "controller" yielding space for proper view to be introduced later
- minor relocation