Moved classes to appropriate package
Merge branch 'develop' of https://github.com/elyas-bhy/pygmy into develop