refactor the app to make sure lib code doesn't depend on the code in app
reorder imports
Merge pull request #3197 from devoncarew/devoncarew_refactor_app

Devoncarew refactor app