Reworking internal file handling.