Revert "(CSCS2650) More cleanup of final"

This reverts commit 9f21a7cabcab3b6d20cf38fae17958542d3c5007.
Restructured stuff again