Updated ClassReference.java arrangement