Fixed file structure for mac