Reorganize
Merge pull request #9 from nathancahill/reorganize

Organizing __init__.py