Restructure test folder