@riking mostly this concern applies to nms.  Organizing other code outside of what is affected by a version update effort is fine.  This type of situation would be fine to resort/reorder things if it makes sense.