re-structure test folder