diff --git a/src/ObjLoading/Parsing/Menu/MenuMatcherFactory.cpp b/src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.cpp
similarity index 100%
rename from src/ObjLoading/Parsing/Menu/MenuMatcherFactory.cpp
rename to src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.cpp
diff --git a/src/ObjLoading/Parsing/Menu/MenuMatcherFactory.h b/src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h
similarity index 100%
rename from src/ObjLoading/Parsing/Menu/MenuMatcherFactory.h
rename to src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/FunctionPropertySequences.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/FunctionPropertySequences.cpp
index 446fc4b0..dab5affb 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/FunctionPropertySequences.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/FunctionPropertySequences.cpp
@@ -1,7 +1,7 @@
 #include "FunctionPropertySequences.h"
 
 #include "GenericStringPropertySequence.h"
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericBoolPropertySequence.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericBoolPropertySequence.cpp
index fae65ef0..1827a32a 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericBoolPropertySequence.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericBoolPropertySequence.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericColorPropertySequence.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericColorPropertySequence.cpp
index acc74630..8bf45e9f 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericColorPropertySequence.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericColorPropertySequence.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericFloatingPointPropertySequence.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericFloatingPointPropertySequence.cpp
index 53876a49..9476784c 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericFloatingPointPropertySequence.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericFloatingPointPropertySequence.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericIntPropertySequence.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericIntPropertySequence.cpp
index 02470ac4..18050f1e 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericIntPropertySequence.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericIntPropertySequence.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericKeywordPropertySequence.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericKeywordPropertySequence.cpp
index feaf56ef..6e03fc05 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericKeywordPropertySequence.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericKeywordPropertySequence.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericStringPropertySequence.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericStringPropertySequence.cpp
index 611fbc5e..35b3cbc6 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericStringPropertySequence.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/GenericStringPropertySequence.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/ItemPropertySequences.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/ItemPropertySequences.cpp
index e547aaf2..ed56caaf 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/ItemPropertySequences.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/ItemPropertySequences.cpp
@@ -8,7 +8,7 @@
 #include "GenericIntPropertySequence.h"
 #include "GenericKeywordPropertySequence.h"
 #include "GenericStringPropertySequence.h"
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/MenuPropertySequences.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/MenuPropertySequences.cpp
index ce9d867e..0bf8f137 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/MenuPropertySequences.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/MenuPropertySequences.cpp
@@ -6,7 +6,7 @@
 #include "GenericIntPropertySequence.h"
 #include "GenericKeywordPropertySequence.h"
 #include "GenericStringPropertySequence.h"
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 #include "Parsing/Menu/Domain/CommonMenuTypes.h"
 
 using namespace menu;
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp
index 8cff5ca8..6c877177 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp
index 297573a3..512460d4 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp
@@ -1,6 +1,6 @@
 #include "SequenceFunctionDef.h"
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp
index 07cbab9e..2b08df04 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp
@@ -1,6 +1,6 @@
 #include "SequenceItemDef.h"
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp
index 92a90d3a..d9a2d377 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp
@@ -1,6 +1,6 @@
 #include "SequenceLoadMenu.h"
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp
index 32a0f2d8..6d3df6e2 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp
@@ -1,6 +1,6 @@
 #include "SequenceMenuDef.h"
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;
 
diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp
index 2d86abb2..ec71b90f 100644
--- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp
+++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp
@@ -1,6 +1,6 @@
 #include "SequenceOpenGlobalScopeBlock.h"
 
-#include "Parsing/Menu/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
 
 using namespace menu;