diff --git a/gooddata-sdk/gooddata_sdk/catalog/export/service.py b/gooddata-sdk/gooddata_sdk/catalog/export/service.py
index f5acdbd83..7d13e36b6 100644
--- a/gooddata-sdk/gooddata_sdk/catalog/export/service.py
+++ b/gooddata-sdk/gooddata_sdk/catalog/export/service.py
@@ -7,16 +7,16 @@
 from gooddata_api_client.exceptions import NotFoundException
 from gooddata_api_client.model.pdf_export_request import PdfExportRequest
 from gooddata_api_client.model.tabular_export_request import TabularExportRequest
-from gooddata_sdk import (
+from gooddata_sdk.catalog.catalog_service_base import CatalogServiceBase
+from gooddata_sdk.catalog.export.request import (
     ExportCustomLabel,
     ExportCustomMetric,
     ExportCustomOverride,
     ExportRequest,
     ExportSettings,
-    GoodDataApiClient,
-    SimpleMetric,
 )
-from gooddata_sdk.catalog.catalog_service_base import CatalogServiceBase
+from gooddata_sdk.client import GoodDataApiClient
+from gooddata_sdk.compute.model.metric import SimpleMetric
 from gooddata_sdk.table import ExecutionTable, TableService
 from gooddata_sdk.visualization import VisualizationService
 
diff --git a/gooddata-sdk/gooddata_sdk/catalog/permission/service.py b/gooddata-sdk/gooddata_sdk/catalog/permission/service.py
index 2f008c5bd..8ea6ccac3 100644
--- a/gooddata-sdk/gooddata_sdk/catalog/permission/service.py
+++ b/gooddata-sdk/gooddata_sdk/catalog/permission/service.py
@@ -1,17 +1,19 @@
 # (C) 2022 GoodData Corporation
 from typing import List, Union
 
-from gooddata_sdk import (
-    CatalogAvailableAssignees,
-    CatalogDashboardPermissions,
+from gooddata_sdk.catalog.catalog_service_base import CatalogServiceBase
+from gooddata_sdk.catalog.permission.declarative_model.dashboard_assignees import CatalogAvailableAssignees
+from gooddata_sdk.catalog.permission.declarative_model.dashboard_permissions import CatalogDashboardPermissions
+from gooddata_sdk.catalog.permission.declarative_model.manage_dashboard_permissions import (
+    CatalogPermissionsForAssigneeIdentifier,
+    CatalogPermissionsForAssigneeRule,
+)
+from gooddata_sdk.catalog.permission.declarative_model.permission import (
     CatalogDeclarativeOrganizationPermission,
     CatalogDeclarativeWorkspacePermissions,
     CatalogOrganizationPermissionAssignment,
-    CatalogPermissionsForAssigneeIdentifier,
-    CatalogPermissionsForAssigneeRule,
-    GoodDataApiClient,
 )
-from gooddata_sdk.catalog.catalog_service_base import CatalogServiceBase
+from gooddata_sdk.client import GoodDataApiClient
 
 
 class CatalogPermissionService(CatalogServiceBase):
diff --git a/gooddata-sdk/gooddata_sdk/catalog/user/management_model/management.py b/gooddata-sdk/gooddata_sdk/catalog/user/management_model/management.py
index ba06f8230..02f67ce85 100644
--- a/gooddata-sdk/gooddata_sdk/catalog/user/management_model/management.py
+++ b/gooddata-sdk/gooddata_sdk/catalog/user/management_model/management.py
@@ -12,8 +12,8 @@
 from gooddata_api_client.model.user_management_workspace_permission_assignment import (
     UserManagementWorkspacePermissionAssignment,
 )
-from gooddata_sdk import CatalogAssigneeIdentifier
 from gooddata_sdk.catalog.base import Base
+from gooddata_sdk.catalog.identifier import CatalogAssigneeIdentifier
 
 
 @attrs.define(auto_attribs=True, kw_only=True)
diff --git a/gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/analytics_model/analytics_model.py b/gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/analytics_model/analytics_model.py
index 6613abcd8..eeb9cc4ad 100644
--- a/gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/analytics_model/analytics_model.py
+++ b/gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/analytics_model/analytics_model.py
@@ -16,12 +16,12 @@
 from gooddata_api_client.model.declarative_filter_context import DeclarativeFilterContext
 from gooddata_api_client.model.declarative_metric import DeclarativeMetric
 from gooddata_api_client.model.declarative_visualization_object import DeclarativeVisualizationObject
-from gooddata_sdk import (
+from gooddata_sdk.catalog.base import Base
+from gooddata_sdk.catalog.identifier import CatalogUserIdentifier
+from gooddata_sdk.catalog.permission.declarative_model.permission import (
     CatalogDeclarativeDashboardPermissionsForAssignee,
     CatalogDeclarativeDashboardPermissionsForAssigneeRule,
 )
-from gooddata_sdk.catalog.base import Base
-from gooddata_sdk.catalog.identifier import CatalogUserIdentifier
 from gooddata_sdk.utils import create_directory, get_sorted_yaml_files, read_layout_from_file, write_layout_to_file
 
 T = TypeVar("T", bound="CatalogAnalyticsObjectBase")
diff --git a/gooddata-sdk/gooddata_sdk/catalog/workspace/service.py b/gooddata-sdk/gooddata_sdk/catalog/workspace/service.py
index 683b7fdd0..0a689377a 100644
--- a/gooddata-sdk/gooddata_sdk/catalog/workspace/service.py
+++ b/gooddata-sdk/gooddata_sdk/catalog/workspace/service.py
@@ -14,7 +14,6 @@
 import attrs
 
 from gooddata_api_client.exceptions import NotFoundException
-from gooddata_sdk import CatalogUserDataFilter
 from gooddata_sdk.catalog.catalog_service_base import CatalogServiceBase
 from gooddata_sdk.catalog.permission.service import CatalogPermissionService
 from gooddata_sdk.catalog.workspace.declarative_model.workspace.workspace import (
@@ -25,7 +24,10 @@
     get_workspace_folder,
 )
 from gooddata_sdk.catalog.workspace.entity_model.content_objects.workspace_setting import CatalogWorkspaceSetting
-from gooddata_sdk.catalog.workspace.entity_model.user_data_filter import CatalogUserDataFilterDocument
+from gooddata_sdk.catalog.workspace.entity_model.user_data_filter import (
+    CatalogUserDataFilter,
+    CatalogUserDataFilterDocument,
+)
 from gooddata_sdk.catalog.workspace.entity_model.workspace import CatalogWorkspace
 from gooddata_sdk.client import GoodDataApiClient
 from gooddata_sdk.utils import (