Reorganized the contracts code.