move serverId to its own field

Still needs to be applied in most other classes, this was done in wordpad, so sue me