rewrote Router.js
updated Router.js