Directory structure fix.