Updates to util and handling of client/server files