Refactoring moves generators to controllers package