Modify test folder structure