updated "Data" folder structure (shorter folder names)