Modified the data_folder to be more generic

Hey @ageorge,

It's a good practice to open a merge request each time you intend to work on branch. Doing this way we can discuss changes in an easier way.

Concerning what you did, are you sure that it still works with Olegs stuff ?

Thanks