Gwtii 16 move non gis and refactor according to new widget structure