Support the new directory structure.