Major reorganisation, plus added func certs of minions