Provide complete containment

Fixes the case where the package class would float off, allowing it to
attempt installation before repositories have been defined.
Merge pull request #24 from blalor/master

Provide containment of all included classes