Reorganized mac files