refactorings, renamings, and reorganization