diff --git a/include/revng/Yield/Support/SugiyamaStyleGraphLayout/Compute.h b/include/revng/Yield/Support/GraphLayout/SugiyamaStyle/Compute.h
similarity index 100%
rename from include/revng/Yield/Support/SugiyamaStyleGraphLayout/Compute.h
rename to include/revng/Yield/Support/GraphLayout/SugiyamaStyle/Compute.h
diff --git a/lib/Yield/CMakeLists.txt b/lib/Yield/CMakeLists.txt
index 655fb33ed..78ff0d3a4 100644
--- a/lib/Yield/CMakeLists.txt
+++ b/lib/Yield/CMakeLists.txt
@@ -13,17 +13,17 @@ revng_add_library_internal(
   ControlFlow/FallthroughDetection.cpp
   ControlFlow/NodeSizeCalculation.cpp
   ControlFlow/SVG.cpp
-  Support/SugiyamaStyleGraphLayout/Compute.cpp
-  Support/SugiyamaStyleGraphLayout/EdgeRouting.cpp
-  Support/SugiyamaStyleGraphLayout/GraphPreparation.cpp
-  Support/SugiyamaStyleGraphLayout/HorizontalPositions.cpp
-  Support/SugiyamaStyleGraphLayout/LaneDistribution.cpp
-  Support/SugiyamaStyleGraphLayout/LayoutConversion.cpp
-  Support/SugiyamaStyleGraphLayout/LinearSegmentSelection.cpp
-  Support/SugiyamaStyleGraphLayout/NodeRanking.cpp
-  Support/SugiyamaStyleGraphLayout/PermutationSelection.cpp
-  Support/SugiyamaStyleGraphLayout/TopologicalOrdering.cpp
-  Support/SugiyamaStyleGraphLayout/VerticalPositions.cpp
+  Support/GraphLayout/SugiyamaStyle/Compute.cpp
+  Support/GraphLayout/SugiyamaStyle/EdgeRouting.cpp
+  Support/GraphLayout/SugiyamaStyle/GraphPreparation.cpp
+  Support/GraphLayout/SugiyamaStyle/HorizontalPositions.cpp
+  Support/GraphLayout/SugiyamaStyle/LaneDistribution.cpp
+  Support/GraphLayout/SugiyamaStyle/LayoutConversion.cpp
+  Support/GraphLayout/SugiyamaStyle/LinearSegmentSelection.cpp
+  Support/GraphLayout/SugiyamaStyle/NodeRanking.cpp
+  Support/GraphLayout/SugiyamaStyle/PermutationSelection.cpp
+  Support/GraphLayout/SugiyamaStyle/TopologicalOrdering.cpp
+  Support/GraphLayout/SugiyamaStyle/VerticalPositions.cpp
   CrossRelations.cpp
   Dump.cpp
   Plain.cpp
diff --git a/lib/Yield/ControlFlow/SVG.cpp b/lib/Yield/ControlFlow/SVG.cpp
index 06231826e..f962cc521 100644
--- a/lib/Yield/ControlFlow/SVG.cpp
+++ b/lib/Yield/ControlFlow/SVG.cpp
@@ -21,7 +21,7 @@
 #include "revng/Yield/Graph.h"
 #include "revng/Yield/PTML.h"
 #include "revng/Yield/SVG.h"
-#include "revng/Yield/Support/SugiyamaStyleGraphLayout/Compute.h"
+#include "revng/Yield/Support/GraphLayout/SugiyamaStyle/Compute.h"
 
 using ptml::Tag;
 
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/Compute.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/Compute.cpp
similarity index 96%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/Compute.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/Compute.cpp
index b43da8b0b..b95d15e55 100644
--- a/lib/Yield/Support/SugiyamaStyleGraphLayout/Compute.cpp
+++ b/lib/Yield/Support/GraphLayout/SugiyamaStyle/Compute.cpp
@@ -5,7 +5,7 @@
 // This file is distributed under the MIT License. See LICENSE.md for details.
 //
 
-#include "revng/Yield/Support/SugiyamaStyleGraphLayout/Compute.h"
+#include "revng/Yield/Support/GraphLayout/SugiyamaStyle/Compute.h"
 
 #include "Layout.h"
 
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/EdgeRouting.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/EdgeRouting.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/EdgeRouting.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/EdgeRouting.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/GraphPreparation.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/GraphPreparation.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/GraphPreparation.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/GraphPreparation.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/HorizontalPositions.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/HorizontalPositions.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/HorizontalPositions.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/HorizontalPositions.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/InternalGraph.h b/lib/Yield/Support/GraphLayout/SugiyamaStyle/InternalGraph.h
similarity index 99%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/InternalGraph.h
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/InternalGraph.h
index be7c89aaa..75bc8545a 100644
--- a/lib/Yield/Support/SugiyamaStyleGraphLayout/InternalGraph.h
+++ b/lib/Yield/Support/GraphLayout/SugiyamaStyle/InternalGraph.h
@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "revng/Yield/Support/SugiyamaStyleGraphLayout/Compute.h"
+#include "revng/Yield/Support/GraphLayout/SugiyamaStyle/Compute.h"
 
 using RankingStrategy = yield::sugiyama::RankingStrategy;
 using Configuration = yield::sugiyama::Configuration;
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/LaneDistribution.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/LaneDistribution.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/LaneDistribution.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/LaneDistribution.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/Layout.h b/lib/Yield/Support/GraphLayout/SugiyamaStyle/Layout.h
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/Layout.h
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/Layout.h
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/LayoutConversion.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/LayoutConversion.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/LayoutConversion.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/LayoutConversion.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/LinearSegmentSelection.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/LinearSegmentSelection.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/LinearSegmentSelection.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/LinearSegmentSelection.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/NodeClassification.h b/lib/Yield/Support/GraphLayout/SugiyamaStyle/NodeClassification.h
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/NodeClassification.h
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/NodeClassification.h
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/NodeRanking.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/NodeRanking.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/NodeRanking.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/NodeRanking.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/NodeRanking.h b/lib/Yield/Support/GraphLayout/SugiyamaStyle/NodeRanking.h
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/NodeRanking.h
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/NodeRanking.h
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/PermutationSelection.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/PermutationSelection.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/PermutationSelection.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/PermutationSelection.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/TopologicalOrdering.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/TopologicalOrdering.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/TopologicalOrdering.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/TopologicalOrdering.cpp
diff --git a/lib/Yield/Support/SugiyamaStyleGraphLayout/VerticalPositions.cpp b/lib/Yield/Support/GraphLayout/SugiyamaStyle/VerticalPositions.cpp
similarity index 100%
rename from lib/Yield/Support/SugiyamaStyleGraphLayout/VerticalPositions.cpp
rename to lib/Yield/Support/GraphLayout/SugiyamaStyle/VerticalPositions.cpp