reorganized proxies into devices & hosts