package rearrangement in common module