re structure test folder and bootstrap