Initial refactoring towards first lifting prototype.