diff --git a/alib2algo/src/tree/NormalizeTreeLabels.cpp b/alib2algo/src/tree/simplify/NormalizeTreeLabels.cpp
similarity index 63%
rename from alib2algo/src/tree/NormalizeTreeLabels.cpp
rename to alib2algo/src/tree/simplify/NormalizeTreeLabels.cpp
index 87ee5642aa516c5dac56796c61646fdc4985a2e1..7ecc80bc489a1e11055d0fbea542e99b827494a8 100644
--- a/alib2algo/src/tree/NormalizeTreeLabels.cpp
+++ b/alib2algo/src/tree/simplify/NormalizeTreeLabels.cpp
@@ -10,6 +10,6 @@
 
 namespace {
 
-auto NormalizeTreeLabelsRankedTree = registration::AbstractRegister < tree::NormalizeTreeLabels, tree::RankedTree < unsigned >, const tree::RankedTree < > & > ( tree::NormalizeTreeLabels::normalize );
+auto NormalizeTreeLabelsRankedTree = registration::AbstractRegister < tree::simplify::NormalizeTreeLabels, tree::RankedTree < unsigned >, const tree::RankedTree < > & > ( tree::simplify::NormalizeTreeLabels::normalize );
 
 } /* namespace */
diff --git a/alib2algo/src/tree/NormalizeTreeLabels.h b/alib2algo/src/tree/simplify/NormalizeTreeLabels.h
similarity index 97%
rename from alib2algo/src/tree/NormalizeTreeLabels.h
rename to alib2algo/src/tree/simplify/NormalizeTreeLabels.h
index 0e91441707bf779635a47e986eb2bd9ab83b60d5..25e9236c0d3b4407b4ab7bcea6921cd1343de8c5 100644
--- a/alib2algo/src/tree/NormalizeTreeLabels.h
+++ b/alib2algo/src/tree/simplify/NormalizeTreeLabels.h
@@ -16,6 +16,8 @@
 
 namespace tree {
 
+namespace simplify {
+
 /**
  * Simple computation of subtree repeats
  */
@@ -65,6 +67,8 @@ tree::RankedTree < unsigned > NormalizeTreeLabels::normalize ( const tree::Ranke
 	return tree::RankedTree < unsigned > ( normalize ( tree.getContent ( ), mapping, counter ) );
 }
 
+} /* namespace simplify */
+
 } /* namespace tree */
 
 #endif /* _ARBOLOGY_NORMALIZE_TREE_LABELS_H_ */
diff --git a/alib2integrationtest/test-src/tests/treeRepeatsTest.cpp b/alib2integrationtest/test-src/tests/treeRepeatsTest.cpp
index 35a3b9e7009d9d773c030cb9c7c50a11ba52b48e..dd548846938145234c17f724b96c18ae69feed01 100644
--- a/alib2integrationtest/test-src/tests/treeRepeatsTest.cpp
+++ b/alib2integrationtest/test-src/tests/treeRepeatsTest.cpp
@@ -12,16 +12,16 @@ const size_t RANDOM_ITERATIONS = 15;
 
 TEST_CASE ( "TreeRepeats", "[integration]" ) {
 	auto pipeline = GENERATE ( as < std::string > ( ),
-		"arbology::properties::ExactSubtreeRepeatsFromSubtreeAutomaton (PrefixRankedTree)$tree | tree::NormalizeTreeLabels (RankedTree) -",
-		"tree::properties::ExactSubtreeRepeatsNaive (PostfixRankedTree)$tree | tree::NormalizeTreeLabels (RankedTree) -",
-		"tree::properties::ExactSubtreeRepeatsNaive (PostfixRankedTree)$tree | tree::NormalizeTreeLabels (RankedTree) -" );
+		"arbology::properties::ExactSubtreeRepeatsFromSubtreeAutomaton (PrefixRankedTree)$tree | tree::simplify::NormalizeTreeLabels (RankedTree) -",
+		"tree::properties::ExactSubtreeRepeatsNaive (PostfixRankedTree)$tree | tree::simplify::NormalizeTreeLabels (RankedTree) -",
+		"tree::properties::ExactSubtreeRepeatsNaive (PostfixRankedTree)$tree | tree::simplify::NormalizeTreeLabels (RankedTree) -" );
 
 
 	SECTION ( "Test Files" ) {
 		for ( const std::string & file : TestFiles::Get ( "/tree/repeats.*.xml" ) ) {
 			ext::vector < std::string > qs = {
 				"execute < " + file + " > $tree",
-				"execute tree::properties::ExactSubtreeRepeatsNaive $tree | tree::NormalizeTreeLabels - > $res1", // naive
+				"execute tree::properties::ExactSubtreeRepeatsNaive $tree | tree::simplify::NormalizeTreeLabels - > $res1", // naive
 				"execute " + pipeline + " > $res2",
 				"quit compare::TreeCompare $res1 $res2",
 			};
@@ -34,7 +34,7 @@ TEST_CASE ( "TreeRepeats", "[integration]" ) {
 		for ( size_t i = 0; i < RANDOM_ITERATIONS; i++ ) {
 			ext::vector < std::string > qs = {
 				"execute tree::generate::RandomRankedTreeFactory " + ext::to_string ( HEIGHT ) + " " + ext::to_string ( SIZE ) + " " + ext::to_string ( rand ( ) % ALPHABET_SIZE + 1 ) + " (bool)true 5 > $tree",
-				"execute tree::properties::ExactSubtreeRepeatsNaive $tree | tree::NormalizeTreeLabels - > $res1", // naive
+				"execute tree::properties::ExactSubtreeRepeatsNaive $tree | tree::simplify::NormalizeTreeLabels - > $res1", // naive
 				"execute " + pipeline + " > $res2",
 				"quit compare::TreeCompare $res1 $res2",
 			};