Add data classes

Also tabs -> spaces