Structure adjustment and coding

new structure and coding for ContentInfo class