terminology and whaawmp are moved into the official repositories