Refactoring App Factory tools.