Better handling of previous commit.
Fix to controllers being created in the app directory.