Fix from old directory structure.