folder structure fix
folder tidy up