Refactored Routes and AppController
Further refactored stuff