refactor and document the server-classes, also add some todos. pls review them #69