diff --git a/book/source/drawio/PKESKv3-decryption.drawio b/book/assets/drawio/PKESKv3-decryption.drawio
similarity index 100%
rename from book/source/drawio/PKESKv3-decryption.drawio
rename to book/assets/drawio/PKESKv3-decryption.drawio
diff --git a/book/source/drawio/PKESKv3-decryption.svg b/book/assets/drawio/PKESKv3-decryption.svg
similarity index 100%
rename from book/source/drawio/PKESKv3-decryption.svg
rename to book/assets/drawio/PKESKv3-decryption.svg
diff --git a/book/source/drawio/PKESKv6-decryption.drawio b/book/assets/drawio/PKESKv6-decryption.drawio
similarity index 100%
rename from book/source/drawio/PKESKv6-decryption.drawio
rename to book/assets/drawio/PKESKv6-decryption.drawio
diff --git a/book/source/drawio/PKESKv6-decryption.svg b/book/assets/drawio/PKESKv6-decryption.svg
similarity index 100%
rename from book/source/drawio/PKESKv6-decryption.svg
rename to book/assets/drawio/PKESKv6-decryption.svg
diff --git a/book/source/drawio/SEIPDv1-PKESK.drawio b/book/assets/drawio/SEIPDv1-PKESK.drawio
similarity index 100%
rename from book/source/drawio/SEIPDv1-PKESK.drawio
rename to book/assets/drawio/SEIPDv1-PKESK.drawio
diff --git a/book/source/drawio/SEIPDv1-PKESK.svg b/book/assets/drawio/SEIPDv1-PKESK.svg
similarity index 100%
rename from book/source/drawio/SEIPDv1-PKESK.svg
rename to book/assets/drawio/SEIPDv1-PKESK.svg
diff --git a/book/source/drawio/SEIPDv1-decryption.drawio b/book/assets/drawio/SEIPDv1-decryption.drawio
similarity index 100%
rename from book/source/drawio/SEIPDv1-decryption.drawio
rename to book/assets/drawio/SEIPDv1-decryption.drawio
diff --git a/book/source/drawio/SEIPDv1-decryption.svg b/book/assets/drawio/SEIPDv1-decryption.svg
similarity index 100%
rename from book/source/drawio/SEIPDv1-decryption.svg
rename to book/assets/drawio/SEIPDv1-decryption.svg
diff --git a/book/source/drawio/SEIPDv2-PKESK.drawio b/book/assets/drawio/SEIPDv2-PKESK.drawio
similarity index 100%
rename from book/source/drawio/SEIPDv2-PKESK.drawio
rename to book/assets/drawio/SEIPDv2-PKESK.drawio
diff --git a/book/source/drawio/SEIPDv2-PKESK.svg b/book/assets/drawio/SEIPDv2-PKESK.svg
similarity index 100%
rename from book/source/drawio/SEIPDv2-PKESK.svg
rename to book/assets/drawio/SEIPDv2-PKESK.svg
diff --git a/book/source/drawio/SEIPDv2-decryption-chunks.drawio b/book/assets/drawio/SEIPDv2-decryption-chunks.drawio
similarity index 100%
rename from book/source/drawio/SEIPDv2-decryption-chunks.drawio
rename to book/assets/drawio/SEIPDv2-decryption-chunks.drawio
diff --git a/book/source/drawio/SEIPDv2-decryption-chunks.svg b/book/assets/drawio/SEIPDv2-decryption-chunks.svg
similarity index 100%
rename from book/source/drawio/SEIPDv2-decryption-chunks.svg
rename to book/assets/drawio/SEIPDv2-decryption-chunks.svg
diff --git a/book/source/drawio/SEIPDv2-decryption-mk-derivation.drawio b/book/assets/drawio/SEIPDv2-decryption-mk-derivation.drawio
similarity index 100%
rename from book/source/drawio/SEIPDv2-decryption-mk-derivation.drawio
rename to book/assets/drawio/SEIPDv2-decryption-mk-derivation.drawio
diff --git a/book/source/drawio/SEIPDv2-decryption-mk-derivation.svg b/book/assets/drawio/SEIPDv2-decryption-mk-derivation.svg
similarity index 100%
rename from book/source/drawio/SEIPDv2-decryption-mk-derivation.svg
rename to book/assets/drawio/SEIPDv2-decryption-mk-derivation.svg
diff --git a/book/source/drawio/SKESKv4-decryption.drawio b/book/assets/drawio/SKESKv4-decryption.drawio
similarity index 100%
rename from book/source/drawio/SKESKv4-decryption.drawio
rename to book/assets/drawio/SKESKv4-decryption.drawio
diff --git a/book/source/drawio/SKESKv4-decryption.svg b/book/assets/drawio/SKESKv4-decryption.svg
similarity index 100%
rename from book/source/drawio/SKESKv4-decryption.svg
rename to book/assets/drawio/SKESKv4-decryption.svg
diff --git a/book/source/drawio/SKESKv6-decryption.drawio b/book/assets/drawio/SKESKv6-decryption.drawio
similarity index 100%
rename from book/source/drawio/SKESKv6-decryption.drawio
rename to book/assets/drawio/SKESKv6-decryption.drawio
diff --git a/book/source/drawio/SKESKv6-decryption.svg b/book/assets/drawio/SKESKv6-decryption.svg
similarity index 100%
rename from book/source/drawio/SKESKv6-decryption.svg
rename to book/assets/drawio/SKESKv6-decryption.svg
diff --git a/book/source/drawio/attribute-shadowing.drawio b/book/assets/drawio/attribute-shadowing.drawio
similarity index 100%
rename from book/source/drawio/attribute-shadowing.drawio
rename to book/assets/drawio/attribute-shadowing.drawio
diff --git a/book/source/drawio/attribute-shadowing.png b/book/assets/drawio/attribute-shadowing.png
similarity index 100%
rename from book/source/drawio/attribute-shadowing.png
rename to book/assets/drawio/attribute-shadowing.png
diff --git a/book/source/drawio/cert-validity-key-expiration.drawio b/book/assets/drawio/cert-validity-key-expiration.drawio
similarity index 100%
rename from book/source/drawio/cert-validity-key-expiration.drawio
rename to book/assets/drawio/cert-validity-key-expiration.drawio
diff --git a/book/source/drawio/cert-validity-key-expiration.png b/book/assets/drawio/cert-validity-key-expiration.png
similarity index 100%
rename from book/source/drawio/cert-validity-key-expiration.png
rename to book/assets/drawio/cert-validity-key-expiration.png
diff --git a/book/source/drawio/cert-validity-simple.drawio b/book/assets/drawio/cert-validity-simple.drawio
similarity index 100%
rename from book/source/drawio/cert-validity-simple.drawio
rename to book/assets/drawio/cert-validity-simple.drawio
diff --git a/book/source/drawio/cert-validity-simple.png b/book/assets/drawio/cert-validity-simple.png
similarity index 100%
rename from book/source/drawio/cert-validity-simple.png
rename to book/assets/drawio/cert-validity-simple.png
diff --git a/book/source/drawio/cert-validity-subkey.drawio b/book/assets/drawio/cert-validity-subkey.drawio
similarity index 100%
rename from book/source/drawio/cert-validity-subkey.drawio
rename to book/assets/drawio/cert-validity-subkey.drawio
diff --git a/book/source/drawio/cert-validity-subkey.png b/book/assets/drawio/cert-validity-subkey.png
similarity index 100%
rename from book/source/drawio/cert-validity-subkey.png
rename to book/assets/drawio/cert-validity-subkey.png
diff --git a/book/source/drawio/dk-attributes-and-shadowing.drawio b/book/assets/drawio/dk-attributes-and-shadowing.drawio
similarity index 100%
rename from book/source/drawio/dk-attributes-and-shadowing.drawio
rename to book/assets/drawio/dk-attributes-and-shadowing.drawio
diff --git a/book/source/drawio/dk-attributes-and-shadowing.png b/book/assets/drawio/dk-attributes-and-shadowing.png
similarity index 100%
rename from book/source/drawio/dk-attributes-and-shadowing.png
rename to book/assets/drawio/dk-attributes-and-shadowing.png
diff --git a/book/source/drawio/narrow-interpretation.drawio b/book/assets/drawio/narrow-interpretation.drawio
similarity index 100%
rename from book/source/drawio/narrow-interpretation.drawio
rename to book/assets/drawio/narrow-interpretation.drawio
diff --git a/book/source/drawio/narrow-interpretation.png b/book/assets/drawio/narrow-interpretation.png
similarity index 100%
rename from book/source/drawio/narrow-interpretation.png
rename to book/assets/drawio/narrow-interpretation.png
diff --git a/book/source/diag/Binding_Subkeys.svg b/book/assets/inkscape/Binding_Subkeys.svg
similarity index 100%
rename from book/source/diag/Binding_Subkeys.svg
rename to book/assets/inkscape/Binding_Subkeys.svg
diff --git a/book/source/diag/Binding_a_UserID.svg b/book/assets/inkscape/Binding_a_UserID.svg
similarity index 100%
rename from book/source/diag/Binding_a_UserID.svg
rename to book/assets/inkscape/Binding_a_UserID.svg
diff --git a/book/source/diag/Component_Key.svg b/book/assets/inkscape/Component_Key.svg
similarity index 100%
rename from book/source/diag/Component_Key.svg
rename to book/assets/inkscape/Component_Key.svg
diff --git a/book/source/diag/Components_of_an_OpenPGP_Certificate.svg b/book/assets/inkscape/Components_of_an_OpenPGP_Certificate.svg
similarity index 100%
rename from book/source/diag/Components_of_an_OpenPGP_Certificate.svg
rename to book/assets/inkscape/Components_of_an_OpenPGP_Certificate.svg
diff --git a/book/source/diag/Fingerprint.svg b/book/assets/inkscape/Fingerprint.svg
similarity index 100%
rename from book/source/diag/Fingerprint.svg
rename to book/assets/inkscape/Fingerprint.svg
diff --git a/book/source/diag/Minimal_OpenPGP_certificate.svg b/book/assets/inkscape/Minimal_OpenPGP_certificate.svg
similarity index 100%
rename from book/source/diag/Minimal_OpenPGP_certificate.svg
rename to book/assets/inkscape/Minimal_OpenPGP_certificate.svg
diff --git a/book/source/diag/OpenPGPCert_with_privatekeystore.svg b/book/assets/inkscape/OpenPGPCert_with_privatekeystore.svg
similarity index 100%
rename from book/source/diag/OpenPGPCert_with_privatekeystore.svg
rename to book/assets/inkscape/OpenPGPCert_with_privatekeystore.svg
diff --git a/book/source/diag/OpenPGP_Certificate.svg b/book/assets/inkscape/OpenPGP_Certificate.svg
similarity index 100%
rename from book/source/diag/OpenPGP_Certificate.svg
rename to book/assets/inkscape/OpenPGP_Certificate.svg
diff --git a/book/source/diag/OpenPGP_Signature_packet.svg b/book/assets/inkscape/OpenPGP_Signature_packet.svg
similarity index 100%
rename from book/source/diag/OpenPGP_Signature_packet.svg
rename to book/assets/inkscape/OpenPGP_Signature_packet.svg
diff --git a/book/source/diag/OpenPGP_Signature_packet_2.svg b/book/assets/inkscape/OpenPGP_Signature_packet_2.svg
similarity index 100%
rename from book/source/diag/OpenPGP_Signature_packet_2.svg
rename to book/assets/inkscape/OpenPGP_Signature_packet_2.svg
diff --git a/book/source/diag/Primary_key_metadata.svg b/book/assets/inkscape/Primary_key_metadata.svg
similarity index 100%
rename from book/source/diag/Primary_key_metadata.svg
rename to book/assets/inkscape/Primary_key_metadata.svg
diff --git a/book/source/diag/Signature_Creation.svg b/book/assets/inkscape/Signature_Creation.svg
similarity index 100%
rename from book/source/diag/Signature_Creation.svg
rename to book/assets/inkscape/Signature_Creation.svg
diff --git a/book/source/diag/Signature_Verification.svg b/book/assets/inkscape/Signature_Verification.svg
similarity index 100%
rename from book/source/diag/Signature_Verification.svg
rename to book/assets/inkscape/Signature_Verification.svg
diff --git a/book/source/diag/TSK.svg b/book/assets/inkscape/TSK.svg
similarity index 100%
rename from book/source/diag/TSK.svg
rename to book/assets/inkscape/TSK.svg
diff --git a/book/source/diag/asymmetric_keypair.svg b/book/assets/inkscape/asymmetric_keypair.svg
similarity index 100%
rename from book/source/diag/asymmetric_keypair.svg
rename to book/assets/inkscape/asymmetric_keypair.svg
diff --git a/book/source/diag/certificate_packet_list.svg b/book/assets/inkscape/certificate_packet_list.svg
similarity index 100%
rename from book/source/diag/certificate_packet_list.svg
rename to book/assets/inkscape/certificate_packet_list.svg
diff --git a/book/source/diag/cryptographic_keypair.svg b/book/assets/inkscape/cryptographic_keypair.svg
similarity index 100%
rename from book/source/diag/cryptographic_keypair.svg
rename to book/assets/inkscape/cryptographic_keypair.svg
diff --git a/book/source/diag/cryptographic_signature.svg b/book/assets/inkscape/cryptographic_signature.svg
similarity index 100%
rename from book/source/diag/cryptographic_signature.svg
rename to book/assets/inkscape/cryptographic_signature.svg
diff --git a/book/source/diag/diag_library_draft.svg b/book/assets/inkscape/diag_library_draft.svg
similarity index 100%
rename from book/source/diag/diag_library_draft.svg
rename to book/assets/inkscape/diag_library_draft.svg
diff --git a/book/source/diag/direct_key_signature_packet.svg b/book/assets/inkscape/direct_key_signature_packet.svg
similarity index 100%
rename from book/source/diag/direct_key_signature_packet.svg
rename to book/assets/inkscape/direct_key_signature_packet.svg
diff --git a/book/source/diag/id_card.svg b/book/assets/inkscape/id_card.svg
similarity index 100%
rename from book/source/diag/id_card.svg
rename to book/assets/inkscape/id_card.svg
diff --git a/book/source/diag/meaning_of_signatures.svg b/book/assets/inkscape/meaning_of_signatures.svg
similarity index 100%
rename from book/source/diag/meaning_of_signatures.svg
rename to book/assets/inkscape/meaning_of_signatures.svg
diff --git a/book/source/diag/passphrase_using_S2K.svg b/book/assets/inkscape/passphrase_using_S2K.svg
similarity index 100%
rename from book/source/diag/passphrase_using_S2K.svg
rename to book/assets/inkscape/passphrase_using_S2K.svg
diff --git a/book/source/diag/public-key_packet.svg b/book/assets/inkscape/public-key_packet.svg
similarity index 100%
rename from book/source/diag/public-key_packet.svg
rename to book/assets/inkscape/public-key_packet.svg
diff --git a/book/source/diag/public_key.svg b/book/assets/inkscape/public_key.svg
similarity index 100%
rename from book/source/diag/public_key.svg
rename to book/assets/inkscape/public_key.svg
diff --git a/book/source/diag/secret-key_packet.svg b/book/assets/inkscape/secret-key_packet.svg
similarity index 100%
rename from book/source/diag/secret-key_packet.svg
rename to book/assets/inkscape/secret-key_packet.svg
diff --git a/book/source/diag/subkey_binding_signatur_for_signing_sk.svg b/book/assets/inkscape/subkey_binding_signatur_for_signing_sk.svg
similarity index 100%
rename from book/source/diag/subkey_binding_signatur_for_signing_sk.svg
rename to book/assets/inkscape/subkey_binding_signatur_for_signing_sk.svg
diff --git a/book/source/diag/subkey_binding_signature.svg b/book/assets/inkscape/subkey_binding_signature.svg
similarity index 100%
rename from book/source/diag/subkey_binding_signature.svg
rename to book/assets/inkscape/subkey_binding_signature.svg
diff --git a/book/source/diag/symmetric_key.svg b/book/assets/inkscape/symmetric_key.svg
similarity index 100%
rename from book/source/diag/symmetric_key.svg
rename to book/assets/inkscape/symmetric_key.svg
diff --git a/book/source/diag/user_id_certification.svg b/book/assets/inkscape/user_id_certification.svg
similarity index 100%
rename from book/source/diag/user_id_certification.svg
rename to book/assets/inkscape/user_id_certification.svg
diff --git a/book/source/diag/with_subkeys.svg b/book/assets/inkscape/with_subkeys.svg
similarity index 100%
rename from book/source/diag/with_subkeys.svg
rename to book/assets/inkscape/with_subkeys.svg
diff --git a/book/input/09-sigtree.md b/book/assets/mermaid/09-sigtree.md
similarity index 100%
rename from book/input/09-sigtree.md
rename to book/assets/mermaid/09-sigtree.md
diff --git a/book/mermaid/sig-types.md b/book/assets/mermaid/sig-types.md
similarity index 100%
rename from book/mermaid/sig-types.md
rename to book/assets/mermaid/sig-types.md