merged the 2 dataproviders into a single one;
corrected some stuff;
another one
added some new files