Reorganize and write out the last of the osx bundle

Untested still