fix: Unnest classes should update inner classes recursively

fix: Unnest classes should update inner classes recursively #1658