The new plan scraps the earlier intention to separate out its infrastructure operations, which will instead continue to be under Toshiba Corp.