contactlist-related code restructure, user list added