Move some Util classes to CompCore
Fix references to moved code
Remove unused imports
Simplify condition in ToolPickaxe
prevent possible NPE, remove unneeded field