SVC, SwitchedShunt class refactor