Quick refactor to put servers into more managable packages