Added in-package and defpacakge support for hierarchy