fix subpackages not listed
add support for events and samples