Move Router to router.js
Merge branch 'master' of github.com:ahmpro/project-x