finish reroute
remove user controller and views
Merge branch 're-routes'