Update and reorganize CHANGELOG