merge server and client in to one directory
remove the old directory