major rearrangement of modules