Update to new file layout.