Merge "ref: Remove most references to the modules/core package."