Toyota shuffles model lineup at U.S. factories