Refactoring everything to use a single server