Updating structure and links to point to v2 data