Split core into two, and update most wgen