Refactored Package
Merge pull request #1 from Coggroach/master

Refactored Package