Tried to make the data folder mapping clearer