Moving Goat.class to core