Reorganised folder structure for tests.