Large refactoring, renamming, commenting session ...