this closes #20 also better organization.
Merge pull request #21 from eprogramming/contrib

this closes #20 also better organization.