Reorganized data folders

Reorganized data folders