Updated the route names
Moved views to their own location