Reorganizes test folders structure