rearranged client files, tieded up server log commands