App wireup was refactored.