cancro: reorganize tree and much cleanup