Restructured the package.
Merge pull request #1 from christopher-henderson/structure_cleanup

Restructured the package.