Refactoring the test folder structure