diff --git a/cpp/ql/src/experimental/crypto/inventory/AllAsymmetricAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/AllAsymmetricAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/AllAsymmetricAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/AllAsymmetricAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/AllCryptoAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/AllCryptoAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/AllCryptoAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/AllCryptoAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/AsymmetricEncryptionAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/AsymmetricEncryptionAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/AsymmetricPaddingAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/AsymmetricPaddingAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/AsymmetricPaddingAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/AsymmetricPaddingAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/AuthenticatedEncryptionAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/AuthenticatedEncryptionAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/BlockModeAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/BlockModeAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/BlockModeAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/BlockModeAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/BlockModeKnownIVsOrNonces.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/BlockModeKnownIVsOrNonces.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/BlockModeKnownIVsOrNonces.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/BlockModeKnownIVsOrNonces.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/BlockModeUnknownIVsOrNonces.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/BlockModeUnknownIVsOrNonces.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/EllipticCurveAlgorithmSize.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/EllipticCurveAlgorithmSize.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/EllipticCurveAlgorithmSize.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/EllipticCurveAlgorithmSize.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/EllipticCurveAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/EllipticCurveAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/EllipticCurveAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/EllipticCurveAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/HashingAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/HashingAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/HashingAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/HashingAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/KeyExchangeAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/KeyExchangeAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/KeyExchangeAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/KeyExchangeAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/KnownAsymmetricKeyGeneration.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/KnownAsymmetricKeyGeneration.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/KnownAsymmetricKeyGeneration.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/KnownAsymmetricKeyGeneration.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/SigningAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/SigningAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/SigningAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/SigningAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/SymmetricEncryptionAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/SymmetricEncryptionAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/SymmetricEncryptionAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/SymmetricEncryptionAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/SymmetricPaddingAlgorithms.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/SymmetricPaddingAlgorithms.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/SymmetricPaddingAlgorithms.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/SymmetricPaddingAlgorithms.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/UnknownAsymmetricKeyGeneration.ql b/cpp/ql/src/experimental/crypto/inventory/new_models/UnknownAsymmetricKeyGeneration.ql
similarity index 100%
rename from cpp/ql/src/experimental/crypto/inventory/UnknownAsymmetricKeyGeneration.ql
rename to cpp/ql/src/experimental/crypto/inventory/new_models/UnknownAsymmetricKeyGeneration.ql
diff --git a/cpp/ql/src/experimental/crypto/inventory/old_models/readme.md b/cpp/ql/src/experimental/crypto/inventory/old_models/readme.md
new file mode 100644
index 00000000000..c338bbc52e7
--- /dev/null
+++ b/cpp/ql/src/experimental/crypto/inventory/old_models/readme.md
@@ -0,0 +1 @@
+No existing 'old models' for inventories
\ No newline at end of file