Make it works and remove redundant router.js