diff --git a/livesync/indico_livesync/models/queue.py b/livesync/indico_livesync/models/queue.py
index 50b6d8e..5bedade 100644
--- a/livesync/indico_livesync/models/queue.py
+++ b/livesync/indico_livesync/models/queue.py
@@ -12,8 +12,8 @@ from indico.core.db.sqlalchemy import PyIntEnum, UTCDateTime, db
 from indico.modules.categories.models.categories import Category
 from indico.modules.events.models.events import Event
 from indico.util.date_time import now_utc
+from indico.util.enum import IndicoEnum
 from indico.util.string import format_repr
-from indico.util.struct.enum import IndicoEnum
 
 from indico_livesync.models.agents import LiveSyncAgent
 from indico_livesync.util import obj_deref
diff --git a/livesync/indico_livesync/simplify.py b/livesync/indico_livesync/simplify.py
index b17180d..61dca60 100644
--- a/livesync/indico_livesync/simplify.py
+++ b/livesync/indico_livesync/simplify.py
@@ -15,7 +15,7 @@ from indico.modules.categories.models.categories import Category
 from indico.modules.events.contributions.models.contributions import Contribution
 from indico.modules.events.contributions.models.subcontributions import SubContribution
 from indico.modules.events.models.events import Event
-from indico.util.struct.enum import IndicoEnum
+from indico.util.enum import IndicoEnum
 
 from indico_livesync.models.queue import ChangeType, EntryType
 
diff --git a/livesync/indico_livesync/uploader.py b/livesync/indico_livesync/uploader.py
index 72513f2..4f49ebb 100644
--- a/livesync/indico_livesync/uploader.py
+++ b/livesync/indico_livesync/uploader.py
@@ -6,7 +6,7 @@
 # see the LICENSE file for more details.
 
 from indico.core.db import db
-from indico.util.struct.iterables import grouper
+from indico.util.iterables import grouper
 
 from indico_livesync.marcxml import MARCXMLGenerator
 from indico_livesync.simplify import process_records
diff --git a/livesync_debug/indico_livesync_debug/backend.py b/livesync_debug/indico_livesync_debug/backend.py
index 3d7cb1f..156ba9c 100644
--- a/livesync_debug/indico_livesync_debug/backend.py
+++ b/livesync_debug/indico_livesync_debug/backend.py
@@ -6,7 +6,7 @@
 # see the LICENSE file for more details.
 
 from indico.util.console import cformat
-from indico.util.struct.iterables import grouper
+from indico.util.iterables import grouper
 
 from indico_livesync import LiveSyncBackendBase, MARCXMLGenerator, SimpleChange, Uploader, process_records
 
diff --git a/storage_s3/indico_storage_s3/migrate.py b/storage_s3/indico_storage_s3/migrate.py
index 2ab6378..291fe70 100644
--- a/storage_s3/indico_storage_s3/migrate.py
+++ b/storage_s3/indico_storage_s3/migrate.py
@@ -43,8 +43,8 @@ from indico.modules.files.models.files import File
 from indico.util.console import cformat
 from indico.util.date_time import format_human_timedelta
 from indico.util.fs import secure_filename
+from indico.util.iterables import committing_iterator
 from indico.util.string import crc32
-from indico.util.struct.iterables import committing_iterator
 
 from indico_storage_s3.storage import S3StorageBase
 
diff --git a/vc_vidyo/indico_vc_vidyo/task.py b/vc_vidyo/indico_vc_vidyo/task.py
index d0e94ea..fca2819 100644
--- a/vc_vidyo/indico_vc_vidyo/task.py
+++ b/vc_vidyo/indico_vc_vidyo/task.py
@@ -16,7 +16,7 @@ from indico.modules.events import Event
 from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomEventAssociation, VCRoomStatus
 from indico.modules.vc.notifications import _send
 from indico.util.date_time import now_utc
-from indico.util.struct.iterables import committing_iterator
+from indico.util.iterables import committing_iterator
 
 from indico_vc_vidyo.api import APIException, RoomNotFoundAPIException
 
diff --git a/vc_zoom/indico_vc_zoom/util.py b/vc_zoom/indico_vc_zoom/util.py
index 546fe36..399521c 100644
--- a/vc_zoom/indico_vc_zoom/util.py
+++ b/vc_zoom/indico_vc_zoom/util.py
@@ -20,7 +20,7 @@ from indico.modules.users.util import get_user_by_email
 from indico.modules.vc.exceptions import VCRoomError, VCRoomNotFoundError
 from indico.util.caching import memoize_request
 from indico.util.date_time import now_utc
-from indico.util.struct.enum import IndicoEnum, RichEnum
+from indico.util.enum import IndicoEnum, RichEnum
 from indico.util.user import principal_from_identifier
 
 from indico_vc_zoom import _