Refactor to put classes in proper packages
Merge pull request #21 from service-enabled/refactor/move-to-package

Refactor to put classes in proper packages