Switch positioning of controller and service import to allow for use of services throughout app.
Fix for scaffolds to make use of newest waterline.