Reorder: put legacy code first (easy to remove)
Add changelog