Rework: Object oriented file handling