Reorganised the structure and naming scheme of files involved in tests.