Merge pull request #221 from iameric1986/master

Organized everything into packages