re-organized data folder structure so not so many folders at one level