Refactoring moves generators (2/2)