reorganized files into client and server folders