diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index cc675429e4..83248b4ebf 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -23,8 +23,6 @@ class Queries extends Validator
      * Queries constructor
      *
      * @param Validator $validator used to validate each query
-     * @param Document[] $attributes allowed attributes to be queried
-     * @param Document[] $indexes available for strict query matching
      * @param bool $strict
      */
     public function __construct(Validator $validator)
diff --git a/src/Appwrite/Utopia/Database/Validator/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Collection.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
diff --git a/src/Appwrite/Utopia/Database/Validator/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Users.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Users.php