reorganize modules mod07