more reorganization development for default 2-winding transformers and separate phase shifter list