reworked files into client/server directories