change layout of test suite file structure