Slight changes to client and server, changed file paths back to lab
versions