restructure test folder