Moved more var marshalling into dom/Setter & moved Query to dom folder