restructured to mac