Adding client and server files
Adjusting the dependencies