Refactor stuff to make it more CTools compliant and in a failed attempt to fix the interface being found