reorganized server/client workers