[software-management-guide/f17] Redordering some files