diff --git a/freqtrade/analyze.py b/freqtrade/exchange/exchange_helpers.py
similarity index 100%
rename from freqtrade/analyze.py
rename to freqtrade/exchange/exchange_helpers.py
diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py
index e9d5b904d..fb8bcd31d 100644
--- a/freqtrade/strategy/interface.py
+++ b/freqtrade/strategy/interface.py
@@ -12,7 +12,7 @@ import arrow
 from pandas import DataFrame
 
 from freqtrade import constants
-from freqtrade.analyze import parse_ticker_dataframe
+from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe
 from freqtrade.exchange import Exchange
 from freqtrade.persistence import Trade
 
diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py
index 788ab5afb..a9ed92765 100644
--- a/freqtrade/tests/conftest.py
+++ b/freqtrade/tests/conftest.py
@@ -12,7 +12,7 @@ from jsonschema import validate
 from telegram import Chat, Message, Update
 
 from freqtrade import constants
-from freqtrade.analyze import parse_ticker_dataframe
+from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe
 from freqtrade.exchange import Exchange
 from freqtrade.freqtradebot import FreqtradeBot
 
@@ -20,7 +20,7 @@ logging.getLogger('').setLevel(logging.INFO)
 
 
 def log_has(line, logs):
-    # caplog mocker returns log as a tuple: ('freqtrade.analyze', logging.WARNING, 'foobar')
+    # caplog mocker returns log as a tuple: ('freqtrade.something', logging.WARNING, 'foobar')
     # and we want to match line against foobar in the tuple
     return reduce(lambda a, b: a or b,
                   filter(lambda x: x[2] == line, logs),
@@ -51,13 +51,11 @@ def get_patched_freqtradebot(mocker, config) -> FreqtradeBot:
     """
     # mocker.patch('freqtrade.fiat_convert.Market', {'price_usd': 12345.0})
     patch_coinmarketcap(mocker, {'price_usd': 12345.0})
-#    mocker.patch('freqtrade.freqtradebot.Analyze', MagicMock())
     mocker.patch('freqtrade.freqtradebot.RPCManager', MagicMock())
     mocker.patch('freqtrade.freqtradebot.persistence.init', MagicMock())
     patch_exchange(mocker, None)
     mocker.patch('freqtrade.freqtradebot.RPCManager._init', MagicMock())
     mocker.patch('freqtrade.freqtradebot.RPCManager.send_msg', MagicMock())
-#    mocker.patch('freqtrade.freqtradebot.Analyze.get_signal', MagicMock())
 
     return FreqtradeBot(config)
 
diff --git a/freqtrade/tests/test_analyze.py b/freqtrade/tests/exchange/test_exchange_helpers.py
similarity index 85%
rename from freqtrade/tests/test_analyze.py
rename to freqtrade/tests/exchange/test_exchange_helpers.py
index fdd83809c..6a3bc9eb6 100644
--- a/freqtrade/tests/test_analyze.py
+++ b/freqtrade/tests/exchange/test_exchange_helpers.py
@@ -1,10 +1,10 @@
 # pragma pylint: disable=missing-docstring, C0103
 
 """
-Unit test file for analyse.py
+Unit test file for exchange_helpers.py
 """
 
-from freqtrade.analyze import parse_ticker_dataframe
+from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe
 
 
 def test_dataframe_correct_length(result):
diff --git a/freqtrade/tests/strategy/test_default_strategy.py b/freqtrade/tests/strategy/test_default_strategy.py
index d965c3f20..37df1748f 100644
--- a/freqtrade/tests/strategy/test_default_strategy.py
+++ b/freqtrade/tests/strategy/test_default_strategy.py
@@ -3,7 +3,7 @@ import json
 import pytest
 from pandas import DataFrame
 
-from freqtrade.analyze import parse_ticker_dataframe
+from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe
 from freqtrade.strategy.default_strategy import DefaultStrategy
 
 
diff --git a/freqtrade/tests/test_misc.py b/freqtrade/tests/test_misc.py
index 1e9b5c181..76290c6ca 100644
--- a/freqtrade/tests/test_misc.py
+++ b/freqtrade/tests/test_misc.py
@@ -7,7 +7,7 @@ Unit test file for misc.py
 import datetime
 from unittest.mock import MagicMock
 
-from freqtrade.analyze import parse_ticker_dataframe
+from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe
 from freqtrade.misc import (common_datearray, datesarray_to_datetimearray,
                             file_dump_json, format_ms_time, shorten_date)
 from freqtrade.optimize.__init__ import load_tickerdata_file