Moved routes and server calls around