CONN-1583 renaming and deleting folders

Renamed CONN-XXXX folders in Bimodal and Manual regression test. Deleted CONN-740 and CONN-997.