Reorganized output paths.