Big module reorganization.