Change packages to use the core module