Reorganized aux. files.