reorganize, check and update models