restructured test folder