diff --git a/MANIFEST.in b/MANIFEST.in
index a252cc8..e12e430 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@
 recursive-include docs *
 prune docs/_build
 recursive-include tests *.py
-recursive-include tests/vectors *
-recursive-include tests/hazmat/primitives/vectors *
+recursive-exclude vectors *
diff --git a/cryptography/__init__.py b/cryptography/__init__.py
index f27ba85..6005361 100644
--- a/cryptography/__init__.py
+++ b/cryptography/__init__.py
@@ -13,6 +13,8 @@
 
 from __future__ import absolute_import, division, print_function
 
+__import__('pkg_resources').declare_namespace(__name__)
+
 from cryptography.__about__ import (
     __author__, __copyright__, __email__, __license__, __summary__, __title__,
     __uri__, __version__
diff --git a/setup.py b/setup.py
index 1dfb80d..1051b42 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,8 @@
 test_requirements = [
     "pytest",
     "pretend",
-    "iso8601"
+    "iso8601",
+    "cryptography.vectors=={0}".format(about['__version__'])
 ]
 
 
@@ -127,6 +128,7 @@
     ],
 
     packages=find_packages(exclude=["tests", "tests.*"]),
+    namespace_packages=['cryptography'],
 
     install_requires=requirements,
     setup_requires=requirements,
