Moving towards uniform file handling

Need some alterations but eventually there will be a single file
handling method.