wip
Reorder definitions in core::private