New folder structure for tests