Bump the structure of the server classes

This commit introduces the Server superclass - the one server class
to rule them all.