Folder structure fix.