Converted routes to be fully lazy loadable