* Restructured App
* Finished routing refactor