Total re-wire to conform to ansible-galaxy