Fix: wrong source and header location for Core