finish rename of app-level router to AppRouter