Reorganize the bencharks into modules.