diff --git a/freqtrade/commands/db_commands.py b/freqtrade/commands/db_commands.py
index 618b5cb6e..c424016b1 100644
--- a/freqtrade/commands/db_commands.py
+++ b/freqtrade/commands/db_commands.py
@@ -4,7 +4,7 @@ from typing import Any, Dict
 from sqlalchemy import func
 
 from freqtrade.configuration.config_setup import setup_utils_configuration
-from freqtrade.enums.runmode import RunMode
+from freqtrade.enums import RunMode
 
 
 logger = logging.getLogger(__name__)
diff --git a/freqtrade/exchange/okx.py b/freqtrade/exchange/okx.py
index 9340dd0e4..49f8ea107 100644
--- a/freqtrade/exchange/okx.py
+++ b/freqtrade/exchange/okx.py
@@ -4,8 +4,7 @@ from typing import Dict, List, Optional, Tuple
 import ccxt
 
 from freqtrade.constants import BuySell
-from freqtrade.enums import MarginMode, TradingMode
-from freqtrade.enums.candletype import CandleType
+from freqtrade.enums import CandleType, MarginMode, TradingMode
 from freqtrade.exceptions import DDosProtection, OperationalException, TemporaryError
 from freqtrade.exchange import Exchange, date_minus_candles
 from freqtrade.exchange.common import retrier
diff --git a/freqtrade/rpc/discord.py b/freqtrade/rpc/discord.py
index 5991f7126..85acfae4e 100644
--- a/freqtrade/rpc/discord.py
+++ b/freqtrade/rpc/discord.py
@@ -1,7 +1,7 @@
 import logging
 from typing import Any, Dict
 
-from freqtrade.enums.rpcmessagetype import RPCMessageType
+from freqtrade.enums import RPCMessageType
 from freqtrade.rpc import RPC
 from freqtrade.rpc.webhook import Webhook
 
diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py
index 70cc7fdb3..9401ebebe 100644
--- a/freqtrade/strategy/interface.py
+++ b/freqtrade/strategy/interface.py
@@ -12,9 +12,8 @@ from pandas import DataFrame
 
 from freqtrade.constants import ListPairsWithTimeframes
 from freqtrade.data.dataprovider import DataProvider
-from freqtrade.enums import (CandleType, ExitCheckTuple, ExitType, SignalDirection, SignalTagType,
-                             SignalType, TradingMode)
-from freqtrade.enums.runmode import RunMode
+from freqtrade.enums import (CandleType, ExitCheckTuple, ExitType, RunMode, SignalDirection,
+                             SignalTagType, SignalType, TradingMode)
 from freqtrade.exceptions import OperationalException, StrategyError
 from freqtrade.exchange import timeframe_to_minutes, timeframe_to_next_date, timeframe_to_seconds
 from freqtrade.persistence import Order, PairLocks, Trade
diff --git a/freqtrade/strategy/parameters.py b/freqtrade/strategy/parameters.py
index c6037ae0b..796fb9514 100644
--- a/freqtrade/strategy/parameters.py
+++ b/freqtrade/strategy/parameters.py
@@ -7,7 +7,7 @@ from abc import ABC, abstractmethod
 from contextlib import suppress
 from typing import Any, Optional, Sequence, Union
 
-from freqtrade.enums.hyperoptstate import HyperoptState
+from freqtrade.enums import HyperoptState
 from freqtrade.optimize.hyperopt_tools import HyperoptStateContainer
 
 
diff --git a/tests/exchange/test_okx.py b/tests/exchange/test_okx.py
index b475b84ff..12322acae 100644
--- a/tests/exchange/test_okx.py
+++ b/tests/exchange/test_okx.py
@@ -4,8 +4,7 @@ from unittest.mock import MagicMock, PropertyMock
 
 import pytest
 
-from freqtrade.enums import MarginMode, TradingMode
-from freqtrade.enums.candletype import CandleType
+from freqtrade.enums import CandleType, MarginMode, TradingMode
 from freqtrade.exchange.exchange import timeframe_to_minutes
 from tests.conftest import get_mock_coro, get_patched_exchange, log_has
 from tests.exchange.test_exchange import ccxt_exceptionhandlers
diff --git a/tests/strategy/test_interface.py b/tests/strategy/test_interface.py
index 65ee05d71..070e78b1d 100644
--- a/tests/strategy/test_interface.py
+++ b/tests/strategy/test_interface.py
@@ -11,8 +11,7 @@ from pandas import DataFrame
 from freqtrade.configuration import TimeRange
 from freqtrade.data.dataprovider import DataProvider
 from freqtrade.data.history import load_data
-from freqtrade.enums import ExitCheckTuple, ExitType, SignalDirection
-from freqtrade.enums.hyperoptstate import HyperoptState
+from freqtrade.enums import ExitCheckTuple, ExitType, HyperoptState, SignalDirection
 from freqtrade.exceptions import OperationalException, StrategyError
 from freqtrade.optimize.hyperopt_tools import HyperoptStateContainer
 from freqtrade.optimize.space import SKDecimal