Move things to the server package