Moved util files into own subdir in core