New structure with support for all AB variants under the same repo