Refactoring: use Struct.
Merge pull request #2 from tadd/refactoring

Refactoring: use Struct.