Rearrangement: reduce number of modules
Rearrangement: reduce number of modules