Now the packages that each function is located in makes more sense.
Merge pull request #120 from juliema/reorg

Fixes #118: breaks out modules into more reasonable packages.