re-org to module