Modified CMakelist and routers