Various Fixes and url hierarchy
Merge https://github.com/AThomsonSMC/zigbee