moved data files out of sub folders and into root of data folder