Added client files to the server and refractoring