tidy up folder structure