Reorder stuff (mostly comments) in core