Usunig v2 and v3 in names, consolidated the api packages