Switch to using core/ since that's on master now