Update to new path layout