Server refactor

Flipped around routing as discussed.