Move Router to toplevel App namespace and out of config/
Merge branch 'cm-router-toplevel'