Refactored to proper package.
Merge pull request #232 from jsarman/master

Refactor class to proper place