diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/packages/data/drift_schemas/main/drift_schema_v1.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v1.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v1.json
diff --git a/mobile/drift_schemas/main/drift_schema_v10.json b/mobile/packages/data/drift_schemas/main/drift_schema_v10.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v10.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v10.json
diff --git a/mobile/drift_schemas/main/drift_schema_v11.json b/mobile/packages/data/drift_schemas/main/drift_schema_v11.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v11.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v11.json
diff --git a/mobile/drift_schemas/main/drift_schema_v12.json b/mobile/packages/data/drift_schemas/main/drift_schema_v12.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v12.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v12.json
diff --git a/mobile/drift_schemas/main/drift_schema_v13.json b/mobile/packages/data/drift_schemas/main/drift_schema_v13.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v13.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v13.json
diff --git a/mobile/drift_schemas/main/drift_schema_v14.json b/mobile/packages/data/drift_schemas/main/drift_schema_v14.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v14.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v14.json
diff --git a/mobile/drift_schemas/main/drift_schema_v15.json b/mobile/packages/data/drift_schemas/main/drift_schema_v15.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v15.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v15.json
diff --git a/mobile/drift_schemas/main/drift_schema_v16.json b/mobile/packages/data/drift_schemas/main/drift_schema_v16.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v16.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v16.json
diff --git a/mobile/drift_schemas/main/drift_schema_v17.json b/mobile/packages/data/drift_schemas/main/drift_schema_v17.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v17.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v17.json
diff --git a/mobile/drift_schemas/main/drift_schema_v18.json b/mobile/packages/data/drift_schemas/main/drift_schema_v18.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v18.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v18.json
diff --git a/mobile/drift_schemas/main/drift_schema_v19.json b/mobile/packages/data/drift_schemas/main/drift_schema_v19.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v19.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v19.json
diff --git a/mobile/drift_schemas/main/drift_schema_v2.json b/mobile/packages/data/drift_schemas/main/drift_schema_v2.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v2.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v2.json
diff --git a/mobile/drift_schemas/main/drift_schema_v20.json b/mobile/packages/data/drift_schemas/main/drift_schema_v20.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v20.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v20.json
diff --git a/mobile/drift_schemas/main/drift_schema_v21.json b/mobile/packages/data/drift_schemas/main/drift_schema_v21.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v21.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v21.json
diff --git a/mobile/drift_schemas/main/drift_schema_v22.json b/mobile/packages/data/drift_schemas/main/drift_schema_v22.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v22.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v22.json
diff --git a/mobile/drift_schemas/main/drift_schema_v23.json b/mobile/packages/data/drift_schemas/main/drift_schema_v23.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v23.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v23.json
diff --git a/mobile/drift_schemas/main/drift_schema_v24.json b/mobile/packages/data/drift_schemas/main/drift_schema_v24.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v24.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v24.json
diff --git a/mobile/drift_schemas/main/drift_schema_v25.json b/mobile/packages/data/drift_schemas/main/drift_schema_v25.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v25.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v25.json
diff --git a/mobile/drift_schemas/main/drift_schema_v26.json b/mobile/packages/data/drift_schemas/main/drift_schema_v26.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v26.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v26.json
diff --git a/mobile/drift_schemas/main/drift_schema_v27.json b/mobile/packages/data/drift_schemas/main/drift_schema_v27.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v27.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v27.json
diff --git a/mobile/drift_schemas/main/drift_schema_v28.json b/mobile/packages/data/drift_schemas/main/drift_schema_v28.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v28.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v28.json
diff --git a/mobile/drift_schemas/main/drift_schema_v29.json b/mobile/packages/data/drift_schemas/main/drift_schema_v29.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v29.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v29.json
diff --git a/mobile/drift_schemas/main/drift_schema_v3.json b/mobile/packages/data/drift_schemas/main/drift_schema_v3.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v3.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v3.json
diff --git a/mobile/drift_schemas/main/drift_schema_v30.json b/mobile/packages/data/drift_schemas/main/drift_schema_v30.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v30.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v30.json
diff --git a/mobile/drift_schemas/main/drift_schema_v31.json b/mobile/packages/data/drift_schemas/main/drift_schema_v31.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v31.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v31.json
diff --git a/mobile/drift_schemas/main/drift_schema_v4.json b/mobile/packages/data/drift_schemas/main/drift_schema_v4.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v4.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v4.json
diff --git a/mobile/drift_schemas/main/drift_schema_v5.json b/mobile/packages/data/drift_schemas/main/drift_schema_v5.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v5.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v5.json
diff --git a/mobile/drift_schemas/main/drift_schema_v6.json b/mobile/packages/data/drift_schemas/main/drift_schema_v6.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v6.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v6.json
diff --git a/mobile/drift_schemas/main/drift_schema_v7.json b/mobile/packages/data/drift_schemas/main/drift_schema_v7.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v7.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v7.json
diff --git a/mobile/drift_schemas/main/drift_schema_v8.json b/mobile/packages/data/drift_schemas/main/drift_schema_v8.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v8.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v8.json
diff --git a/mobile/drift_schemas/main/drift_schema_v9.json b/mobile/packages/data/drift_schemas/main/drift_schema_v9.json
similarity index 100%
rename from mobile/drift_schemas/main/drift_schema_v9.json
rename to mobile/packages/data/drift_schemas/main/drift_schema_v9.json
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/packages/data/lib/db/database.dart
similarity index 100%
rename from mobile/lib/infrastructure/repositories/db.repository.dart
rename to mobile/packages/data/lib/db/database.dart
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/packages/data/lib/db/database.steps.dart
similarity index 100%
rename from mobile/lib/infrastructure/repositories/db.repository.steps.dart
rename to mobile/packages/data/lib/db/database.steps.dart
diff --git a/mobile/lib/infrastructure/repositories/logger_db.repository.dart b/mobile/packages/data/lib/db/logger.dart
similarity index 100%
rename from mobile/lib/infrastructure/repositories/logger_db.repository.dart
rename to mobile/packages/data/lib/db/logger.dart
diff --git a/mobile/lib/infrastructure/repositories/people.repository.dart b/mobile/packages/data/lib/db/person.dart
similarity index 100%
rename from mobile/lib/infrastructure/repositories/people.repository.dart
rename to mobile/packages/data/lib/db/person.dart
diff --git a/mobile/lib/infrastructure/entities/asset_edit.entity.dart b/mobile/packages/data/lib/db/table/asset_edit.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/asset_edit.entity.dart
rename to mobile/packages/data/lib/db/table/asset_edit.dart
diff --git a/mobile/lib/infrastructure/entities/asset_face.entity.dart b/mobile/packages/data/lib/db/table/asset_face.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/asset_face.entity.dart
rename to mobile/packages/data/lib/db/table/asset_face.dart
diff --git a/mobile/lib/infrastructure/entities/asset_ocr.entity.dart b/mobile/packages/data/lib/db/table/asset_ocr.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/asset_ocr.entity.dart
rename to mobile/packages/data/lib/db/table/asset_ocr.dart
diff --git a/mobile/lib/infrastructure/entities/auth_user.entity.dart b/mobile/packages/data/lib/db/table/auth_user.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/auth_user.entity.dart
rename to mobile/packages/data/lib/db/table/auth_user.dart
diff --git a/mobile/lib/infrastructure/entities/exif.entity.dart b/mobile/packages/data/lib/db/table/exif.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/exif.entity.dart
rename to mobile/packages/data/lib/db/table/exif.dart
diff --git a/mobile/lib/infrastructure/entities/local_album.entity.dart b/mobile/packages/data/lib/db/table/local_album.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/local_album.entity.dart
rename to mobile/packages/data/lib/db/table/local_album.dart
diff --git a/mobile/lib/infrastructure/entities/local_album_asset.entity.dart b/mobile/packages/data/lib/db/table/local_album_asset.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/local_album_asset.entity.dart
rename to mobile/packages/data/lib/db/table/local_album_asset.dart
diff --git a/mobile/lib/infrastructure/entities/local_asset.entity.dart b/mobile/packages/data/lib/db/table/local_asset.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/local_asset.entity.dart
rename to mobile/packages/data/lib/db/table/local_asset.dart
diff --git a/mobile/lib/infrastructure/entities/log.entity.dart b/mobile/packages/data/lib/db/table/log.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/log.entity.dart
rename to mobile/packages/data/lib/db/table/log.dart
diff --git a/mobile/lib/infrastructure/entities/memory.entity.dart b/mobile/packages/data/lib/db/table/memory.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/memory.entity.dart
rename to mobile/packages/data/lib/db/table/memory.dart
diff --git a/mobile/lib/infrastructure/entities/memory_asset.entity.dart b/mobile/packages/data/lib/db/table/memory_asset.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/memory_asset.entity.dart
rename to mobile/packages/data/lib/db/table/memory_asset.dart
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/packages/data/lib/db/table/merged_asset.drift
similarity index 100%
rename from mobile/lib/infrastructure/entities/merged_asset.drift
rename to mobile/packages/data/lib/db/table/merged_asset.drift
diff --git a/mobile/lib/infrastructure/entities/partner.entity.dart b/mobile/packages/data/lib/db/table/partner.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/partner.entity.dart
rename to mobile/packages/data/lib/db/table/partner.dart
diff --git a/mobile/lib/infrastructure/entities/person.entity.dart b/mobile/packages/data/lib/db/table/person.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/person.entity.dart
rename to mobile/packages/data/lib/db/table/person.dart
diff --git a/mobile/lib/infrastructure/entities/remote_album.entity.dart b/mobile/packages/data/lib/db/table/remote_album.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/remote_album.entity.dart
rename to mobile/packages/data/lib/db/table/remote_album.dart
diff --git a/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart b/mobile/packages/data/lib/db/table/remote_album_asset.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/remote_album_asset.entity.dart
rename to mobile/packages/data/lib/db/table/remote_album_asset.dart
diff --git a/mobile/lib/infrastructure/entities/remote_album_user.entity.dart b/mobile/packages/data/lib/db/table/remote_album_user.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/remote_album_user.entity.dart
rename to mobile/packages/data/lib/db/table/remote_album_user.dart
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.dart b/mobile/packages/data/lib/db/table/remote_asset.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/remote_asset.entity.dart
rename to mobile/packages/data/lib/db/table/remote_asset.dart
diff --git a/mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.dart b/mobile/packages/data/lib/db/table/remote_asset_cloud_id.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.dart
rename to mobile/packages/data/lib/db/table/remote_asset_cloud_id.dart
diff --git a/mobile/lib/infrastructure/entities/settings.entity.dart b/mobile/packages/data/lib/db/table/settings.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/settings.entity.dart
rename to mobile/packages/data/lib/db/table/settings.dart
diff --git a/mobile/lib/infrastructure/entities/stack.entity.dart b/mobile/packages/data/lib/db/table/stack.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/stack.entity.dart
rename to mobile/packages/data/lib/db/table/stack.dart
diff --git a/mobile/lib/infrastructure/entities/store.entity.dart b/mobile/packages/data/lib/db/table/store.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/store.entity.dart
rename to mobile/packages/data/lib/db/table/store.dart
diff --git a/mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart b/mobile/packages/data/lib/db/table/trashed_local_asset.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart
rename to mobile/packages/data/lib/db/table/trashed_local_asset.dart
diff --git a/mobile/lib/infrastructure/entities/user.entity.dart b/mobile/packages/data/lib/db/table/user.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/user.entity.dart
rename to mobile/packages/data/lib/db/table/user.dart
diff --git a/mobile/lib/infrastructure/entities/user_metadata.entity.dart b/mobile/packages/data/lib/db/table/user_metadata.dart
similarity index 100%
rename from mobile/lib/infrastructure/entities/user_metadata.entity.dart
rename to mobile/packages/data/lib/db/table/user_metadata.dart
diff --git a/mobile/lib/infrastructure/utils/asset.mixin.dart b/mobile/packages/data/lib/db/util/asset_mixin.dart
similarity index 100%
rename from mobile/lib/infrastructure/utils/asset.mixin.dart
rename to mobile/packages/data/lib/db/util/asset_mixin.dart
diff --git a/mobile/lib/infrastructure/utils/drift_default.mixin.dart b/mobile/packages/data/lib/db/util/defaults_mixin.dart
similarity index 100%
rename from mobile/lib/infrastructure/utils/drift_default.mixin.dart
rename to mobile/packages/data/lib/db/util/defaults_mixin.dart
diff --git a/mobile/lib/infrastructure/utils/exif.converter.dart b/mobile/packages/data/lib/db/util/exif_converter.dart
similarity index 100%
rename from mobile/lib/infrastructure/utils/exif.converter.dart
rename to mobile/packages/data/lib/db/util/exif_converter.dart
diff --git a/mobile/lib/domain/models/album/album.model.dart b/mobile/packages/data/lib/model/album/album.dart
similarity index 100%
rename from mobile/lib/domain/models/album/album.model.dart
rename to mobile/packages/data/lib/model/album/album.dart
diff --git a/mobile/lib/domain/models/album/local_album.model.dart b/mobile/packages/data/lib/model/album/local_album.dart
similarity index 100%
rename from mobile/lib/domain/models/album/local_album.model.dart
rename to mobile/packages/data/lib/model/album/local_album.dart
diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/packages/data/lib/model/asset/base_asset.dart
similarity index 100%
rename from mobile/lib/domain/models/asset/base_asset.model.dart
rename to mobile/packages/data/lib/model/asset/base_asset.dart
diff --git a/mobile/lib/domain/models/asset/local_asset.model.dart b/mobile/packages/data/lib/model/asset/local_asset.dart
similarity index 100%
rename from mobile/lib/domain/models/asset/local_asset.model.dart
rename to mobile/packages/data/lib/model/asset/local_asset.dart
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/packages/data/lib/model/asset/remote_asset.dart
similarity index 100%
rename from mobile/lib/domain/models/asset/remote_asset.model.dart
rename to mobile/packages/data/lib/model/asset/remote_asset.dart
diff --git a/mobile/lib/domain/models/asset_edit.model.dart b/mobile/packages/data/lib/model/asset_edit.dart
similarity index 100%
rename from mobile/lib/domain/models/asset_edit.model.dart
rename to mobile/packages/data/lib/model/asset_edit.dart
diff --git a/mobile/lib/domain/models/exif.model.dart b/mobile/packages/data/lib/model/exif.dart
similarity index 100%
rename from mobile/lib/domain/models/exif.model.dart
rename to mobile/packages/data/lib/model/exif.dart
diff --git a/mobile/lib/domain/models/log.model.dart b/mobile/packages/data/lib/model/log.dart
similarity index 100%
rename from mobile/lib/domain/models/log.model.dart
rename to mobile/packages/data/lib/model/log.dart
diff --git a/mobile/lib/domain/models/memory.model.dart b/mobile/packages/data/lib/model/memory.dart
similarity index 100%
rename from mobile/lib/domain/models/memory.model.dart
rename to mobile/packages/data/lib/model/memory.dart
diff --git a/mobile/lib/domain/models/person.model.dart b/mobile/packages/data/lib/model/person.dart
similarity index 100%
rename from mobile/lib/domain/models/person.model.dart
rename to mobile/packages/data/lib/model/person.dart
diff --git a/mobile/lib/domain/models/user.model.dart b/mobile/packages/data/lib/model/user/user.dart
similarity index 100%
rename from mobile/lib/domain/models/user.model.dart
rename to mobile/packages/data/lib/model/user/user.dart
diff --git a/mobile/lib/domain/models/user_metadata.model.dart b/mobile/packages/data/lib/model/user/user_metadata.dart
similarity index 100%
rename from mobile/lib/domain/models/user_metadata.model.dart
rename to mobile/packages/data/lib/model/user/user_metadata.dart
diff --git a/mobile/lib/repositories/api.repository.dart b/mobile/packages/data/lib/server/api_repository.dart
similarity index 100%
rename from mobile/lib/repositories/api.repository.dart
rename to mobile/packages/data/lib/server/api_repository.dart
diff --git a/mobile/lib/constants/errors.dart b/mobile/packages/data/lib/server/errors.dart
similarity index 100%
rename from mobile/lib/constants/errors.dart
rename to mobile/packages/data/lib/server/errors.dart
diff --git a/mobile/lib/repositories/person_api.repository.dart b/mobile/packages/data/lib/server/person.dart
similarity index 100%
rename from mobile/lib/repositories/person_api.repository.dart
rename to mobile/packages/data/lib/server/person.dart
diff --git a/mobile/lib/extensions/object_extensions.dart b/mobile/packages/data/lib/util/object.dart
similarity index 100%
rename from mobile/lib/extensions/object_extensions.dart
rename to mobile/packages/data/lib/util/object.dart