More juggling of file locations.