cleaned up directories and put server files in server and client files in client