Core files moved to core package