server: move some things around