Sync to local copy

Lots of changes - lots to change and update, many
incorrect filenames, etc.