Some major restructuring, catching up to CTools. This is very much in process, there is a huge list of things that need to happen here still, but this may be checkpoint usable to the strong-stomached.