Phase 1 of changes from feature/modules_integration

refactors project to include a standalone app
updates numerous parts of settings
Remove commented out code.