Add Mac OS X binary, reorganize files