diff --git a/vectors/MANIFEST.in b/vectors/MANIFEST.in
new file mode 100644
index 0000000..9e1e9e3
--- /dev/null
+++ b/vectors/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include cryptography/vectors *
diff --git a/vectors/cryptography/__init__.py b/vectors/cryptography/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vectors/cryptography/__init__.py
diff --git a/tests/hazmat/primitives/vectors/HMAC/rfc-2202-md5.txt b/vectors/cryptography/vectors/HMAC/rfc-2202-md5.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/HMAC/rfc-2202-md5.txt
rename to vectors/cryptography/vectors/HMAC/rfc-2202-md5.txt
diff --git a/tests/hazmat/primitives/vectors/HMAC/rfc-2202-sha1.txt b/vectors/cryptography/vectors/HMAC/rfc-2202-sha1.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/HMAC/rfc-2202-sha1.txt
rename to vectors/cryptography/vectors/HMAC/rfc-2202-sha1.txt
diff --git a/tests/hazmat/primitives/vectors/HMAC/rfc-2286-ripemd160.txt b/vectors/cryptography/vectors/HMAC/rfc-2286-ripemd160.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/HMAC/rfc-2286-ripemd160.txt
rename to vectors/cryptography/vectors/HMAC/rfc-2286-ripemd160.txt
diff --git a/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha224.txt b/vectors/cryptography/vectors/HMAC/rfc-4231-sha224.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha224.txt
rename to vectors/cryptography/vectors/HMAC/rfc-4231-sha224.txt
diff --git a/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha256.txt b/vectors/cryptography/vectors/HMAC/rfc-4231-sha256.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha256.txt
rename to vectors/cryptography/vectors/HMAC/rfc-4231-sha256.txt
diff --git a/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha384.txt b/vectors/cryptography/vectors/HMAC/rfc-4231-sha384.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha384.txt
rename to vectors/cryptography/vectors/HMAC/rfc-4231-sha384.txt
diff --git a/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha512.txt b/vectors/cryptography/vectors/HMAC/rfc-4231-sha512.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha512.txt
rename to vectors/cryptography/vectors/HMAC/rfc-4231-sha512.txt
diff --git a/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA1.txt b/vectors/cryptography/vectors/KDF/rfc-5869-HKDF-SHA1.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA1.txt
rename to vectors/cryptography/vectors/KDF/rfc-5869-HKDF-SHA1.txt
diff --git a/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA256.txt b/vectors/cryptography/vectors/KDF/rfc-5869-HKDF-SHA256.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA256.txt
rename to vectors/cryptography/vectors/KDF/rfc-5869-HKDF-SHA256.txt
diff --git a/tests/hazmat/primitives/vectors/KDF/rfc-6070-PBKDF2-SHA1.txt b/vectors/cryptography/vectors/KDF/rfc-6070-PBKDF2-SHA1.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/KDF/rfc-6070-PBKDF2-SHA1.txt
rename to vectors/cryptography/vectors/KDF/rfc-6070-PBKDF2-SHA1.txt
diff --git a/tests/hazmat/primitives/vectors/KDF/scrypt.txt b/vectors/cryptography/vectors/KDF/scrypt.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/KDF/scrypt.txt
rename to vectors/cryptography/vectors/KDF/scrypt.txt
diff --git a/vectors/cryptography/vectors/__about__.py b/vectors/cryptography/vectors/__about__.py
new file mode 100644
index 0000000..4924759
--- /dev/null
+++ b/vectors/cryptography/vectors/__about__.py
@@ -0,0 +1,31 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
+
+__title__ = "cryptography.vectors"
+__summary__ = "Test vectors for the cryptography package."
+
+__uri__ = "https://github.com/pyca/cryptography"
+
+__version__ = "0.3.dev1"
+
+__author__ = "The cryptography developers"
+__email__ = "cryptography-dev@python.org"
+
+__license__ = "Apache License, Version 2.0"
+__copyright__ = "Copyright 2013-2014 %s" % __author__
diff --git a/vectors/cryptography/vectors/__init__.py b/vectors/cryptography/vectors/__init__.py
new file mode 100644
index 0000000..6f0746f
--- /dev/null
+++ b/vectors/cryptography/vectors/__init__.py
@@ -0,0 +1,21 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+import os
+
+
+def open_vector_file(*args):
+    base = os.path.dirname(__file__)
+    filepath = [base] + list(args)
+    return open(os.path.join(*filepath), "r")
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/KeyPair.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/KeyPair.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/KeyPair.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/KeyPair.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.txt b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.txt
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/PQGGen.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/PQGVer.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/PQGVer.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/PQGVer.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/PQGVer.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/Readme.txt b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/Readme.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/Readme.txt
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/Readme.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/SigGen.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/SigGen.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/SigGen.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/SigGen.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/SigGen.txt b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/SigGen.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/SigGen.txt
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/SigGen.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/SigVer.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/SigVer.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-2/SigVer.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-2/SigVer.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/KeyPair.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/KeyPair.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/KeyPair.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/KeyPair.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.txt b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.txt
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/PQGGen.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/PQGVer.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/PQGVer.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/PQGVer.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/PQGVer.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/Readme.txt b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/Readme.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/Readme.txt
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/Readme.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/SigGen.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/SigGen.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/SigGen.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/SigGen.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/SigGen.txt b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/SigGen.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/SigGen.txt
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/SigGen.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/SigVer.rsp b/vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/SigVer.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/DSA/FIPS_186-3/SigVer.rsp
rename to vectors/cryptography/vectors/asymmetric/DSA/FIPS_186-3/SigVer.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/dsa.1024.pem b/vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/dsa.1024.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/dsa.1024.pem
rename to vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/dsa.1024.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/dsa.2048.pem b/vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/dsa.2048.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/dsa.2048.pem
rename to vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/dsa.2048.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/dsa.3072.pem b/vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/dsa.3072.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/dsa.3072.pem
rename to vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/dsa.3072.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key1.pem b/vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/key1.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key1.pem
rename to vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/key1.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key2.pem b/vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/key2.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/key2.pem
rename to vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/key2.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa-encrypted.pem b/vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/testrsa-encrypted.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa-encrypted.pem
rename to vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/testrsa-encrypted.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa.pem b/vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/testrsa.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/OpenSSL_Serialization/testrsa.pem
rename to vectors/cryptography/vectors/asymmetric/OpenSSL_Serialization/testrsa.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/ec_oid_not_in_reg_private_2.pkcs8.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/ec_oid_not_in_reg_private_2.pkcs8.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/ec_oid_not_in_reg_private_2.pkcs8.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/ec_oid_not_in_reg_private_2.pkcs8.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/ecc_private_with_rfc5915_ext.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/ecc_private_with_rfc5915_ext.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/ecc_private_with_rfc5915_ext.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/ecc_private_with_rfc5915_ext.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/enc2pkcs8.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/enc2pkcs8.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/enc2pkcs8.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/enc2pkcs8.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/encpkcs8.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/encpkcs8.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/encpkcs8.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/encpkcs8.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/nodompar_private.pkcs8.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/nodompar_private.pkcs8.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/nodompar_private.pkcs8.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/nodompar_private.pkcs8.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9607.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9607.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9607.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9607.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9671.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9671.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9671.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9671.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9925.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9925.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9925.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9925.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9926.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9926.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9926.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9926.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9927.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9927.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9927.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9927.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9928.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9928.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9928.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9928.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9929.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9929.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9929.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9929.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9930.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9930.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9930.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9930.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9931.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9931.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9931.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9931.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9932.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9932.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9932.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/pkcs12_s2k_pem-X_9932.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/private.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/private.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/private.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/private.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/unencpkcs8.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/unencpkcs8.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/unencpkcs8.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/unencpkcs8.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/PKCS8/withdompar_private.pkcs8.pem b/vectors/cryptography/vectors/asymmetric/PKCS8/withdompar_private.pkcs8.pem
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/PKCS8/withdompar_private.pkcs8.pem
rename to vectors/cryptography/vectors/asymmetric/PKCS8/withdompar_private.pkcs8.pem
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/KeyGenRSA.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/KeyGenRSA.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/KeyGenRSA.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/KeyGenRSA.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/Readme.txt b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/Readme.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/Readme.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/Readme.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.txt b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-2.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-3.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-3.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGen15_186-3.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.txt b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-2.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-3.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-3.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenPSS_186-3.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.txt b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigGenRSA_186-2.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigVer15_186-3.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigVer15_186-3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigVer15_186-3.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigVer15_186-3.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigVerPSS_186-3.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigVerPSS_186-3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigVerPSS_186-3.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigVerPSS_186-3.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigVerRSA.rsp b/vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigVerRSA.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/FIPS_186-2/SigVerRSA.rsp
rename to vectors/cryptography/vectors/asymmetric/RSA/FIPS_186-2/SigVerRSA.rsp
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/SigVer15EMTest.txt b/vectors/cryptography/vectors/asymmetric/RSA/SigVer15EMTest.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/SigVer15EMTest.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/SigVer15EMTest.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-int.txt b/vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-int.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-int.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-int.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-vect.txt b/vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-vect.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-vect.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/oaep-vect.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-int.txt b/vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-int.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-int.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-int.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-vect.txt b/vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-vect.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-vect.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/pss-vect.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/readme.txt b/vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/readme.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/readme.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/pkcs-1v2-1d2-vec/readme.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs1v15crypt-vectors.txt b/vectors/cryptography/vectors/asymmetric/RSA/pkcs1v15crypt-vectors.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs1v15crypt-vectors.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/pkcs1v15crypt-vectors.txt
diff --git a/tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs1v15sign-vectors.txt b/vectors/cryptography/vectors/asymmetric/RSA/pkcs1v15sign-vectors.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/asymmetric/RSA/pkcs1v15sign-vectors.txt
rename to vectors/cryptography/vectors/asymmetric/RSA/pkcs1v15sign-vectors.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCpermop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCpermop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CBC/TCBCvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1permop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1permop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1permop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64permop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64permop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64permop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8permop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8permop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8permop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBinvperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBinvperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBpermop.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBpermop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBsubtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBsubtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvarkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvarkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/ECB/TECBvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/ECB/TECBvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBpermop.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBpermop.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvartext.rsp b/vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvartext.rsp
rename to vectors/cryptography/vectors/ciphers/3DES/OFB/TOFBvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT128.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCMMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCMMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT192.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCMMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCMMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT256.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCMMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCMMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey128.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey192.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey256.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp b/vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128MMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128MMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128MMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128MMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128MMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128MMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1MMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1MMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1MMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1MMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1MMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1MMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8MMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8MMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8MMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8MMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8MMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8MMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp b/vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-128-ctr.txt b/vectors/cryptography/vectors/ciphers/AES/CTR/aes-128-ctr.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-128-ctr.txt
rename to vectors/cryptography/vectors/ciphers/AES/CTR/aes-128-ctr.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-192-ctr.txt b/vectors/cryptography/vectors/ciphers/AES/CTR/aes-192-ctr.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-192-ctr.txt
rename to vectors/cryptography/vectors/ciphers/AES/CTR/aes-192-ctr.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-256-ctr.txt b/vectors/cryptography/vectors/ciphers/AES/CTR/aes-256-ctr.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-256-ctr.txt
rename to vectors/cryptography/vectors/ciphers/AES/CTR/aes-256-ctr.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT128.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBMMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBMMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT192.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBMMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBMMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT256.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBMMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBMMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey128.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey192.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey256.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp b/vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp b/vectors/cryptography/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp b/vectors/cryptography/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp b/vectors/cryptography/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp b/vectors/cryptography/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp b/vectors/cryptography/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp b/vectors/cryptography/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT128.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBMMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBMMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT192.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBMMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBMMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT256.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBMMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBMMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey128.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey192.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey256.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp b/vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp b/vectors/cryptography/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp b/vectors/cryptography/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp b/vectors/cryptography/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp
rename to vectors/cryptography/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp b/vectors/cryptography/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp
rename to vectors/cryptography/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp
diff --git a/tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-128.txt b/vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-128.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-128.txt
rename to vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-128.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-192.txt b/vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-192.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-192.txt
rename to vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-192.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-256.txt b/vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-256.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-256.txt
rename to vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-256.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-40.txt b/vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-40.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-40.txt
rename to vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-40.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-56.txt b/vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-56.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-56.txt
rename to vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-56.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-64.txt b/vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-64.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-64.txt
rename to vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-64.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-80.txt b/vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-80.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/ARC4/rfc-6229-80.txt
rename to vectors/cryptography/vectors/ciphers/ARC4/rfc-6229-80.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-cbc.txt b/vectors/cryptography/vectors/ciphers/Blowfish/bf-cbc.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-cbc.txt
rename to vectors/cryptography/vectors/ciphers/Blowfish/bf-cbc.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-cfb.txt b/vectors/cryptography/vectors/ciphers/Blowfish/bf-cfb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-cfb.txt
rename to vectors/cryptography/vectors/ciphers/Blowfish/bf-cfb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-ecb.txt b/vectors/cryptography/vectors/ciphers/Blowfish/bf-ecb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-ecb.txt
rename to vectors/cryptography/vectors/ciphers/Blowfish/bf-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-ofb.txt b/vectors/cryptography/vectors/ciphers/Blowfish/bf-ofb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Blowfish/bf-ofb.txt
rename to vectors/cryptography/vectors/ciphers/Blowfish/bf-ofb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-cbc.txt b/vectors/cryptography/vectors/ciphers/CAST5/cast5-cbc.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-cbc.txt
rename to vectors/cryptography/vectors/ciphers/CAST5/cast5-cbc.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-cfb.txt b/vectors/cryptography/vectors/ciphers/CAST5/cast5-cfb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-cfb.txt
rename to vectors/cryptography/vectors/ciphers/CAST5/cast5-cfb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-ctr.txt b/vectors/cryptography/vectors/ciphers/CAST5/cast5-ctr.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-ctr.txt
rename to vectors/cryptography/vectors/ciphers/CAST5/cast5-ctr.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-ecb.txt b/vectors/cryptography/vectors/ciphers/CAST5/cast5-ecb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-ecb.txt
rename to vectors/cryptography/vectors/ciphers/CAST5/cast5-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-ofb.txt b/vectors/cryptography/vectors/ciphers/CAST5/cast5-ofb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/CAST5/cast5-ofb.txt
rename to vectors/cryptography/vectors/ciphers/CAST5/cast5-ofb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-128-ecb.txt b/vectors/cryptography/vectors/ciphers/Camellia/camellia-128-ecb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-128-ecb.txt
rename to vectors/cryptography/vectors/ciphers/Camellia/camellia-128-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-192-ecb.txt b/vectors/cryptography/vectors/ciphers/Camellia/camellia-192-ecb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-192-ecb.txt
rename to vectors/cryptography/vectors/ciphers/Camellia/camellia-192-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-256-ecb.txt b/vectors/cryptography/vectors/ciphers/Camellia/camellia-256-ecb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-256-ecb.txt
rename to vectors/cryptography/vectors/ciphers/Camellia/camellia-256-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cbc.txt b/vectors/cryptography/vectors/ciphers/Camellia/camellia-cbc.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cbc.txt
rename to vectors/cryptography/vectors/ciphers/Camellia/camellia-cbc.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cfb.txt b/vectors/cryptography/vectors/ciphers/Camellia/camellia-cfb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cfb.txt
rename to vectors/cryptography/vectors/ciphers/Camellia/camellia-cfb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-ofb.txt b/vectors/cryptography/vectors/ciphers/Camellia/camellia-ofb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-ofb.txt
rename to vectors/cryptography/vectors/ciphers/Camellia/camellia-ofb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/IDEA/idea-cbc.txt b/vectors/cryptography/vectors/ciphers/IDEA/idea-cbc.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/IDEA/idea-cbc.txt
rename to vectors/cryptography/vectors/ciphers/IDEA/idea-cbc.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/IDEA/idea-cfb.txt b/vectors/cryptography/vectors/ciphers/IDEA/idea-cfb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/IDEA/idea-cfb.txt
rename to vectors/cryptography/vectors/ciphers/IDEA/idea-cfb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/IDEA/idea-ecb.txt b/vectors/cryptography/vectors/ciphers/IDEA/idea-ecb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/IDEA/idea-ecb.txt
rename to vectors/cryptography/vectors/ciphers/IDEA/idea-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/ciphers/IDEA/idea-ofb.txt b/vectors/cryptography/vectors/ciphers/IDEA/idea-ofb.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/IDEA/idea-ofb.txt
rename to vectors/cryptography/vectors/ciphers/IDEA/idea-ofb.txt
diff --git a/tests/vectors/fernet/generate.json b/vectors/cryptography/vectors/fernet/generate.json
similarity index 100%
rename from tests/vectors/fernet/generate.json
rename to vectors/cryptography/vectors/fernet/generate.json
diff --git a/tests/vectors/fernet/invalid.json b/vectors/cryptography/vectors/fernet/invalid.json
similarity index 100%
rename from tests/vectors/fernet/invalid.json
rename to vectors/cryptography/vectors/fernet/invalid.json
diff --git a/tests/vectors/fernet/verify.json b/vectors/cryptography/vectors/fernet/verify.json
similarity index 100%
rename from tests/vectors/fernet/verify.json
rename to vectors/cryptography/vectors/fernet/verify.json
diff --git a/tests/hazmat/primitives/vectors/hashes/MD5/rfc-1321.txt b/vectors/cryptography/vectors/hashes/MD5/rfc-1321.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/MD5/rfc-1321.txt
rename to vectors/cryptography/vectors/hashes/MD5/rfc-1321.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA1/Readme.txt b/vectors/cryptography/vectors/hashes/SHA1/Readme.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA1/Readme.txt
rename to vectors/cryptography/vectors/hashes/SHA1/Readme.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1LongMsg.rsp b/vectors/cryptography/vectors/hashes/SHA1/SHA1LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA1/SHA1LongMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA1/SHA1LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.rsp b/vectors/cryptography/vectors/hashes/SHA1/SHA1Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.rsp
rename to vectors/cryptography/vectors/hashes/SHA1/SHA1Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.txt b/vectors/cryptography/vectors/hashes/SHA1/SHA1Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.txt
rename to vectors/cryptography/vectors/hashes/SHA1/SHA1Monte.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1ShortMsg.rsp b/vectors/cryptography/vectors/hashes/SHA1/SHA1ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA1/SHA1ShortMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA1/SHA1ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt b/vectors/cryptography/vectors/hashes/SHA2/Readme.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt
rename to vectors/cryptography/vectors/hashes/SHA2/Readme.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224LongMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA224LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA224LongMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA224LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA224Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA224Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.txt b/vectors/cryptography/vectors/hashes/SHA2/SHA224Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.txt
rename to vectors/cryptography/vectors/hashes/SHA2/SHA224Monte.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224ShortMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA224ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA224ShortMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA224ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256LongMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA256LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA256LongMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA256LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA256Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA256Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.txt b/vectors/cryptography/vectors/hashes/SHA2/SHA256Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.txt
rename to vectors/cryptography/vectors/hashes/SHA2/SHA256Monte.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256ShortMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA256ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA256ShortMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA256ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384LongMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA384LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA384LongMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA384LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA384Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA384Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.txt b/vectors/cryptography/vectors/hashes/SHA2/SHA384Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.txt
rename to vectors/cryptography/vectors/hashes/SHA2/SHA384Monte.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384ShortMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA384ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA384ShortMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA384ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512LongMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA512LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA512LongMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA512LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA512Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA512Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.txt b/vectors/cryptography/vectors/hashes/SHA2/SHA512Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.txt
rename to vectors/cryptography/vectors/hashes/SHA2/SHA512Monte.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512ShortMsg.rsp b/vectors/cryptography/vectors/hashes/SHA2/SHA512ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHA2/SHA512ShortMsg.rsp
rename to vectors/cryptography/vectors/hashes/SHA2/SHA512ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/ripemd160/ripevectors.txt b/vectors/cryptography/vectors/hashes/ripemd160/ripevectors.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/ripemd160/ripevectors.txt
rename to vectors/cryptography/vectors/hashes/ripemd160/ripevectors.txt
diff --git a/tests/hazmat/primitives/vectors/hashes/whirlpool/iso-test-vectors.txt b/vectors/cryptography/vectors/hashes/whirlpool/iso-test-vectors.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/whirlpool/iso-test-vectors.txt
rename to vectors/cryptography/vectors/hashes/whirlpool/iso-test-vectors.txt
diff --git a/tests/hazmat/primitives/vectors/twofactor/rfc-4226.txt b/vectors/cryptography/vectors/twofactor/rfc-4226.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/twofactor/rfc-4226.txt
rename to vectors/cryptography/vectors/twofactor/rfc-4226.txt
diff --git a/tests/hazmat/primitives/vectors/twofactor/rfc-6238.txt b/vectors/cryptography/vectors/twofactor/rfc-6238.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/twofactor/rfc-6238.txt
rename to vectors/cryptography/vectors/twofactor/rfc-6238.txt
diff --git a/vectors/setup.py b/vectors/setup.py
new file mode 100644
index 0000000..773fc45
--- /dev/null
+++ b/vectors/setup.py
@@ -0,0 +1,27 @@
+import os
+from setuptools import setup, find_packages
+
+
+base_dir = os.path.dirname(__file__)
+
+about = {}
+with open(os.path.join(base_dir, "cryptography", "vectors",
+                       "__about__.py")) as f:
+    exec(f.read(), about)
+
+
+setup(
+    name=about["__title__"],
+    version=about["__version__"],
+
+    description=about["__summary__"],
+    license=about["__license__"],
+    url=about["__uri__"],
+    author=about["__author__"],
+    author_email=about["__email__"],
+
+    packages=find_packages(),
+    zip_safe=False,
+    include_package_data=True,
+    namespace_packages=['cryptography'],
+)