Added the UnpackagedPackage. Not satisfying.
Reverted the _Unpackaged addition, not really satisfying, need more work.
Added test on class definition modified.