diff --git a/webauthn-authenticator-rs/src/ctap2/ctap21.rs b/webauthn-authenticator-rs/src/ctap2/ctap21.rs
index 35bb2819..c182dd20 100644
--- a/webauthn-authenticator-rs/src/ctap2/ctap21.rs
+++ b/webauthn-authenticator-rs/src/ctap2/ctap21.rs
@@ -1,26 +1,28 @@
-use std::ops::{Deref, DerefMut};
-
-#[cfg(any(all(doc, not(doctest)), feature = "ctap2-management"))]
-use webauthn_rs_proto::UserVerificationPolicy;
-
-use crate::{error::WebauthnCError, transport::Token, ui::UiCallback};
-
-use super::{
-    commands::GetInfoResponse, ctap21_bio::BiometricAuthenticatorInfo,
-    ctap21_cred::CredentialManagementAuthenticatorInfo, internal::CtapAuthenticatorVersion,
-    Ctap20Authenticator,
+use crate::{
+    ctap2::{
+        commands::GetInfoResponse, ctap21_bio::BiometricAuthenticatorInfo,
+        ctap21_cred::CredentialManagementAuthenticatorInfo, internal::CtapAuthenticatorVersion,
+        Ctap20Authenticator,
+    },
+    transport::Token,
+    ui::UiCallback,
 };
-
 #[cfg(any(all(doc, not(doctest)), feature = "ctap2-management"))]
-use super::{
-    commands::{
-        BioEnrollmentRequest, ConfigRequest, ConfigSubCommand, CredSubCommand,
-        CredentialManagementRequest, Permissions, PublicKeyCredentialDescriptorCM,
-        SetMinPinLengthParams, UserCM,
+use crate::{
+    ctap2::{
+        commands::{
+            BioEnrollmentRequest, ConfigRequest, ConfigSubCommand, CredSubCommand,
+            CredentialManagementRequest, Permissions, PublicKeyCredentialDescriptorCM,
+            SetMinPinLengthParams, UserCM,
+        },
+        ctap21_cred::CredentialManagementAuthenticatorSupport,
+        CredentialManagementAuthenticator,
     },
-    ctap21_cred::CredentialManagementAuthenticatorSupport,
-    CredentialManagementAuthenticator,
+    error::WebauthnCError,
 };
+use std::ops::{Deref, DerefMut};
+#[cfg(any(all(doc, not(doctest)), feature = "ctap2-management"))]
+use webauthn_rs_proto::UserVerificationPolicy;
 
 /// CTAP 2.1 protocol implementation.
 ///