Fix for new directory structure.