change module organization