Made router proper module.
Made router proper module.