Random server cleanup. AH-579
More refactoring of the server. AH-579
Rector setup on server. AH-579
Rector more on the server. AH-579