Started refactorisation
Resolved conflicts after merging with remote-tracking branch. After starting refactorisation.
Refactorisation finished