Moved /data to individual folders