diff --git a/lib/tfw/components/directory_monitor.py b/lib/tfw/components/directory_monitor.py
index cad2860..9413fe5 100644
--- a/lib/tfw/components/directory_monitor.py
+++ b/lib/tfw/components/directory_monitor.py
@@ -6,8 +6,8 @@ from functools import wraps
 from watchdog.events import FileSystemEventHandler as FileSystemWatchdogEventHandler
 
 from tfw.networking.event_handlers import ServerUplinkConnector
-from tfw.components.decorators import RateLimiter
-from tfw.components.mixins import ObserverMixin
+from tfw.decorators import RateLimiter
+from tfw.mixins import ObserverMixin
 
 from tfw.config.logs import logging
 
diff --git a/lib/tfw/components/history_monitor.py b/lib/tfw/components/history_monitor.py
index 2540c3f..7f3965c 100644
--- a/lib/tfw/components/history_monitor.py
+++ b/lib/tfw/components/history_monitor.py
@@ -8,8 +8,8 @@ from abc import ABC, abstractmethod
 
 from watchdog.events import PatternMatchingEventHandler
 
-from tfw.components.mixins import CallbackMixin, ObserverMixin
-from tfw.components.decorators import RateLimiter
+from tfw.mixins import CallbackMixin, ObserverMixin
+from tfw.decorators import RateLimiter
 
 
 class CallbackEventHandler(PatternMatchingEventHandler, ABC):
diff --git a/lib/tfw/components/process_managing_event_handler.py b/lib/tfw/components/process_managing_event_handler.py
index 3f6c24a..3246174 100644
--- a/lib/tfw/components/process_managing_event_handler.py
+++ b/lib/tfw/components/process_managing_event_handler.py
@@ -4,7 +4,7 @@
 from xmlrpc.client import Fault as SupervisorFault
 
 from tfw import TriggerlessEventHandler
-from tfw.components.mixins import SupervisorMixin
+from tfw.mixins import SupervisorMixin
 from tfw.config.logs import logging
 from .directory_monitor import with_monitor_paused
 
diff --git a/lib/tfw/components/decorators/__init__.py b/lib/tfw/decorators/__init__.py
similarity index 100%
rename from lib/tfw/components/decorators/__init__.py
rename to lib/tfw/decorators/__init__.py
diff --git a/lib/tfw/components/decorators/rate_limiter.py b/lib/tfw/decorators/rate_limiter.py
similarity index 100%
rename from lib/tfw/components/decorators/rate_limiter.py
rename to lib/tfw/decorators/rate_limiter.py
diff --git a/lib/tfw/fsm_base.py b/lib/tfw/fsm_base.py
index 545c0b6..4657b36 100644
--- a/lib/tfw/fsm_base.py
+++ b/lib/tfw/fsm_base.py
@@ -5,7 +5,7 @@ from typing import List
 
 from transitions import Machine
 
-from tfw.components.mixins import CallbackMixin
+from tfw.mixins import CallbackMixin
 
 
 class FSMBase(CallbackMixin):
diff --git a/lib/tfw/components/mixins/__init__.py b/lib/tfw/mixins/__init__.py
similarity index 100%
rename from lib/tfw/components/mixins/__init__.py
rename to lib/tfw/mixins/__init__.py
diff --git a/lib/tfw/components/mixins/callback_mixin.py b/lib/tfw/mixins/callback_mixin.py
similarity index 100%
rename from lib/tfw/components/mixins/callback_mixin.py
rename to lib/tfw/mixins/callback_mixin.py
diff --git a/lib/tfw/components/mixins/observer_mixin.py b/lib/tfw/mixins/observer_mixin.py
similarity index 100%
rename from lib/tfw/components/mixins/observer_mixin.py
rename to lib/tfw/mixins/observer_mixin.py
diff --git a/lib/tfw/components/mixins/supervisor_mixin.py b/lib/tfw/mixins/supervisor_mixin.py
similarity index 100%
rename from lib/tfw/components/mixins/supervisor_mixin.py
rename to lib/tfw/mixins/supervisor_mixin.py