GWTII-50: everything in one package (except if it was api)