Updated App and other classes to use the new Router class