Refactors the object model on osx