diff --git a/src/struct/treesearch/NodeDepthMapInterface.php b/src/struct/tree/search/NodeDepthMapInterface.php
similarity index 95%
rename from src/struct/treesearch/NodeDepthMapInterface.php
rename to src/struct/tree/search/NodeDepthMapInterface.php
index 7b747ff..191929b 100644
--- a/src/struct/treesearch/NodeDepthMapInterface.php
+++ b/src/struct/tree/search/NodeDepthMapInterface.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace pvc\interfaces\struct\treesearch;
+namespace pvc\interfaces\struct\tree\search;
 
 use Iterator;
 
diff --git a/src/struct/treesearch/NodeFilterInterface.php b/src/struct/tree/search/NodeFilterInterface.php
similarity index 92%
rename from src/struct/treesearch/NodeFilterInterface.php
rename to src/struct/tree/search/NodeFilterInterface.php
index 77bcf33..ac7a540 100644
--- a/src/struct/treesearch/NodeFilterInterface.php
+++ b/src/struct/tree/search/NodeFilterInterface.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace pvc\interfaces\struct\treesearch;
+namespace pvc\interfaces\struct\tree\search;
 
 use pvc\interfaces\struct\collection\CollectionAbstractInterface;
 use pvc\interfaces\struct\payload\HasPayloadInterface;
diff --git a/src/struct/treesearch/NodeSearchableInterface.php b/src/struct/tree/search/NodeSearchableInterface.php
similarity index 94%
rename from src/struct/treesearch/NodeSearchableInterface.php
rename to src/struct/tree/search/NodeSearchableInterface.php
index f168fe8..225f016 100644
--- a/src/struct/treesearch/NodeSearchableInterface.php
+++ b/src/struct/tree/search/NodeSearchableInterface.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace pvc\interfaces\struct\treesearch;
+namespace pvc\interfaces\struct\tree\search;
 
 use pvc\interfaces\struct\collection\CollectionAbstractInterface;
 use pvc\interfaces\struct\payload\HasPayloadInterface;
diff --git a/src/struct/treesearch/NodeVisitableInterface.php b/src/struct/tree/search/NodeVisitableInterface.php
similarity index 95%
rename from src/struct/treesearch/NodeVisitableInterface.php
rename to src/struct/tree/search/NodeVisitableInterface.php
index 28af95d..fd17047 100644
--- a/src/struct/treesearch/NodeVisitableInterface.php
+++ b/src/struct/tree/search/NodeVisitableInterface.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace pvc\interfaces\struct\treesearch;
+namespace pvc\interfaces\struct\tree\search;
 
 use pvc\interfaces\struct\collection\CollectionAbstractInterface;
 use pvc\interfaces\struct\payload\HasPayloadInterface;
diff --git a/src/struct/treesearch/TreeSearchInterface.php b/src/struct/tree/search/SearchInterface.php
similarity index 81%
rename from src/struct/treesearch/TreeSearchInterface.php
rename to src/struct/tree/search/SearchInterface.php
index 841e962..d8b86a4 100644
--- a/src/struct/treesearch/TreeSearchInterface.php
+++ b/src/struct/tree/search/SearchInterface.php
@@ -6,17 +6,17 @@
 
 declare(strict_types=1);
 
-namespace pvc\interfaces\struct\treesearch;
+namespace pvc\interfaces\struct\tree\search;
 
 use pvc\interfaces\struct\collection\CollectionAbstractInterface;
 use pvc\interfaces\struct\payload\HasPayloadInterface;
 
 /**
- * Class TreeSearchInterface
+ * Class SearchInterface
  * @template PayloadType of HasPayloadInterface
  * @template CollectionType of CollectionAbstractInterface
  */
-interface TreeSearchInterface
+interface SearchInterface
 {
     /**
      * setStartNode
@@ -32,15 +32,15 @@ public function getStartNode(): mixed;
 
     /**
      * setSearchStrategy
-     * @param TreeSearchStrategyInterface<PayloadType, CollectionType> $strategy
+     * @param SearchStrategyInterface<PayloadType, CollectionType> $strategy
      */
-    public function setSearchStrategy(TreeSearchStrategyInterface $strategy): void;
+    public function setSearchStrategy(SearchStrategyInterface $strategy): void;
 
     /**
      * getSearchStrategy
-     * @return TreeSearchStrategyInterface<PayloadType, CollectionType>
+     * @return SearchStrategyInterface<PayloadType, CollectionType>
      */
-    public function getSearchStrategy(): TreeSearchStrategyInterface;
+    public function getSearchStrategy(): SearchStrategyInterface;
 
     /**
      * setSearchFilter
diff --git a/src/struct/treesearch/TreeSearchStrategyInterface.php b/src/struct/tree/search/SearchStrategyInterface.php
similarity index 87%
rename from src/struct/treesearch/TreeSearchStrategyInterface.php
rename to src/struct/tree/search/SearchStrategyInterface.php
index 6813bbf..2203b88 100644
--- a/src/struct/treesearch/TreeSearchStrategyInterface.php
+++ b/src/struct/tree/search/SearchStrategyInterface.php
@@ -6,19 +6,19 @@
 
 declare(strict_types=1);
 
-namespace pvc\interfaces\struct\treesearch;
+namespace pvc\interfaces\struct\tree\search;
 
 use Iterator;
 use pvc\interfaces\struct\collection\CollectionAbstractInterface;
 use pvc\interfaces\struct\payload\HasPayloadInterface;
 
 /**
- * Class TreeSearchStrategyInterface
+ * Class SearchStrategyInterface
  * @template PayloadType of HasPayloadInterface
  * @template CollectionType of CollectionAbstractInterface
  * @extends Iterator<NodeSearchableInterface>
  */
-interface TreeSearchStrategyInterface extends Iterator
+interface SearchStrategyInterface extends Iterator
 {
     /**
      * setStartNode