Refactoring moves generators (1/2)