reorganising the modules