Reorganized gadget structure, put in latest ChatterProxy and GrantLoader