reorganised, created usermanagement vocab