diff --git a/freqtrade/dataprovider.py b/freqtrade/data/dataprovider.py
similarity index 97%
rename from freqtrade/dataprovider.py
rename to freqtrade/data/dataprovider.py
index ddbd35fb7..32969fe3b 100644
--- a/freqtrade/dataprovider.py
+++ b/freqtrade/data/dataprovider.py
@@ -32,7 +32,7 @@ class DataProvider(object):
         """
         # TODO: Should not be stored in exchange but in this class
         # TODO: should return dataframe, not list
-        return self._exchange.klines.get(pair)
+        return self._exchange.klines(pair)
 
     def historic_ohlcv(self, pair: str) -> DataFrame:
         """
diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 9bcc3f86b..4d0369849 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -15,8 +15,8 @@ from requests.exceptions import RequestException
 from freqtrade import (DependencyException, OperationalException,
                        TemporaryError, __version__, constants, persistence)
 from freqtrade.data.converter import order_book_to_dataframe
+from freqtrade.data.dataprovider import DataProvider
 from freqtrade.edge import Edge
-from freqtrade.dataprovider import DataProvider
 from freqtrade.exchange import Exchange
 from freqtrade.persistence import Trade
 from freqtrade.rpc import RPCManager, RPCMessageType