Better split up parts of Tetra

This does require manual intervention to upgrade.

Tetra now can be broken apart easier.