Moving files around, refactoring variable names.