refactor DataProvider out of __init__
fixed imports