Change uri format

The new format is /package/#module.subcomponent.
Fix bug in handling of included items