diff --git a/pype/modules/ftrack/actions/action_store_thumbnails_to_avalon.py b/pype/modules/ftrack/actions/action_store_thumbnails_to_avalon.py
index 84f857e37a..4fbea6b8a5 100644
--- a/pype/modules/ftrack/actions/action_store_thumbnails_to_avalon.py
+++ b/pype/modules/ftrack/actions/action_store_thumbnails_to_avalon.py
@@ -1,7 +1,7 @@
 import os
-import requests
 import errno
 import json
+import requests
 
 from bson.objectid import ObjectId
 from pype.modules.ftrack.lib import BaseAction, statics_icon
diff --git a/pype/modules/ftrack/events/action_sync_to_avalon.py b/pype/modules/ftrack/events/action_sync_to_avalon.py
index 486b977f04..6bec1fb259 100644
--- a/pype/modules/ftrack/events/action_sync_to_avalon.py
+++ b/pype/modules/ftrack/events/action_sync_to_avalon.py
@@ -1,7 +1,7 @@
 import time
 import traceback
 
-from pype.modules.ftrack import ServerAction
+from pype.modules.ftrack.lib import ServerAction
 from pype.modules.ftrack.lib.avalon_sync import SyncEntitiesFactory
 
 
diff --git a/pype/modules/ftrack/events/event_first_version_status.py b/pype/modules/ftrack/events/event_first_version_status.py
index cfca047c09..440b455edf 100644
--- a/pype/modules/ftrack/events/event_first_version_status.py
+++ b/pype/modules/ftrack/events/event_first_version_status.py
@@ -1,4 +1,4 @@
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 
 
 class FirstVersionStatus(BaseEvent):
diff --git a/pype/modules/ftrack/events/event_next_task_update.py b/pype/modules/ftrack/events/event_next_task_update.py
index 284cff886b..e546f00c77 100644
--- a/pype/modules/ftrack/events/event_next_task_update.py
+++ b/pype/modules/ftrack/events/event_next_task_update.py
@@ -1,5 +1,5 @@
 import collections
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 
 
 class NextTaskUpdate(BaseEvent):
diff --git a/pype/modules/ftrack/events/event_push_frame_values_to_task.py b/pype/modules/ftrack/events/event_push_frame_values_to_task.py
index 8e277679bd..f41466d664 100644
--- a/pype/modules/ftrack/events/event_push_frame_values_to_task.py
+++ b/pype/modules/ftrack/events/event_push_frame_values_to_task.py
@@ -2,7 +2,7 @@ import collections
 import datetime
 
 import ftrack_api
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 
 
 class PushFrameValuesToTaskEvent(BaseEvent):
diff --git a/pype/modules/ftrack/events/event_sync_to_avalon.py b/pype/modules/ftrack/events/event_sync_to_avalon.py
index 527f3996e1..7c9c4d196f 100644
--- a/pype/modules/ftrack/events/event_sync_to_avalon.py
+++ b/pype/modules/ftrack/events/event_sync_to_avalon.py
@@ -10,17 +10,21 @@ import traceback
 from bson.objectid import ObjectId
 from pymongo import UpdateOne
 
-from avalon import schema
-
-from pype.modules.ftrack.lib import avalon_sync
-from pype.modules.ftrack.lib.avalon_sync import (
-    CUST_ATTR_ID_KEY, CUST_ATTR_AUTO_SYNC, EntitySchemas
-)
 import ftrack_api
-from pype.modules.ftrack import BaseEvent
 
+from avalon import schema
 from avalon.api import AvalonMongoDB
 
+from pype.modules.ftrack.lib import (
+    avalon_sync,
+    BaseEvent
+)
+from pype.modules.ftrack.lib.avalon_sync import (
+    CUST_ATTR_ID_KEY,
+    CUST_ATTR_AUTO_SYNC,
+    EntitySchemas
+)
+
 
 class SyncToAvalonEvent(BaseEvent):
     interest_entTypes = ["show", "task"]
diff --git a/pype/modules/ftrack/events/event_task_to_parent_status.py b/pype/modules/ftrack/events/event_task_to_parent_status.py
index 9b1f61911e..72b6675404 100644
--- a/pype/modules/ftrack/events/event_task_to_parent_status.py
+++ b/pype/modules/ftrack/events/event_task_to_parent_status.py
@@ -1,5 +1,5 @@
 import collections
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 
 
 class TaskStatusToParent(BaseEvent):
diff --git a/pype/modules/ftrack/events/event_task_to_version_status.py b/pype/modules/ftrack/events/event_task_to_version_status.py
index d27a7f9e98..14f456831f 100644
--- a/pype/modules/ftrack/events/event_task_to_version_status.py
+++ b/pype/modules/ftrack/events/event_task_to_version_status.py
@@ -1,5 +1,5 @@
 import collections
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 
 
 class TaskToVersionStatus(BaseEvent):
diff --git a/pype/modules/ftrack/events/event_thumbnail_updates.py b/pype/modules/ftrack/events/event_thumbnail_updates.py
index b71322c894..de189463d0 100644
--- a/pype/modules/ftrack/events/event_thumbnail_updates.py
+++ b/pype/modules/ftrack/events/event_thumbnail_updates.py
@@ -1,5 +1,5 @@
 import collections
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 
 
 class ThumbnailEvents(BaseEvent):
diff --git a/pype/modules/ftrack/events/event_user_assigment.py b/pype/modules/ftrack/events/event_user_assigment.py
index 59880fabe5..85cf6db12b 100644
--- a/pype/modules/ftrack/events/event_user_assigment.py
+++ b/pype/modules/ftrack/events/event_user_assigment.py
@@ -2,7 +2,7 @@ import os
 import re
 import subprocess
 
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 from pype.modules.ftrack.lib.avalon_sync import CUST_ATTR_ID_KEY
 from avalon.api import AvalonMongoDB
 
diff --git a/pype/modules/ftrack/events/event_version_to_task_statuses.py b/pype/modules/ftrack/events/event_version_to_task_statuses.py
index 4a42e27336..58caf7db51 100644
--- a/pype/modules/ftrack/events/event_version_to_task_statuses.py
+++ b/pype/modules/ftrack/events/event_version_to_task_statuses.py
@@ -1,4 +1,4 @@
-from pype.modules.ftrack import BaseEvent
+from pype.modules.ftrack.lib import BaseEvent
 
 
 class VersionToTaskStatus(BaseEvent):