diff --git a/lib/Crypto/CryptArgon2.php b/lib/Crypto/CryptArgon2.php
index a1a22e3..ddbfe0a 100644
--- a/lib/Crypto/CryptArgon2.php
+++ b/lib/Crypto/CryptArgon2.php
@@ -21,7 +21,6 @@
 
 namespace OCA\UserSQL\Crypto;
 
-use OCA\UserSQL\Model\CryptoParam;
 use OCP\IL10N;
 
 /**
diff --git a/lib/Crypto/CryptBlowfish.php b/lib/Crypto/CryptBlowfish.php
index a76d187..fb9e28b 100644
--- a/lib/Crypto/CryptBlowfish.php
+++ b/lib/Crypto/CryptBlowfish.php
@@ -21,7 +21,6 @@
 
 namespace OCA\UserSQL\Crypto;
 
-use OCA\UserSQL\Model\CryptoParam;
 use OCP\IL10N;
 
 /**
diff --git a/lib/Crypto/CryptExtendedDES.php b/lib/Crypto/CryptExtendedDES.php
index 6bd2f30..8cde30a 100644
--- a/lib/Crypto/CryptExtendedDES.php
+++ b/lib/Crypto/CryptExtendedDES.php
@@ -21,7 +21,6 @@
 
 namespace OCA\UserSQL\Crypto;
 
-use OCA\UserSQL\Model\CryptoParam;
 use OCP\IL10N;
 
 /**
diff --git a/lib/Crypto/CryptSHA256.php b/lib/Crypto/CryptSHA256.php
index 72a372d..91063ef 100644
--- a/lib/Crypto/CryptSHA256.php
+++ b/lib/Crypto/CryptSHA256.php
@@ -21,7 +21,6 @@
 
 namespace OCA\UserSQL\Crypto;
 
-use OCA\UserSQL\Model\CryptoParam;
 use OCP\IL10N;
 
 /**
diff --git a/lib/Crypto/CryptSHA512.php b/lib/Crypto/CryptSHA512.php
index 2cc9a33..1cafee5 100644
--- a/lib/Crypto/CryptSHA512.php
+++ b/lib/Crypto/CryptSHA512.php
@@ -21,7 +21,6 @@
 
 namespace OCA\UserSQL\Crypto;
 
-use OCA\UserSQL\Model\CryptoParam;
 use OCP\IL10N;
 
 /**
diff --git a/lib/Model/CryptoParam.php b/lib/Crypto/CryptoParam.php
similarity index 98%
rename from lib/Model/CryptoParam.php
rename to lib/Crypto/CryptoParam.php
index 81a24fc..d694cf2 100644
--- a/lib/Model/CryptoParam.php
+++ b/lib/Crypto/CryptoParam.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace OCA\UserSQL\Model;
+namespace OCA\UserSQL\Crypto;
 
 /**
  * A parameter of a hash algorithm.
diff --git a/lib/Crypto/Phpass.php b/lib/Crypto/Phpass.php
index b038d3f..7edd728 100644
--- a/lib/Crypto/Phpass.php
+++ b/lib/Crypto/Phpass.php
@@ -21,7 +21,6 @@
 
 namespace OCA\UserSQL\Crypto;
 
-use OCA\UserSQL\Model\CryptoParam;
 use OCP\IL10N;
 
 /**