File structure fix