Restructured the package.
Merge pull request #1 from ajdawson/package-structure

Restructured the package.