Cleaner CDIC parsing and exporting

Use a new CDICEntry structure.