moved files, fixed client bug