move server stuff into server/