Added master controller to start the app instead of router
Refactored some things into the MasterCtrl