reorganized data folder