Moved include and skip attributes
Renamed CSV columns
Refactoring and changes to JSON structure