Gaf module refactoring.