Move packages back into the main file.
Merge pull request #4 from richfitz/master

Move packages back into the main file.