Adding react-router generator, refactor