Connecting Kato Unitrack switches to ESU SwitchPilot

The Kato Unitrack switches are DC operated and require the wiring shown below to be controlled by a SwitchPilot and SwitchPilot Extension combo.

Unfortunately this arrangement looks like this – too much of a jumble!
So I opened the decoder case and exposed the boards
And soldered the connections internally
The replaced the base and covers (after making openings in the base for the wires).
And this looks neat – worthy of the clean ESU Look!