Reorganization, eliminated redundant module contract-date-testng