OSX improvements, reorganize files