Restructure app routes and views