Updating folder structure for more accurate test