More changes to keep OSX up to date. Moving incubator files into platform friendly folders