Start to re-organize things to remove the dependency of core on eureka.