Porting everything to the newer imports was trivial except for one instance which required a very small refactor.
The core package could contain non-functions, so we might as well move it upwards.