diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py
index cb95bbf..2f4f825 100644
--- a/solvable/src/event_handler_main.py
+++ b/solvable/src/event_handler_main.py
@@ -1,12 +1,8 @@
 from tornado.ioloop import IOLoop
 
-from tfw.components.source_code_event_handler import SourceCodeEventHandler
-from tfw.components.terminado_event_handler import TerminadoEventHandler
-from tfw.components.process_managing_event_handler import ProcessManagingEventHandler
-from tfw.components.history_monitor import BashMonitor
+from tfw.components import SourceCodeEventHandler, TerminadoEventHandler, ProcessManagingEventHandler, BashMonitor
+from tfw.networking import MessageSender, TFWServerConnector
 from tfw.config import TFWENV
-from tfw.message_sender import MessageSender
-from tfw.networking.event_handlers.server_connector import ServerUplinkConnector
 from tfw.config.logs import logging
 
 LOG = logging.getLogger(__name__)
@@ -21,7 +17,7 @@ def selectdir(history):
     try:
         cmd = history[-1].split()
         if cmd[0] == 'selectdir':
-            ServerUplinkConnector().send_to_eventhandler('webide',
+            TFWServerConnector().send_to_eventhandler('webide',
                                                          {'data': {'command': 'selectdir',
                                                                    'directory': cmd[1]}})
     except IndexError:
@@ -33,7 +29,7 @@ def toggle_next(history):
     try:
         cmd = history[-1].split()
         if cmd[0] == 'togglenext':
-            ServerUplinkConnector().send('messagecontrol',
+            TFWServerConnector().send('messagecontrol',
                                          {'data': {'command': 'showbutton',
                                                    'next_visibility': toggle_next.button_state}})
     except IndexError:
@@ -43,7 +39,8 @@ toggle_next.button_state = False
 
 if __name__ == '__main__':
     # pylint: disable=invalid-name
-    ide = SourceCodeEventHandler(key='webide', allowed_directories=[TFWENV.WEBIDE_WD], directory=TFWENV.WEBIDE_WD, exclude=['*.pyc'])
+    ide = SourceCodeEventHandler(key='webide', allowed_directories=[TFWENV.WEBIDE_WD],
+                                 directory=TFWENV.WEBIDE_WD, exclude=['*.pyc'])
     terminado = TerminadoEventHandler(key='shell', monitor=BashMonitor(TFWENV.HISTFILE))
     terminado.historymonitor.subscribe_callback(cenator)
     terminado.historymonitor.subscribe_callback(selectdir)
diff --git a/solvable/src/tfw_server.py b/solvable/src/tfw_server.py
index f5122aa..116e2a9 100644
--- a/solvable/src/tfw_server.py
+++ b/solvable/src/tfw_server.py
@@ -4,9 +4,10 @@ import tornado
 from tornado.ioloop import IOLoop
 
 from sql_injection_fsm import SQLInjectionFSM
-from tfw.networking.server.tfw_server import TFWServer
+from tfw.networking import TFWServer
 from tfw.config import TFWENV
 from tfw.config.logs import logging
+
 LOG = logging.getLogger(__name__)