Move routes to standard location, fix some small things