Change the structure of the tests folder