Removed router global variable, embedded it as a type in Application