fix:arrange the file