re-grouped components