Refactor class attributes to corresponding section

Refactor class attributes to corresponding section instead of DataCirco