Change fixtures folder structure to enhance performance