Package split cleanup.
Merge pull request #20 from leftclickben/master

Package split cleanup.