As suggested by Jeff, I updated the files to match the updated format of client/server seperated code.