1 files changed, 30 insertions, 29 deletions
diff --git a/openpgp/src/cert/prelude.rs b/openpgp/src/cert/prelude.rs
index 2b1cb2d0..f79f8714 100644
--- a/openpgp/src/cert/prelude.rs
+++ b/openpgp/src/cert/prelude.rs
@@ -18,43 +18,44 @@ pub use crate::cert::{
     CertBuilder,
     CertParser,
     CertRevocationBuilder,
-    CertValidator,
-    CertValidity,
     CipherSuite,
-    KeyringValidator,
-    KeyringValidity,
     Preferences as _,
     SubkeyRevocationBuilder,
     UserAttributeRevocationBuilder,
     UserIDRevocationBuilder,
     ValidCert,
     amalgamation::ComponentAmalgamation,
+    amalgamation::ComponentAmalgamationIter,
+    amalgamation::UnknownComponentAmalgamation,
+    amalgamation::UnknownComponentAmalgamationIter,
+    amalgamation::UserAttributeAmalgamation,
+    amalgamation::UserAttributeAmalgamationIter,
+    amalgamation::UserIDAmalgamation,
+    amalgamation::UserIDAmalgamationIter,
     amalgamation::ValidAmalgamation as _,
     amalgamation::ValidComponentAmalgamation,
+    amalgamation::ValidComponentAmalgamationIter,
+    amalgamation::ValidUserAttributeAmalgamation,
+    amalgamation::ValidUserAttributeAmalgamationIter,
+    amalgamation::ValidUserIDAmalgamation,
+    amalgamation::ValidUserIDAmalgamationIter,
     amalgamation::ValidateAmalgamation as _,
-    components::ComponentBundle,
-    components::ComponentBundleIter,
-    components::ComponentIter,
-    components::KeyBundle,
-    components::KeyIter,
-    components::PrimaryKeyBundle,
-    components::SubkeyBundle,
-    components::UnfilteredKeyBundleIter,
-    components::UnknownBundle,
-    components::UnknownBundleIter,
-    components::UserAttributeBundle,
-    components::UserAttributeBundleIter,
-    components::UserIDBundle,
-    components::UserIDBundleIter,
-    components::ValidComponentIter,
-    components::ValidKeyIter,
-    key_amalgamation::ErasedKeyAmalgamation,
-    key_amalgamation::KeyAmalgamation,
-    key_amalgamation::Primary as _,
-    key_amalgamation::PrimaryKeyAmalgamation,
-    key_amalgamation::SubordinateKeyAmalgamation,
-    key_amalgamation::ValidErasedKeyAmalgamation,
-    key_amalgamation::ValidKeyAmalgamation,
-    key_amalgamation::ValidPrimaryKeyAmalgamation,
-    key_amalgamation::ValidSubordinateKeyAmalgamation,
+    amalgamation::key::ErasedKeyAmalgamation,
+    amalgamation::key::KeyAmalgamation,
+    amalgamation::key::KeyAmalgamationIter,
+    amalgamation::key::PrimaryKey as _,
+    amalgamation::key::PrimaryKeyAmalgamation,
+    amalgamation::key::SubordinateKeyAmalgamation,
+    amalgamation::key::ValidErasedKeyAmalgamation,
+    amalgamation::key::ValidKeyAmalgamation,
+    amalgamation::key::ValidKeyAmalgamationIter,
+    amalgamation::key::ValidPrimaryKeyAmalgamation,
+    amalgamation::key::ValidSubordinateKeyAmalgamation,
+    bundle::ComponentBundle,
+    bundle::KeyBundle,
+    bundle::PrimaryKeyBundle,
+    bundle::SubkeyBundle,
+    bundle::UnknownBundle,
+    bundle::UserAttributeBundle,
+    bundle::UserIDBundle,
 };