Partial implementation of the Tree Recomposer.

Some more cases covered.
Merge branch 'master' of https://github.com/aghosn/persistence