Apply better directory layout for testing configuration