[GAIA] - reorganization of the DOM handlers