Folder structure fix