ADD: Move field refactoring