7 files changed, 8 insertions, 10 deletions
diff --git a/packages/server/src/attestation/verifications/tpm/verifyTPM.ts b/packages/server/src/attestation/verifications/tpm/verifyTPM.ts
index fc549ff..50eb0b0 100644
--- a/packages/server/src/attestation/verifications/tpm/verifyTPM.ts
+++ b/packages/server/src/attestation/verifications/tpm/verifyTPM.ts
@@ -15,7 +15,7 @@ import toHash from '../../../helpers/toHash';
 import convertX509CertToPEM from '../../../helpers/convertX509CertToPEM';
 import getCertificateInfo from '../../../helpers/getCertificateInfo';
 import verifySignature from '../../../helpers/verifySignature';
-import MetadataService from '../../../metadata/metadataService';
+import MetadataService from '../../../services/metadataService';
 import verifyAttestationWithMetadata from '../../../metadata/verifyAttestationWithMetadata';
 
 import { TPM_ECC_CURVE, TPM_MANUFACTURERS } from './constants';
@@ -281,9 +281,7 @@ export default async function verifyTPM(options: Options): Promise<boolean> {
 /**
  * Contain logic for pulling TPM-specific values out of subjectAlternativeName extension
  */
-function getTcgAtTpmValues(
-  root: Name,
-): {
+function getTcgAtTpmValues(root: Name): {
   tcgAtTpmManufacturer?: string;
   tcgAtTpmModel?: string;
   tcgAtTpmVersion?: string;
diff --git a/packages/server/src/attestation/verifications/verifyAndroidKey.ts b/packages/server/src/attestation/verifications/verifyAndroidKey.ts
index f917fa5..e137125 100644
--- a/packages/server/src/attestation/verifications/verifyAndroidKey.ts
+++ b/packages/server/src/attestation/verifications/verifyAndroidKey.ts
@@ -6,7 +6,7 @@ import type { AttestationStatement } from '../../helpers/decodeAttestationObject
 import convertX509CertToPEM from '../../helpers/convertX509CertToPEM';
 import verifySignature from '../../helpers/verifySignature';
 import convertCOSEtoPKCS, { COSEALGHASH } from '../../helpers/convertCOSEtoPKCS';
-import MetadataService from '../../metadata/metadataService';
+import MetadataService from '../../services/metadataService';
 import verifyAttestationWithMetadata from '../../metadata/verifyAttestationWithMetadata';
 
 type Options = {
diff --git a/packages/server/src/attestation/verifications/verifyAndroidSafetyNet.ts b/packages/server/src/attestation/verifications/verifyAndroidSafetyNet.ts
index 6c0a5c8..11dec6b 100644
--- a/packages/server/src/attestation/verifications/verifyAndroidSafetyNet.ts
+++ b/packages/server/src/attestation/verifications/verifyAndroidSafetyNet.ts
@@ -7,7 +7,7 @@ import verifySignature from '../../helpers/verifySignature';
 import getCertificateInfo from '../../helpers/getCertificateInfo';
 import validateCertificatePath from '../../helpers/validateCertificatePath';
 import convertX509CertToPEM from '../../helpers/convertX509CertToPEM';
-import MetadataService from '../../metadata/metadataService';
+import MetadataService from '../../services/metadataService';
 import verifyAttestationWithMetadata from '../../metadata/verifyAttestationWithMetadata';
 
 type Options = {
diff --git a/packages/server/src/attestation/verifications/verifyPacked.ts b/packages/server/src/attestation/verifications/verifyPacked.ts
index 3068bbb..077e54d 100644
--- a/packages/server/src/attestation/verifications/verifyPacked.ts
+++ b/packages/server/src/attestation/verifications/verifyPacked.ts
@@ -15,7 +15,7 @@ import convertX509CertToPEM from '../../helpers/convertX509CertToPEM';
 import getCertificateInfo from '../../helpers/getCertificateInfo';
 import verifySignature from '../../helpers/verifySignature';
 import decodeCredentialPublicKey from '../../helpers/decodeCredentialPublicKey';
-import MetadataService from '../../metadata/metadataService';
+import MetadataService from '../../services/metadataService';
 import verifyAttestationWithMetadata from '../../metadata/verifyAttestationWithMetadata';
 
 type Options = {
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 1a24c63..cad0180 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -6,7 +6,7 @@ import generateAttestationOptions from './attestation/generateAttestationOptions
 import verifyAttestationResponse from './attestation/verifyAttestationResponse';
 import generateAssertionOptions from './assertion/generateAssertionOptions';
 import verifyAssertionResponse from './assertion/verifyAssertionResponse';
-import MetadataService from './metadata/metadataService';
+import MetadataService from './services/metadataService';
 
 export {
   generateAttestationOptions,
diff --git a/packages/server/src/metadata/verifyAttestationWithMetadata.ts b/packages/server/src/metadata/verifyAttestationWithMetadata.ts
index 63ea1f6..3ef04a9 100644
--- a/packages/server/src/metadata/verifyAttestationWithMetadata.ts
+++ b/packages/server/src/metadata/verifyAttestationWithMetadata.ts
@@ -1,6 +1,6 @@
 import { Base64URLString } from '@simplewebauthn/typescript-types';
 
-import { MetadataStatement } from './metadataService';
+import { MetadataStatement } from '../services/metadataService';
 import { FIDO_METADATA_AUTH_ALG_TO_COSE } from '../helpers/constants';
 import convertX509CertToPEM from '../helpers/convertX509CertToPEM';
 import validateCertificatePath from '../helpers/validateCertificatePath';
diff --git a/packages/server/src/metadata/metadataService.ts b/packages/server/src/services/metadataService.ts
index dc48f28..3cec5e3 100644
--- a/packages/server/src/metadata/metadataService.ts
+++ b/packages/server/src/services/metadataService.ts
@@ -11,7 +11,7 @@ import convertAAGUIDToString from '../helpers/convertAAGUIDToString';
 // TODO: Re-enable this once we figure out logging
 // import { log } from '../helpers/logging';
 
-import parseJWT from './parseJWT';
+import parseJWT from '../metadata/parseJWT';
 
 // Cached WebAuthn metadata statements
 type CachedAAGUID = {