Updated directory structure on mac