diff --git a/MANIFEST.in b/MANIFEST.in
index a0d91ce..67e9da1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,4 +4,4 @@
 include README.rst
 
 recursive-include tests *.py
-recursive-include tests/primitives/vectors *
+recursive-include tests/hazmat/primitives/vectors *
diff --git a/cryptography/bindings/openssl/backend.py b/cryptography/bindings/openssl/backend.py
index 4ec1618..3477d3e 100644
--- a/cryptography/bindings/openssl/backend.py
+++ b/cryptography/bindings/openssl/backend.py
@@ -18,9 +18,11 @@
 
 import cffi
 
-from cryptography.primitives import interfaces
-from cryptography.primitives.block.ciphers import AES, Camellia, TripleDES
-from cryptography.primitives.block.modes import CBC, CTR, ECB, OFB, CFB
+from cryptography.hazmat.primitives import interfaces
+from cryptography.hazmat.primitives.block.ciphers import (
+    AES, Camellia, TripleDES,
+)
+from cryptography.hazmat.primitives.block.modes import CBC, CTR, ECB, OFB, CFB
 
 
 class Backend(object):
diff --git a/cryptography/primitives/block/__init__.py b/cryptography/hazmat/__init__.py
similarity index 77%
copy from cryptography/primitives/block/__init__.py
copy to cryptography/hazmat/__init__.py
index a0c6d03..55c925c 100644
--- a/cryptography/primitives/block/__init__.py
+++ b/cryptography/hazmat/__init__.py
@@ -10,12 +10,3 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-from __future__ import absolute_import, division, print_function
-
-from cryptography.primitives.block.base import BlockCipher
-
-
-__all__ = [
-    "BlockCipher",
-]
diff --git a/cryptography/primitives/__init__.py b/cryptography/hazmat/primitives/__init__.py
similarity index 100%
rename from cryptography/primitives/__init__.py
rename to cryptography/hazmat/primitives/__init__.py
diff --git a/cryptography/primitives/block/__init__.py b/cryptography/hazmat/primitives/block/__init__.py
similarity index 90%
rename from cryptography/primitives/block/__init__.py
rename to cryptography/hazmat/primitives/block/__init__.py
index a0c6d03..5b8942b 100644
--- a/cryptography/primitives/block/__init__.py
+++ b/cryptography/hazmat/primitives/block/__init__.py
@@ -13,7 +13,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from cryptography.primitives.block.base import BlockCipher
+from cryptography.hazmat.primitives.block.base import BlockCipher
 
 
 __all__ = [
diff --git a/cryptography/primitives/block/base.py b/cryptography/hazmat/primitives/block/base.py
similarity index 96%
rename from cryptography/primitives/block/base.py
rename to cryptography/hazmat/primitives/block/base.py
index 7924cf9..b4cc32a 100644
--- a/cryptography/primitives/block/base.py
+++ b/cryptography/hazmat/primitives/block/base.py
@@ -13,7 +13,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from cryptography.primitives import interfaces
+from cryptography.hazmat.primitives import interfaces
 
 
 class BlockCipher(object):
diff --git a/cryptography/primitives/block/ciphers.py b/cryptography/hazmat/primitives/block/ciphers.py
similarity index 100%
rename from cryptography/primitives/block/ciphers.py
rename to cryptography/hazmat/primitives/block/ciphers.py
diff --git a/cryptography/primitives/block/modes.py b/cryptography/hazmat/primitives/block/modes.py
similarity index 96%
rename from cryptography/primitives/block/modes.py
rename to cryptography/hazmat/primitives/block/modes.py
index a933c18..a60e8a3 100644
--- a/cryptography/primitives/block/modes.py
+++ b/cryptography/hazmat/primitives/block/modes.py
@@ -13,7 +13,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from cryptography.primitives import interfaces
+from cryptography.hazmat.primitives import interfaces
 
 
 @interfaces.register(interfaces.ModeWithInitializationVector)
diff --git a/cryptography/primitives/hashes.py b/cryptography/hazmat/primitives/hashes.py
similarity index 100%
rename from cryptography/primitives/hashes.py
rename to cryptography/hazmat/primitives/hashes.py
diff --git a/cryptography/primitives/interfaces.py b/cryptography/hazmat/primitives/interfaces.py
similarity index 100%
rename from cryptography/primitives/interfaces.py
rename to cryptography/hazmat/primitives/interfaces.py
diff --git a/docs/architecture.rst b/docs/architecture.rst
index 0a9550c..8de8649 100644
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -10,9 +10,9 @@
 
 * ``cryptography.bindings``: This package contains bindings to low level
   cryptographic libraries. Our initial target will be OpenSSL.
-* ``cryptography.primitives``: This packages contains low level algorithms,
-  things like ``AES`` or ``SHA1``. This is implemented on top of
+* ``cryptography.hazmat.primitives``: This packages contains low level
+  algorithms, things like ``AES`` or ``SHA1``. This is implemented on top of
   ``cryptography.bindings``.
 * ``cryptography``: This package contains higher level recipes, for example
   "encrypt and then MAC". This is implemented on top of
-  ``cryptography.primitives``.
+  ``cryptography.hazmat.primitives``.
diff --git a/docs/primitives/cryptographic-hashes.rst b/docs/hazmat/primitives/cryptographic-hashes.rst
similarity index 97%
rename from docs/primitives/cryptographic-hashes.rst
rename to docs/hazmat/primitives/cryptographic-hashes.rst
index dcf2125..0500408 100644
--- a/docs/primitives/cryptographic-hashes.rst
+++ b/docs/hazmat/primitives/cryptographic-hashes.rst
@@ -1,7 +1,7 @@
 Message Digests
 ===============
 
-.. currentmodule:: cryptography.primitives.hashes
+.. currentmodule:: cryptography.hazmat.primitives.hashes
 
 .. class:: BaseHash(data=None)
 
diff --git a/docs/primitives/index.rst b/docs/hazmat/primitives/index.rst
similarity index 100%
rename from docs/primitives/index.rst
rename to docs/hazmat/primitives/index.rst
diff --git a/docs/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
similarity index 93%
rename from docs/primitives/symmetric-encryption.rst
rename to docs/hazmat/primitives/symmetric-encryption.rst
index 87e1e69..e2586aa 100644
--- a/docs/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -1,7 +1,7 @@
 Symmetric Encryption
 ====================
 
-.. currentmodule:: cryptography.primitives.block
+.. currentmodule:: cryptography.hazmat.primitives.block
 
 .. testsetup::
 
@@ -22,7 +22,7 @@
 
     .. doctest::
 
-        >>> from cryptography.primitives.block import BlockCipher, ciphers, modes
+        >>> from cryptography.hazmat.primitives.block import BlockCipher, ciphers, modes
         >>> cipher = BlockCipher(ciphers.AES(key), modes.CBC(iv))
         >>> encryptor = cipher.encryptor()
         >>> ct = encryptor.update(b"a secret message") + encryptor.finalize()
@@ -36,16 +36,16 @@
     .. method:: encryptor()
 
         :return: An encrypting
-            :class:`~cryptography.primitives.interfaces.CipherContext`
+            :class:`~cryptography.hazmat.primitives.interfaces.CipherContext`
             provider.
 
     .. method:: decryptor()
 
         :return: A decrypting
-            :class:`~cryptography.primitives.interfaces.CipherContext`
+            :class:`~cryptography.hazmat.primitives.interfaces.CipherContext`
             provider.
 
-.. currentmodule:: cryptography.primitives.interfaces
+.. currentmodule:: cryptography.hazmat.primitives.interfaces
 
 .. class:: CipherContext()
 
@@ -68,7 +68,7 @@
 Ciphers
 ~~~~~~~
 
-.. currentmodule:: cryptography.primitives.block.ciphers
+.. currentmodule:: cryptography.hazmat.primitives.block.ciphers
 
 .. class:: AES(key)
 
@@ -109,7 +109,7 @@
 Modes
 ~~~~~
 
-.. currentmodule:: cryptography.primitives.block.modes
+.. currentmodule:: cryptography.hazmat.primitives.block.modes
 
 .. class:: CBC(initialization_vector)
 
diff --git a/docs/index.rst b/docs/index.rst
index a868a5d..47418ab 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -31,8 +31,15 @@
     :maxdepth: 2
 
     architecture
-    primitives/index
     bindings/index
     contributing
     security
     community
+
+Hazard Materials
+----------------
+
+.. toctree::
+    :maxdepth: 2
+
+    hazmat/primitives/index
diff --git a/tests/bindings/test_openssl.py b/tests/bindings/test_openssl.py
index 6f9c9d2..69ab38d 100644
--- a/tests/bindings/test_openssl.py
+++ b/tests/bindings/test_openssl.py
@@ -14,8 +14,8 @@
 import pytest
 
 from cryptography.bindings.openssl.backend import backend
-from cryptography.primitives.block.ciphers import AES
-from cryptography.primitives.block.modes import CBC
+from cryptography.hazmat.primitives.block.ciphers import AES
+from cryptography.hazmat.primitives.block.modes import CBC
 
 
 class TestOpenSSL(object):
diff --git a/tests/primitives/__init__.py b/tests/hazmat/__init__.py
similarity index 100%
copy from tests/primitives/__init__.py
copy to tests/hazmat/__init__.py
diff --git a/tests/primitives/__init__.py b/tests/hazmat/primitives/__init__.py
similarity index 100%
rename from tests/primitives/__init__.py
rename to tests/hazmat/primitives/__init__.py
diff --git a/tests/primitives/test_block.py b/tests/hazmat/primitives/test_block.py
similarity index 95%
rename from tests/primitives/test_block.py
rename to tests/hazmat/primitives/test_block.py
index 3b3b1f9..e0ed669 100644
--- a/tests/primitives/test_block.py
+++ b/tests/hazmat/primitives/test_block.py
@@ -17,8 +17,8 @@
 
 import pytest
 
-from cryptography.primitives import interfaces
-from cryptography.primitives.block import BlockCipher, ciphers, modes
+from cryptography.hazmat.primitives import interfaces
+from cryptography.hazmat.primitives.block import BlockCipher, ciphers, modes
 
 
 class TestBlockCipher(object):
diff --git a/tests/primitives/test_ciphers.py b/tests/hazmat/primitives/test_ciphers.py
similarity index 95%
rename from tests/primitives/test_ciphers.py
rename to tests/hazmat/primitives/test_ciphers.py
index 17fcdba..26b297a 100644
--- a/tests/primitives/test_ciphers.py
+++ b/tests/hazmat/primitives/test_ciphers.py
@@ -17,7 +17,9 @@
 
 import pytest
 
-from cryptography.primitives.block.ciphers import AES, Camellia, TripleDES
+from cryptography.hazmat.primitives.block.ciphers import (
+    AES, Camellia, TripleDES,
+)
 
 
 class TestAES(object):
diff --git a/tests/primitives/test_cryptrec.py b/tests/hazmat/primitives/test_cryptrec.py
similarity index 95%
rename from tests/primitives/test_cryptrec.py
rename to tests/hazmat/primitives/test_cryptrec.py
index 5e0b12d..f3b24fc 100644
--- a/tests/primitives/test_cryptrec.py
+++ b/tests/hazmat/primitives/test_cryptrec.py
@@ -20,7 +20,7 @@
 import binascii
 import os
 
-from cryptography.primitives.block import ciphers, modes
+from cryptography.hazmat.primitives.block import ciphers, modes
 
 from .utils import generate_encrypt_test
 from ..utils import load_cryptrec_vectors_from_file
diff --git a/tests/primitives/test_hash_vectors.py b/tests/hazmat/primitives/test_hash_vectors.py
similarity index 98%
rename from tests/primitives/test_hash_vectors.py
rename to tests/hazmat/primitives/test_hash_vectors.py
index e385472..4485260 100644
--- a/tests/primitives/test_hash_vectors.py
+++ b/tests/hazmat/primitives/test_hash_vectors.py
@@ -15,7 +15,7 @@
 
 import os
 
-from cryptography.primitives import hashes
+from cryptography.hazmat.primitives import hashes
 
 from .utils import generate_hash_test, generate_long_string_hash_test
 from ..utils import load_hash_vectors_from_file
diff --git a/tests/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py
similarity index 98%
rename from tests/primitives/test_hashes.py
rename to tests/hazmat/primitives/test_hashes.py
index 174fd5f..110ca4b 100644
--- a/tests/primitives/test_hashes.py
+++ b/tests/hazmat/primitives/test_hashes.py
@@ -21,7 +21,7 @@
 
 from cryptography.bindings import _default_backend
 
-from cryptography.primitives import hashes
+from cryptography.hazmat.primitives import hashes
 
 from .utils import generate_base_hash_test
 
diff --git a/tests/primitives/test_nist.py b/tests/hazmat/primitives/test_nist.py
similarity index 98%
rename from tests/primitives/test_nist.py
rename to tests/hazmat/primitives/test_nist.py
index 2a32d1b..7f79f23 100644
--- a/tests/primitives/test_nist.py
+++ b/tests/hazmat/primitives/test_nist.py
@@ -20,7 +20,7 @@
 import binascii
 import os
 
-from cryptography.primitives.block import ciphers, modes
+from cryptography.hazmat.primitives.block import ciphers, modes
 
 from .utils import generate_encrypt_test
 from ..utils import load_nist_vectors_from_file
diff --git a/tests/primitives/test_openssl_vectors.py b/tests/hazmat/primitives/test_openssl_vectors.py
similarity index 97%
rename from tests/primitives/test_openssl_vectors.py
rename to tests/hazmat/primitives/test_openssl_vectors.py
index 0f242ef..ef963a0 100644
--- a/tests/primitives/test_openssl_vectors.py
+++ b/tests/hazmat/primitives/test_openssl_vectors.py
@@ -19,7 +19,7 @@
 
 import binascii
 
-from cryptography.primitives.block import ciphers, modes
+from cryptography.hazmat.primitives.block import ciphers, modes
 
 from .utils import generate_encrypt_test
 from ..utils import load_openssl_vectors_from_file
diff --git a/tests/primitives/test_utils.py b/tests/hazmat/primitives/test_utils.py
similarity index 100%
rename from tests/primitives/test_utils.py
rename to tests/hazmat/primitives/test_utils.py
diff --git a/tests/primitives/utils.py b/tests/hazmat/primitives/utils.py
similarity index 98%
rename from tests/primitives/utils.py
rename to tests/hazmat/primitives/utils.py
index d3b2134..79d0aba 100644
--- a/tests/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -4,7 +4,7 @@
 import pytest
 
 from cryptography.bindings import _ALL_BACKENDS
-from cryptography.primitives.block import BlockCipher
+from cryptography.hazmat.primitives.block import BlockCipher
 
 
 def generate_encrypt_test(param_loader, path, file_names, cipher_factory,
diff --git a/tests/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-128-ecb.txt b/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-128-ecb.txt
similarity index 100%
rename from tests/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-128-ecb.txt
rename to tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-128-ecb.txt
diff --git a/tests/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-192-ecb.txt b/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-192-ecb.txt
similarity index 100%
rename from tests/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-192-ecb.txt
rename to tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-192-ecb.txt
diff --git a/tests/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-256-ecb.txt b/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-256-ecb.txt
similarity index 100%
rename from tests/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-256-ecb.txt
rename to tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-256-ecb.txt
diff --git a/tests/primitives/vectors/ISO/ripemd160/ripevectors.txt b/tests/hazmat/primitives/vectors/ISO/ripemd160/ripevectors.txt
similarity index 100%
rename from tests/primitives/vectors/ISO/ripemd160/ripevectors.txt
rename to tests/hazmat/primitives/vectors/ISO/ripemd160/ripevectors.txt
diff --git a/tests/primitives/vectors/ISO/whirlpool/iso-test-vectors.txt b/tests/hazmat/primitives/vectors/ISO/whirlpool/iso-test-vectors.txt
similarity index 100%
rename from tests/primitives/vectors/ISO/whirlpool/iso-test-vectors.txt
rename to tests/hazmat/primitives/vectors/ISO/whirlpool/iso-test-vectors.txt
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCIinvperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIinvperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCIinvperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIinvperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCIpermop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIpermop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCIpermop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIpermop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCIsubtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIsubtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCIsubtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIsubtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCIvarkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvarkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCIvarkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvarkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCIvartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCIvartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCinvperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCinvperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCinvperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCinvperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCpermop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCpermop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCpermop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCpermop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCsubtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCsubtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCsubtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCsubtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCvarkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvarkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCvarkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvarkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCBCvartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCBCvartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB1invperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1invperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB1invperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1invperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB1permop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1permop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB1permop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1permop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB1subtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1subtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB1subtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1subtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB1varkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1varkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB1varkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1varkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB1vartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1vartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB1vartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1vartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB64invperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64invperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB64invperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64invperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB64permop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64permop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB64permop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64permop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB64subtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64subtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB64subtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64subtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB64varkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64varkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB64varkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64varkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB64vartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64vartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB64vartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64vartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB8invperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8invperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB8invperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8invperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB8permop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8permop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB8permop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8permop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB8subtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8subtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB8subtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8subtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB8varkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8varkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB8varkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8varkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFB8vartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8vartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFB8vartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8vartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP1invperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1invperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP1invperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1invperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP1permop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1permop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP1permop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1permop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP1subtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1subtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP1subtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1subtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP1varkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1varkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP1varkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1varkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP1vartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1vartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP1vartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1vartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP64invperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64invperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP64invperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64invperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP64permop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64permop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP64permop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64permop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP64subtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64subtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP64subtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64subtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP64varkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64varkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP64varkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64varkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP64vartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64vartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP64vartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64vartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP8invperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8invperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP8invperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8invperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP8permop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8permop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP8permop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8permop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP8subtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8subtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP8subtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8subtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP8varkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8varkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP8varkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8varkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TCFBP8vartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8vartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TCFBP8vartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8vartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TECBinvperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBinvperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TECBinvperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBinvperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TECBpermop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBpermop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TECBpermop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBpermop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TECBsubtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBsubtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TECBsubtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBsubtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TECBvarkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvarkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TECBvarkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvarkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TECBvartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TECBvartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBIinvperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIinvperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBIinvperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIinvperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBIpermop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIpermop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBIpermop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIpermop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBIsubtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIsubtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBIsubtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIsubtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBIvarkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvarkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBIvarkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvarkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBIvartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBIvartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBinvperm.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBinvperm.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBinvperm.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBinvperm.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBpermop.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBpermop.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBpermop.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBpermop.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBsubtab.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBsubtab.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBsubtab.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBsubtab.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBvarkey.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvarkey.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBvarkey.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvarkey.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/KAT/TOFBvartext.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvartext.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/KAT/TOFBvartext.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvartext.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCBCIMMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCBCIMMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCBCIMMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCBCIMMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCBCIMMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCBCIMMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCBCMMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCBCMMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCBCMMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCBCMMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCBCMMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCBCMMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB1MMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB1MMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB1MMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB1MMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB1MMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB1MMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB64MMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB64MMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB64MMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB64MMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB64MMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB64MMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB8MMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB8MMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB8MMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB8MMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFB8MMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFB8MMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TECBMMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TECBMMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TECBMMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TECBMMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TECBMMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TECBMMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TOFBIMMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TOFBIMMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TOFBIMMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TOFBIMMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TOFBIMMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TOFBIMMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT3.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TOFBMMT1.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT1.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TOFBMMT1.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT1.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TOFBMMT2.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT2.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TOFBMMT2.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT2.rsp
diff --git a/tests/primitives/vectors/NIST/3DES/MMT/TOFBMMT3.rsp b/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT3.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/3DES/MMT/TOFBMMT3.rsp
rename to tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT3.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCGFSbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCGFSbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCGFSbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCGFSbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCGFSbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCGFSbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCKeySbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCKeySbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCKeySbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCKeySbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCKeySbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCKeySbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCVarKey128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCVarKey128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCVarKey192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCVarKey192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCVarKey256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCVarKey256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCVarTxt128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCVarTxt128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCVarTxt192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCVarTxt192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CBCVarTxt256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CBCVarTxt256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128GFSbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128GFSbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128GFSbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128GFSbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128GFSbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128GFSbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128KeySbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128KeySbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128KeySbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128KeySbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128KeySbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128KeySbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128VarKey128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128VarKey128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128VarKey192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128VarKey192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128VarKey256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128VarKey256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128VarTxt128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128VarTxt128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128VarTxt192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128VarTxt192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB128VarTxt256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB128VarTxt256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1GFSbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1GFSbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1GFSbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1GFSbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1GFSbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1GFSbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1KeySbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1KeySbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1KeySbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1KeySbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1KeySbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1KeySbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1VarKey128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1VarKey128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1VarKey192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1VarKey192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1VarKey256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1VarKey256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1VarTxt128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1VarTxt128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1VarTxt192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1VarTxt192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB1VarTxt256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB1VarTxt256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8GFSbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8GFSbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8GFSbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8GFSbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8GFSbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8GFSbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8KeySbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8KeySbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8KeySbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8KeySbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8KeySbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8KeySbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8VarKey128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8VarKey128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8VarKey192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8VarKey192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8VarKey256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8VarKey256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8VarTxt128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8VarTxt128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8VarTxt192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8VarTxt192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/CFB8VarTxt256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/CFB8VarTxt256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBGFSbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBGFSbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBGFSbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBGFSbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBGFSbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBGFSbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBKeySbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBKeySbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBKeySbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBKeySbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBKeySbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBKeySbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBVarKey128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBVarKey128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBVarKey192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBVarKey192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBVarKey256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBVarKey256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBVarTxt128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBVarTxt128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBVarTxt192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBVarTxt192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/ECBVarTxt256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/ECBVarTxt256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBGFSbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBGFSbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBGFSbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBGFSbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBGFSbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBGFSbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBKeySbox128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBKeySbox128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBKeySbox192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBKeySbox192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBKeySbox256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBKeySbox256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBVarKey128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBVarKey128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBVarKey192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBVarKey192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBVarKey256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBVarKey256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBVarTxt128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBVarTxt128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBVarTxt192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBVarTxt192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/KAT/OFBVarTxt256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/KAT/OFBVarTxt256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CBCMMT128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CBCMMT128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CBCMMT192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CBCMMT192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CBCMMT256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CBCMMT256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB128MMT128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB128MMT128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB128MMT192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB128MMT192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB128MMT256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB128MMT256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB1MMT128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB1MMT128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB1MMT192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB1MMT192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB1MMT256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB1MMT256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB8MMT128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB8MMT128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB8MMT192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB8MMT192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/CFB8MMT256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/CFB8MMT256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/ECBMMT128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/ECBMMT128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/ECBMMT192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/ECBMMT192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/ECBMMT256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/ECBMMT256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/OFBMMT128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/OFBMMT128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/OFBMMT192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/OFBMMT192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/MMT/OFBMMT256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/MMT/OFBMMT256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt256.rsp
diff --git a/tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV128.rsp b/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV128.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV128.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV128.rsp
diff --git a/tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV192.rsp b/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV192.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV192.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV192.rsp
diff --git a/tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV256.rsp b/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV256.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV256.rsp
rename to tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV256.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/Readme.txt b/tests/hazmat/primitives/vectors/NIST/SHABYTE/Readme.txt
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/Readme.txt
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/Readme.txt
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA1LongMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1LongMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA1LongMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1LongMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA1Monte.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA1Monte.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA1Monte.txt b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.txt
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA1Monte.txt
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.txt
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA1ShortMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1ShortMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA1ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1ShortMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA224LongMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224LongMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA224LongMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224LongMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA224Monte.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA224Monte.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA224Monte.txt b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.txt
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA224Monte.txt
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.txt
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA224ShortMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224ShortMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA224ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224ShortMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA256LongMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256LongMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA256LongMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256LongMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA256Monte.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA256Monte.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA256Monte.txt b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.txt
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA256Monte.txt
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.txt
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA256ShortMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256ShortMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA256ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256ShortMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA384LongMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384LongMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA384LongMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384LongMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA384Monte.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA384Monte.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA384Monte.txt b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.txt
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA384Monte.txt
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.txt
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA384ShortMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384ShortMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA384ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384ShortMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA512LongMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512LongMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA512LongMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512LongMsg.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA512Monte.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA512Monte.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.rsp
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA512Monte.txt b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.txt
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA512Monte.txt
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.txt
diff --git a/tests/primitives/vectors/NIST/SHABYTE/SHA512ShortMsg.rsp b/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512ShortMsg.rsp
similarity index 100%
rename from tests/primitives/vectors/NIST/SHABYTE/SHA512ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512ShortMsg.rsp
diff --git a/tests/primitives/vectors/OpenSSL/AES/aes-128-ctr.txt b/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-128-ctr.txt
similarity index 100%
rename from tests/primitives/vectors/OpenSSL/AES/aes-128-ctr.txt
rename to tests/hazmat/primitives/vectors/OpenSSL/AES/aes-128-ctr.txt
diff --git a/tests/primitives/vectors/OpenSSL/AES/aes-192-ctr.txt b/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-192-ctr.txt
similarity index 100%
rename from tests/primitives/vectors/OpenSSL/AES/aes-192-ctr.txt
rename to tests/hazmat/primitives/vectors/OpenSSL/AES/aes-192-ctr.txt
diff --git a/tests/primitives/vectors/OpenSSL/AES/aes-256-ctr.txt b/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-256-ctr.txt
similarity index 100%
rename from tests/primitives/vectors/OpenSSL/AES/aes-256-ctr.txt
rename to tests/hazmat/primitives/vectors/OpenSSL/AES/aes-256-ctr.txt
diff --git a/tests/primitives/vectors/OpenSSL/Camellia/camellia-cbc.txt b/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cbc.txt
similarity index 100%
rename from tests/primitives/vectors/OpenSSL/Camellia/camellia-cbc.txt
rename to tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cbc.txt
diff --git a/tests/primitives/vectors/OpenSSL/Camellia/camellia-cfb.txt b/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cfb.txt
similarity index 100%
rename from tests/primitives/vectors/OpenSSL/Camellia/camellia-cfb.txt
rename to tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cfb.txt
diff --git a/tests/primitives/vectors/OpenSSL/Camellia/camellia-ofb.txt b/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-ofb.txt
similarity index 100%
rename from tests/primitives/vectors/OpenSSL/Camellia/camellia-ofb.txt
rename to tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-ofb.txt
diff --git a/tests/primitives/vectors/RFC/HMAC/rfc-2202-md5.txt b/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-md5.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/HMAC/rfc-2202-md5.txt
rename to tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-md5.txt
diff --git a/tests/primitives/vectors/RFC/HMAC/rfc-2202-sha1.txt b/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-sha1.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/HMAC/rfc-2202-sha1.txt
rename to tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-sha1.txt
diff --git a/tests/primitives/vectors/RFC/HMAC/rfc-2286-ripemd160.txt b/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2286-ripemd160.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/HMAC/rfc-2286-ripemd160.txt
rename to tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2286-ripemd160.txt
diff --git a/tests/primitives/vectors/RFC/HMAC/rfc-4231-sha224.txt b/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha224.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/HMAC/rfc-4231-sha224.txt
rename to tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha224.txt
diff --git a/tests/primitives/vectors/RFC/HMAC/rfc-4231-sha256.txt b/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha256.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/HMAC/rfc-4231-sha256.txt
rename to tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha256.txt
diff --git a/tests/primitives/vectors/RFC/HMAC/rfc-4231-sha384.txt b/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha384.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/HMAC/rfc-4231-sha384.txt
rename to tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha384.txt
diff --git a/tests/primitives/vectors/RFC/HMAC/rfc-4231-sha512.txt b/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha512.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/HMAC/rfc-4231-sha512.txt
rename to tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha512.txt
diff --git a/tests/primitives/vectors/RFC/MD5/rfc-1321.txt b/tests/hazmat/primitives/vectors/RFC/MD5/rfc-1321.txt
similarity index 100%
rename from tests/primitives/vectors/RFC/MD5/rfc-1321.txt
rename to tests/hazmat/primitives/vectors/RFC/MD5/rfc-1321.txt
diff --git a/tests/utils.py b/tests/utils.py
index fa7cc68..9d01746 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -53,7 +53,7 @@
 
 def load_nist_vectors_from_file(filename, op):
     base = os.path.join(
-        os.path.dirname(__file__), "primitives", "vectors", "NIST",
+        os.path.dirname(__file__), "hazmat", "primitives", "vectors", "NIST",
     )
     with open(os.path.join(base, filename), "r") as vector_file:
         return load_nist_vectors(vector_file, op)
@@ -61,7 +61,8 @@
 
 def load_cryptrec_vectors_from_file(filename):
     base = os.path.join(
-        os.path.dirname(__file__), "primitives", "vectors", "CRYPTREC",
+        os.path.dirname(__file__),
+        "hazmat", "primitives", "vectors", "CRYPTREC",
     )
     with open(os.path.join(base, filename), "r") as vector_file:
         return load_cryptrec_vectors(vector_file)
@@ -97,7 +98,8 @@
 
 def load_openssl_vectors_from_file(filename):
     base = os.path.join(
-        os.path.dirname(__file__), "primitives", "vectors", "OpenSSL",
+        os.path.dirname(__file__),
+        "hazmat", "primitives", "vectors", "OpenSSL",
     )
     with open(os.path.join(base, filename), "r") as vector_file:
         return load_openssl_vectors(vector_file)
@@ -152,7 +154,7 @@
 
 def load_hash_vectors_from_file(filename):
     base = os.path.join(
-        os.path.dirname(__file__), "primitives", "vectors"
+        os.path.dirname(__file__), "hazmat", "primitives", "vectors"
     )
     with open(os.path.join(base, filename), "r") as vector_file:
         return load_hash_vectors(vector_file)