package reorg

Just reorganized some packages.  No code changes.
Merge pull request #22 from adennie/package-reorg

package reorg