Remove things in core, leaving only extras
Core/extras splitting WIP.
Core/extras split WIP.
Core/extras splitting WIP.