Reorganized _data folder