Updated classpath order and removed incubator jar