Re-organised supervisor files.
Tweaks and re-organisations