Reorganize file methods