[CHANGELOG] reorder some things