Revert "cancro: restructure the tree to match CM standards (2/2)"

This reverts commit 6c27793aab6085fb8f143b444398387d36ebf0ea.
Revert "Revert "cancro: restructure the tree to match CM standards (2/2)""

This reverts commit 849a7001ae53f5cd67d7b607a46115a3349ec8dd.
Revert "Revert "Revert "cancro: restructure the tree to match CM standards (2/2)"""

This reverts commit 84f462f5af128d7caf7b8962baeb61761db5f82f.