The energy regulator is planning a major shakeup