clean up folder structure