Rearrange some modules.