Support the layout of iWork 5.5 files (top level zip instead of a bundle)
Cleanup with goimports