Client modules reorganized