Refactored router
Added routing, and moved routes to app