diff --git a/client/ayon_core/tools/ayon_utils/widgets/__init__.py b/client/ayon_core/tools/ayon_utils/widgets/__init__.py
deleted file mode 100644
index a62bab6751..0000000000
--- a/client/ayon_core/tools/ayon_utils/widgets/__init__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from .projects_widget import (
-    # ProjectsWidget,
-    ProjectsCombobox,
-    ProjectsQtModel,
-    ProjectSortFilterProxy,
-    PROJECT_NAME_ROLE,
-    PROJECT_IS_CURRENT_ROLE,
-    PROJECT_IS_ACTIVE_ROLE,
-    PROJECT_IS_LIBRARY_ROLE,
-)
-
-from .folders_widget import (
-    FoldersWidget,
-    FoldersQtModel,
-    FOLDERS_MODEL_SENDER_NAME,
-    SimpleFoldersWidget,
-)
-
-from .tasks_widget import (
-    TasksWidget,
-    TasksQtModel,
-    TASKS_MODEL_SENDER_NAME,
-)
-from .utils import (
-    get_qt_icon,
-    RefreshThread,
-)
-
-
-__all__ = (
-    # "ProjectsWidget",
-    "ProjectsCombobox",
-    "ProjectsQtModel",
-    "ProjectSortFilterProxy",
-    "PROJECT_NAME_ROLE",
-    "PROJECT_IS_CURRENT_ROLE",
-    "PROJECT_IS_ACTIVE_ROLE",
-    "PROJECT_IS_LIBRARY_ROLE",
-
-    "FoldersWidget",
-    "FoldersQtModel",
-    "FOLDERS_MODEL_SENDER_NAME",
-    "SimpleFoldersWidget",
-
-    "TasksWidget",
-    "TasksQtModel",
-    "TASKS_MODEL_SENDER_NAME",
-
-    "get_qt_icon",
-    "RefreshThread",
-)
diff --git a/client/ayon_core/tools/utils/__init__.py b/client/ayon_core/tools/utils/__init__.py
index 39570a4813..4b5fbeaf67 100644
--- a/client/ayon_core/tools/utils/__init__.py
+++ b/client/ayon_core/tools/utils/__init__.py
@@ -56,6 +56,28 @@ from .dialogs import (
     SimplePopup,
     PopupUpdateKeys,
 )
+from .projects_widget import (
+    ProjectsCombobox,
+    ProjectsQtModel,
+    ProjectSortFilterProxy,
+    PROJECT_NAME_ROLE,
+    PROJECT_IS_CURRENT_ROLE,
+    PROJECT_IS_ACTIVE_ROLE,
+    PROJECT_IS_LIBRARY_ROLE,
+)
+
+from .folders_widget import (
+    FoldersWidget,
+    FoldersQtModel,
+    FOLDERS_MODEL_SENDER_NAME,
+    SimpleFoldersWidget,
+)
+
+from .tasks_widget import (
+    TasksWidget,
+    TasksQtModel,
+    TASKS_MODEL_SENDER_NAME,
+)
 
 
 __all__ = (
@@ -115,4 +137,21 @@ __all__ = (
     "ScrollMessageBox",
     "SimplePopup",
     "PopupUpdateKeys",
+
+    "ProjectsCombobox",
+    "ProjectsQtModel",
+    "ProjectSortFilterProxy",
+    "PROJECT_NAME_ROLE",
+    "PROJECT_IS_CURRENT_ROLE",
+    "PROJECT_IS_ACTIVE_ROLE",
+    "PROJECT_IS_LIBRARY_ROLE",
+
+    "FoldersWidget",
+    "FoldersQtModel",
+    "FOLDERS_MODEL_SENDER_NAME",
+    "SimpleFoldersWidget",
+
+    "TasksWidget",
+    "TasksQtModel",
+    "TASKS_MODEL_SENDER_NAME",
 )
diff --git a/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py b/client/ayon_core/tools/utils/folders_widget.py
similarity index 99%
rename from client/ayon_core/tools/ayon_utils/widgets/folders_widget.py
rename to client/ayon_core/tools/utils/folders_widget.py
index e42a5b635c..a2519f90c2 100644
--- a/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py
+++ b/client/ayon_core/tools/utils/folders_widget.py
@@ -7,12 +7,11 @@ from ayon_core.tools.ayon_utils.models import (
     HierarchyModel,
     HierarchyExpectedSelection,
 )
-from ayon_core.tools.utils import (
-    RecursiveSortFilterProxyModel,
-    TreeView,
-)
 
-from .utils import RefreshThread, get_qt_icon
+from .models import RecursiveSortFilterProxyModel
+from .views import TreeView
+from .lib import RefreshThread, get_qt_icon
+
 
 FOLDERS_MODEL_SENDER_NAME = "qt_folders_model"
 FOLDER_ID_ROLE = QtCore.Qt.UserRole + 1
diff --git a/client/ayon_core/tools/ayon_utils/widgets/projects_widget.py b/client/ayon_core/tools/utils/projects_widget.py
similarity index 99%
rename from client/ayon_core/tools/ayon_utils/widgets/projects_widget.py
rename to client/ayon_core/tools/utils/projects_widget.py
index 79ffc77640..e4ac69198a 100644
--- a/client/ayon_core/tools/ayon_utils/widgets/projects_widget.py
+++ b/client/ayon_core/tools/utils/projects_widget.py
@@ -1,7 +1,8 @@
 from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core.tools.ayon_utils.models import PROJECTS_MODEL_SENDER
-from .utils import RefreshThread, get_qt_icon
+
+from .lib import RefreshThread, get_qt_icon
 
 PROJECT_NAME_ROLE = QtCore.Qt.UserRole + 1
 PROJECT_IS_ACTIVE_ROLE = QtCore.Qt.UserRole + 2
diff --git a/client/ayon_core/tools/ayon_utils/widgets/tasks_widget.py b/client/ayon_core/tools/utils/tasks_widget.py
similarity index 99%
rename from client/ayon_core/tools/ayon_utils/widgets/tasks_widget.py
rename to client/ayon_core/tools/utils/tasks_widget.py
index cfe901c492..0ff8e8a5c1 100644
--- a/client/ayon_core/tools/ayon_utils/widgets/tasks_widget.py
+++ b/client/ayon_core/tools/utils/tasks_widget.py
@@ -1,9 +1,9 @@
 from qtpy import QtWidgets, QtGui, QtCore
 
 from ayon_core.style import get_disabled_entity_icon_color
-from ayon_core.tools.utils import DeselectableTreeView
 
-from .utils import RefreshThread, get_qt_icon
+from .views import DeselectableTreeView
+from .lib import RefreshThread, get_qt_icon
 
 TASKS_MODEL_SENDER_NAME = "qt_tasks_model"
 ITEM_ID_ROLE = QtCore.Qt.UserRole + 1