Directory structure fix