diff --git a/aconversions/src/aconversion/ConversionHandler.h b/aconversions/src/aconversion/ConversionHandler.h
index 1bb285673211cb54fb16607710a214fc3aec7d98..0b273043a3d974f5873d3e6cf8d217ffdf8da40b 100644
--- a/aconversions/src/aconversion/ConversionHandler.h
+++ b/aconversions/src/aconversion/ConversionHandler.h
@@ -36,8 +36,8 @@
 #include "../re2rg/re2rrg/GlushkovRRG.h"
 #include "../re2rg/re2rrg/BrzozowskiDerivationRRG.h"
 
-#include "../lrg2rrg/LeftToRightRegularGrammar.h"
-#include "../rrg2lrg/RightToLeftRegularGrammar.h"
+#include "../rg2rg/lrg2rrg/LeftToRightRegularGrammar.h"
+#include "../rg2rg/rrg2lrg/RightToLeftRegularGrammar.h"
 
 
 namespace conversions
diff --git a/aconversions/src/lrg2rrg/AbstractLRGtoRRGConverter.cpp b/aconversions/src/rg2rg/lrg2rrg/AbstractLRGtoRRGConverter.cpp
similarity index 100%
rename from aconversions/src/lrg2rrg/AbstractLRGtoRRGConverter.cpp
rename to aconversions/src/rg2rg/lrg2rrg/AbstractLRGtoRRGConverter.cpp
diff --git a/aconversions/src/lrg2rrg/AbstractLRGtoRRGConverter.h b/aconversions/src/rg2rg/lrg2rrg/AbstractLRGtoRRGConverter.h
similarity index 94%
rename from aconversions/src/lrg2rrg/AbstractLRGtoRRGConverter.h
rename to aconversions/src/rg2rg/lrg2rrg/AbstractLRGtoRRGConverter.h
index eedc24309a9a2d87be797d47a8185d82e60921ae..f13f242aaf37e8fdb3669b0e9d7577bb2e3d41e4 100644
--- a/aconversions/src/lrg2rrg/AbstractLRGtoRRGConverter.h
+++ b/aconversions/src/rg2rg/lrg2rrg/AbstractLRGtoRRGConverter.h
@@ -11,7 +11,7 @@
 #include <grammar/Regular/LeftRegularGrammar.h>
 #include <grammar/Regular/RightRegularGrammar.h>
 
-#include "../abstract/Conversion.h"
+#include "../../abstract/Conversion.h"
 
 namespace conversions
 {
diff --git a/aconversions/src/lrg2rrg/LeftToRightRegularGrammar.cpp b/aconversions/src/rg2rg/lrg2rrg/LeftToRightRegularGrammar.cpp
similarity index 100%
rename from aconversions/src/lrg2rrg/LeftToRightRegularGrammar.cpp
rename to aconversions/src/rg2rg/lrg2rrg/LeftToRightRegularGrammar.cpp
diff --git a/aconversions/src/lrg2rrg/LeftToRightRegularGrammar.h b/aconversions/src/rg2rg/lrg2rrg/LeftToRightRegularGrammar.h
similarity index 100%
rename from aconversions/src/lrg2rrg/LeftToRightRegularGrammar.h
rename to aconversions/src/rg2rg/lrg2rrg/LeftToRightRegularGrammar.h
diff --git a/aconversions/src/rrg2lrg/AbstractRRGtoLRGConverter.cpp b/aconversions/src/rg2rg/rrg2lrg/AbstractRRGtoLRGConverter.cpp
similarity index 100%
rename from aconversions/src/rrg2lrg/AbstractRRGtoLRGConverter.cpp
rename to aconversions/src/rg2rg/rrg2lrg/AbstractRRGtoLRGConverter.cpp
diff --git a/aconversions/src/rrg2lrg/AbstractRRGtoLRGConverter.h b/aconversions/src/rg2rg/rrg2lrg/AbstractRRGtoLRGConverter.h
similarity index 94%
rename from aconversions/src/rrg2lrg/AbstractRRGtoLRGConverter.h
rename to aconversions/src/rg2rg/rrg2lrg/AbstractRRGtoLRGConverter.h
index 54aa96b4483e7d3590797258da1cc35fb3683150..37d0468c03f4cc89946692f9db96b309777189cb 100644
--- a/aconversions/src/rrg2lrg/AbstractRRGtoLRGConverter.h
+++ b/aconversions/src/rg2rg/rrg2lrg/AbstractRRGtoLRGConverter.h
@@ -8,7 +8,7 @@
 #ifndef ABSTRACTRRGTOLRGCONVERTER_H_
 #define ABSTRACTRRGTOLRGCONVERTER_H_
 
-#include "../abstract/Conversion.h"
+#include "../../abstract/Conversion.h"
 
 #include <grammar/Regular/LeftRegularGrammar.h>
 #include <grammar/Regular/RightRegularGrammar.h>
diff --git a/aconversions/src/rrg2lrg/RightToLeftRegularGrammar.cpp b/aconversions/src/rg2rg/rrg2lrg/RightToLeftRegularGrammar.cpp
similarity index 100%
rename from aconversions/src/rrg2lrg/RightToLeftRegularGrammar.cpp
rename to aconversions/src/rg2rg/rrg2lrg/RightToLeftRegularGrammar.cpp
diff --git a/aconversions/src/rrg2lrg/RightToLeftRegularGrammar.h b/aconversions/src/rg2rg/rrg2lrg/RightToLeftRegularGrammar.h
similarity index 100%
rename from aconversions/src/rrg2lrg/RightToLeftRegularGrammar.h
rename to aconversions/src/rg2rg/rrg2lrg/RightToLeftRegularGrammar.h