Reorganize and add an osx install.