Reordered module includes to make sure options are set before anything else
Reordered module includes to make sure options are set before anything else

dev-osrose/osIROSE-new,RavenX8/osIROSE-new,RavenX8/osIROSE-new,RavenX8/osIROSE-new,dev-osrose/osIROSE-new,dev-osrose/osIROSE-new