Restruture test folder