~ Reorganize modules.