Reorganise file names