Rearranging the structure of the test directory