refactor structs
Merge pull request #7 from adrianob/refactor_structs

refactor structs