Various adjustments for new directory structure.