[GWT20] Refactor package names