diff --git a/aconversions/src/fa2re/BrzozowskiAlgebraic.h b/aconversions/src/fa2re/BrzozowskiAlgebraic.h
index 052406d8cb5de7a15402e2e6d52ae8c5e18bb8aa..717be5902203c091979a07a90419ee8f2a366c17 100644
--- a/aconversions/src/fa2re/BrzozowskiAlgebraic.h
+++ b/aconversions/src/fa2re/BrzozowskiAlgebraic.h
@@ -21,7 +21,7 @@
 #include <regexp/RegExpEpsilon.h>
 
 #include "AbstractFAtoREConverter.h"
-#include "../shared/RightRegularEquationSolver.h"
+#include "../shared/equations/RightRegularEquationSolver.h"
 
 namespace conversions
 {
diff --git a/aconversions/src/rg2re/LRGAlgebraic.h b/aconversions/src/rg2re/LRGAlgebraic.h
index 09894ca22158fbd5f4f6935f32659ace36be0fdd..e1cec275f6373127262f93d59cd6229c5dc7eddf 100644
--- a/aconversions/src/rg2re/LRGAlgebraic.h
+++ b/aconversions/src/rg2re/LRGAlgebraic.h
@@ -11,7 +11,7 @@
 #include <grammar/Regular/LeftRegularGrammar.h>
 #include <regexp/RegExp.h>
 
-#include "../shared/LeftRegularEquationSolver.h"
+#include "../shared/equations/LeftRegularEquationSolver.h"
 #include "AbstractRGtoREConverter.h"
 
 namespace conversions
diff --git a/aconversions/src/rg2re/RRGAlgebraic.h b/aconversions/src/rg2re/RRGAlgebraic.h
index f96f407d1d683c18f94dd197644305200023f5fa..b1f59bba91ca9da5074fb557e8a0a9a44cc0a1ce 100644
--- a/aconversions/src/rg2re/RRGAlgebraic.h
+++ b/aconversions/src/rg2re/RRGAlgebraic.h
@@ -11,7 +11,7 @@
 #include <grammar/Regular/RightRegularGrammar.h>
 #include <regexp/RegExp.h>
 
-#include "../shared/RightRegularEquationSolver.h"
+#include "../shared/equations/RightRegularEquationSolver.h"
 #include "AbstractRGtoREConverter.h"
 
 namespace conversions
diff --git a/aconversions/src/shared/LeftRegularEquationSolver.cpp b/aconversions/src/shared/equations/LeftRegularEquationSolver.cpp
similarity index 100%
rename from aconversions/src/shared/LeftRegularEquationSolver.cpp
rename to aconversions/src/shared/equations/LeftRegularEquationSolver.cpp
diff --git a/aconversions/src/shared/LeftRegularEquationSolver.h b/aconversions/src/shared/equations/LeftRegularEquationSolver.h
similarity index 100%
rename from aconversions/src/shared/LeftRegularEquationSolver.h
rename to aconversions/src/shared/equations/LeftRegularEquationSolver.h
diff --git a/aconversions/src/shared/RegularEquationSolver.cpp b/aconversions/src/shared/equations/RegularEquationSolver.cpp
similarity index 100%
rename from aconversions/src/shared/RegularEquationSolver.cpp
rename to aconversions/src/shared/equations/RegularEquationSolver.cpp
diff --git a/aconversions/src/shared/RegularEquationSolver.h b/aconversions/src/shared/equations/RegularEquationSolver.h
similarity index 97%
rename from aconversions/src/shared/RegularEquationSolver.h
rename to aconversions/src/shared/equations/RegularEquationSolver.h
index efd6d74ed451a28ad99238849e633cc957d35878..5add4af8454b72f4cea4789d1e999648ad51101f 100644
--- a/aconversions/src/shared/RegularEquationSolver.h
+++ b/aconversions/src/shared/equations/RegularEquationSolver.h
@@ -16,7 +16,7 @@
 #include <AlibException.h>
 #include <regexp/RegExpElement.h>
 
-#include "../include/macros.h"
+#include "../../include/macros.h"
 
 #include "RegExpOptimize.h"
 
diff --git a/aconversions/src/shared/RightRegularEquationSolver.cpp b/aconversions/src/shared/equations/RightRegularEquationSolver.cpp
similarity index 100%
rename from aconversions/src/shared/RightRegularEquationSolver.cpp
rename to aconversions/src/shared/equations/RightRegularEquationSolver.cpp
diff --git a/aconversions/src/shared/RightRegularEquationSolver.h b/aconversions/src/shared/equations/RightRegularEquationSolver.h
similarity index 100%
rename from aconversions/src/shared/RightRegularEquationSolver.h
rename to aconversions/src/shared/equations/RightRegularEquationSolver.h