Organizing stuff, moved some of the data-record parsing into the data-record parser file.
Merge pull request #2 from fake-name/master

Organizing stuff, moved some of the data-record parsing into the data-record parser file.