Refactoring. Move router to seperate namespace.