diff --git a/controller/Dockerfile b/controller/Dockerfile
index ef96d41..d09b2fd 100644
--- a/controller/Dockerfile
+++ b/controller/Dockerfile
@@ -7,7 +7,6 @@ ENV PYTHONPATH="/usr/local/lib"      \
     TFW_AUTH_KEY="/tmp/tfw-auth.key" \
     CONTROLLER_PORT=5555
 
-RUN pip3 install watchdog transitions
 COPY ./controller/ /
 
 CMD ["python3", "/opt/server.py"]
diff --git a/controller/opt/server.py b/controller/opt/server.py
index 8155726..175d738 100644
--- a/controller/opt/server.py
+++ b/controller/opt/server.py
@@ -4,7 +4,7 @@ import json
 from tornado.ioloop import IOLoop
 from tornado.web import RequestHandler, Application
 
-from tfw import FSMAwareEventHandler
+from tfw.event_handler_base import FSMAwareEventHandler
 
 
 class ControllerPostHandler(RequestHandler):
diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py
index 36a8902..1d09f7a 100644
--- a/solvable/src/event_handler_main.py
+++ b/solvable/src/event_handler_main.py
@@ -3,7 +3,8 @@ from functools import partial
 
 from tornado.ioloop import IOLoop
 
-from tfw import YamlFSM, FSMAwareEventHandler
+from tfw.fsm import YamlFSM
+from tfw.event_handler_base import FSMAwareEventHandler
 from tfw.components import IdeEventHandler, TerminalEventHandler
 from tfw.components import ProcessManagingEventHandler, BashMonitor
 from tfw.components import TerminalCommands, LogMonitoringEventHandler
diff --git a/solvable/src/test_fsm.py b/solvable/src/test_fsm.py
index 3dcf7c3..2db9b97 100644
--- a/solvable/src/test_fsm.py
+++ b/solvable/src/test_fsm.py
@@ -2,7 +2,7 @@
 
 from os.path import exists
 
-from tfw import LinearFSM
+from tfw.fsm import LinearFSM
 from tfw.networking import MessageSender