Major code re-org, now using UUIDs everywhere
Not fully tested yet
Also added CB 1.7.8 support