re-org submods