Refactored Router, App