Move classes into packages

Fixes #2
Merge pull request #4 from jstanier/3-move-into-packages

Move classes into packages