Reorganize modules.