Reorganise module.  get rid of rgh prefix