Finalize core headers reorganization
Update docs