Moved client directory into the server directory