Moved the contracts to their respective files.