Messed up folder structure fix