Updated paths to include servlet context path.