major app clean up and refactoring
Merge pull request #5 from vforgione/app-refactor

major app clean up and refactoring