refactor to improve application objects, zdo and clusters object model.