Cleaned up quite a bit.  Made the concept of a pakage / container much simpler.