Move more things to core-utils for better organization