FLUID-5131: simplified tree rebasing

Removed the model transformations in favour of a more direct and simple approach using straight functions.