Update to point to new /core/ directory