Renamed the directories to make it more mac-friendly