Dir structure fix.