admin-client restructuring