Moved classloader stuff to where it belongs