Moving to classes
Merge pull request #5 from lodr/refactor-into-classes

Moving to classes