C-Docs: New structure