test folder reorganized