Move Router namespace