Rearrange the formulas and submodules