Finalize core headers reorganization