diff --git a/phpseclib/Crypt/Common/Fingerprint.php b/phpseclib/Crypt/Common/Traits/Fingerprint.php
similarity index 97%
rename from phpseclib/Crypt/Common/Fingerprint.php
rename to phpseclib/Crypt/Common/Traits/Fingerprint.php
index 0a87d07e..687ebb1c 100644
--- a/phpseclib/Crypt/Common/Fingerprint.php
+++ b/phpseclib/Crypt/Common/Traits/Fingerprint.php
@@ -13,7 +13,7 @@
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt\Common;
+namespace phpseclib\Crypt\Common\Traits;
 
 use phpseclib\Crypt\Hash;
 
diff --git a/phpseclib/Crypt/Common/PasswordProtected.php b/phpseclib/Crypt/Common/Traits/PasswordProtected.php
similarity index 96%
rename from phpseclib/Crypt/Common/PasswordProtected.php
rename to phpseclib/Crypt/Common/Traits/PasswordProtected.php
index 614114ca..fa9a8692 100644
--- a/phpseclib/Crypt/Common/PasswordProtected.php
+++ b/phpseclib/Crypt/Common/Traits/PasswordProtected.php
@@ -13,7 +13,7 @@
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt\Common;
+namespace phpseclib\Crypt\Common\Traits;
 
 /**
  * Password Protected Trait for Private Keys
diff --git a/phpseclib/Crypt/DSA/PrivateKey.php b/phpseclib/Crypt/DSA/PrivateKey.php
index a7647ea3..cd43a698 100644
--- a/phpseclib/Crypt/DSA/PrivateKey.php
+++ b/phpseclib/Crypt/DSA/PrivateKey.php
@@ -27,7 +27,7 @@ use phpseclib\Crypt\Common;
  */
 class PrivateKey extends DSA implements Common\PrivateKey
 {
-    use Common\PasswordProtected;
+    use Common\Traits\PasswordProtected;
 
     /**
      * DSA secret exponent x
diff --git a/phpseclib/Crypt/DSA/PublicKey.php b/phpseclib/Crypt/DSA/PublicKey.php
index 6a1a2e03..ee3aeedc 100644
--- a/phpseclib/Crypt/DSA/PublicKey.php
+++ b/phpseclib/Crypt/DSA/PublicKey.php
@@ -26,7 +26,7 @@ use phpseclib\Crypt\Common;
  */
 class PublicKey extends DSA implements Common\PublicKey
 {
-    use Common\Fingerprint;
+    use Common\Traits\Fingerprint;
 
     /**
      * Verify a signature
diff --git a/phpseclib/Crypt/ECDSA/PrivateKey.php b/phpseclib/Crypt/ECDSA/PrivateKey.php
index 819a1f40..ad309f82 100644
--- a/phpseclib/Crypt/ECDSA/PrivateKey.php
+++ b/phpseclib/Crypt/ECDSA/PrivateKey.php
@@ -31,7 +31,7 @@ use phpseclib\Crypt\Common;
  */
 class PrivateKey extends ECDSA implements Common\PrivateKey
 {
-    use Common\PasswordProtected;
+    use Common\Traits\PasswordProtected;
 
     /**
      * Private Key dA
diff --git a/phpseclib/Crypt/ECDSA/PublicKey.php b/phpseclib/Crypt/ECDSA/PublicKey.php
index 0ba169c9..fdcda54e 100644
--- a/phpseclib/Crypt/ECDSA/PublicKey.php
+++ b/phpseclib/Crypt/ECDSA/PublicKey.php
@@ -32,7 +32,7 @@ use phpseclib\Crypt\Common;
  */
 class PublicKey extends ECDSA implements Common\PublicKey
 {
-    use Common\Fingerprint;
+    use Common\Traits\Fingerprint;
 
     /**
      * Verify a signature
diff --git a/phpseclib/Crypt/RSA/PrivateKey.php b/phpseclib/Crypt/RSA/PrivateKey.php
index 5e770b40..b5599f87 100644
--- a/phpseclib/Crypt/RSA/PrivateKey.php
+++ b/phpseclib/Crypt/RSA/PrivateKey.php
@@ -33,7 +33,7 @@ use phpseclib\Crypt\RSA\Formats\Keys\PSS;
  */
 class PrivateKey extends RSA implements Common\PrivateKey
 {
-    use Common\PasswordProtected;
+    use Common\Traits\PasswordProtected;
 
     /**
      * Primes for Chinese Remainder Theorem (ie. p and q)
diff --git a/phpseclib/Crypt/RSA/PublicKey.php b/phpseclib/Crypt/RSA/PublicKey.php
index 34a0f96b..4adf3b89 100644
--- a/phpseclib/Crypt/RSA/PublicKey.php
+++ b/phpseclib/Crypt/RSA/PublicKey.php
@@ -34,7 +34,7 @@ use phpseclib\Crypt\RSA\Formats\Keys\PSS;
  */
 class PublicKey extends RSA implements Common\PublicKey
 {
-    use Common\Fingerprint;
+    use Common\Traits\Fingerprint;
 
     /**
      * Exponentiate