moved server stuff into server package