rearranged modules