moved client into server dir