Move core files ahead of Schema Merge