Reorganise file reading file structure