reorganize by modules