Update basic project directories
Merge branch 'mac'