Rewrote origin and app URI dependency section

Attempt to close https://github.com/sysapps/runtime/issues/74