Updated directory structure (for linguist)