a bit more work getting the cp/proxy/gateway/filesystem eco system in shape
fix up mv logic for proxy/gateway/filesystem leaf node