Reorganized definitions chunks and annotation chunks