California Regulator Wants Changes in PG&E Reorganization Plan, Proposes $2 Billion Fine