Reorganization of the test folder