Organized everything into packages
Fixed the errors to test cases due to packaging
Merge pull request #221 from iameric1986/master

Organized everything into packages