Further adjustments for new directory structure.