move serverId to its own field, prepare for next release (0.3.1-SNAPSHOT)