Final changes to module names
diff --git a/cryptography/hazmat/oath/__init__.py b/cryptography/hazmat/primitives/otp/__init__.py
similarity index 100%
rename from cryptography/hazmat/oath/__init__.py
rename to cryptography/hazmat/primitives/otp/__init__.py
diff --git a/cryptography/hazmat/oath/hotp.py b/cryptography/hazmat/primitives/otp/hotp.py
similarity index 99%
rename from cryptography/hazmat/oath/hotp.py
rename to cryptography/hazmat/primitives/otp/hotp.py
index 9f5a0f1..0bc4cc5 100644
--- a/cryptography/hazmat/oath/hotp.py
+++ b/cryptography/hazmat/primitives/otp/hotp.py
@@ -12,9 +12,10 @@
# limitations under the License.
import struct
-from cryptography.exceptions import InvalidToken
+
import six
+from cryptography.exceptions import InvalidToken
from cryptography.hazmat.primitives import constant_time, hmac
from cryptography.hazmat.primitives.hashes import SHA1
diff --git a/tests/hazmat/oath/__init__.py b/tests/hazmat/primitives/otp/__init__.py
similarity index 100%
rename from tests/hazmat/oath/__init__.py
rename to tests/hazmat/primitives/otp/__init__.py
diff --git a/tests/hazmat/oath/test_hotp.py b/tests/hazmat/primitives/otp/test_hotp.py
similarity index 97%
rename from tests/hazmat/oath/test_hotp.py
rename to tests/hazmat/primitives/otp/test_hotp.py
index 7b1db93..2641cb9 100644
--- a/tests/hazmat/oath/test_hotp.py
+++ b/tests/hazmat/primitives/otp/test_hotp.py
@@ -10,13 +10,13 @@
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from cryptography.exceptions import InvalidToken
import os
import pytest
-from cryptography.hazmat.oath.hotp import HOTP
+from cryptography.exceptions import InvalidToken
+from cryptography.hazmat.primitives.otp.hotp import HOTP
from cryptography.hazmat.primitives import hashes
from tests.utils import load_vectors_from_file, load_nist_vectors