Moved new classes over to the classloader